Merge pull request #2663 from cloudflare/release-please--branches--main--changes--next

release: 4.3.1

.devcontainer/Dockerfile

@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
 
 USER vscode
 
-RUN curl -sSf https://rye-up.com/get | RYE_VERSION="0.24.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

.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.

.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

.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: |

.github/workflows/ci.yml

@@ -1,41 +1,110 @@
 name: CI
+
 on:
   push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+    branches-ignore:
+      - 'generated'
+      - 'codegen/**'
+      - 'integrated/**'
+      - 'stl-preview-head/**'
+      - 'stl-preview-base/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   lint:
+    timeout-minutes: 10
     name: lint
-    runs-on: ubuntu-latest
-    
+    runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - 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 lints
+        run: ./scripts/lint
+
+  upload:
+    if: github.repository == 'stainless-sdks/cloudflare-python'
+    timeout-minutes: 10
+    name: upload
+    permissions:
+      contents: read
+      id-token: write
+    runs-on: depot-ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get GitHub OIDC Token
+        id: github-oidc
+        uses: actions/github-script@v6
+        with:
+          script: core.setOutput('github_token', await core.getIDToken());
+
+      - name: Upload tarball
+        env:
+          URL: https://pkg.stainless.com/s
+          AUTH: ${{ steps.github-oidc.outputs.github_token }}
+          SHA: ${{ github.sha }}
+        run: ./scripts/utils/upload-artifact.sh
+
+  test:
+    timeout-minutes: 30
+    name: test
+    runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - 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: Bootstrap
+        run: ./scripts/bootstrap
+
+      - name: Run tests
+        run: ./scripts/test
+
+  examples:
+    timeout-minutes: 10
+    name: examples
+    runs-on: ${{ github.repository == 'stainless-sdks/cloudflare-python' && 'depot-ubuntu-24.04' || 'ubuntu-latest' }}
+    if: github.repository == 'cloudflare/cloudflare-python'
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Install Rye
         run: |
-          curl -sSf https://rye-up.com/get | bash
+          curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: 0.24.0
-          RYE_INSTALL_OPTION: "--yes"
-
+          RYE_VERSION: '0.44.0'
+          RYE_INSTALL_OPTION: '--yes'
       - name: Install dependencies
         run: |
           rye sync --all-features
 
-      - name: Run ruff
+      - env:
+          CLOUDFLARE_ACCOUNT_ID: f037e56e89293a057740de681ac9abbe
+          CLOUDFLARE_EMAIL: terraform-acceptance-test@cfapi.net
+          CLOUDFLARE_ZONE_ID: 0da42c8d2132a9ddaf714f9e7c920711
+          CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
         run: |
-          rye run check:ruff
-
-      - name: Run type checking
-        run: |
-          rye run typecheck
-
-      - name: Ensure importable
-        run: |
-          rye run python -c 'import cloudflare'
+            rye run python ./examples/ai/demo.py
+            rye run python ./examples/dns/record.py

.github/workflows/publish-pypi.yml

@@ -14,15 +14,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Rye
         run: |
-          curl -sSf https://rye-up.com/get | bash
+          curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: 0.24.0
-          RYE_INSTALL_OPTION: "--yes"
+          RYE_VERSION: '0.44.0'
+          RYE_INSTALL_OPTION: '--yes'
 
       - name: Publish to PyPI
         run: |

.github/workflows/release-doctor.yml

@@ -1,16 +1,24 @@
 name: Release Doctor
+
 on:
   pull_request:
+    branches:
+      - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   release_doctor:
     name: release doctor
     runs-on: ubuntu-latest
+    timeout-minutes: 2
     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@v3
+      - uses: actions/checkout@v4
 
       - name: Check release environment
         run: |

.github/workflows/semgrep.yml

@@ -0,0 +1,19 @@
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: '0 4 * * *'
+name: Semgrep config
+jobs:
+  semgrep:
+    name: semgrep/ci
+    runs-on: ubuntu-latest
+    env:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+      SEMGREP_URL: https://cloudflare.semgrep.dev
+      SEMGREP_APP_URL: https://cloudflare.semgrep.dev
+      SEMGREP_VERSION_CHECK_URL: https://cloudflare.semgrep.dev/api/check-version
+    container:
+      image: returntocorp/semgrep
+    steps:
+      - uses: actions/checkout@v4
+      - run: semgrep ci

.gitignore

@@ -1,3 +1,4 @@
+.prism.log
 .vscode
 _dev
 
@@ -12,3 +13,4 @@ dist
 .env
 .envrc
 codegen.log
+Brewfile.lock.json

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "3.0.0-beta.4"
+  ".": "4.3.1"
 }

.stats.yml

@@ -1 +1,4 @@
-configured_endpoints: 1288
+configured_endpoints: 1752
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-b15b44e0efd207de48e7e74e742b0b4b190c74f12a941a1a0ef59a51656a5224.yml
+openapi_spec_hash: 83243c9ee06f88d0fa91e9b185d8a42e
+config_hash: 8601d43fd5ccaf9e3d08f26748a5a63a

Brewfile

@@ -0,0 +1,2 @@
+brew "rye"
+

CONTRIBUTING.md

@@ -2,9 +2,13 @@
 
 ### With Rye
 
-We use [Rye](https://rye-up.com/) to manage dependencies so we highly recommend [installing it](https://rye-up.com/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
@@ -121,5 +124,5 @@ You can release to package managers by using [the `Publish PyPI` GitHub action](
 
 ### Publish manually
 
-If you need to manually release a package, you can run the `bin/publish-pypi` script with an `PYPI_TOKEN` set on
+If you need to manually release a package, you can run the `bin/publish-pypi` script with a `PYPI_TOKEN` set on
 the environment.

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Cloudflare
+   Copyright 2025 Cloudflare
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -2,13 +2,13 @@
 
 [![PyPI version](https://img.shields.io/pypi/v/cloudflare.svg)](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.8+
 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).
 
 ## 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).
+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).
 
 ## Installation
 
@@ -26,8 +26,7 @@ import os
 from cloudflare import Cloudflare
 
 client = Cloudflare(
-    # This is the default and can be omitted
-    api_email=os.environ.get("CLOUDFLARE_EMAIL"),
+    api_token=os.environ.get("CLOUDFLARE_API_TOKEN"),  # This is the default and can be omitted
 )
 
 zone = client.zones.create(
@@ -53,8 +52,7 @@ import asyncio
 from cloudflare import AsyncCloudflare
 
 client = AsyncCloudflare(
-    # This is the default and can be omitted
-    api_email=os.environ.get("CLOUDFLARE_EMAIL"),
+    api_token=os.environ.get("CLOUDFLARE_API_TOKEN"),  # This is the default and can be omitted
 )
 
 
@@ -74,10 +72,10 @@ Functionality between the synchronous and asynchronous clients is otherwise iden
 
 ## 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 provide helper methods for things like:
+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:
 
-- Serializing back into JSON, `model.model_dump_json(indent=2, exclude_unset=True)`
-- Converting to a dictionary, `model.model_dump(exclude_unset=True)`
+- Serializing back into JSON, `model.to_json()`
+- Converting to a dictionary, `model.to_dict()`
 
 Typed requests and responses provide autocomplete and documentation within your editor. If you would like to see type errors in VS Code to help catch bugs earlier, set `python.analysis.typeCheckingMode` to `basic`.
 
@@ -88,7 +86,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()
 
@@ -104,7 +102,7 @@ Or, asynchronously:
 
 ```python
 import asyncio
-import cloudflare
+from cloudflare import AsyncCloudflare
 
 client = AsyncCloudflare()
 
@@ -137,11 +135,46 @@ 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.api_gateway.user_schemas.create(
+    zone_id="023e105f4ecef8ad9ca31a8372d0c353",
+    file=Path("/path/to/file"),
+    kind="openapi_v3",
+)
+```
+
+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.
@@ -172,7 +205,7 @@ except cloudflare.APIStatusError as e:
     print(e.response)
 ```
 
-Error codes are as followed:
+Error codes are as follows:
 
 | Status Code | Error Type                 |
 | ----------- | -------------------------- |
@@ -228,7 +261,7 @@ client = Cloudflare(
 )
 
 # Override per-request:
-client.with_options(timeout=5 * 1000).zones.edit(
+client.with_options(timeout=5.0).zones.edit(
     zone_id="023e105f4ecef8ad9ca31a8372d0c353",
 )
 ```
@@ -243,12 +276,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`:
@@ -306,44 +341,105 @@ with client.zones.with_streaming_response.create(
 
 The context manager is required so that the response will reliably be closed.
 
+### Making custom/undocumented requests
+
+This library is typed for convenient access to the documented API.
+
+If you need to access undocumented endpoints, params, or response properties, the library can still be used.
+
+#### 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) when making this request.
+
+```py
+import httpx
+
+response = client.post(
+    "/foo",
+    cast_to=httpx.Response,
+    body={"my_param": True},
+)
+
+print(response.headers.get("x-foo"))
+```
+
+#### Undocumented request params
+
+If you want to explicitly send an extra param, you can do so with the `extra_query`, `extra_body`, and `extra_headers` request
+options.
+
+#### Undocumented response properties
+
+To access undocumented response properties, you can access the extra fields like `response.unknown_prop`. You
+can also get all the extra fields on the Pydantic model as a dict with
+[`response.model_extra`](https://docs.pydantic.dev/latest/api/base_model/#pydantic.BaseModel.model_extra).
+
 ### Configuring the HTTP client
 
 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
-- Additional [advanced](https://www.python-httpx.org/advanced/#client-instances) functionality
+- 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
+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=httpx.Client(
-        proxies="http://my.test.proxy.example.com",
+    http_client=DefaultHttpxClient(
+        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.
 
-## Versioning
+```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.
-2. 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)_.
-3. Changes that we do not expect to impact the vast majority of users in practice.
+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.
 
-We take backwards-compatibility seriously and work hard to ensure you can rely on a smooth upgrade experience.
+### Determining the installed version
 
-We are keen for your feedback; please open an [issue](https://www.github.com/cloudflare/cloudflare-python/issues) with questions, bugs, or suggestions.
+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.8 or higher.
+
+## Contributing
+
+See [the contributing documentation](./CONTRIBUTING.md).

SECURITY.md

@@ -0,0 +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!

bin/check-env-state.py

@@ -1,40 +0,0 @@
-"""Script that exits 1 if the current environment is not
-in sync with the `requirements-dev.lock` file.
-"""
-
-from pathlib import Path
-
-import importlib_metadata
-
-
-def should_run_sync() -> bool:
-    dev_lock = Path(__file__).parent.parent.joinpath("requirements-dev.lock")
-
-    for line in dev_lock.read_text().splitlines():
-        if not line or line.startswith("#") or line.startswith("-e"):
-            continue
-
-        dep, lock_version = line.split("==")
-
-        try:
-            version = importlib_metadata.version(dep)
-
-            if lock_version != version:
-                print(f"mismatch for {dep} current={version} lock={lock_version}")
-                return True
-        except Exception:
-            print(f"could not import {dep}")
-            return True
-
-    return False
-
-
-def main() -> None:
-    if should_run_sync():
-        exit(1)
-    else:
-        exit(0)
-
-
-if __name__ == "__main__":
-    main()

bin/check-test-server

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-NC='\033[0m' # No Color
-
-function prism_is_running() {
-  curl --silent "http://localhost:4010" >/dev/null 2>&1
-}
-
-function is_overriding_api_base_url() {
-  [ -n "$TEST_API_BASE_URL" ]
-}
-
-if is_overriding_api_base_url ; then
-  # If someone is running the tests against the live API, we can trust they know
-  # what they're doing and exit early.
-  echo -e "${GREEN}✔ Running tests against ${TEST_API_BASE_URL}${NC}"
-
-  exit 0
-elif prism_is_running ; then
-  echo -e "${GREEN}✔ Mock prism server is running with your OpenAPI spec${NC}"
-  echo
-
-  exit 0
-else
-  echo -e "${RED}ERROR:${NC} The test suite will not run without a mock Prism server"
-  echo -e "running against your OpenAPI spec."
-  echo
-  echo -e "${YELLOW}To fix:${NC}"
-  echo
-  echo -e "1. Install Prism (requires Node 16+):"
-  echo
-  echo -e "  With npm:"
-  echo -e "    \$ ${YELLOW}npm install -g @stoplight/prism-cli${NC}"
-  echo
-  echo -e "  With yarn:"
-  echo -e "    \$ ${YELLOW}yarn global add @stoplight/prism-cli${NC}"
-  echo
-  echo -e "2. Run the mock server"
-  echo
-  echo -e "  To run the server, pass in the path of your OpenAPI"
-  echo -e "  spec to the prism command:"
-  echo
-  echo -e "    \$ ${YELLOW}prism mock path/to/your.openapi.yml${NC}"
-  echo
-
-  exit 1
-fi

bin/test

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-bin/check-test-server && rye run pytest "$@"

examples/.keep

@@ -1,4 +0,0 @@
-File generated from our OpenAPI spec by Stainless.
-
-This directory can be used to store example files demonstrating usage of this SDK.
-It is ignored by Stainless code generation and its content (other than this keep file) won't be touched.

examples/ai/demo.py

@@ -0,0 +1,20 @@
+import os
+import sys
+
+from cloudflare import Cloudflare
+
+account_id = os.getenv("CLOUDFLARE_ACCOUNT_ID")
+if account_id is None:
+    sys.exit("CLOUDFLARE_ACCOUNT_ID is not defined")
+
+client = Cloudflare()
+
+t = client.ai.run(
+    "@cf/meta/m2m100-1.2b",
+    account_id=account_id,
+    text="I'll have an order of the moule frites",
+    target_lang="french",
+    source_lang="english",
+)
+
+# print(t['translated_text'])

examples/dns/record.py

@@ -0,0 +1,25 @@
+import os
+import sys
+
+from cloudflare import Cloudflare
+
+zone_id = os.getenv("CLOUDFLARE_ZONE_ID")
+if zone_id is None:
+    sys.exit("CLOUDFLARE_ZONE_ID is not defined")
+
+client = Cloudflare()
+
+record = client.dns.records.create(
+    zone_id=zone_id,
+    type="A",
+    name="www.mydns.com",
+    content="198.51.100.1",
+    proxied=True,
+)
+assert record is not None
+
+# clean up after we're done
+client.dns.records.delete(
+    zone_id=zone_id,
+    dns_record_id=record.id,
+)

examples/workers/script_upload.py

@@ -0,0 +1,97 @@
+"""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, BadRequestError
+
+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
+                script_file_name: (
+                    script_file_name,
+                    bytes(script_content, "utf-8"),
+                    "application/javascript+module",
+                )
+                # Can add other files, such as more modules or source maps
+                # source_map_file_name: (
+                #   source_map_file_name,
+                #   bytes(source_map_content, "utf-8"),
+                #   "application/source-map"
+                #)
+            },
+        )
+        print("Script Upload success!")
+        print(script.to_json(indent=2))
+    except BadRequestError as err:
+        print("Script Upload failure!")
+        print(err)
+
+
+if __name__ == "__main__":
+    main()

mypy.ini

@@ -5,7 +5,10 @@ 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)$
+#
+# 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
@@ -38,7 +41,7 @@ cache_fine_grained = True
 # ```
 # Changing this codegen to make mypy happy would increase complexity
 # and would not be worth it.
-disable_error_code = func-returns-value
+disable_error_code = func-returns-value,overload-cannot-match
 
 # https://github.com/python/mypy/issues/12162
 [mypy.overrides]

pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "cloudflare"
-version = "3.0.0-beta.4"
+version = "4.3.1"
 description = "The official Python library for the cloudflare API"
-readme = "README.md"
+dynamic = ["readme"]
 license = "Apache-2.0"
 authors = [
 { name = "Cloudflare", email = "api@cloudflare.com" },
@@ -10,18 +10,15 @@ authors = [
 dependencies = [
     "httpx>=0.23.0, <1",
     "pydantic>=1.9.0, <3",
-    "typing-extensions>=4.7, <5",
+    "typing-extensions>=4.10, <5",
     "anyio>=3.5.0, <5",
     "distro>=1.7.0, <2",
     "sniffio",
-    "cached-property; python_version < '3.8'",
-
 ]
-requires-python = ">= 3.7"
+requires-python = ">= 3.8"
 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",
@@ -36,19 +33,16 @@ classifiers = [
   "License :: OSI Approved :: Apache Software License"
 ]
 
-
-
 [project.urls]
 Homepage = "https://github.com/cloudflare/cloudflare-python"
 Repository = "https://github.com/cloudflare/cloudflare-python"
 
 
-
 [tool.rye]
 managed = true
 # version pins are in requirements-dev.lock
 dev-dependencies = [
-    "pyright",
+    "pyright==1.1.399",
     "mypy",
     "respx",
     "pytest",
@@ -58,7 +52,9 @@ dev-dependencies = [
     "nox",
     "dirty-equals>=0.6.0",
     "importlib-metadata>=6.7.0",
-
+    "rich>=13.7.1",
+    "nest_asyncio==1.6.0",
+    "pytest-xdist>=3.6.1",
 ]
 
 [tool.rye.scripts]
@@ -66,18 +62,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 bin/ruffen-docs.py README.md api.md"
+"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",
@@ -88,7 +87,7 @@ typecheck = { chain = [
 "typecheck:mypy" = "mypy ."
 
 [build-system]
-requires = ["hatchling"]
+requires = ["hatchling==1.26.3", "hatch-fancy-pypi-readme"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build]
@@ -99,15 +98,38 @@ include = [
 [tool.hatch.build.targets.wheel]
 packages = ["src/cloudflare"]
 
-[tool.black]
-line-length = 120
-target-version = ["py37"]
+[tool.hatch.build.targets.sdist]
+# Basically everything except hidden files/directories (such as .github, .devcontainers, .python-version, etc)
+include = [
+  "/*.toml",
+  "/*.json",
+  "/*.lock",
+  "/*.md",
+  "/mypy.ini",
+  "/noxfile.py",
+  "bin/*",
+  "examples/*",
+  "src/*",
+  "tests/*",
+]
+
+[tool.hatch.metadata.hooks.fancy-pypi-readme]
+content-type = "text/markdown"
+
+[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+path = "README.md"
+
+[[tool.hatch.metadata.hooks.fancy-pypi-readme.substitutions]]
+# replace relative links with absolute links
+pattern = '\[(.+?)\]\(((?!https?://)\S+?)\)'
+replacement = '[\1](https://github.com/cloudflare/cloudflare-python/tree/main/\g<2>)'
 
 [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"
 ]
@@ -117,7 +139,7 @@ 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.8"
 
 exclude = [
     "_dev",
@@ -126,6 +148,7 @@ exclude = [
 ]
 
 reportImplicitOverride = true
+reportOverlappingOverload = false
 
 reportImportCycles = false
 reportPrivateUsage = false
@@ -134,6 +157,11 @@ reportPrivateUsage = false
 line-length = 120
 output-format = "grouped"
 target-version = "py37"
+
+[tool.ruff.format]
+docstring-code-format = true
+
+[tool.ruff.lint]
 select = [
   # isort
   "I",
@@ -149,7 +177,9 @@ select = [
   "T201",
   "T203",
   # misuse of typing.TYPE_CHECKING
-  "TCH004"
+  "TC004",
+  # import rules
+  "TID251",
 ]
 ignore = [
   # mutable defaults
@@ -160,10 +190,9 @@ unfixable = [
   "T201",
   "T203",
 ]
-ignore-init-module-imports = true
 
-[tool.ruff.format]
-docstring-code-format = true
+[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"
 
 [tool.ruff.lint.isort]
 length-sort = true
@@ -172,7 +201,8 @@ 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"]
 "examples/**.py" = ["T201", "T203"]

requirements-dev.lock

@@ -6,17 +6,17 @@
 #   features: []
 #   all-features: true
 #   with-sources: false
+#   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
     # via pydantic
-anyio==4.1.0
+anyio==4.4.0
     # via cloudflare
     # via httpx
 argcomplete==3.1.2
     # via nox
-attrs==23.1.0
-    # via pytest
 certifi==2023.7.22
     # via httpcore
     # via httpx
@@ -27,15 +27,18 @@ distlib==0.3.7
     # via virtualenv
 distro==1.8.0
     # via cloudflare
-exceptiongroup==1.1.3
+exceptiongroup==1.2.2
     # via anyio
+    # via pytest
+execnet==2.1.1
+    # via pytest-xdist
 filelock==3.12.4
     # via virtualenv
 h11==0.14.0
     # via httpcore
 httpcore==1.0.2
     # via httpx
-httpx==0.25.2
+httpx==0.28.1
     # via cloudflare
     # via respx
 idna==3.4
@@ -44,9 +47,14 @@ idna==3.4
 importlib-metadata==7.0.0
 iniconfig==2.0.0
     # via pytest
-mypy==1.7.1
+markdown-it-py==3.0.0
+    # via rich
+mdurl==0.1.2
+    # via markdown-it-py
+mypy==1.14.1
 mypy-extensions==1.0.0
     # via mypy
+nest-asyncio==1.6.0
 nodeenv==1.8.0
     # via pyright
 nox==2023.4.22
@@ -55,24 +63,27 @@ packaging==23.2
     # via pytest
 platformdirs==3.11.0
     # via virtualenv
-pluggy==1.3.0
+pluggy==1.5.0
     # via pytest
-py==1.11.0
-    # via pytest
-pydantic==2.4.2
+pydantic==2.10.3
     # via cloudflare
-pydantic-core==2.10.1
+pydantic-core==2.27.1
     # via pydantic
-pyright==1.1.353
-pytest==7.1.1
+pygments==2.18.0
+    # via rich
+pyright==1.1.399
+pytest==8.3.3
     # via pytest-asyncio
-pytest-asyncio==0.21.1
+    # via pytest-xdist
+pytest-asyncio==0.24.0
+pytest-xdist==3.7.0
 python-dateutil==2.8.2
     # via time-machine
 pytz==2023.3.post1
     # via dirty-equals
-respx==0.20.2
-ruff==0.1.9
+respx==0.22.0
+rich==13.7.1
+ruff==0.9.4
 setuptools==68.2.2
     # via nodeenv
 six==1.16.0
@@ -80,16 +91,17 @@ six==1.16.0
 sniffio==1.3.0
     # via anyio
     # via cloudflare
-    # via httpx
 time-machine==2.9.0
-tomli==2.0.1
+tomli==2.0.2
     # via mypy
     # via pytest
-typing-extensions==4.8.0
+typing-extensions==4.12.2
+    # via anyio
     # via cloudflare
     # via mypy
     # via pydantic
     # via pydantic-core
+    # via pyright
 virtualenv==20.24.5
     # via nox
 zipp==3.17.0

requirements.lock

@@ -6,11 +6,13 @@
 #   features: []
 #   all-features: true
 #   with-sources: false
+#   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
     # via pydantic
-anyio==4.1.0
+anyio==4.4.0
     # via cloudflare
     # via httpx
 certifi==2023.7.22
@@ -18,26 +20,26 @@ certifi==2023.7.22
     # via httpx
 distro==1.8.0
     # via cloudflare
-exceptiongroup==1.1.3
+exceptiongroup==1.2.2
     # via anyio
 h11==0.14.0
     # via httpcore
 httpcore==1.0.2
     # via httpx
-httpx==0.25.2
+httpx==0.28.1
     # via cloudflare
 idna==3.4
     # via anyio
     # via httpx
-pydantic==2.4.2
+pydantic==2.10.3
     # via cloudflare
-pydantic-core==2.10.1
+pydantic-core==2.27.1
     # via pydantic
 sniffio==1.3.0
     # via anyio
     # via cloudflare
-    # via httpx
-typing-extensions==4.8.0
+typing-extensions==4.12.2
+    # via anyio
     # via cloudflare
     # via pydantic
     # via pydantic-core

scripts/bootstrap

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+if ! command -v rye >/dev/null 2>&1 && [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ]; then
+  brew bundle check >/dev/null 2>&1 || {
+    echo "==> Installing Homebrew dependencies…"
+    brew bundle
+  }
+fi
+
+echo "==> Installing Python dependencies…"
+
+# experimental uv support makes installations significantly faster
+rye config --set-bool behavior.use-uv=true
+
+rye sync --all-features

scripts/format

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+echo "==> Running formatters"
+rye run format

scripts/lint

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+echo "==> Running lints"
+rye run lint
+
+echo "==> Making sure it imports"
+rye run python -c 'import cloudflare'

scripts/mock

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+if [[ -n "$1" && "$1" != '--'* ]]; then
+  URL="$1"
+  shift
+else
+  URL="$(grep 'openapi_spec_url' .stats.yml | cut -d' ' -f2)"
+fi
+
+# Check if the URL is empty
+if [ -z "$URL" ]; then
+  echo "Error: No OpenAPI spec path/url provided or found in .stats.yml"
+  exit 1
+fi
+
+echo "==> Starting mock server with URL ${URL}"
+
+# Run prism mock on the given spec
+if [ "$1" == "--daemon" ]; then
+  npm exec --package=@stainless-api/prism-cli@5.8.5 -- prism mock "$URL" &> .prism.log &
+
+  # Wait for server to come online
+  echo -n "Waiting for server"
+  while ! grep -q "✖  fatal\|Prism is listening" ".prism.log" ; do
+    echo -n "."
+    sleep 0.1
+  done
+
+  if grep -q "✖  fatal" ".prism.log"; then
+    cat .prism.log
+    exit 1
+  fi
+
+  echo
+else
+  npm exec --package=@stainless-api/prism-cli@5.8.5 -- prism mock "$URL"
+fi

scripts/test

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[0;33m'
+NC='\033[0m' # No Color
+
+function prism_is_running() {
+  curl --silent "http://localhost:4010" >/dev/null 2>&1
+}
+
+kill_server_on_port() {
+  pids=$(lsof -t -i tcp:"$1" || echo "")
+  if [ "$pids" != "" ]; then
+    kill "$pids"
+    echo "Stopped $pids."
+  fi
+}
+
+function is_overriding_api_base_url() {
+  [ -n "$TEST_API_BASE_URL" ]
+}
+
+if ! is_overriding_api_base_url && ! prism_is_running ; then
+  # When we exit this script, make sure to kill the background mock server process
+  trap 'kill_server_on_port 4010' EXIT
+
+  # Start the dev server
+  ./scripts/mock --daemon
+fi
+
+if is_overriding_api_base_url ; then
+  echo -e "${GREEN}✔ Running tests against ${TEST_API_BASE_URL}${NC}"
+  echo
+elif ! prism_is_running ; then
+  echo -e "${RED}ERROR:${NC} The test suite will not run without a mock Prism server"
+  echo -e "running against your OpenAPI spec."
+  echo
+  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
+
+  exit 1
+else
+  echo -e "${GREEN}✔ Mock prism server is running with your OpenAPI spec${NC}"
+  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 -- "$@"

scripts/utils/ruffen-docs.py

@@ -47,7 +47,7 @@ def format_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 format_str(
     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)

scripts/utils/upload-artifact.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+set -exuo pipefail
+
+RESPONSE=$(curl -X POST "$URL" \
+  -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=$(tar -cz . | curl -v -X PUT \
+  -H "Content-Type: application/gzip" \
+  --data-binary @- "$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'\033[0m"
+else
+  echo -e "\033[31mFailed to upload artifact.\033[0m"
+  exit 1
+fi

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
 from ._utils import file_from_path
 from ._client import (
     Client,
@@ -17,6 +19,7 @@ from ._client import (
 from ._models import BaseModel
 from ._version import __title__, __version__
 from ._response import APIResponse as APIResponse, AsyncAPIResponse as AsyncAPIResponse
+from ._constants import DEFAULT_TIMEOUT, DEFAULT_MAX_RETRIES, DEFAULT_CONNECTION_LIMITS
 from ._exceptions import (
     APIError,
     ConflictError,
@@ -33,6 +36,7 @@ from ._exceptions import (
     UnprocessableEntityError,
     APIResponseValidationError,
 )
+from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
 from ._utils._logs import setup_logging as _setup_logging
 
 __all__ = [
@@ -44,6 +48,7 @@ __all__ = [
     "ProxiesTypes",
     "NotGiven",
     "NOT_GIVEN",
+    "Omit",
     "CloudflareError",
     "APIError",
     "APIStatusError",
@@ -68,8 +73,16 @@ __all__ = [
     "AsyncCloudflare",
     "file_from_path",
     "BaseModel",
+    "DEFAULT_TIMEOUT",
+    "DEFAULT_MAX_RETRIES",
+    "DEFAULT_CONNECTION_LIMITS",
+    "DefaultHttpxClient",
+    "DefaultAsyncHttpxClient",
 ]
 
+if not _t.TYPE_CHECKING:
+    from ._utils._resources_proxy import resources as resources
+
 _setup_logging()
 
 # Update the __module__ attribute for exported symbols so that

src/cloudflare/_compat.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 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)
@@ -118,10 +118,10 @@ def get_model_fields(model: type[pydantic.BaseModel]) -> dict[str, FieldInfo]:
     return model.__fields__  # type: ignore
 
 
-def model_copy(model: _ModelT) -> _ModelT:
+def model_copy(model: _ModelT, *, deep: bool = False) -> _ModelT:
     if PYDANTIC_V2:
-        return model.model_copy()
-    return model.copy()  # type: ignore
+        return model.model_copy(deep=deep)
+    return model.copy(deep=deep)  # type: ignore
 
 
 def model_json(model: pydantic.BaseModel, *, indent: int | None = None) -> str:
@@ -133,17 +133,25 @@ def model_json(model: pydantic.BaseModel, *, indent: int | None = None) -> str:
 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 PYDANTIC_V2 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=warnings if PYDANTIC_V2 else True,
         )
     return cast(
         "dict[str, Any]",
         model.dict(  # pyright: ignore[reportDeprecated, reportUnnecessaryCast]
+            exclude=exclude,
             exclude_unset=exclude_unset,
             exclude_defaults=exclude_defaults,
         ),
@@ -159,22 +167,19 @@ def model_parse(model: type[_ModelT], data: Any) -> _ModelT:
 # generic models
 if TYPE_CHECKING:
 
-    class GenericModel(pydantic.BaseModel):
-        ...
+    class GenericModel(pydantic.BaseModel): ...
 
 else:
     if PYDANTIC_V2:
         # 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):
-            ...
+        class GenericModel(pydantic.BaseModel): ...
 
     else:
         import pydantic.generics
 
-        class GenericModel(pydantic.generics.GenericModel, pydantic.BaseModel):
-            ...
+        class GenericModel(pydantic.generics.GenericModel, pydantic.BaseModel): ...
 
 
 # cached properties
@@ -193,30 +198,22 @@ if TYPE_CHECKING:
         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

src/cloudflare/_constants.py

@@ -6,9 +6,9 @@ RAW_RESPONSE_HEADER = "X-Stainless-Raw-Response"
 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_LIMITS = httpx.Limits(max_connections=100, max_keepalive_connections=20)
+DEFAULT_CONNECTION_LIMITS = httpx.Limits(max_connections=100, max_keepalive_connections=20)
 
 INITIAL_RETRY_DELAY = 0.5
 MAX_RETRY_DELAY = 8.0

src/cloudflare/_exceptions.py

@@ -2,10 +2,15 @@
 
 from __future__ import annotations
 
+from typing import Any, List, cast
 from typing_extensions import Literal
 
 import httpx
 
+from ._utils import is_dict
+from ._models import construct_type
+from .types.shared.error_data import ErrorData
+
 __all__ = [
     "BadRequestError",
     "AuthenticationError",
@@ -37,12 +42,19 @@ class APIError(CloudflareError):
     If there was no response associated with this error then it will be `None`.
     """
 
-    def __init__(self, message: str, request: httpx.Request, *, body: object | None) -> None:  # noqa: ARG002
+    errors: List[ErrorData]
+
+    def __init__(self, message: str, request: httpx.Request, *, body: object | None) -> None:
         super().__init__(message)
         self.request = request
         self.message = message
         self.body = body
 
+        if is_dict(body):
+            self.errors = cast(Any, construct_type(type_=List[ErrorData], value=body.get("errors")))
+        else:
+            self.errors = []
+
 
 class APIResponseValidationError(APIError):
     response: httpx.Response

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:
@@ -83,13 +81,11 @@ def _read_file_content(file: FileContent) -> HttpxFileContent:
 
 
 @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:

src/cloudflare/_models.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
+import os
 import inspect
 from typing import TYPE_CHECKING, Any, Type, Union, Generic, TypeVar, Callable, cast
 from datetime import date, datetime
-from functools import lru_cache
 from typing_extensions import (
     Unpack,
     Literal,
     ClassVar,
     Protocol,
     Required,
+    ParamSpec,
     TypedDict,
     TypeGuard,
     final,
@@ -18,7 +19,6 @@ from typing_extensions import (
 )
 
 import pydantic
-import pydantic.generics
 from pydantic.fields import FieldInfo
 
 from ._types import (
@@ -30,18 +30,23 @@ from ._types import (
     Timeout,
     NotGiven,
     AnyMapping,
+    MultipartSyntax,
     HttpxRequestFiles,
 )
 from ._utils import (
     PropertyInfo,
     is_list,
     is_given,
+    json_safe,
+    lru_cache,
     is_mapping,
     parse_date,
+    coerce_boolean,
     parse_datetime,
     strip_not_given,
     extract_type_arg,
     is_annotated_type,
+    is_type_alias_type,
     strip_annotated_type,
 )
 from ._compat import (
@@ -60,11 +65,14 @@ from ._compat import (
 from ._constants import RAW_RESPONSE_HEADER
 
 if TYPE_CHECKING:
-    from pydantic_core.core_schema import ModelField, ModelFieldsSchema
+    from pydantic_core.core_schema import ModelField, ModelSchema, LiteralSchema, ModelFieldsSchema
 
 __all__ = ["BaseModel", "GenericModel"]
 
 _T = TypeVar("_T")
+_BaseModelT = TypeVar("_BaseModelT", bound="BaseModel")
+
+P = ParamSpec("P")
 
 
 @runtime_checkable
@@ -74,7 +82,9 @@ class _ConfigProtocol(Protocol):
 
 class BaseModel(pydantic.BaseModel):
     if PYDANTIC_V2:
-        model_config: ClassVar[ConfigDict] = ConfigDict(extra="allow")
+        model_config: ClassVar[ConfigDict] = ConfigDict(
+            extra="allow", defer_build=coerce_boolean(os.environ.get("DEFER_PYDANTIC_BUILD", "true"))
+        )
     else:
 
         @property
@@ -86,24 +96,97 @@ class BaseModel(pydantic.BaseModel):
         class Config(pydantic.BaseConfig):  # pyright: ignore[reportDeprecated]
             extra: Any = pydantic.Extra.allow  # type: ignore
 
+    def to_dict(
+        self,
+        *,
+        mode: Literal["json", "python"] = "python",
+        use_api_names: bool = True,
+        exclude_unset: bool = True,
+        exclude_defaults: bool = False,
+        exclude_none: bool = False,
+        warnings: bool = True,
+    ) -> dict[str, object]:
+        """Recursively generate a dictionary representation of the model, optionally specifying which fields to include or exclude.
+
+        By default, fields that were not set by the API will not be included,
+        and keys will match the API response, *not* the property names from the model.
+
+        For example, if the API responds with `"fooBar": true` but we've defined a `foo_bar: bool` property,
+        the output will use the `"fooBar"` key (unless `use_api_names=False` is passed).
+
+        Args:
+            mode:
+                If mode is 'json', the dictionary will only contain JSON serializable types. e.g. `datetime` will be turned into a string, `"2024-3-22T18:11:19.117000Z"`.
+                If mode is 'python', the dictionary may contain any Python objects. e.g. `datetime(2024, 3, 22)`
+
+            use_api_names: Whether to use the key that the API responded with or the property name. Defaults to `True`.
+            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 from the output.
+            exclude_none: Whether to exclude fields that have a value of `None` from the output.
+            warnings: Whether to log warnings when invalid fields are encountered. This is only supported in Pydantic v2.
+        """
+        return self.model_dump(
+            mode=mode,
+            by_alias=use_api_names,
+            exclude_unset=exclude_unset,
+            exclude_defaults=exclude_defaults,
+            exclude_none=exclude_none,
+            warnings=warnings,
+        )
+
+    def to_json(
+        self,
+        *,
+        indent: int | None = 2,
+        use_api_names: bool = True,
+        exclude_unset: bool = True,
+        exclude_defaults: bool = False,
+        exclude_none: bool = False,
+        warnings: bool = True,
+    ) -> str:
+        """Generates a JSON string representing this model as it would be received from or sent to the API (but with indentation).
+
+        By default, fields that were not set by the API will not be included,
+        and keys will match the API response, *not* the property names from the model.
+
+        For example, if the API responds with `"fooBar": true` but we've defined a `foo_bar: bool` property,
+        the output will use the `"fooBar"` key (unless `use_api_names=False` is passed).
+
+        Args:
+            indent: Indentation to use in the JSON output. If `None` is passed, the output will be compact. Defaults to `2`
+            use_api_names: Whether to use the key that the API responded with or the property name. Defaults to `True`.
+            exclude_unset: Whether to exclude fields that have not been explicitly set.
+            exclude_defaults: Whether to exclude fields that have the default value.
+            exclude_none: Whether to exclude fields that have a value of `None`.
+            warnings: Whether to show any warnings that occurred during serialization. This is only supported in Pydantic v2.
+        """
+        return self.model_dump_json(
+            indent=indent,
+            by_alias=use_api_names,
+            exclude_unset=exclude_unset,
+            exclude_defaults=exclude_defaults,
+            exclude_none=exclude_none,
+            warnings=warnings,
+        )
+
     @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)
@@ -113,7 +196,7 @@ class BaseModel(pydantic.BaseModel):
         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):
@@ -167,14 +250,16 @@ class BaseModel(pydantic.BaseModel):
             self,
             *,
             mode: Literal["json", "python"] | str = "python",
-            include: IncEx = None,
-            exclude: IncEx = None,
+            include: IncEx | None = None,
+            exclude: IncEx | None = None,
             by_alias: bool = False,
             exclude_unset: bool = False,
             exclude_defaults: bool = False,
             exclude_none: bool = False,
             round_trip: bool = False,
-            warnings: bool = True,
+            warnings: bool | Literal["none", "warn", "error"] = True,
+            context: dict[str, Any] | None = None,
+            serialize_as_any: bool = False,
         ) -> dict[str, Any]:
             """Usage docs: https://docs.pydantic.dev/2.4/concepts/serialization/#modelmodel_dump
 
@@ -196,13 +281,17 @@ class BaseModel(pydantic.BaseModel):
             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:
                 raise ValueError("warnings is only supported in Pydantic v2")
-            return super().dict(  # pyright: ignore[reportDeprecated]
+            if context is not None:
+                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")
+            dumped = super().dict(  # pyright: ignore[reportDeprecated]
                 include=include,
                 exclude=exclude,
                 by_alias=by_alias,
@@ -211,19 +300,23 @@ class BaseModel(pydantic.BaseModel):
                 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,
+            include: IncEx | None = None,
+            exclude: IncEx | None = None,
             by_alias: bool = False,
             exclude_unset: bool = False,
             exclude_defaults: bool = False,
             exclude_none: bool = False,
             round_trip: bool = False,
-            warnings: bool = True,
+            warnings: bool | Literal["none", "warn", "error"] = True,
+            context: dict[str, Any] | None = None,
+            serialize_as_any: bool = False,
         ) -> str:
             """Usage docs: https://docs.pydantic.dev/2.4/concepts/serialization/#modelmodel_dump_json
 
@@ -247,6 +340,10 @@ class BaseModel(pydantic.BaseModel):
                 raise ValueError("round_trip is only supported in Pydantic v2")
             if warnings != True:
                 raise ValueError("warnings is only supported in Pydantic v2")
+            if context is not None:
+                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().json(  # type: ignore[reportDeprecated]
                 indent=indent,
                 include=include,
@@ -287,21 +384,63 @@ 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)
 
 
+def build(
+    base_model_cls: Callable[P, _BaseModelT],
+    *args: P.args,
+    **kwargs: P.kwargs,
+) -> _BaseModelT:
+    """Construct a BaseModel class without validation.
+
+    This is useful for cases where you need to instantiate a `BaseModel`
+    from an API response as this provides type-safe params which isn't supported
+    by helpers like `construct_type()`.
+
+    ```py
+    build(MyModel, my_field_a="foo", my_field_b=123)
+    ```
+    """
+    if args:
+        raise TypeError(
+            "Received positional arguments which are not supported; Keyword arguments must be used instead",
+        )
+
+    return cast(_BaseModelT, construct_type(type_=base_model_cls, value=kwargs))
+
+
+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) -> 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 = get_args(type_)[1:]
+        meta: tuple[Any, ...] = get_args(type_)[1:]
         type_ = extract_type_arg(type_, 0)
     else:
         meta = tuple()
@@ -313,7 +452,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
 
@@ -355,7 +494,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]
 
@@ -473,7 +616,7 @@ def _build_discriminated_union_meta(*, union: type, meta_annotations: tuple[Any,
                 field_schema = field["schema"]
 
                 if field_schema["type"] == "literal":
-                    for entry in field_schema["expected"]:
+                    for entry in cast("LiteralSchema", field_schema)["expected"]:
                         if isinstance(entry, str):
                             mapping[entry] = variant
             else:
@@ -484,8 +627,8 @@ def _build_discriminated_union_meta(*, union: type, meta_annotations: tuple[Any,
                 # Note: if one variant defines an alias then they all should
                 discriminator_alias = field_info.alias
 
-                if field_info.annotation and is_literal_type(field_info.annotation):
-                    for entry in get_args(field_info.annotation):
+                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
 
@@ -503,15 +646,18 @@ def _build_discriminated_union_meta(*, union: type, meta_annotations: tuple[Any,
 
 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
@@ -527,7 +673,15 @@ def validate_type(*, type_: type[_T], value: object) -> _T:
     return cast(_T, _validate_non_model_type(type_=type_, value=value))
 
 
-# our use of subclasssing here causes weirdness for type checkers,
+def set_pydantic_config(typ: Any, config: pydantic.ConfigDict) -> None:
+    """Add a pydantic config for the given type.
+
+    Note: this is a no-op on Pydantic v1.
+    """
+    setattr(typ, "__pydantic_config__", config)  # noqa: B010
+
+
+# our use of subclassing here causes weirdness for type checkers,
 # so we just pretend that we don't subclass
 if TYPE_CHECKING:
     GenericModel = BaseModel
@@ -538,12 +692,14 @@ else:
 
 
 if PYDANTIC_V2:
+    from pydantic import TypeAdapter as _TypeAdapter
+
+    _CachedTypeAdapter = cast("TypeAdapter[object]", lru_cache(maxsize=None)(_TypeAdapter))
+
     if TYPE_CHECKING:
         from pydantic import TypeAdapter
     else:
-        from pydantic import TypeAdapter as _TypeAdapter
-
-        TypeAdapter = lru_cache(_TypeAdapter)
+        TypeAdapter = _CachedTypeAdapter
 
     def _validate_non_model_type(*, type_: type[_T], value: object) -> _T:
         return TypeAdapter(type_).validate_python(value)
@@ -582,6 +738,8 @@ class FinalRequestOptionsInput(TypedDict, total=False):
     idempotency_key: str
     json_data: Body
     extra_json: AnyMapping
+    multipart_syntax: MultipartSyntax
+    follow_redirects: bool
 
 
 @final
@@ -594,7 +752,9 @@ 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
 
     # It should be noted that we cannot use `json` here as that would override
     # a BaseModel method in an incompatible fashion.

src/cloudflare/_response.py

@@ -25,7 +25,7 @@ import httpx
 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 @@ class BaseAPIResponse(Generic[R]):
         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 @@ class BaseAPIResponse(Generic[R]):
         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 @@ class BaseAPIResponse(Generic[R]):
         )
 
     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 @@ class BaseAPIResponse(Generic[R]):
             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 @@ class BaseAPIResponse(Generic[R]):
         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 @@ class BaseAPIResponse(Generic[R]):
                 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 @@ class BaseAPIResponse(Generic[R]):
         # 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 @@ class BaseAPIResponse(Generic[R]):
 
 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 @@ class APIResponse(BaseAPIResponse[R]):
 
 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.

src/cloudflare/_streaming.py

@@ -23,7 +23,7 @@ class Stream(Generic[_T]):
 
     response: httpx.Response
 
-    _decoder: SSEDecoder | SSEBytesDecoder
+    _decoder: SSEBytesDecoder
 
     def __init__(
         self,
@@ -46,10 +46,7 @@ class Stream(Generic[_T]):
             yield item
 
     def _iter_events(self) -> Iterator[ServerSentEvent]:
-        if isinstance(self._decoder, SSEBytesDecoder):
-            yield from self._decoder.iter_bytes(self.response.iter_bytes())
-        else:
-            yield from self._decoder.iter(self.response.iter_lines())
+        yield from self._decoder.iter_bytes(self.response.iter_bytes())
 
     def __stream__(self) -> Iterator[_T]:
         cast_to = cast(Any, self._cast_to)
@@ -112,12 +109,8 @@ class AsyncStream(Generic[_T]):
             yield item
 
     async def _iter_events(self) -> AsyncIterator[ServerSentEvent]:
-        if isinstance(self._decoder, SSEBytesDecoder):
-            async for sse in self._decoder.aiter_bytes(self.response.aiter_bytes()):
-                yield sse
-        else:
-            async for sse in self._decoder.aiter(self.response.aiter_lines()):
-                yield sse
+        async for sse in self._decoder.aiter_bytes(self.response.aiter_bytes()):
+            yield sse
 
     async def __stream__(self) -> AsyncIterator[_T]:
         cast_to = cast(Any, self._cast_to)
@@ -205,21 +198,49 @@ class SSEDecoder:
         self._last_event_id = None
         self._retry = None
 
-    def iter(self, iterator: Iterator[str]) -> Iterator[ServerSentEvent]:
-        """Given an iterator that yields lines, iterate over it & yield every event encountered"""
-        for line in iterator:
-            line = line.rstrip("\n")
-            sse = self.decode(line)
-            if sse is not None:
-                yield sse
+    def iter_bytes(self, iterator: Iterator[bytes]) -> Iterator[ServerSentEvent]:
+        """Given an iterator that yields raw binary data, iterate over it & yield every event encountered"""
+        for chunk in self._iter_chunks(iterator):
+            # Split before decoding so splitlines() only uses \r and \n
+            for raw_line in chunk.splitlines():
+                line = raw_line.decode("utf-8")
+                sse = self.decode(line)
+                if sse:
+                    yield sse
 
-    async def aiter(self, iterator: AsyncIterator[str]) -> AsyncIterator[ServerSentEvent]:
-        """Given an async iterator that yields lines, iterate over it & yield every event encountered"""
-        async for line in iterator:
-            line = line.rstrip("\n")
-            sse = self.decode(line)
-            if sse is not None:
-                yield sse
+    def _iter_chunks(self, iterator: Iterator[bytes]) -> Iterator[bytes]:
+        """Given an iterator that yields raw binary data, iterate over it and yield individual SSE chunks"""
+        data = b""
+        for chunk in iterator:
+            for line in chunk.splitlines(keepends=True):
+                data += line
+                if data.endswith((b"\r\r", b"\n\n", b"\r\n\r\n")):
+                    yield data
+                    data = b""
+        if data:
+            yield data
+
+    async def aiter_bytes(self, iterator: AsyncIterator[bytes]) -> AsyncIterator[ServerSentEvent]:
+        """Given an iterator that yields raw binary data, iterate over it & yield every event encountered"""
+        async for chunk in self._aiter_chunks(iterator):
+            # Split before decoding so splitlines() only uses \r and \n
+            for raw_line in chunk.splitlines():
+                line = raw_line.decode("utf-8")
+                sse = self.decode(line)
+                if sse:
+                    yield sse
+
+    async def _aiter_chunks(self, iterator: AsyncIterator[bytes]) -> AsyncIterator[bytes]:
+        """Given an iterator that yields raw binary data, iterate over it and yield individual SSE chunks"""
+        data = b""
+        async for chunk in iterator:
+            for line in chunk.splitlines(keepends=True):
+                data += line
+                if data.endswith((b"\r\r", b"\n\n", b"\r\n\r\n")):
+                    yield data
+                    data = b""
+        if data:
+            yield data
 
     def decode(self, line: str) -> ServerSentEvent | None:
         # See: https://html.spec.whatwg.org/multipage/server-sent-events.html#event-stream-interpretation  # noqa: E501

src/cloudflare/_types.py

@@ -16,7 +16,7 @@ from typing import (
     Optional,
     Sequence,
 )
-from typing_extensions import Literal, Protocol, TypeAlias, TypedDict, override, runtime_checkable
+from typing_extensions import Set, Literal, Protocol, TypeAlias, TypedDict, override, runtime_checkable
 
 import httpx
 import pydantic
@@ -71,6 +71,8 @@ HttpxFileTypes = Union[
 ]
 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,6 +102,8 @@ 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
@@ -111,8 +115,7 @@ class NotGiven:
     For example:
 
     ```py
-    def get(timeout: Union[int, NotGiven, None] = NotGiven()) -> Response:
-        ...
+    def get(timeout: Union[int, NotGiven, None] = NotGiven()) -> Response: ...
 
 
     get(timeout=1)  # 1s timeout
@@ -162,16 +165,14 @@ class ModelBuilderProtocol(Protocol):
         *,
         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 +196,8 @@ ResponseT = TypeVar(
 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 +219,4 @@ class _GenericAlias(Protocol):
 
 class HttpxSendArgs(TypedDict, total=False):
     auth: httpx.Auth
+    follow_redirects: bool

src/cloudflare/_utils/__init__.py

@@ -6,6 +6,8 @@ from ._utils import (
     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,
@@ -37,6 +39,7 @@ from ._typing import (
     is_iterable_type as is_iterable_type,
     is_required_type as is_required_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,
 )
@@ -48,3 +51,7 @@ from ._transform import (
     maybe_transform as maybe_transform,
     async_maybe_transform as async_maybe_transform,
 )
+from ._reflection import (
+    function_has_argument as function_has_argument,
+    assert_signatures_in_sync as assert_signatures_in_sync,
+)

src/cloudflare/_utils/_proxy.py

@@ -10,7 +10,7 @@ T = TypeVar("T")
 class LazyProxy(Generic[T], ABC):
     """Implements data methods to pretend that an instance is another instance.
 
-    This includes forwarding attribute access and othe methods.
+    This includes forwarding attribute access and other methods.
     """
 
     # Note: we have to special case proxies that themselves return proxies
@@ -46,7 +46,10 @@ class LazyProxy(Generic[T], ABC):
     @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 @@ class LazyProxy(Generic[T], ABC):
         return cast(T, self)
 
     @abstractmethod
-    def __load__(self) -> T:
-        ...
+    def __load__(self) -> T: ...

src/cloudflare/_utils/_reflection.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import inspect
+from typing import Any, Callable
+
+
+def function_has_argument(func: Callable[..., Any], arg_name: str) -> bool:
+    """Returns whether or not the given function has a specific parameter"""
+    sig = inspect.signature(func)
+    return arg_name in sig.parameters
+
+
+def assert_signatures_in_sync(
+    source_func: Callable[..., Any],
+    check_func: Callable[..., Any],
+    *,
+    exclude_params: set[str] = set(),
+) -> None:
+    """Ensure that the signature of the second function matches the first."""
+
+    check_sig = inspect.signature(check_func)
+    source_sig = inspect.signature(source_func)
+
+    errors: list[str] = []
+
+    for name, source_param in source_sig.parameters.items():
+        if name in exclude_params:
+            continue
+
+        custom_param = check_sig.parameters.get(name)
+        if not custom_param:
+            errors.append(f"the `{name}` param is missing")
+            continue
+
+        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(custom_param.annotation)}"
+            )
+            continue
+
+    if errors:
+        raise AssertionError(f"{len(errors)} errors encountered when comparing signatures:\n\n" + "\n\n".join(errors))

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__()

src/cloudflare/_utils/_sync.py

@@ -1,54 +1,77 @@
 from __future__ import annotations
 
+import sys
+import asyncio
 import functools
-from typing import TypeVar, Callable, Awaitable
+import contextvars
+from typing import Any, TypeVar, Callable, Awaitable
 from typing_extensions import ParamSpec
 
 import anyio
+import sniffio
 import anyio.to_thread
 
 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]]:
+if sys.version_info >= (3, 9):
+    _asyncio_to_thread = asyncio.to_thread
+else:
+    # backport of https://docs.python.org/3/library/asyncio-task.html#asyncio.to_thread
+    # for Python 3.8 support
+    async def _asyncio_to_thread(
+        func: Callable[T_ParamSpec, T_Retval], /, *args: T_ParamSpec.args, **kwargs: T_ParamSpec.kwargs
+    ) -> Any:
+        """Asynchronously run function *func* in a separate thread.
+
+        Any *args and **kwargs supplied for this function are directly passed
+        to *func*. Also, the current :class:`contextvars.Context` is propagated,
+        allowing context variables from the main thread to be accessed in the
+        separate thread.
+
+        Returns a coroutine that can be awaited to get the eventual result of *func*.
+        """
+        loop = asyncio.events.get_running_loop()
+        ctx = contextvars.copy_context()
+        func_call = functools.partial(ctx.run, func, *args, **kwargs)
+        return await loop.run_in_executor(None, func_call)
+
+
+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.
+    positional and keyword arguments. For python version 3.9 and above, it uses
+    asyncio.to_thread to run the function in a separate thread. For python version
+    3.8, it uses locally defined copy of the asyncio.to_thread function which was
+    introduced in python 3.9.
 
-    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.
+    Usage:
 
-    Use it like this:
-
-    ```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
 
@@ -58,7 +81,6 @@ def asyncify(
     """
 
     async def wrapper(*args: T_ParamSpec.args, **kwargs: T_ParamSpec.kwargs) -> T_Retval:
-        partial_f = functools.partial(function, *args, **kwargs)
-        return await anyio.to_thread.run_sync(partial_f, cancellable=cancellable, limiter=limiter)
+        return await to_thread(function, *args, **kwargs)
 
     return wrapper

src/cloudflare/_utils/_transform.py

@@ -5,13 +5,15 @@ import base64
 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,
 )
@@ -25,7 +27,7 @@ from ._typing import (
     is_annotated_type,
     strip_annotated_type,
 )
-from .._compat import model_dump, is_typeddict
+from .._compat import get_origin, model_dump, is_typeddict
 
 _T = TypeVar("_T")
 
@@ -108,6 +110,7 @@ def transform(
     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 +129,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 +145,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,
     *,
@@ -164,16 +171,35 @@ def _transform_recursive(
         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))
     ):
+        # 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 +212,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 +261,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 `NotGiven` 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
@@ -302,16 +333,35 @@ async def _async_transform_recursive(
         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))
     ):
+        # 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 +374,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 +423,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 `NotGiven` 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 +435,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)

src/cloudflare/_utils/_typing.py

@@ -1,9 +1,19 @@
 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
 
@@ -36,7 +46,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 +110,7 @@ def extract_type_var_from_base(
     ```
     """
     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)
 

src/cloudflare/_utils/_utils.py

@@ -16,11 +16,12 @@ from typing import (
     overload,
 )
 from pathlib import Path
+from datetime import date, datetime
 from typing_extensions import TypeGuard
 
 import sniffio
 
-from .._types import Headers, NotGiven, FileTypes, NotGivenOr, HeadersLike
+from .._types import NotGiven, FileTypes, NotGivenOr, HeadersLike
 from .._compat import parse_date as parse_date, parse_datetime as parse_datetime
 
 _T = TypeVar("_T")
@@ -71,8 +72,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
@@ -211,20 +220,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: ...
     ```
     """
 
@@ -265,6 +271,8 @@ def required_args(*variants: Sequence[str]) -> Callable[[CallableT], CallableT]:
                     )
                     msg = f"Missing required arguments; Expected either {variations} arguments to be given"
                 else:
+                    assert len(variants) > 0
+
                     # TODO: this error message is not deterministic
                     missing = list(set(variants[0]) - given_params)
                     if len(missing) > 1:
@@ -284,18 +292,15 @@ _V = TypeVar("_V")
 
 
 @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:
@@ -367,13 +372,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):
-        headers = cast(Headers, headers)
-        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]:
@@ -389,3 +394,29 @@ def get_async_library() -> str:
         return sniffio.current_async_library()
     except Exception:
         return "false"
+
+
+def lru_cache(*, maxsize: int | None = 128) -> Callable[[CallableT], CallableT]:
+    """A version of functools.lru_cache that retains the type signature
+    for the wrapped function arguments.
+    """
+    wrapper = functools.lru_cache(  # noqa: TID251
+        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

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.0.0-beta.4"  # x-release-please-version
+__version__ = "4.3.1"  # x-release-please-version

src/cloudflare/pagination.py

@@ -1,11 +1,8 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Any, List, Type, Generic, Mapping, TypeVar, Optional, cast
+from typing import List, Generic, TypeVar, Optional, cast
 from typing_extensions import override
 
-from httpx import Response
-
-from ._utils import is_mapping
 from ._models import BaseModel, GenericModel
 from ._base_client import BasePage, PageInfo, BaseSyncPage, BaseAsyncPage
 
@@ -27,8 +24,6 @@ __all__ = [
     "AsyncSinglePage",
 ]
 
-_BaseModelT = TypeVar("_BaseModelT", bound=BaseModel)
-
 _T = TypeVar("_T")
 
 
@@ -50,23 +45,17 @@ 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
 
     @override
     def next_page_info(self) -> Optional[PageInfo]:
-        current_page = cast("int | None", self._options.params.get("page"))
-        if current_page is None:
-            current_page = 1
+        last_page = cast("int | None", self._options.params.get("page")) or 1
 
-        last_page = cast("int | None", self._options.params.get("page"))
-        if last_page is not None and current_page <= last_page:
-            # The API didn't return a new page in the last request
-            return None
-
-        return PageInfo(params={"page": current_page + 1})
+        return PageInfo(params={"page": last_page + 1})
 
 
 class AsyncV4PagePagination(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
@@ -77,23 +66,17 @@ 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
 
     @override
     def next_page_info(self) -> Optional[PageInfo]:
-        current_page = cast("int | None", self._options.params.get("page"))
-        if current_page is None:
-            current_page = 1
+        last_page = cast("int | None", self._options.params.get("page")) or 1
 
-        last_page = cast("int | None", self._options.params.get("page"))
-        if last_page is not None and current_page <= last_page:
-            # The API didn't return a new page in the last request
-            return None
-
-        return PageInfo(params={"page": current_page + 1})
+        return PageInfo(params={"page": last_page + 1})
 
 
 class V4PagePaginationArrayResultInfo(BaseModel):
@@ -115,16 +98,9 @@ class SyncV4PagePaginationArray(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
 
     @override
     def next_page_info(self) -> Optional[PageInfo]:
-        current_page = cast("int | None", self._options.params.get("page"))
-        if current_page is None:
-            current_page = 1
+        last_page = cast("int | None", self._options.params.get("page")) or 1
 
-        last_page = cast("int | None", self._options.params.get("page"))
-        if last_page is not None and current_page <= last_page:
-            # The API didn't return a new page in the last request
-            return None
-
-        return PageInfo(params={"page": current_page + 1})
+        return PageInfo(params={"page": last_page + 1})
 
 
 class AsyncV4PagePaginationArray(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
@@ -140,16 +116,9 @@ class AsyncV4PagePaginationArray(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
 
     @override
     def next_page_info(self) -> Optional[PageInfo]:
-        current_page = cast("int | None", self._options.params.get("page"))
-        if current_page is None:
-            current_page = 1
+        last_page = cast("int | None", self._options.params.get("page")) or 1
 
-        last_page = cast("int | None", self._options.params.get("page"))
-        if last_page is not None and current_page <= last_page:
-            # The API didn't return a new page in the last request
-            return None
-
-        return PageInfo(params={"page": current_page + 1})
+        return PageInfo(params={"page": last_page + 1})
 
 
 class CursorPaginationResultInfo(BaseModel):
@@ -175,7 +144,8 @@ class SyncCursorPagination(BaseSyncPage[_T], BasePage[_T], Generic[_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
 
@@ -197,7 +167,8 @@ class AsyncCursorPagination(BaseAsyncPage[_T], BasePage[_T], Generic[_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
 
@@ -227,7 +198,8 @@ class SyncCursorLimitPagination(BaseSyncPage[_T], BasePage[_T], Generic[_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
 
@@ -249,7 +221,8 @@ class AsyncCursorLimitPagination(BaseAsyncPage[_T], BasePage[_T], Generic[_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
 
@@ -257,14 +230,14 @@ class AsyncCursorLimitPagination(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
 
 
 class SyncSinglePage(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
-    items: List[_T]
+    result: List[_T]
 
     @override
     def _get_page_items(self) -> List[_T]:
-        items = self.items
-        if not items:
+        result = self.result
+        if not result:
             return []
-        return items
+        return result
 
     @override
     def next_page_info(self) -> None:
@@ -274,25 +247,16 @@ class SyncSinglePage(BaseSyncPage[_T], BasePage[_T], Generic[_T]):
         """
         return None
 
-    @classmethod
-    def build(cls: Type[_BaseModelT], *, response: Response, data: object) -> _BaseModelT:  # noqa: ARG003
-        return cls.construct(
-            None,
-            **{
-                **(cast(Mapping[str, Any], data) if is_mapping(data) else {"items": data}),
-            },
-        )
-
 
 class AsyncSinglePage(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
-    items: List[_T]
+    result: List[_T]
 
     @override
     def _get_page_items(self) -> List[_T]:
-        items = self.items
-        if not items:
+        result = self.result
+        if not result:
             return []
-        return items
+        return result
 
     @override
     def next_page_info(self) -> None:
@@ -301,12 +265,3 @@ class AsyncSinglePage(BaseAsyncPage[_T], BasePage[_T], Generic[_T]):
         so there will never be a next page.
         """
         return None
-
-    @classmethod
-    def build(cls: Type[_BaseModelT], *, response: Response, data: object) -> _BaseModelT:  # noqa: ARG003
-        return cls.construct(
-            None,
-            **{
-                **(cast(Mapping[str, Any], data) if is_mapping(data) else {"items": data}),
-            },
-        )

src/cloudflare/resources/accounts/__init__.py

@@ -1,47 +1,89 @@
 # 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 (
-    Roles,
-    AsyncRoles,
-    RolesWithRawResponse,
-    AsyncRolesWithRawResponse,
-    RolesWithStreamingResponse,
-    AsyncRolesWithStreamingResponse,
+    RolesResource,
+    AsyncRolesResource,
+    RolesResourceWithRawResponse,
+    AsyncRolesResourceWithRawResponse,
+    RolesResourceWithStreamingResponse,
+    AsyncRolesResourceWithStreamingResponse,
+)
+from .tokens import (
+    TokensResource,
+    AsyncTokensResource,
+    TokensResourceWithRawResponse,
+    AsyncTokensResourceWithRawResponse,
+    TokensResourceWithStreamingResponse,
+    AsyncTokensResourceWithStreamingResponse,
 )
 from .members import (
-    Members,
-    AsyncMembers,
-    MembersWithRawResponse,
-    AsyncMembersWithRawResponse,
-    MembersWithStreamingResponse,
-    AsyncMembersWithStreamingResponse,
+    MembersResource,
+    AsyncMembersResource,
+    MembersResourceWithRawResponse,
+    AsyncMembersResourceWithRawResponse,
+    MembersResourceWithStreamingResponse,
+    AsyncMembersResourceWithStreamingResponse,
 )
 from .accounts import (
-    Accounts,
-    AsyncAccounts,
-    AccountsWithRawResponse,
-    AsyncAccountsWithRawResponse,
-    AccountsWithStreamingResponse,
-    AsyncAccountsWithStreamingResponse,
+    AccountsResource,
+    AsyncAccountsResource,
+    AccountsResourceWithRawResponse,
+    AsyncAccountsResourceWithRawResponse,
+    AccountsResourceWithStreamingResponse,
+    AsyncAccountsResourceWithStreamingResponse,
+)
+from .subscriptions import (
+    SubscriptionsResource,
+    AsyncSubscriptionsResource,
+    SubscriptionsResourceWithRawResponse,
+    AsyncSubscriptionsResourceWithRawResponse,
+    SubscriptionsResourceWithStreamingResponse,
+    AsyncSubscriptionsResourceWithStreamingResponse,
 )
 
 __all__ = [
-    "Members",
-    "AsyncMembers",
-    "MembersWithRawResponse",
-    "AsyncMembersWithRawResponse",
-    "MembersWithStreamingResponse",
-    "AsyncMembersWithStreamingResponse",
-    "Roles",
-    "AsyncRoles",
-    "RolesWithRawResponse",
-    "AsyncRolesWithRawResponse",
-    "RolesWithStreamingResponse",
-    "AsyncRolesWithStreamingResponse",
-    "Accounts",
-    "AsyncAccounts",
-    "AccountsWithRawResponse",
-    "AsyncAccountsWithRawResponse",
-    "AccountsWithStreamingResponse",
-    "AsyncAccountsWithStreamingResponse",
+    "MembersResource",
+    "AsyncMembersResource",
+    "MembersResourceWithRawResponse",
+    "AsyncMembersResourceWithRawResponse",
+    "MembersResourceWithStreamingResponse",
+    "AsyncMembersResourceWithStreamingResponse",
+    "RolesResource",
+    "AsyncRolesResource",
+    "RolesResourceWithRawResponse",
+    "AsyncRolesResourceWithRawResponse",
+    "RolesResourceWithStreamingResponse",
+    "AsyncRolesResourceWithStreamingResponse",
+    "SubscriptionsResource",
+    "AsyncSubscriptionsResource",
+    "SubscriptionsResourceWithRawResponse",
+    "AsyncSubscriptionsResourceWithRawResponse",
+    "SubscriptionsResourceWithStreamingResponse",
+    "AsyncSubscriptionsResourceWithStreamingResponse",
+    "TokensResource",
+    "AsyncTokensResource",
+    "TokensResourceWithRawResponse",
+    "AsyncTokensResourceWithRawResponse",
+    "TokensResourceWithStreamingResponse",
+    "AsyncTokensResourceWithStreamingResponse",
+    "LogsResource",
+    "AsyncLogsResource",
+    "LogsResourceWithRawResponse",
+    "AsyncLogsResourceWithRawResponse",
+    "LogsResourceWithStreamingResponse",
+    "AsyncLogsResourceWithStreamingResponse",
+    "AccountsResource",
+    "AsyncAccountsResource",
+    "AccountsResourceWithRawResponse",
+    "AsyncAccountsResourceWithRawResponse",
+    "AccountsResourceWithStreamingResponse",
+    "AsyncAccountsResourceWithStreamingResponse",
 ]

src/cloudflare/resources/accounts/accounts.py

@@ -2,39 +2,38 @@
 
 from __future__ import annotations
 
-from typing import Any, cast
+from typing import Type, Optional, cast
 from typing_extensions import Literal
 
 import httpx
 
 from .roles import (
-    Roles,
-    AsyncRoles,
-    RolesWithRawResponse,
-    AsyncRolesWithRawResponse,
-    RolesWithStreamingResponse,
-    AsyncRolesWithStreamingResponse,
-)
-from ...types import (
-    AccountGetResponse,
-    AccountUpdateResponse,
-    account_list_params,
-    account_update_params,
+    RolesResource,
+    AsyncRolesResource,
+    RolesResourceWithRawResponse,
+    AsyncRolesResourceWithRawResponse,
+    RolesResourceWithStreamingResponse,
+    AsyncRolesResourceWithStreamingResponse,
 )
 from .members import (
-    Members,
-    AsyncMembers,
-    MembersWithRawResponse,
-    AsyncMembersWithRawResponse,
-    MembersWithStreamingResponse,
-    AsyncMembersWithStreamingResponse,
+    MembersResource,
+    AsyncMembersResource,
+    MembersResourceWithRawResponse,
+    AsyncMembersResourceWithRawResponse,
+    MembersResourceWithStreamingResponse,
+    AsyncMembersResourceWithStreamingResponse,
 )
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ..._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+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,
@@ -44,35 +43,129 @@ from ..._response import (
 )
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from ..._base_client import (
-    AsyncPaginator,
-    make_request_options,
+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_create_params, account_update_params
+from ...types.accounts.account import Account
+from ...types.accounts.account_delete_response import AccountDeleteResponse
 
-__all__ = ["Accounts", "AsyncAccounts"]
+__all__ = ["AccountsResource", "AsyncAccountsResource"]
 
 
-class Accounts(SyncAPIResource):
+class AccountsResource(SyncAPIResource):
     @cached_property
-    def members(self) -> Members:
-        return Members(self._client)
+    def members(self) -> MembersResource:
+        return MembersResource(self._client)
 
     @cached_property
-    def roles(self) -> Roles:
-        return Roles(self._client)
+    def roles(self) -> RolesResource:
+        return RolesResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AccountsWithRawResponse:
-        return AccountsWithRawResponse(self)
+    def subscriptions(self) -> SubscriptionsResource:
+        return SubscriptionsResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> AccountsWithStreamingResponse:
-        return AccountsWithStreamingResponse(self)
+    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"],
+        unit: account_create_params.Unit | 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[Account]:
+        """
+        Create an account (only available for tenant admins at this time)
+
+        Args:
+          name: Account name
+
+          type: the type of account being created. For self-serve customers, use standard. for
+              enterprise customers, use enterprise.
+
+          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,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -81,11 +174,15 @@ class Accounts(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AccountUpdateResponse:
+    ) -> Optional[Account]:
         """
         Update an existing account.
 
         Args:
+          account_id: Account identifier tag.
+
+          id: Identifier
+
           name: Account name
 
           settings: Account settings
@@ -98,34 +195,33 @@ class Accounts(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            AccountUpdateResponse,
-            self._put(
-                f"/accounts/{account_id}",
-                body=maybe_transform(
-                    {
-                        "name": name,
-                        "settings": settings,
-                    },
-                    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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountUpdateResponse]
-                ),  # 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._put(
+            f"/accounts/{account_id}",
+            body=maybe_transform(
+                {
+                    "id": id,
+                    "name": name,
+                    "settings": settings,
+                },
+                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[Account]]._unwrapper,
+            ),
+            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,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -134,13 +230,15 @@ class Accounts(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[object]:
+    ) -> SyncV4PagePaginationArray[Account]:
         """
         List all accounts you have ownership or verified access to.
 
         Args:
           direction: Direction to order results.
 
+          name: Name of the account.
+
           page: Page number of paginated results.
 
           per_page: Maximum number of results per page.
@@ -155,7 +253,7 @@ class Accounts(SyncAPIResource):
         """
         return self._get_api_list(
             "/accounts",
-            page=SyncV4PagePaginationArray[object],
+            page=SyncV4PagePaginationArray[Account],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -164,30 +262,75 @@ class Accounts(SyncAPIResource):
                 query=maybe_transform(
                     {
                         "direction": direction,
+                        "name": name,
                         "page": page,
                         "per_page": per_page,
                     },
                     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,
-    ) -> AccountGetResponse:
+    ) -> 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
@@ -196,45 +339,120 @@ class Accounts(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            AccountGetResponse,
-            self._get(
-                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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountGetResponse]
-                ),  # 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}",
+            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]),
         )
 
 
-class AsyncAccounts(AsyncAPIResource):
+class AsyncAccountsResource(AsyncAPIResource):
     @cached_property
-    def members(self) -> AsyncMembers:
-        return AsyncMembers(self._client)
+    def members(self) -> AsyncMembersResource:
+        return AsyncMembersResource(self._client)
 
     @cached_property
-    def roles(self) -> AsyncRoles:
-        return AsyncRoles(self._client)
+    def roles(self) -> AsyncRolesResource:
+        return AsyncRolesResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncAccountsWithRawResponse:
-        return AsyncAccountsWithRawResponse(self)
+    def subscriptions(self) -> AsyncSubscriptionsResource:
+        return AsyncSubscriptionsResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> AsyncAccountsWithStreamingResponse:
-        return AsyncAccountsWithStreamingResponse(self)
+    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"],
+        unit: account_create_params.Unit | 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[Account]:
+        """
+        Create an account (only available for tenant admins at this time)
+
+        Args:
+          name: Account name
+
+          type: the type of account being created. For self-serve customers, use standard. for
+              enterprise customers, use enterprise.
+
+          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,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -243,11 +461,15 @@ class AsyncAccounts(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AccountUpdateResponse:
+    ) -> Optional[Account]:
         """
         Update an existing account.
 
         Args:
+          account_id: Account identifier tag.
+
+          id: Identifier
+
           name: Account name
 
           settings: Account settings
@@ -260,34 +482,33 @@ class AsyncAccounts(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            AccountUpdateResponse,
-            await self._put(
-                f"/accounts/{account_id}",
-                body=await async_maybe_transform(
-                    {
-                        "name": name,
-                        "settings": settings,
-                    },
-                    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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountUpdateResponse]
-                ),  # 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._put(
+            f"/accounts/{account_id}",
+            body=await async_maybe_transform(
+                {
+                    "id": id,
+                    "name": name,
+                    "settings": settings,
+                },
+                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[Account]]._unwrapper,
+            ),
+            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,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@@ -296,13 +517,15 @@ class AsyncAccounts(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[object, AsyncV4PagePaginationArray[object]]:
+    ) -> AsyncPaginator[Account, AsyncV4PagePaginationArray[Account]]:
         """
         List all accounts you have ownership or verified access to.
 
         Args:
           direction: Direction to order results.
 
+          name: Name of the account.
+
           page: Page number of paginated results.
 
           per_page: Maximum number of results per page.
@@ -317,7 +540,7 @@ class AsyncAccounts(AsyncAPIResource):
         """
         return self._get_api_list(
             "/accounts",
-            page=AsyncV4PagePaginationArray[object],
+            page=AsyncV4PagePaginationArray[Account],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -326,30 +549,36 @@ class AsyncAccounts(AsyncAPIResource):
                 query=maybe_transform(
                     {
                         "direction": direction,
+                        "name": name,
                         "page": page,
                         "per_page": per_page,
                     },
                     account_list_params.AccountListParams,
                 ),
             ),
-            model=object,
+            model=Account,
         )
 
-    async def get(
+    async def delete(
         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,
-    ) -> AccountGetResponse:
-        """
-        Get information about a specific account that you are a member of.
+    ) -> 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
@@ -358,111 +587,219 @@ class AsyncAccounts(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            AccountGetResponse,
-            await self._get(
-                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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountGetResponse]
-                ),  # 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._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: str,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        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]:
+        """
+        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
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this 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(
+                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]),
         )
 
 
-class AccountsWithRawResponse:
-    def __init__(self, accounts: Accounts) -> None:
+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,
         )
 
     @cached_property
-    def members(self) -> MembersWithRawResponse:
-        return MembersWithRawResponse(self._accounts.members)
+    def members(self) -> MembersResourceWithRawResponse:
+        return MembersResourceWithRawResponse(self._accounts.members)
 
     @cached_property
-    def roles(self) -> RolesWithRawResponse:
-        return RolesWithRawResponse(self._accounts.roles)
+    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 AsyncAccountsWithRawResponse:
-    def __init__(self, accounts: AsyncAccounts) -> None:
+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,
         )
 
     @cached_property
-    def members(self) -> AsyncMembersWithRawResponse:
-        return AsyncMembersWithRawResponse(self._accounts.members)
+    def members(self) -> AsyncMembersResourceWithRawResponse:
+        return AsyncMembersResourceWithRawResponse(self._accounts.members)
 
     @cached_property
-    def roles(self) -> AsyncRolesWithRawResponse:
-        return AsyncRolesWithRawResponse(self._accounts.roles)
+    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 AccountsWithStreamingResponse:
-    def __init__(self, accounts: Accounts) -> None:
+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,
         )
 
     @cached_property
-    def members(self) -> MembersWithStreamingResponse:
-        return MembersWithStreamingResponse(self._accounts.members)
+    def members(self) -> MembersResourceWithStreamingResponse:
+        return MembersResourceWithStreamingResponse(self._accounts.members)
 
     @cached_property
-    def roles(self) -> RolesWithStreamingResponse:
-        return RolesWithStreamingResponse(self._accounts.roles)
+    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 AsyncAccountsWithStreamingResponse:
-    def __init__(self, accounts: AsyncAccounts) -> None:
+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,
         )
 
     @cached_property
-    def members(self) -> AsyncMembersWithStreamingResponse:
-        return AsyncMembersWithStreamingResponse(self._accounts.members)
+    def members(self) -> AsyncMembersResourceWithStreamingResponse:
+        return AsyncMembersResourceWithStreamingResponse(self._accounts.members)
 
     @cached_property
-    def roles(self) -> AsyncRolesWithStreamingResponse:
-        return AsyncRolesWithStreamingResponse(self._accounts.roles)
+    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)

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",
+]

src/cloudflare/resources/accounts/logs/audit.py

@@ -0,0 +1,342 @@
+# 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 NOT_GIVEN, Body, Query, Headers, NotGiven
+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 SyncCursorLimitPagination, AsyncCursorLimitPagination
+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],
+        account_name: audit_list_params.AccountName | NotGiven = NOT_GIVEN,
+        action_result: audit_list_params.ActionResult | NotGiven = NOT_GIVEN,
+        action_type: audit_list_params.ActionType | NotGiven = NOT_GIVEN,
+        actor_context: audit_list_params.ActorContext | NotGiven = NOT_GIVEN,
+        actor_email: audit_list_params.ActorEmail | NotGiven = NOT_GIVEN,
+        actor_id: audit_list_params.ActorID | NotGiven = NOT_GIVEN,
+        actor_ip_address: audit_list_params.ActorIPAddress | NotGiven = NOT_GIVEN,
+        actor_token_id: audit_list_params.ActorTokenID | NotGiven = NOT_GIVEN,
+        actor_token_name: audit_list_params.ActorTokenName | NotGiven = NOT_GIVEN,
+        actor_type: audit_list_params.ActorType | NotGiven = NOT_GIVEN,
+        audit_log_id: audit_list_params.AuditLogID | NotGiven = NOT_GIVEN,
+        cursor: str | NotGiven = NOT_GIVEN,
+        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
+        limit: float | NotGiven = NOT_GIVEN,
+        raw_cf_rayid: audit_list_params.RawCfRayID | NotGiven = NOT_GIVEN,
+        raw_method: audit_list_params.RawMethod | NotGiven = NOT_GIVEN,
+        raw_status_code: audit_list_params.RawStatusCode | NotGiven = NOT_GIVEN,
+        raw_uri: audit_list_params.RawURI | NotGiven = NOT_GIVEN,
+        resource_id: audit_list_params.ResourceID | NotGiven = NOT_GIVEN,
+        resource_product: audit_list_params.ResourceProduct | NotGiven = NOT_GIVEN,
+        resource_scope: audit_list_params.ResourceScope | NotGiven = NOT_GIVEN,
+        resource_type: audit_list_params.ResourceType | NotGiven = NOT_GIVEN,
+        zone_id: audit_list_params.ZoneID | NotGiven = NOT_GIVEN,
+        zone_name: audit_list_params.ZoneName | 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,
+    ) -> SyncCursorLimitPagination[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=SyncCursorLimitPagination[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,
+                        "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],
+        account_name: audit_list_params.AccountName | NotGiven = NOT_GIVEN,
+        action_result: audit_list_params.ActionResult | NotGiven = NOT_GIVEN,
+        action_type: audit_list_params.ActionType | NotGiven = NOT_GIVEN,
+        actor_context: audit_list_params.ActorContext | NotGiven = NOT_GIVEN,
+        actor_email: audit_list_params.ActorEmail | NotGiven = NOT_GIVEN,
+        actor_id: audit_list_params.ActorID | NotGiven = NOT_GIVEN,
+        actor_ip_address: audit_list_params.ActorIPAddress | NotGiven = NOT_GIVEN,
+        actor_token_id: audit_list_params.ActorTokenID | NotGiven = NOT_GIVEN,
+        actor_token_name: audit_list_params.ActorTokenName | NotGiven = NOT_GIVEN,
+        actor_type: audit_list_params.ActorType | NotGiven = NOT_GIVEN,
+        audit_log_id: audit_list_params.AuditLogID | NotGiven = NOT_GIVEN,
+        cursor: str | NotGiven = NOT_GIVEN,
+        direction: Literal["desc", "asc"] | NotGiven = NOT_GIVEN,
+        limit: float | NotGiven = NOT_GIVEN,
+        raw_cf_rayid: audit_list_params.RawCfRayID | NotGiven = NOT_GIVEN,
+        raw_method: audit_list_params.RawMethod | NotGiven = NOT_GIVEN,
+        raw_status_code: audit_list_params.RawStatusCode | NotGiven = NOT_GIVEN,
+        raw_uri: audit_list_params.RawURI | NotGiven = NOT_GIVEN,
+        resource_id: audit_list_params.ResourceID | NotGiven = NOT_GIVEN,
+        resource_product: audit_list_params.ResourceProduct | NotGiven = NOT_GIVEN,
+        resource_scope: audit_list_params.ResourceScope | NotGiven = NOT_GIVEN,
+        resource_type: audit_list_params.ResourceType | NotGiven = NOT_GIVEN,
+        zone_id: audit_list_params.ZoneID | NotGiven = NOT_GIVEN,
+        zone_name: audit_list_params.ZoneName | 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[AuditListResponse, AsyncCursorLimitPagination[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=AsyncCursorLimitPagination[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,
+                        "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,
+        )

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)

src/cloudflare/resources/accounts/members.py

@@ -3,15 +3,12 @@
 from __future__ import annotations
 
 from typing import List, Type, Iterable, 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 ..._utils import required_args, maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -22,36 +19,40 @@ from ..._response import (
 )
 from ..._wrappers import ResultWrapper
 from ...pagination import SyncV4PagePaginationArray, AsyncV4PagePaginationArray
-from ..._base_client import (
-    AsyncPaginator,
-    make_request_options,
-)
-from ...types.accounts import (
-    AccountMember,
-    MemberListResponse,
-    AccountMemberWithID,
-    MemberDeleteResponse,
-    member_list_params,
-    member_create_params,
-    member_update_params,
-)
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.accounts import member_list_params, member_create_params, member_update_params
+from ...types.shared.member import Member
+from ...types.shared_params.role import Role
+from ...types.accounts.member_delete_response import MemberDeleteResponse
 
-__all__ = ["Members", "AsyncMembers"]
+__all__ = ["MembersResource", "AsyncMembersResource"]
 
 
-class Members(SyncAPIResource):
+class MembersResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> MembersWithRawResponse:
-        return MembersWithRawResponse(self)
+    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) -> MembersWithStreamingResponse:
-        return MembersWithStreamingResponse(self)
+    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
     def create(
         self,
         *,
-        account_id: object,
+        account_id: str,
         email: str,
         roles: List[str],
         status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
@@ -61,11 +62,13 @@ class Members(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AccountMemberWithID:
+    ) -> Optional[Member]:
         """
         Add a user to the list of members for this account.
 
         Args:
+          account_id: Account identifier tag.
+
           email: The contact email address of the user.
 
           roles: Array of roles associated with this member.
@@ -78,6 +81,61 @@ class Members(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @overload
+    def create(
+        self,
+        *,
+        account_id: str,
+        email: str,
+        policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy],
+        status: Literal["accepted", "pending"] | 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[Member]:
+        """
+        Add a user to the list of members for this account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          email: The contact email address of the user.
+
+          policies: Array of policies associated with this 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
+        """
+        ...
+
+    @required_args(["account_id", "email", "roles"], ["account_id", "email", "policies"])
+    def create(
+        self,
+        *,
+        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,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        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(
             f"/accounts/{account_id}/members",
             body=maybe_transform(
@@ -85,6 +143,7 @@ class Members(SyncAPIResource):
                     "email": email,
                     "roles": roles,
                     "status": status,
+                    "policies": policies,
                 },
                 member_create_params.MemberCreateParams,
             ),
@@ -93,28 +152,31 @@ class Members(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[AccountMemberWithID], ResultWrapper[AccountMemberWithID]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
+    @overload
     def update(
         self,
         member_id: str,
         *,
-        account_id: object,
-        roles: Iterable[member_update_params.Role],
+        account_id: str,
+        roles: Iterable[Role] | 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,
-    ) -> AccountMember:
+    ) -> Optional[Member]:
         """
         Modify an account member.
 
         Args:
+          account_id: Account identifier tag.
+
           member_id: Membership identifier tag.
 
           roles: Roles assigned to this member.
@@ -127,25 +189,84 @@ class Members(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @overload
+    def update(
+        self,
+        member_id: str,
+        *,
+        account_id: str,
+        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> Optional[Member]:
+        """
+        Modify an account member.
+
+        Args:
+          account_id: Account identifier tag.
+
+          member_id: Membership identifier tag.
+
+          policies: Array of policies associated with this 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
+        """
+        ...
+
+    @required_args(["account_id"], ["account_id", "policies"])
+    def update(
+        self,
+        member_id: str,
+        *,
+        account_id: str,
+        roles: Iterable[Role] | NotGiven = NOT_GIVEN,
+        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy] | 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[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:
             raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}")
         return self._put(
             f"/accounts/{account_id}/members/{member_id}",
-            body=maybe_transform({"roles": roles}, member_update_params.MemberUpdateParams),
+            body=maybe_transform(
+                {
+                    "roles": roles,
+                    "policies": policies,
+                },
+                member_update_params.MemberUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[AccountMember], ResultWrapper[AccountMember]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
     def list(
         self,
         *,
-        account_id: object,
+        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,
@@ -157,11 +278,13 @@ class Members(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncV4PagePaginationArray[MemberListResponse]:
+    ) -> SyncV4PagePaginationArray[Member]:
         """
         List all members of an account.
 
         Args:
+          account_id: Account identifier tag.
+
           direction: Direction to order results.
 
           order: Field to order results by.
@@ -180,9 +303,11 @@ class Members(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, 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}/members",
-            page=SyncV4PagePaginationArray[MemberListResponse],
+            page=SyncV4PagePaginationArray[Member],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -199,14 +324,14 @@ class Members(SyncAPIResource):
                     member_list_params.MemberListParams,
                 ),
             ),
-            model=MemberListResponse,
+            model=Member,
         )
 
     def delete(
         self,
         member_id: str,
         *,
-        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,
@@ -218,6 +343,8 @@ class Members(SyncAPIResource):
         Remove a member from an account.
 
         Args:
+          account_id: Account identifier tag.
+
           member_id: Membership identifier tag.
 
           extra_headers: Send extra headers
@@ -228,6 +355,8 @@ class Members(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_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(
@@ -237,7 +366,7 @@ class Members(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[MemberDeleteResponse]]._unwrapper,
             ),
             cast_to=cast(Type[Optional[MemberDeleteResponse]], ResultWrapper[MemberDeleteResponse]),
         )
@@ -246,18 +375,20 @@ class Members(SyncAPIResource):
         self,
         member_id: str,
         *,
-        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,
-    ) -> AccountMember:
+    ) -> Optional[Member]:
         """
         Get information about a specific member of an account.
 
         Args:
+          account_id: Account identifier tag.
+
           member_id: Membership identifier tag.
 
           extra_headers: Send extra headers
@@ -268,6 +399,8 @@ class Members(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not member_id:
             raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}")
         return self._get(
@@ -277,25 +410,37 @@ class Members(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[AccountMember], ResultWrapper[AccountMember]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
 
-class AsyncMembers(AsyncAPIResource):
+class AsyncMembersResource(AsyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AsyncMembersWithRawResponse:
-        return AsyncMembersWithRawResponse(self)
+    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) -> AsyncMembersWithStreamingResponse:
-        return AsyncMembersWithStreamingResponse(self)
+    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
     async def create(
         self,
         *,
-        account_id: object,
+        account_id: str,
         email: str,
         roles: List[str],
         status: Literal["accepted", "pending"] | NotGiven = NOT_GIVEN,
@@ -305,11 +450,13 @@ class AsyncMembers(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AccountMemberWithID:
+    ) -> Optional[Member]:
         """
         Add a user to the list of members for this account.
 
         Args:
+          account_id: Account identifier tag.
+
           email: The contact email address of the user.
 
           roles: Array of roles associated with this member.
@@ -322,6 +469,61 @@ class AsyncMembers(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @overload
+    async def create(
+        self,
+        *,
+        account_id: str,
+        email: str,
+        policies: Iterable[member_create_params.IAMCreateMemberWithPoliciesPolicy],
+        status: Literal["accepted", "pending"] | 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[Member]:
+        """
+        Add a user to the list of members for this account.
+
+        Args:
+          account_id: Account identifier tag.
+
+          email: The contact email address of the user.
+
+          policies: Array of policies associated with this 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
+        """
+        ...
+
+    @required_args(["account_id", "email", "roles"], ["account_id", "email", "policies"])
+    async def create(
+        self,
+        *,
+        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,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        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(
             f"/accounts/{account_id}/members",
             body=await async_maybe_transform(
@@ -329,6 +531,7 @@ class AsyncMembers(AsyncAPIResource):
                     "email": email,
                     "roles": roles,
                     "status": status,
+                    "policies": policies,
                 },
                 member_create_params.MemberCreateParams,
             ),
@@ -337,28 +540,31 @@ class AsyncMembers(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[AccountMemberWithID], ResultWrapper[AccountMemberWithID]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
+    @overload
     async def update(
         self,
         member_id: str,
         *,
-        account_id: object,
-        roles: Iterable[member_update_params.Role],
+        account_id: str,
+        roles: Iterable[Role] | 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,
-    ) -> AccountMember:
+    ) -> Optional[Member]:
         """
         Modify an account member.
 
         Args:
+          account_id: Account identifier tag.
+
           member_id: Membership identifier tag.
 
           roles: Roles assigned to this member.
@@ -371,25 +577,84 @@ class AsyncMembers(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        ...
+
+    @overload
+    async def update(
+        self,
+        member_id: str,
+        *,
+        account_id: str,
+        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> Optional[Member]:
+        """
+        Modify an account member.
+
+        Args:
+          account_id: Account identifier tag.
+
+          member_id: Membership identifier tag.
+
+          policies: Array of policies associated with this 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
+        """
+        ...
+
+    @required_args(["account_id"], ["account_id", "policies"])
+    async def update(
+        self,
+        member_id: str,
+        *,
+        account_id: str,
+        roles: Iterable[Role] | NotGiven = NOT_GIVEN,
+        policies: Iterable[member_update_params.IAMUpdateMemberWithPoliciesPolicy] | 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[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:
             raise ValueError(f"Expected a non-empty value for `member_id` but received {member_id!r}")
         return await self._put(
             f"/accounts/{account_id}/members/{member_id}",
-            body=await async_maybe_transform({"roles": roles}, member_update_params.MemberUpdateParams),
+            body=await async_maybe_transform(
+                {
+                    "roles": roles,
+                    "policies": policies,
+                },
+                member_update_params.MemberUpdateParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[AccountMember], ResultWrapper[AccountMember]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
     def list(
         self,
         *,
-        account_id: object,
+        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,
@@ -401,11 +666,13 @@ class AsyncMembers(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[MemberListResponse, AsyncV4PagePaginationArray[MemberListResponse]]:
+    ) -> AsyncPaginator[Member, AsyncV4PagePaginationArray[Member]]:
         """
         List all members of an account.
 
         Args:
+          account_id: Account identifier tag.
+
           direction: Direction to order results.
 
           order: Field to order results by.
@@ -424,9 +691,11 @@ class AsyncMembers(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, 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}/members",
-            page=AsyncV4PagePaginationArray[MemberListResponse],
+            page=AsyncV4PagePaginationArray[Member],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -443,14 +712,14 @@ class AsyncMembers(AsyncAPIResource):
                     member_list_params.MemberListParams,
                 ),
             ),
-            model=MemberListResponse,
+            model=Member,
         )
 
     async def delete(
         self,
         member_id: str,
         *,
-        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,
@@ -462,6 +731,8 @@ class AsyncMembers(AsyncAPIResource):
         Remove a member from an account.
 
         Args:
+          account_id: Account identifier tag.
+
           member_id: Membership identifier tag.
 
           extra_headers: Send extra headers
@@ -472,6 +743,8 @@ class AsyncMembers(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_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(
@@ -481,7 +754,7 @@ class AsyncMembers(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[MemberDeleteResponse]]._unwrapper,
             ),
             cast_to=cast(Type[Optional[MemberDeleteResponse]], ResultWrapper[MemberDeleteResponse]),
         )
@@ -490,18 +763,20 @@ class AsyncMembers(AsyncAPIResource):
         self,
         member_id: str,
         *,
-        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,
-    ) -> AccountMember:
+    ) -> Optional[Member]:
         """
         Get information about a specific member of an account.
 
         Args:
+          account_id: Account identifier tag.
+
           member_id: Membership identifier tag.
 
           extra_headers: Send extra headers
@@ -512,6 +787,8 @@ class AsyncMembers(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
+        if not account_id:
+            raise ValueError(f"Expected a non-empty value for `account_id` but received {account_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._get(
@@ -521,14 +798,14 @@ class AsyncMembers(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Member]]._unwrapper,
             ),
-            cast_to=cast(Type[AccountMember], ResultWrapper[AccountMember]),
+            cast_to=cast(Type[Optional[Member]], ResultWrapper[Member]),
         )
 
 
-class MembersWithRawResponse:
-    def __init__(self, members: Members) -> None:
+class MembersResourceWithRawResponse:
+    def __init__(self, members: MembersResource) -> None:
         self._members = members
 
         self.create = to_raw_response_wrapper(
@@ -548,8 +825,8 @@ class MembersWithRawResponse:
         )
 
 
-class AsyncMembersWithRawResponse:
-    def __init__(self, members: AsyncMembers) -> None:
+class AsyncMembersResourceWithRawResponse:
+    def __init__(self, members: AsyncMembersResource) -> None:
         self._members = members
 
         self.create = async_to_raw_response_wrapper(
@@ -569,8 +846,8 @@ class AsyncMembersWithRawResponse:
         )
 
 
-class MembersWithStreamingResponse:
-    def __init__(self, members: Members) -> None:
+class MembersResourceWithStreamingResponse:
+    def __init__(self, members: MembersResource) -> None:
         self._members = members
 
         self.create = to_streamed_response_wrapper(
@@ -590,8 +867,8 @@ class MembersWithStreamingResponse:
         )
 
 
-class AsyncMembersWithStreamingResponse:
-    def __init__(self, members: AsyncMembers) -> None:
+class AsyncMembersResourceWithStreamingResponse:
+    def __init__(self, members: AsyncMembersResource) -> None:
         self._members = members
 
         self.create = async_to_streamed_response_wrapper(

src/cloudflare/resources/accounts/roles.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 ..._utils import maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -16,38 +17,57 @@ from ..._response import (
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ..._base_client import (
-    make_request_options,
-)
-from ...types.accounts import RoleGetResponse, RoleListResponse
+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__ = ["Roles", "AsyncRoles"]
+__all__ = ["RolesResource", "AsyncRolesResource"]
 
 
-class Roles(SyncAPIResource):
+class RolesResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> RolesWithRawResponse:
-        return RolesWithRawResponse(self)
+    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) -> RolesWithStreamingResponse:
-        return RolesWithStreamingResponse(self)
+    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: object,
+        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,
-    ) -> Optional[RoleListResponse]:
+    ) -> 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
@@ -56,34 +76,47 @@ class Roles(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get(
+        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}/roles",
+            page=SyncV4PagePaginationArray[Role],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                query=maybe_transform(
+                    {
+                        "page": page,
+                        "per_page": per_page,
+                    },
+                    role_list_params.RoleListParams,
+                ),
             ),
-            cast_to=cast(Type[Optional[RoleListResponse]], ResultWrapper[RoleListResponse]),
+            model=Role,
         )
 
     def get(
         self,
-        role_id: object,
+        role_id: str,
         *,
-        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,
-    ) -> RoleGetResponse:
+    ) -> 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
@@ -92,84 +125,66 @@ class Roles(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            RoleGetResponse,
-            self._get(
-                f"/accounts/{account_id}/roles/{role_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[RoleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-
-class AsyncRoles(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncRolesWithRawResponse:
-        return AsyncRolesWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncRolesWithStreamingResponse:
-        return AsyncRolesWithStreamingResponse(self)
-
-    async def list(
-        self,
-        *,
-        account_id: 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[RoleListResponse]:
-        """
-        Get all available roles 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
-        """
-        return await self._get(
-            f"/accounts/{account_id}/roles",
+        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(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Role]]._unwrapper,
             ),
-            cast_to=cast(Type[Optional[RoleListResponse]], ResultWrapper[RoleListResponse]),
+            cast_to=cast(Type[Optional[Role]], ResultWrapper[Role]),
         )
 
-    async def get(
+
+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,
-        role_id: object,
         *,
-        account_id: object,
+        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,
-    ) -> RoleGetResponse:
+    ) -> AsyncPaginator[Role, AsyncV4PagePaginationArray[Role]]:
         """
-        Get information about a specific role for an account.
+        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
@@ -178,26 +193,74 @@ class AsyncRoles(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return cast(
-            RoleGetResponse,
-            await self._get(
-                f"/accounts/{account_id}/roles/{role_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper._unwrapper,
+        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}/roles",
+            page=AsyncV4PagePaginationArray[Role],
+            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,
+                    },
+                    role_list_params.RoleListParams,
                 ),
-                cast_to=cast(
-                    Any, ResultWrapper[RoleGetResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
             ),
+            model=Role,
+        )
+
+    async def get(
+        self,
+        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.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        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
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        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(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[Role]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[Role]], ResultWrapper[Role]),
         )
 
 
-class RolesWithRawResponse:
-    def __init__(self, roles: Roles) -> None:
+class RolesResourceWithRawResponse:
+    def __init__(self, roles: RolesResource) -> None:
         self._roles = roles
 
         self.list = to_raw_response_wrapper(
@@ -208,8 +271,8 @@ class RolesWithRawResponse:
         )
 
 
-class AsyncRolesWithRawResponse:
-    def __init__(self, roles: AsyncRoles) -> None:
+class AsyncRolesResourceWithRawResponse:
+    def __init__(self, roles: AsyncRolesResource) -> None:
         self._roles = roles
 
         self.list = async_to_raw_response_wrapper(
@@ -220,8 +283,8 @@ class AsyncRolesWithRawResponse:
         )
 
 
-class RolesWithStreamingResponse:
-    def __init__(self, roles: Roles) -> None:
+class RolesResourceWithStreamingResponse:
+    def __init__(self, roles: RolesResource) -> None:
         self._roles = roles
 
         self.list = to_streamed_response_wrapper(
@@ -232,8 +295,8 @@ class RolesWithStreamingResponse:
         )
 
 
-class AsyncRolesWithStreamingResponse:
-    def __init__(self, roles: AsyncRoles) -> None:
+class AsyncRolesResourceWithStreamingResponse:
+    def __init__(self, roles: AsyncRolesResource) -> None:
         self._roles = roles
 
         self.list = async_to_streamed_response_wrapper(

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 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.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"] | NotGiven = NOT_GIVEN,
+        rate_plan: RatePlan | 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,
+    ) -> 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"] | NotGiven = NOT_GIVEN,
+        rate_plan: RatePlan | 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,
+    ) -> 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"] | NotGiven = NOT_GIVEN,
+        rate_plan: RatePlan | 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,
+    ) -> 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"] | NotGiven = NOT_GIVEN,
+        rate_plan: RatePlan | 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,
+    ) -> 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,
+        )

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",
+]

src/cloudflare/resources/accounts/tokens/permission_groups.py

@@ -0,0 +1,255 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+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 ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+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,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this 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.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, 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
+            ),
+            model=PermissionGroupListResponse,
+        )
+
+    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[PermissionGroupGetResponse]:
+        """
+        Find all available permission groups for Account Owned API Tokens
+
+        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}/tokens/permission_groups",
+            page=SyncSinglePage[PermissionGroupGetResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=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,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this 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.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, 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
+            ),
+            model=PermissionGroupListResponse,
+        )
+
+    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[PermissionGroupGetResponse, AsyncSinglePage[PermissionGroupGetResponse]]:
+        """
+        Find all available permission groups for Account Owned API Tokens
+
+        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}/tokens/permission_groups",
+            page=AsyncSinglePage[PermissionGroupGetResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=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,
+        )

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 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.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 | NotGiven = NOT_GIVEN,
+        expires_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        not_before: 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[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],
+        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,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        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.
+
+          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.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, 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,
+                    "status": status,
+                    "condition": condition,
+                    "expires_on": expires_on,
+                    "not_before": not_before,
+                },
+                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"] | 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[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 | NotGiven = NOT_GIVEN,
+        expires_on: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        not_before: 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[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],
+        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,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        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.
+
+          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.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, 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,
+                    "status": status,
+                    "condition": condition,
+                    "expires_on": expires_on,
+                    "not_before": not_before,
+                },
+                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"] | 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[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)

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 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.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,
+        )

src/cloudflare/resources/acm/__init__.py

@@ -1,33 +1,33 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from .acm import (
-    ACM,
-    AsyncACM,
-    ACMWithRawResponse,
-    AsyncACMWithRawResponse,
-    ACMWithStreamingResponse,
-    AsyncACMWithStreamingResponse,
+    ACMResource,
+    AsyncACMResource,
+    ACMResourceWithRawResponse,
+    AsyncACMResourceWithRawResponse,
+    ACMResourceWithStreamingResponse,
+    AsyncACMResourceWithStreamingResponse,
 )
 from .total_tls import (
-    TotalTLS,
-    AsyncTotalTLS,
-    TotalTLSWithRawResponse,
-    AsyncTotalTLSWithRawResponse,
-    TotalTLSWithStreamingResponse,
-    AsyncTotalTLSWithStreamingResponse,
+    TotalTLSResource,
+    AsyncTotalTLSResource,
+    TotalTLSResourceWithRawResponse,
+    AsyncTotalTLSResourceWithRawResponse,
+    TotalTLSResourceWithStreamingResponse,
+    AsyncTotalTLSResourceWithStreamingResponse,
 )
 
 __all__ = [
-    "TotalTLS",
-    "AsyncTotalTLS",
-    "TotalTLSWithRawResponse",
-    "AsyncTotalTLSWithRawResponse",
-    "TotalTLSWithStreamingResponse",
-    "AsyncTotalTLSWithStreamingResponse",
-    "ACM",
-    "AsyncACM",
-    "ACMWithRawResponse",
-    "AsyncACMWithRawResponse",
-    "ACMWithStreamingResponse",
-    "AsyncACMWithStreamingResponse",
+    "TotalTLSResource",
+    "AsyncTotalTLSResource",
+    "TotalTLSResourceWithRawResponse",
+    "AsyncTotalTLSResourceWithRawResponse",
+    "TotalTLSResourceWithStreamingResponse",
+    "AsyncTotalTLSResourceWithStreamingResponse",
+    "ACMResource",
+    "AsyncACMResource",
+    "ACMResourceWithRawResponse",
+    "AsyncACMResourceWithRawResponse",
+    "ACMResourceWithStreamingResponse",
+    "AsyncACMResourceWithStreamingResponse",
 ]

src/cloudflare/resources/acm/acm.py

@@ -4,77 +4,99 @@ from __future__ import annotations
 
 from ..._compat import cached_property
 from .total_tls import (
-    TotalTLS,
-    AsyncTotalTLS,
-    TotalTLSWithRawResponse,
-    AsyncTotalTLSWithRawResponse,
-    TotalTLSWithStreamingResponse,
-    AsyncTotalTLSWithStreamingResponse,
+    TotalTLSResource,
+    AsyncTotalTLSResource,
+    TotalTLSResourceWithRawResponse,
+    AsyncTotalTLSResourceWithRawResponse,
+    TotalTLSResourceWithStreamingResponse,
+    AsyncTotalTLSResourceWithStreamingResponse,
 )
 from ..._resource import SyncAPIResource, AsyncAPIResource
 
-__all__ = ["ACM", "AsyncACM"]
+__all__ = ["ACMResource", "AsyncACMResource"]
 
 
-class ACM(SyncAPIResource):
+class ACMResource(SyncAPIResource):
     @cached_property
-    def total_tls(self) -> TotalTLS:
-        return TotalTLS(self._client)
+    def total_tls(self) -> TotalTLSResource:
+        return TotalTLSResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> ACMWithRawResponse:
-        return ACMWithRawResponse(self)
+    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) -> ACMWithStreamingResponse:
-        return ACMWithStreamingResponse(self)
+    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)
 
 
-class AsyncACM(AsyncAPIResource):
+class AsyncACMResource(AsyncAPIResource):
     @cached_property
-    def total_tls(self) -> AsyncTotalTLS:
-        return AsyncTotalTLS(self._client)
+    def total_tls(self) -> AsyncTotalTLSResource:
+        return AsyncTotalTLSResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncACMWithRawResponse:
-        return AsyncACMWithRawResponse(self)
+    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) -> AsyncACMWithStreamingResponse:
-        return AsyncACMWithStreamingResponse(self)
+    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)
 
 
-class ACMWithRawResponse:
-    def __init__(self, acm: ACM) -> None:
+class ACMResourceWithRawResponse:
+    def __init__(self, acm: ACMResource) -> None:
         self._acm = acm
 
     @cached_property
-    def total_tls(self) -> TotalTLSWithRawResponse:
-        return TotalTLSWithRawResponse(self._acm.total_tls)
+    def total_tls(self) -> TotalTLSResourceWithRawResponse:
+        return TotalTLSResourceWithRawResponse(self._acm.total_tls)
 
 
-class AsyncACMWithRawResponse:
-    def __init__(self, acm: AsyncACM) -> None:
+class AsyncACMResourceWithRawResponse:
+    def __init__(self, acm: AsyncACMResource) -> None:
         self._acm = acm
 
     @cached_property
-    def total_tls(self) -> AsyncTotalTLSWithRawResponse:
-        return AsyncTotalTLSWithRawResponse(self._acm.total_tls)
+    def total_tls(self) -> AsyncTotalTLSResourceWithRawResponse:
+        return AsyncTotalTLSResourceWithRawResponse(self._acm.total_tls)
 
 
-class ACMWithStreamingResponse:
-    def __init__(self, acm: ACM) -> None:
+class ACMResourceWithStreamingResponse:
+    def __init__(self, acm: ACMResource) -> None:
         self._acm = acm
 
     @cached_property
-    def total_tls(self) -> TotalTLSWithStreamingResponse:
-        return TotalTLSWithStreamingResponse(self._acm.total_tls)
+    def total_tls(self) -> TotalTLSResourceWithStreamingResponse:
+        return TotalTLSResourceWithStreamingResponse(self._acm.total_tls)
 
 
-class AsyncACMWithStreamingResponse:
-    def __init__(self, acm: AsyncACM) -> None:
+class AsyncACMResourceWithStreamingResponse:
+    def __init__(self, acm: AsyncACMResource) -> None:
         self._acm = acm
 
     @cached_property
-    def total_tls(self) -> AsyncTotalTLSWithStreamingResponse:
-        return AsyncTotalTLSWithStreamingResponse(self._acm.total_tls)
+    def total_tls(self) -> AsyncTotalTLSResourceWithStreamingResponse:
+        return AsyncTotalTLSResourceWithStreamingResponse(self._acm.total_tls)

src/cloudflare/resources/acm/total_tls.py

@@ -2,16 +2,12 @@
 
 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 ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
 from ..._response import (
@@ -21,41 +17,53 @@ from ..._response import (
     async_to_streamed_response_wrapper,
 )
 from ..._wrappers import ResultWrapper
-from ...types.acm import TotalTLSGetResponse, TotalTLSCreateResponse, total_tls_create_params
-from ..._base_client import (
-    make_request_options,
-)
+from ...types.acm import CertificateAuthority, total_tls_create_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
 
-__all__ = ["TotalTLS", "AsyncTotalTLS"]
+__all__ = ["TotalTLSResource", "AsyncTotalTLSResource"]
 
 
-class TotalTLS(SyncAPIResource):
+class TotalTLSResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> TotalTLSWithRawResponse:
-        return TotalTLSWithRawResponse(self)
+    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) -> TotalTLSWithStreamingResponse:
-        return TotalTLSWithStreamingResponse(self)
+    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(
         self,
         *,
         zone_id: str,
         enabled: bool,
-        certificate_authority: Literal["google", "lets_encrypt"] | NotGiven = NOT_GIVEN,
+        certificate_authority: CertificateAuthority | 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,
-    ) -> TotalTLSCreateResponse:
+    ) -> Optional[TotalTLSCreateResponse]:
         """
         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.
@@ -86,9 +94,9 @@ class TotalTLS(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[TotalTLSCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TotalTLSCreateResponse], ResultWrapper[TotalTLSCreateResponse]),
+            cast_to=cast(Type[Optional[TotalTLSCreateResponse]], ResultWrapper[TotalTLSCreateResponse]),
         )
 
     def get(
@@ -101,12 +109,12 @@ class TotalTLS(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TotalTLSGetResponse:
+    ) -> Optional[TotalTLSGetResponse]:
         """
         Get Total TLS Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -125,39 +133,50 @@ class TotalTLS(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[TotalTLSGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TotalTLSGetResponse], ResultWrapper[TotalTLSGetResponse]),
+            cast_to=cast(Type[Optional[TotalTLSGetResponse]], ResultWrapper[TotalTLSGetResponse]),
         )
 
 
-class AsyncTotalTLS(AsyncAPIResource):
+class AsyncTotalTLSResource(AsyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AsyncTotalTLSWithRawResponse:
-        return AsyncTotalTLSWithRawResponse(self)
+    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) -> AsyncTotalTLSWithStreamingResponse:
-        return AsyncTotalTLSWithStreamingResponse(self)
+    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(
         self,
         *,
         zone_id: str,
         enabled: bool,
-        certificate_authority: Literal["google", "lets_encrypt"] | NotGiven = NOT_GIVEN,
+        certificate_authority: CertificateAuthority | 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,
-    ) -> TotalTLSCreateResponse:
+    ) -> Optional[TotalTLSCreateResponse]:
         """
         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.
@@ -188,9 +207,9 @@ class AsyncTotalTLS(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[TotalTLSCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TotalTLSCreateResponse], ResultWrapper[TotalTLSCreateResponse]),
+            cast_to=cast(Type[Optional[TotalTLSCreateResponse]], ResultWrapper[TotalTLSCreateResponse]),
         )
 
     async def get(
@@ -203,12 +222,12 @@ class AsyncTotalTLS(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> TotalTLSGetResponse:
+    ) -> Optional[TotalTLSGetResponse]:
         """
         Get Total TLS Settings for a Zone.
 
         Args:
-          zone_id: Identifier
+          zone_id: Identifier.
 
           extra_headers: Send extra headers
 
@@ -227,14 +246,14 @@ class AsyncTotalTLS(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[TotalTLSGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[TotalTLSGetResponse], ResultWrapper[TotalTLSGetResponse]),
+            cast_to=cast(Type[Optional[TotalTLSGetResponse]], ResultWrapper[TotalTLSGetResponse]),
         )
 
 
-class TotalTLSWithRawResponse:
-    def __init__(self, total_tls: TotalTLS) -> None:
+class TotalTLSResourceWithRawResponse:
+    def __init__(self, total_tls: TotalTLSResource) -> None:
         self._total_tls = total_tls
 
         self.create = to_raw_response_wrapper(
@@ -245,8 +264,8 @@ class TotalTLSWithRawResponse:
         )
 
 
-class AsyncTotalTLSWithRawResponse:
-    def __init__(self, total_tls: AsyncTotalTLS) -> None:
+class AsyncTotalTLSResourceWithRawResponse:
+    def __init__(self, total_tls: AsyncTotalTLSResource) -> None:
         self._total_tls = total_tls
 
         self.create = async_to_raw_response_wrapper(
@@ -257,8 +276,8 @@ class AsyncTotalTLSWithRawResponse:
         )
 
 
-class TotalTLSWithStreamingResponse:
-    def __init__(self, total_tls: TotalTLS) -> None:
+class TotalTLSResourceWithStreamingResponse:
+    def __init__(self, total_tls: TotalTLSResource) -> None:
         self._total_tls = total_tls
 
         self.create = to_streamed_response_wrapper(
@@ -269,8 +288,8 @@ class TotalTLSWithStreamingResponse:
         )
 
 
-class AsyncTotalTLSWithStreamingResponse:
-    def __init__(self, total_tls: AsyncTotalTLS) -> None:
+class AsyncTotalTLSResourceWithStreamingResponse:
+    def __init__(self, total_tls: AsyncTotalTLSResource) -> None:
         self._total_tls = total_tls
 
         self.create = async_to_streamed_response_wrapper(

src/cloudflare/resources/addressing/__init__.py

@@ -1,75 +1,89 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from .prefixes import (
-    Prefixes,
-    AsyncPrefixes,
-    PrefixesWithRawResponse,
-    AsyncPrefixesWithRawResponse,
-    PrefixesWithStreamingResponse,
-    AsyncPrefixesWithStreamingResponse,
+    PrefixesResource,
+    AsyncPrefixesResource,
+    PrefixesResourceWithRawResponse,
+    AsyncPrefixesResourceWithRawResponse,
+    PrefixesResourceWithStreamingResponse,
+    AsyncPrefixesResourceWithStreamingResponse,
 )
 from .services import (
-    Services,
-    AsyncServices,
-    ServicesWithRawResponse,
-    AsyncServicesWithRawResponse,
-    ServicesWithStreamingResponse,
-    AsyncServicesWithStreamingResponse,
+    ServicesResource,
+    AsyncServicesResource,
+    ServicesResourceWithRawResponse,
+    AsyncServicesResourceWithRawResponse,
+    ServicesResourceWithStreamingResponse,
+    AsyncServicesResourceWithStreamingResponse,
 )
 from .addressing import (
-    Addressing,
-    AsyncAddressing,
-    AddressingWithRawResponse,
-    AsyncAddressingWithRawResponse,
-    AddressingWithStreamingResponse,
-    AsyncAddressingWithStreamingResponse,
+    AddressingResource,
+    AsyncAddressingResource,
+    AddressingResourceWithRawResponse,
+    AsyncAddressingResourceWithRawResponse,
+    AddressingResourceWithStreamingResponse,
+    AsyncAddressingResourceWithStreamingResponse,
 )
 from .address_maps import (
-    AddressMaps,
-    AsyncAddressMaps,
-    AddressMapsWithRawResponse,
-    AsyncAddressMapsWithRawResponse,
-    AddressMapsWithStreamingResponse,
-    AsyncAddressMapsWithStreamingResponse,
+    AddressMapsResource,
+    AsyncAddressMapsResource,
+    AddressMapsResourceWithRawResponse,
+    AsyncAddressMapsResourceWithRawResponse,
+    AddressMapsResourceWithStreamingResponse,
+    AsyncAddressMapsResourceWithStreamingResponse,
 )
 from .loa_documents import (
-    LOADocuments,
-    AsyncLOADocuments,
-    LOADocumentsWithRawResponse,
-    AsyncLOADocumentsWithRawResponse,
-    LOADocumentsWithStreamingResponse,
-    AsyncLOADocumentsWithStreamingResponse,
+    LOADocumentsResource,
+    AsyncLOADocumentsResource,
+    LOADocumentsResourceWithRawResponse,
+    AsyncLOADocumentsResourceWithRawResponse,
+    LOADocumentsResourceWithStreamingResponse,
+    AsyncLOADocumentsResourceWithStreamingResponse,
+)
+from .regional_hostnames import (
+    RegionalHostnamesResource,
+    AsyncRegionalHostnamesResource,
+    RegionalHostnamesResourceWithRawResponse,
+    AsyncRegionalHostnamesResourceWithRawResponse,
+    RegionalHostnamesResourceWithStreamingResponse,
+    AsyncRegionalHostnamesResourceWithStreamingResponse,
 )
 
 __all__ = [
-    "Services",
-    "AsyncServices",
-    "ServicesWithRawResponse",
-    "AsyncServicesWithRawResponse",
-    "ServicesWithStreamingResponse",
-    "AsyncServicesWithStreamingResponse",
-    "AddressMaps",
-    "AsyncAddressMaps",
-    "AddressMapsWithRawResponse",
-    "AsyncAddressMapsWithRawResponse",
-    "AddressMapsWithStreamingResponse",
-    "AsyncAddressMapsWithStreamingResponse",
-    "LOADocuments",
-    "AsyncLOADocuments",
-    "LOADocumentsWithRawResponse",
-    "AsyncLOADocumentsWithRawResponse",
-    "LOADocumentsWithStreamingResponse",
-    "AsyncLOADocumentsWithStreamingResponse",
-    "Prefixes",
-    "AsyncPrefixes",
-    "PrefixesWithRawResponse",
-    "AsyncPrefixesWithRawResponse",
-    "PrefixesWithStreamingResponse",
-    "AsyncPrefixesWithStreamingResponse",
-    "Addressing",
-    "AsyncAddressing",
-    "AddressingWithRawResponse",
-    "AsyncAddressingWithRawResponse",
-    "AddressingWithStreamingResponse",
-    "AsyncAddressingWithStreamingResponse",
+    "RegionalHostnamesResource",
+    "AsyncRegionalHostnamesResource",
+    "RegionalHostnamesResourceWithRawResponse",
+    "AsyncRegionalHostnamesResourceWithRawResponse",
+    "RegionalHostnamesResourceWithStreamingResponse",
+    "AsyncRegionalHostnamesResourceWithStreamingResponse",
+    "ServicesResource",
+    "AsyncServicesResource",
+    "ServicesResourceWithRawResponse",
+    "AsyncServicesResourceWithRawResponse",
+    "ServicesResourceWithStreamingResponse",
+    "AsyncServicesResourceWithStreamingResponse",
+    "AddressMapsResource",
+    "AsyncAddressMapsResource",
+    "AddressMapsResourceWithRawResponse",
+    "AsyncAddressMapsResourceWithRawResponse",
+    "AddressMapsResourceWithStreamingResponse",
+    "AsyncAddressMapsResourceWithStreamingResponse",
+    "LOADocumentsResource",
+    "AsyncLOADocumentsResource",
+    "LOADocumentsResourceWithRawResponse",
+    "AsyncLOADocumentsResourceWithRawResponse",
+    "LOADocumentsResourceWithStreamingResponse",
+    "AsyncLOADocumentsResourceWithStreamingResponse",
+    "PrefixesResource",
+    "AsyncPrefixesResource",
+    "PrefixesResourceWithRawResponse",
+    "AsyncPrefixesResourceWithRawResponse",
+    "PrefixesResourceWithStreamingResponse",
+    "AsyncPrefixesResourceWithStreamingResponse",
+    "AddressingResource",
+    "AsyncAddressingResource",
+    "AddressingResourceWithRawResponse",
+    "AsyncAddressingResourceWithRawResponse",
+    "AddressingResourceWithStreamingResponse",
+    "AsyncAddressingResourceWithStreamingResponse",
 ]

src/cloudflare/resources/addressing/address_maps/__init__.py

@@ -1,61 +1,61 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from .ips import (
-    IPs,
-    AsyncIPs,
-    IPsWithRawResponse,
-    AsyncIPsWithRawResponse,
-    IPsWithStreamingResponse,
-    AsyncIPsWithStreamingResponse,
+    IPsResource,
+    AsyncIPsResource,
+    IPsResourceWithRawResponse,
+    AsyncIPsResourceWithRawResponse,
+    IPsResourceWithStreamingResponse,
+    AsyncIPsResourceWithStreamingResponse,
 )
 from .zones import (
-    Zones,
-    AsyncZones,
-    ZonesWithRawResponse,
-    AsyncZonesWithRawResponse,
-    ZonesWithStreamingResponse,
-    AsyncZonesWithStreamingResponse,
+    ZonesResource,
+    AsyncZonesResource,
+    ZonesResourceWithRawResponse,
+    AsyncZonesResourceWithRawResponse,
+    ZonesResourceWithStreamingResponse,
+    AsyncZonesResourceWithStreamingResponse,
 )
 from .accounts import (
-    Accounts,
-    AsyncAccounts,
-    AccountsWithRawResponse,
-    AsyncAccountsWithRawResponse,
-    AccountsWithStreamingResponse,
-    AsyncAccountsWithStreamingResponse,
+    AccountsResource,
+    AsyncAccountsResource,
+    AccountsResourceWithRawResponse,
+    AsyncAccountsResourceWithRawResponse,
+    AccountsResourceWithStreamingResponse,
+    AsyncAccountsResourceWithStreamingResponse,
 )
 from .address_maps import (
-    AddressMaps,
-    AsyncAddressMaps,
-    AddressMapsWithRawResponse,
-    AsyncAddressMapsWithRawResponse,
-    AddressMapsWithStreamingResponse,
-    AsyncAddressMapsWithStreamingResponse,
+    AddressMapsResource,
+    AsyncAddressMapsResource,
+    AddressMapsResourceWithRawResponse,
+    AsyncAddressMapsResourceWithRawResponse,
+    AddressMapsResourceWithStreamingResponse,
+    AsyncAddressMapsResourceWithStreamingResponse,
 )
 
 __all__ = [
-    "Accounts",
-    "AsyncAccounts",
-    "AccountsWithRawResponse",
-    "AsyncAccountsWithRawResponse",
-    "AccountsWithStreamingResponse",
-    "AsyncAccountsWithStreamingResponse",
-    "IPs",
-    "AsyncIPs",
-    "IPsWithRawResponse",
-    "AsyncIPsWithRawResponse",
-    "IPsWithStreamingResponse",
-    "AsyncIPsWithStreamingResponse",
-    "Zones",
-    "AsyncZones",
-    "ZonesWithRawResponse",
-    "AsyncZonesWithRawResponse",
-    "ZonesWithStreamingResponse",
-    "AsyncZonesWithStreamingResponse",
-    "AddressMaps",
-    "AsyncAddressMaps",
-    "AddressMapsWithRawResponse",
-    "AsyncAddressMapsWithRawResponse",
-    "AddressMapsWithStreamingResponse",
-    "AsyncAddressMapsWithStreamingResponse",
+    "AccountsResource",
+    "AsyncAccountsResource",
+    "AccountsResourceWithRawResponse",
+    "AsyncAccountsResourceWithRawResponse",
+    "AccountsResourceWithStreamingResponse",
+    "AsyncAccountsResourceWithStreamingResponse",
+    "IPsResource",
+    "AsyncIPsResource",
+    "IPsResourceWithRawResponse",
+    "AsyncIPsResourceWithRawResponse",
+    "IPsResourceWithStreamingResponse",
+    "AsyncIPsResourceWithStreamingResponse",
+    "ZonesResource",
+    "AsyncZonesResource",
+    "ZonesResourceWithRawResponse",
+    "AsyncZonesResourceWithRawResponse",
+    "ZonesResourceWithStreamingResponse",
+    "AsyncZonesResourceWithStreamingResponse",
+    "AddressMapsResource",
+    "AsyncAddressMapsResource",
+    "AddressMapsResourceWithRawResponse",
+    "AsyncAddressMapsResourceWithRawResponse",
+    "AddressMapsResourceWithStreamingResponse",
+    "AsyncAddressMapsResourceWithStreamingResponse",
 ]

src/cloudflare/resources/addressing/address_maps/accounts.py

@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-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 ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,43 +14,54 @@ from ...._response import (
     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 AccountDeleteResponse, AccountUpdateResponse
+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
+from ....types.addressing.address_maps.account_update_response import AccountUpdateResponse
 
-__all__ = ["Accounts", "AsyncAccounts"]
+__all__ = ["AccountsResource", "AsyncAccountsResource"]
 
 
-class Accounts(SyncAPIResource):
+class AccountsResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AccountsWithRawResponse:
-        return AccountsWithRawResponse(self)
+    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) -> AccountsWithStreamingResponse:
-        return AccountsWithStreamingResponse(self)
+    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(
         self,
         address_map_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[AccountUpdateResponse]:
+    ) -> 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
 
@@ -65,21 +75,13 @@ class Accounts(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        return cast(
-            Optional[AccountUpdateResponse],
-            self._put(
-                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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            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
             ),
+            cast_to=AccountUpdateResponse,
         )
 
     def delete(
@@ -93,14 +95,14 @@ class Accounts(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountDeleteResponse]:
+    ) -> 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
 
@@ -114,52 +116,55 @@ class Accounts(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        return cast(
-            Optional[AccountDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=AccountDeleteResponse,
         )
 
 
-class AsyncAccounts(AsyncAPIResource):
+class AsyncAccountsResource(AsyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AsyncAccountsWithRawResponse:
-        return AsyncAccountsWithRawResponse(self)
+    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) -> AsyncAccountsWithStreamingResponse:
-        return AsyncAccountsWithStreamingResponse(self)
+    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(
         self,
         address_map_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[AccountUpdateResponse]:
+    ) -> 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
 
@@ -173,21 +178,13 @@ class AsyncAccounts(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        return cast(
-            Optional[AccountUpdateResponse],
-            await self._put(
-                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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            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
             ),
+            cast_to=AccountUpdateResponse,
         )
 
     async def delete(
@@ -201,14 +198,14 @@ class AsyncAccounts(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AccountDeleteResponse]:
+    ) -> 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
 
@@ -222,26 +219,17 @@ class AsyncAccounts(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        return cast(
-            Optional[AccountDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AccountDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=AccountDeleteResponse,
         )
 
 
-class AccountsWithRawResponse:
-    def __init__(self, accounts: Accounts) -> None:
+class AccountsResourceWithRawResponse:
+    def __init__(self, accounts: AccountsResource) -> None:
         self._accounts = accounts
 
         self.update = to_raw_response_wrapper(
@@ -252,8 +240,8 @@ class AccountsWithRawResponse:
         )
 
 
-class AsyncAccountsWithRawResponse:
-    def __init__(self, accounts: AsyncAccounts) -> None:
+class AsyncAccountsResourceWithRawResponse:
+    def __init__(self, accounts: AsyncAccountsResource) -> None:
         self._accounts = accounts
 
         self.update = async_to_raw_response_wrapper(
@@ -264,8 +252,8 @@ class AsyncAccountsWithRawResponse:
         )
 
 
-class AccountsWithStreamingResponse:
-    def __init__(self, accounts: Accounts) -> None:
+class AccountsResourceWithStreamingResponse:
+    def __init__(self, accounts: AccountsResource) -> None:
         self._accounts = accounts
 
         self.update = to_streamed_response_wrapper(
@@ -276,8 +264,8 @@ class AccountsWithStreamingResponse:
         )
 
 
-class AsyncAccountsWithStreamingResponse:
-    def __init__(self, accounts: AsyncAccounts) -> None:
+class AsyncAccountsResourceWithStreamingResponse:
+    def __init__(self, accounts: AsyncAccountsResource) -> None:
         self._accounts = accounts
 
         self.update = async_to_streamed_response_wrapper(

src/cloudflare/resources/addressing/address_maps/address_maps.py

@@ -2,39 +2,36 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import List, Type, Iterable, Optional, cast
 
 import httpx
 
 from .ips import (
-    IPs,
-    AsyncIPs,
-    IPsWithRawResponse,
-    AsyncIPsWithRawResponse,
-    IPsWithStreamingResponse,
-    AsyncIPsWithStreamingResponse,
+    IPsResource,
+    AsyncIPsResource,
+    IPsResourceWithRawResponse,
+    AsyncIPsResourceWithRawResponse,
+    IPsResourceWithStreamingResponse,
+    AsyncIPsResourceWithStreamingResponse,
 )
 from .zones import (
-    Zones,
-    AsyncZones,
-    ZonesWithRawResponse,
-    AsyncZonesWithRawResponse,
-    ZonesWithStreamingResponse,
-    AsyncZonesWithStreamingResponse,
+    ZonesResource,
+    AsyncZonesResource,
+    ZonesResourceWithRawResponse,
+    AsyncZonesResourceWithRawResponse,
+    ZonesResourceWithStreamingResponse,
+    AsyncZonesResourceWithStreamingResponse,
 )
 from .accounts import (
-    Accounts,
-    AsyncAccounts,
-    AccountsWithRawResponse,
-    AsyncAccountsWithRawResponse,
-    AccountsWithStreamingResponse,
-    AsyncAccountsWithStreamingResponse,
+    AccountsResource,
+    AsyncAccountsResource,
+    AccountsResourceWithRawResponse,
+    AsyncAccountsResourceWithRawResponse,
+    AccountsResourceWithStreamingResponse,
+    AsyncAccountsResourceWithStreamingResponse,
 )
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -44,42 +41,48 @@ from ...._response import (
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import (
-    make_request_options,
-)
-from ....types.addressing import (
-    AddressingAddressMaps,
-    AddressMapGetResponse,
-    AddressMapListResponse,
-    AddressMapCreateResponse,
-    AddressMapDeleteResponse,
-    address_map_edit_params,
-    address_map_create_params,
-)
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.addressing import address_map_edit_params, address_map_create_params
+from ....types.addressing.address_map import AddressMap
+from ....types.addressing.address_map_get_response import AddressMapGetResponse
+from ....types.addressing.address_map_create_response import AddressMapCreateResponse
+from ....types.addressing.address_map_delete_response import AddressMapDeleteResponse
 
-__all__ = ["AddressMaps", "AsyncAddressMaps"]
+__all__ = ["AddressMapsResource", "AsyncAddressMapsResource"]
 
 
-class AddressMaps(SyncAPIResource):
+class AddressMapsResource(SyncAPIResource):
     @cached_property
-    def accounts(self) -> Accounts:
-        return Accounts(self._client)
+    def accounts(self) -> AccountsResource:
+        return AccountsResource(self._client)
 
     @cached_property
-    def ips(self) -> IPs:
-        return IPs(self._client)
+    def ips(self) -> IPsResource:
+        return IPsResource(self._client)
 
     @cached_property
-    def zones(self) -> Zones:
-        return Zones(self._client)
+    def zones(self) -> ZonesResource:
+        return ZonesResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AddressMapsWithRawResponse:
-        return AddressMapsWithRawResponse(self)
+    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) -> AddressMapsWithStreamingResponse:
-        return AddressMapsWithStreamingResponse(self)
+    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,
@@ -87,18 +90,20 @@ class AddressMaps(SyncAPIResource):
         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,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressMapCreateResponse:
+    ) -> 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.
@@ -106,6 +111,9 @@ class AddressMaps(SyncAPIResource):
           enabled: Whether the Address Map is enabled or not. Cloudflare's DNS will not respond
               with IP addresses on an Address Map until the map is enabled.
 
+          memberships: Zones and Accounts which will be assigned IPs on this Address Map. A zone
+              membership will take priority over an account membership.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -122,6 +130,8 @@ class AddressMaps(SyncAPIResource):
                 {
                     "description": description,
                     "enabled": enabled,
+                    "ips": ips,
+                    "memberships": memberships,
                 },
                 address_map_create_params.AddressMapCreateParams,
             ),
@@ -130,9 +140,9 @@ class AddressMaps(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[AddressMapCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressMapCreateResponse], ResultWrapper[AddressMapCreateResponse]),
+            cast_to=cast(Type[Optional[AddressMapCreateResponse]], ResultWrapper[AddressMapCreateResponse]),
         )
 
     def list(
@@ -145,12 +155,12 @@ class AddressMaps(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapListResponse]:
+    ) -> 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
 
@@ -162,16 +172,13 @@ class AddressMaps(SyncAPIResource):
         """
         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}/addressing/address_maps",
+            page=SyncSinglePage[AddressMap],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AddressMapListResponse]], ResultWrapper[AddressMapListResponse]),
+            model=AddressMap,
         )
 
     def delete(
@@ -185,16 +192,16 @@ class AddressMaps(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapDeleteResponse]:
+    ) -> 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
 
@@ -208,21 +215,12 @@ class AddressMaps(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        return cast(
-            Optional[AddressMapDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AddressMapDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=AddressMapDeleteResponse,
         )
 
     def edit(
@@ -239,14 +237,14 @@ class AddressMaps(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingAddressMaps:
+    ) -> 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
@@ -287,9 +285,9 @@ class AddressMaps(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[AddressMap]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingAddressMaps], ResultWrapper[AddressingAddressMaps]),
+            cast_to=cast(Type[Optional[AddressMap]], ResultWrapper[AddressMap]),
         )
 
     def get(
@@ -303,14 +301,14 @@ class AddressMaps(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressMapGetResponse:
+    ) -> 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
 
@@ -331,32 +329,43 @@ class AddressMaps(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[AddressMapGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressMapGetResponse], ResultWrapper[AddressMapGetResponse]),
+            cast_to=cast(Type[Optional[AddressMapGetResponse]], ResultWrapper[AddressMapGetResponse]),
         )
 
 
-class AsyncAddressMaps(AsyncAPIResource):
+class AsyncAddressMapsResource(AsyncAPIResource):
     @cached_property
-    def accounts(self) -> AsyncAccounts:
-        return AsyncAccounts(self._client)
+    def accounts(self) -> AsyncAccountsResource:
+        return AsyncAccountsResource(self._client)
 
     @cached_property
-    def ips(self) -> AsyncIPs:
-        return AsyncIPs(self._client)
+    def ips(self) -> AsyncIPsResource:
+        return AsyncIPsResource(self._client)
 
     @cached_property
-    def zones(self) -> AsyncZones:
-        return AsyncZones(self._client)
+    def zones(self) -> AsyncZonesResource:
+        return AsyncZonesResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncAddressMapsWithRawResponse:
-        return AsyncAddressMapsWithRawResponse(self)
+    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) -> AsyncAddressMapsWithStreamingResponse:
-        return AsyncAddressMapsWithStreamingResponse(self)
+    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,
@@ -364,18 +373,20 @@ class AsyncAddressMaps(AsyncAPIResource):
         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,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressMapCreateResponse:
+    ) -> 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.
@@ -383,6 +394,9 @@ class AsyncAddressMaps(AsyncAPIResource):
           enabled: Whether the Address Map is enabled or not. Cloudflare's DNS will not respond
               with IP addresses on an Address Map until the map is enabled.
 
+          memberships: Zones and Accounts which will be assigned IPs on this Address Map. A zone
+              membership will take priority over an account membership.
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -399,6 +413,8 @@ class AsyncAddressMaps(AsyncAPIResource):
                 {
                     "description": description,
                     "enabled": enabled,
+                    "ips": ips,
+                    "memberships": memberships,
                 },
                 address_map_create_params.AddressMapCreateParams,
             ),
@@ -407,12 +423,12 @@ class AsyncAddressMaps(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[AddressMapCreateResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressMapCreateResponse], ResultWrapper[AddressMapCreateResponse]),
+            cast_to=cast(Type[Optional[AddressMapCreateResponse]], ResultWrapper[AddressMapCreateResponse]),
         )
 
-    async def list(
+    def list(
         self,
         *,
         account_id: str,
@@ -422,12 +438,12 @@ class AsyncAddressMaps(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapListResponse]:
+    ) -> 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
 
@@ -439,16 +455,13 @@ class AsyncAddressMaps(AsyncAPIResource):
         """
         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}/addressing/address_maps",
+            page=AsyncSinglePage[AddressMap],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[AddressMapListResponse]], ResultWrapper[AddressMapListResponse]),
+            model=AddressMap,
         )
 
     async def delete(
@@ -462,16 +475,16 @@ class AsyncAddressMaps(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[AddressMapDeleteResponse]:
+    ) -> 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
 
@@ -485,21 +498,12 @@ class AsyncAddressMaps(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        return cast(
-            Optional[AddressMapDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[AddressMapDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=AddressMapDeleteResponse,
         )
 
     async def edit(
@@ -516,14 +520,14 @@ class AsyncAddressMaps(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingAddressMaps:
+    ) -> 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
@@ -564,9 +568,9 @@ class AsyncAddressMaps(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[AddressMap]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingAddressMaps], ResultWrapper[AddressingAddressMaps]),
+            cast_to=cast(Type[Optional[AddressMap]], ResultWrapper[AddressMap]),
         )
 
     async def get(
@@ -580,14 +584,14 @@ class AsyncAddressMaps(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressMapGetResponse:
+    ) -> 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
 
@@ -608,14 +612,14 @@ class AsyncAddressMaps(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[AddressMapGetResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressMapGetResponse], ResultWrapper[AddressMapGetResponse]),
+            cast_to=cast(Type[Optional[AddressMapGetResponse]], ResultWrapper[AddressMapGetResponse]),
         )
 
 
-class AddressMapsWithRawResponse:
-    def __init__(self, address_maps: AddressMaps) -> None:
+class AddressMapsResourceWithRawResponse:
+    def __init__(self, address_maps: AddressMapsResource) -> None:
         self._address_maps = address_maps
 
         self.create = to_raw_response_wrapper(
@@ -635,20 +639,20 @@ class AddressMapsWithRawResponse:
         )
 
     @cached_property
-    def accounts(self) -> AccountsWithRawResponse:
-        return AccountsWithRawResponse(self._address_maps.accounts)
+    def accounts(self) -> AccountsResourceWithRawResponse:
+        return AccountsResourceWithRawResponse(self._address_maps.accounts)
 
     @cached_property
-    def ips(self) -> IPsWithRawResponse:
-        return IPsWithRawResponse(self._address_maps.ips)
+    def ips(self) -> IPsResourceWithRawResponse:
+        return IPsResourceWithRawResponse(self._address_maps.ips)
 
     @cached_property
-    def zones(self) -> ZonesWithRawResponse:
-        return ZonesWithRawResponse(self._address_maps.zones)
+    def zones(self) -> ZonesResourceWithRawResponse:
+        return ZonesResourceWithRawResponse(self._address_maps.zones)
 
 
-class AsyncAddressMapsWithRawResponse:
-    def __init__(self, address_maps: AsyncAddressMaps) -> None:
+class AsyncAddressMapsResourceWithRawResponse:
+    def __init__(self, address_maps: AsyncAddressMapsResource) -> None:
         self._address_maps = address_maps
 
         self.create = async_to_raw_response_wrapper(
@@ -668,20 +672,20 @@ class AsyncAddressMapsWithRawResponse:
         )
 
     @cached_property
-    def accounts(self) -> AsyncAccountsWithRawResponse:
-        return AsyncAccountsWithRawResponse(self._address_maps.accounts)
+    def accounts(self) -> AsyncAccountsResourceWithRawResponse:
+        return AsyncAccountsResourceWithRawResponse(self._address_maps.accounts)
 
     @cached_property
-    def ips(self) -> AsyncIPsWithRawResponse:
-        return AsyncIPsWithRawResponse(self._address_maps.ips)
+    def ips(self) -> AsyncIPsResourceWithRawResponse:
+        return AsyncIPsResourceWithRawResponse(self._address_maps.ips)
 
     @cached_property
-    def zones(self) -> AsyncZonesWithRawResponse:
-        return AsyncZonesWithRawResponse(self._address_maps.zones)
+    def zones(self) -> AsyncZonesResourceWithRawResponse:
+        return AsyncZonesResourceWithRawResponse(self._address_maps.zones)
 
 
-class AddressMapsWithStreamingResponse:
-    def __init__(self, address_maps: AddressMaps) -> None:
+class AddressMapsResourceWithStreamingResponse:
+    def __init__(self, address_maps: AddressMapsResource) -> None:
         self._address_maps = address_maps
 
         self.create = to_streamed_response_wrapper(
@@ -701,20 +705,20 @@ class AddressMapsWithStreamingResponse:
         )
 
     @cached_property
-    def accounts(self) -> AccountsWithStreamingResponse:
-        return AccountsWithStreamingResponse(self._address_maps.accounts)
+    def accounts(self) -> AccountsResourceWithStreamingResponse:
+        return AccountsResourceWithStreamingResponse(self._address_maps.accounts)
 
     @cached_property
-    def ips(self) -> IPsWithStreamingResponse:
-        return IPsWithStreamingResponse(self._address_maps.ips)
+    def ips(self) -> IPsResourceWithStreamingResponse:
+        return IPsResourceWithStreamingResponse(self._address_maps.ips)
 
     @cached_property
-    def zones(self) -> ZonesWithStreamingResponse:
-        return ZonesWithStreamingResponse(self._address_maps.zones)
+    def zones(self) -> ZonesResourceWithStreamingResponse:
+        return ZonesResourceWithStreamingResponse(self._address_maps.zones)
 
 
-class AsyncAddressMapsWithStreamingResponse:
-    def __init__(self, address_maps: AsyncAddressMaps) -> None:
+class AsyncAddressMapsResourceWithStreamingResponse:
+    def __init__(self, address_maps: AsyncAddressMapsResource) -> None:
         self._address_maps = address_maps
 
         self.create = async_to_streamed_response_wrapper(
@@ -734,13 +738,13 @@ class AsyncAddressMapsWithStreamingResponse:
         )
 
     @cached_property
-    def accounts(self) -> AsyncAccountsWithStreamingResponse:
-        return AsyncAccountsWithStreamingResponse(self._address_maps.accounts)
+    def accounts(self) -> AsyncAccountsResourceWithStreamingResponse:
+        return AsyncAccountsResourceWithStreamingResponse(self._address_maps.accounts)
 
     @cached_property
-    def ips(self) -> AsyncIPsWithStreamingResponse:
-        return AsyncIPsWithStreamingResponse(self._address_maps.ips)
+    def ips(self) -> AsyncIPsResourceWithStreamingResponse:
+        return AsyncIPsResourceWithStreamingResponse(self._address_maps.ips)
 
     @cached_property
-    def zones(self) -> AsyncZonesWithStreamingResponse:
-        return AsyncZonesWithStreamingResponse(self._address_maps.zones)
+    def zones(self) -> AsyncZonesResourceWithStreamingResponse:
+        return AsyncZonesResourceWithStreamingResponse(self._address_maps.zones)

src/cloudflare/resources/addressing/address_maps/ips.py

@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-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 ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,23 +14,33 @@ from ...._response import (
     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 IPDeleteResponse, IPUpdateResponse
+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
+from ....types.addressing.address_maps.ip_update_response import IPUpdateResponse
 
-__all__ = ["IPs", "AsyncIPs"]
+__all__ = ["IPsResource", "AsyncIPsResource"]
 
 
-class IPs(SyncAPIResource):
+class IPsResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> IPsWithRawResponse:
-        return IPsWithRawResponse(self)
+    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) -> IPsWithStreamingResponse:
-        return IPsWithStreamingResponse(self)
+    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(
         self,
@@ -39,20 +48,21 @@ class IPs(SyncAPIResource):
         *,
         account_id: str,
         address_map_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[IPUpdateResponse]:
+    ) -> 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.
 
@@ -70,21 +80,13 @@ class IPs(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
         if not ip_address:
             raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}")
-        return cast(
-            Optional[IPUpdateResponse],
-            self._put(
-                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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IPUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            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
             ),
+            cast_to=IPUpdateResponse,
         )
 
     def delete(
@@ -99,14 +101,14 @@ class IPs(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPDeleteResponse]:
+    ) -> 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.
 
@@ -124,32 +126,34 @@ class IPs(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
         if not ip_address:
             raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}")
-        return cast(
-            Optional[IPDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IPDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=IPDeleteResponse,
         )
 
 
-class AsyncIPs(AsyncAPIResource):
+class AsyncIPsResource(AsyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AsyncIPsWithRawResponse:
-        return AsyncIPsWithRawResponse(self)
+    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) -> AsyncIPsWithStreamingResponse:
-        return AsyncIPsWithStreamingResponse(self)
+    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(
         self,
@@ -157,20 +161,21 @@ class AsyncIPs(AsyncAPIResource):
         *,
         account_id: str,
         address_map_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[IPUpdateResponse]:
+    ) -> 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.
 
@@ -188,21 +193,13 @@ class AsyncIPs(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
         if not ip_address:
             raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}")
-        return cast(
-            Optional[IPUpdateResponse],
-            await self._put(
-                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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IPUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            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
             ),
+            cast_to=IPUpdateResponse,
         )
 
     async def delete(
@@ -217,14 +214,14 @@ class AsyncIPs(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[IPDeleteResponse]:
+    ) -> 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.
 
@@ -242,26 +239,17 @@ class AsyncIPs(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
         if not ip_address:
             raise ValueError(f"Expected a non-empty value for `ip_address` but received {ip_address!r}")
-        return cast(
-            Optional[IPDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[IPDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=IPDeleteResponse,
         )
 
 
-class IPsWithRawResponse:
-    def __init__(self, ips: IPs) -> None:
+class IPsResourceWithRawResponse:
+    def __init__(self, ips: IPsResource) -> None:
         self._ips = ips
 
         self.update = to_raw_response_wrapper(
@@ -272,8 +260,8 @@ class IPsWithRawResponse:
         )
 
 
-class AsyncIPsWithRawResponse:
-    def __init__(self, ips: AsyncIPs) -> None:
+class AsyncIPsResourceWithRawResponse:
+    def __init__(self, ips: AsyncIPsResource) -> None:
         self._ips = ips
 
         self.update = async_to_raw_response_wrapper(
@@ -284,8 +272,8 @@ class AsyncIPsWithRawResponse:
         )
 
 
-class IPsWithStreamingResponse:
-    def __init__(self, ips: IPs) -> None:
+class IPsResourceWithStreamingResponse:
+    def __init__(self, ips: IPsResource) -> None:
         self._ips = ips
 
         self.update = to_streamed_response_wrapper(
@@ -296,8 +284,8 @@ class IPsWithStreamingResponse:
         )
 
 
-class AsyncIPsWithStreamingResponse:
-    def __init__(self, ips: AsyncIPs) -> None:
+class AsyncIPsResourceWithStreamingResponse:
+    def __init__(self, ips: AsyncIPsResource) -> None:
         self._ips = ips
 
         self.update = async_to_streamed_response_wrapper(

src/cloudflare/resources/addressing/address_maps/zones.py

@@ -2,11 +2,10 @@
 
 from __future__ import annotations
 
-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 ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -15,23 +14,33 @@ from ...._response import (
     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 ZoneDeleteResponse, ZoneUpdateResponse
+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
+from ....types.addressing.address_maps.zone_update_response import ZoneUpdateResponse
 
-__all__ = ["Zones", "AsyncZones"]
+__all__ = ["ZonesResource", "AsyncZonesResource"]
 
 
-class Zones(SyncAPIResource):
+class ZonesResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> ZonesWithRawResponse:
-        return ZonesWithRawResponse(self)
+    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) -> ZonesWithStreamingResponse:
-        return ZonesWithStreamingResponse(self)
+    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(
         self,
@@ -39,22 +48,23 @@ class Zones(SyncAPIResource):
         *,
         zone_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[ZoneUpdateResponse]:
+    ) -> 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
 
@@ -70,32 +80,13 @@ class Zones(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        if not account_id and not zone_id:
-            raise ValueError("You must provide either account_id or zone_id")
-        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:
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return cast(
-            Optional[ZoneUpdateResponse],
-            self._put(
-                f"/accounts/{account_or_zone}/addressing/address_maps/{address_map_id}/zones/{account_or_zone_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ZoneUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return self._put(
+            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
             ),
+            cast_to=ZoneUpdateResponse,
         )
 
     def delete(
@@ -110,16 +101,16 @@ class Zones(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneDeleteResponse]:
+    ) -> 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
 
@@ -135,43 +126,34 @@ class Zones(SyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        if not account_id and not zone_id:
-            raise ValueError("You must provide either account_id or zone_id")
-        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:
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return cast(
-            Optional[ZoneDeleteResponse],
-            self._delete(
-                f"/accounts/{account_or_zone}/addressing/address_maps/{address_map_id}/zones/{account_or_zone_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ZoneDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=ZoneDeleteResponse,
         )
 
 
-class AsyncZones(AsyncAPIResource):
+class AsyncZonesResource(AsyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AsyncZonesWithRawResponse:
-        return AsyncZonesWithRawResponse(self)
+    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) -> AsyncZonesWithStreamingResponse:
-        return AsyncZonesWithStreamingResponse(self)
+    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(
         self,
@@ -179,22 +161,23 @@ class AsyncZones(AsyncAPIResource):
         *,
         zone_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[ZoneUpdateResponse]:
+    ) -> 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
 
@@ -210,32 +193,13 @@ class AsyncZones(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        if not account_id and not zone_id:
-            raise ValueError("You must provide either account_id or zone_id")
-        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:
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return cast(
-            Optional[ZoneUpdateResponse],
-            await self._put(
-                f"/accounts/{account_or_zone}/addressing/address_maps/{address_map_id}/zones/{account_or_zone_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ZoneUpdateResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        return await self._put(
+            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
             ),
+            cast_to=ZoneUpdateResponse,
         )
 
     async def delete(
@@ -250,16 +214,16 @@ class AsyncZones(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[ZoneDeleteResponse]:
+    ) -> 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
 
@@ -275,37 +239,17 @@ class AsyncZones(AsyncAPIResource):
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not address_map_id:
             raise ValueError(f"Expected a non-empty value for `address_map_id` but received {address_map_id!r}")
-        if not account_id and not zone_id:
-            raise ValueError("You must provide either account_id or zone_id")
-        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:
-            account_or_zone = "zones"
-            account_or_zone_id = zone_id
-        return cast(
-            Optional[ZoneDeleteResponse],
-            await self._delete(
-                f"/accounts/{account_or_zone}/addressing/address_maps/{address_map_id}/zones/{account_or_zone_id}",
-                options=make_request_options(
-                    extra_headers=extra_headers,
-                    extra_query=extra_query,
-                    extra_body=extra_body,
-                    timeout=timeout,
-                    post_parser=ResultWrapper._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[ZoneDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=ZoneDeleteResponse,
         )
 
 
-class ZonesWithRawResponse:
-    def __init__(self, zones: Zones) -> None:
+class ZonesResourceWithRawResponse:
+    def __init__(self, zones: ZonesResource) -> None:
         self._zones = zones
 
         self.update = to_raw_response_wrapper(
@@ -316,8 +260,8 @@ class ZonesWithRawResponse:
         )
 
 
-class AsyncZonesWithRawResponse:
-    def __init__(self, zones: AsyncZones) -> None:
+class AsyncZonesResourceWithRawResponse:
+    def __init__(self, zones: AsyncZonesResource) -> None:
         self._zones = zones
 
         self.update = async_to_raw_response_wrapper(
@@ -328,8 +272,8 @@ class AsyncZonesWithRawResponse:
         )
 
 
-class ZonesWithStreamingResponse:
-    def __init__(self, zones: Zones) -> None:
+class ZonesResourceWithStreamingResponse:
+    def __init__(self, zones: ZonesResource) -> None:
         self._zones = zones
 
         self.update = to_streamed_response_wrapper(
@@ -340,8 +284,8 @@ class ZonesWithStreamingResponse:
         )
 
 
-class AsyncZonesWithStreamingResponse:
-    def __init__(self, zones: AsyncZones) -> None:
+class AsyncZonesResourceWithStreamingResponse:
+    def __init__(self, zones: AsyncZonesResource) -> None:
         self._zones = zones
 
         self.update = async_to_streamed_response_wrapper(

src/cloudflare/resources/addressing/addressing.py

@@ -2,178 +2,229 @@
 
 from __future__ import annotations
 
-from .prefixes import (
-    Prefixes,
-    AsyncPrefixes,
-    PrefixesWithRawResponse,
-    AsyncPrefixesWithRawResponse,
-    PrefixesWithStreamingResponse,
-    AsyncPrefixesWithStreamingResponse,
-)
 from .services import (
-    Services,
-    AsyncServices,
-    ServicesWithRawResponse,
-    AsyncServicesWithRawResponse,
-    ServicesWithStreamingResponse,
-    AsyncServicesWithStreamingResponse,
+    ServicesResource,
+    AsyncServicesResource,
+    ServicesResourceWithRawResponse,
+    AsyncServicesResourceWithRawResponse,
+    ServicesResourceWithStreamingResponse,
+    AsyncServicesResourceWithStreamingResponse,
 )
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
-from .address_maps import (
-    AddressMaps,
-    AsyncAddressMaps,
-    AddressMapsWithRawResponse,
-    AsyncAddressMapsWithRawResponse,
-    AddressMapsWithStreamingResponse,
-    AsyncAddressMapsWithStreamingResponse,
-)
 from .loa_documents import (
-    LOADocuments,
-    AsyncLOADocuments,
-    LOADocumentsWithRawResponse,
-    AsyncLOADocumentsWithRawResponse,
-    LOADocumentsWithStreamingResponse,
-    AsyncLOADocumentsWithStreamingResponse,
+    LOADocumentsResource,
+    AsyncLOADocumentsResource,
+    LOADocumentsResourceWithRawResponse,
+    AsyncLOADocumentsResourceWithRawResponse,
+    LOADocumentsResourceWithStreamingResponse,
+    AsyncLOADocumentsResourceWithStreamingResponse,
+)
+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,
+    AsyncRegionalHostnamesResourceWithRawResponse,
+    RegionalHostnamesResourceWithStreamingResponse,
+    AsyncRegionalHostnamesResourceWithStreamingResponse,
 )
-from .prefixes.prefixes import Prefixes, AsyncPrefixes
-from .address_maps.address_maps import AddressMaps, AsyncAddressMaps
-from .loa_documents.loa_documents import LOADocuments, AsyncLOADocuments
 
-__all__ = ["Addressing", "AsyncAddressing"]
+__all__ = ["AddressingResource", "AsyncAddressingResource"]
 
 
-class Addressing(SyncAPIResource):
+class AddressingResource(SyncAPIResource):
     @cached_property
-    def services(self) -> Services:
-        return Services(self._client)
+    def regional_hostnames(self) -> RegionalHostnamesResource:
+        return RegionalHostnamesResource(self._client)
 
     @cached_property
-    def address_maps(self) -> AddressMaps:
-        return AddressMaps(self._client)
+    def services(self) -> ServicesResource:
+        return ServicesResource(self._client)
 
     @cached_property
-    def loa_documents(self) -> LOADocuments:
-        return LOADocuments(self._client)
+    def address_maps(self) -> AddressMapsResource:
+        return AddressMapsResource(self._client)
 
     @cached_property
-    def prefixes(self) -> Prefixes:
-        return Prefixes(self._client)
+    def loa_documents(self) -> LOADocumentsResource:
+        return LOADocumentsResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AddressingWithRawResponse:
-        return AddressingWithRawResponse(self)
+    def prefixes(self) -> PrefixesResource:
+        return PrefixesResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> AddressingWithStreamingResponse:
-        return AddressingWithStreamingResponse(self)
+    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.
 
-
-class AsyncAddressing(AsyncAPIResource):
-    @cached_property
-    def services(self) -> AsyncServices:
-        return AsyncServices(self._client)
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#accessing-raw-response-data-eg-headers
+        """
+        return AddressingResourceWithRawResponse(self)
 
     @cached_property
-    def address_maps(self) -> AsyncAddressMaps:
-        return AsyncAddressMaps(self._client)
+    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)
+
+
+class AsyncAddressingResource(AsyncAPIResource):
+    @cached_property
+    def regional_hostnames(self) -> AsyncRegionalHostnamesResource:
+        return AsyncRegionalHostnamesResource(self._client)
 
     @cached_property
-    def loa_documents(self) -> AsyncLOADocuments:
-        return AsyncLOADocuments(self._client)
+    def services(self) -> AsyncServicesResource:
+        return AsyncServicesResource(self._client)
 
     @cached_property
-    def prefixes(self) -> AsyncPrefixes:
-        return AsyncPrefixes(self._client)
+    def address_maps(self) -> AsyncAddressMapsResource:
+        return AsyncAddressMapsResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncAddressingWithRawResponse:
-        return AsyncAddressingWithRawResponse(self)
+    def loa_documents(self) -> AsyncLOADocumentsResource:
+        return AsyncLOADocumentsResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> AsyncAddressingWithStreamingResponse:
-        return AsyncAddressingWithStreamingResponse(self)
+    def prefixes(self) -> AsyncPrefixesResource:
+        return AsyncPrefixesResource(self._client)
+
+    @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)
 
 
-class AddressingWithRawResponse:
-    def __init__(self, addressing: Addressing) -> None:
+class AddressingResourceWithRawResponse:
+    def __init__(self, addressing: AddressingResource) -> None:
         self._addressing = addressing
 
     @cached_property
-    def services(self) -> ServicesWithRawResponse:
-        return ServicesWithRawResponse(self._addressing.services)
+    def regional_hostnames(self) -> RegionalHostnamesResourceWithRawResponse:
+        return RegionalHostnamesResourceWithRawResponse(self._addressing.regional_hostnames)
 
     @cached_property
-    def address_maps(self) -> AddressMapsWithRawResponse:
-        return AddressMapsWithRawResponse(self._addressing.address_maps)
+    def services(self) -> ServicesResourceWithRawResponse:
+        return ServicesResourceWithRawResponse(self._addressing.services)
 
     @cached_property
-    def loa_documents(self) -> LOADocumentsWithRawResponse:
-        return LOADocumentsWithRawResponse(self._addressing.loa_documents)
+    def address_maps(self) -> AddressMapsResourceWithRawResponse:
+        return AddressMapsResourceWithRawResponse(self._addressing.address_maps)
 
     @cached_property
-    def prefixes(self) -> PrefixesWithRawResponse:
-        return PrefixesWithRawResponse(self._addressing.prefixes)
+    def loa_documents(self) -> LOADocumentsResourceWithRawResponse:
+        return LOADocumentsResourceWithRawResponse(self._addressing.loa_documents)
+
+    @cached_property
+    def prefixes(self) -> PrefixesResourceWithRawResponse:
+        return PrefixesResourceWithRawResponse(self._addressing.prefixes)
 
 
-class AsyncAddressingWithRawResponse:
-    def __init__(self, addressing: AsyncAddressing) -> None:
+class AsyncAddressingResourceWithRawResponse:
+    def __init__(self, addressing: AsyncAddressingResource) -> None:
         self._addressing = addressing
 
     @cached_property
-    def services(self) -> AsyncServicesWithRawResponse:
-        return AsyncServicesWithRawResponse(self._addressing.services)
+    def regional_hostnames(self) -> AsyncRegionalHostnamesResourceWithRawResponse:
+        return AsyncRegionalHostnamesResourceWithRawResponse(self._addressing.regional_hostnames)
 
     @cached_property
-    def address_maps(self) -> AsyncAddressMapsWithRawResponse:
-        return AsyncAddressMapsWithRawResponse(self._addressing.address_maps)
+    def services(self) -> AsyncServicesResourceWithRawResponse:
+        return AsyncServicesResourceWithRawResponse(self._addressing.services)
 
     @cached_property
-    def loa_documents(self) -> AsyncLOADocumentsWithRawResponse:
-        return AsyncLOADocumentsWithRawResponse(self._addressing.loa_documents)
+    def address_maps(self) -> AsyncAddressMapsResourceWithRawResponse:
+        return AsyncAddressMapsResourceWithRawResponse(self._addressing.address_maps)
 
     @cached_property
-    def prefixes(self) -> AsyncPrefixesWithRawResponse:
-        return AsyncPrefixesWithRawResponse(self._addressing.prefixes)
+    def loa_documents(self) -> AsyncLOADocumentsResourceWithRawResponse:
+        return AsyncLOADocumentsResourceWithRawResponse(self._addressing.loa_documents)
+
+    @cached_property
+    def prefixes(self) -> AsyncPrefixesResourceWithRawResponse:
+        return AsyncPrefixesResourceWithRawResponse(self._addressing.prefixes)
 
 
-class AddressingWithStreamingResponse:
-    def __init__(self, addressing: Addressing) -> None:
+class AddressingResourceWithStreamingResponse:
+    def __init__(self, addressing: AddressingResource) -> None:
         self._addressing = addressing
 
     @cached_property
-    def services(self) -> ServicesWithStreamingResponse:
-        return ServicesWithStreamingResponse(self._addressing.services)
+    def regional_hostnames(self) -> RegionalHostnamesResourceWithStreamingResponse:
+        return RegionalHostnamesResourceWithStreamingResponse(self._addressing.regional_hostnames)
 
     @cached_property
-    def address_maps(self) -> AddressMapsWithStreamingResponse:
-        return AddressMapsWithStreamingResponse(self._addressing.address_maps)
+    def services(self) -> ServicesResourceWithStreamingResponse:
+        return ServicesResourceWithStreamingResponse(self._addressing.services)
 
     @cached_property
-    def loa_documents(self) -> LOADocumentsWithStreamingResponse:
-        return LOADocumentsWithStreamingResponse(self._addressing.loa_documents)
+    def address_maps(self) -> AddressMapsResourceWithStreamingResponse:
+        return AddressMapsResourceWithStreamingResponse(self._addressing.address_maps)
 
     @cached_property
-    def prefixes(self) -> PrefixesWithStreamingResponse:
-        return PrefixesWithStreamingResponse(self._addressing.prefixes)
+    def loa_documents(self) -> LOADocumentsResourceWithStreamingResponse:
+        return LOADocumentsResourceWithStreamingResponse(self._addressing.loa_documents)
+
+    @cached_property
+    def prefixes(self) -> PrefixesResourceWithStreamingResponse:
+        return PrefixesResourceWithStreamingResponse(self._addressing.prefixes)
 
 
-class AsyncAddressingWithStreamingResponse:
-    def __init__(self, addressing: AsyncAddressing) -> None:
+class AsyncAddressingResourceWithStreamingResponse:
+    def __init__(self, addressing: AsyncAddressingResource) -> None:
         self._addressing = addressing
 
     @cached_property
-    def services(self) -> AsyncServicesWithStreamingResponse:
-        return AsyncServicesWithStreamingResponse(self._addressing.services)
+    def regional_hostnames(self) -> AsyncRegionalHostnamesResourceWithStreamingResponse:
+        return AsyncRegionalHostnamesResourceWithStreamingResponse(self._addressing.regional_hostnames)
 
     @cached_property
-    def address_maps(self) -> AsyncAddressMapsWithStreamingResponse:
-        return AsyncAddressMapsWithStreamingResponse(self._addressing.address_maps)
+    def services(self) -> AsyncServicesResourceWithStreamingResponse:
+        return AsyncServicesResourceWithStreamingResponse(self._addressing.services)
 
     @cached_property
-    def loa_documents(self) -> AsyncLOADocumentsWithStreamingResponse:
-        return AsyncLOADocumentsWithStreamingResponse(self._addressing.loa_documents)
+    def address_maps(self) -> AsyncAddressMapsResourceWithStreamingResponse:
+        return AsyncAddressMapsResourceWithStreamingResponse(self._addressing.address_maps)
 
     @cached_property
-    def prefixes(self) -> AsyncPrefixesWithStreamingResponse:
-        return AsyncPrefixesWithStreamingResponse(self._addressing.prefixes)
+    def loa_documents(self) -> AsyncLOADocumentsResourceWithStreamingResponse:
+        return AsyncLOADocumentsResourceWithStreamingResponse(self._addressing.loa_documents)
+
+    @cached_property
+    def prefixes(self) -> AsyncPrefixesResourceWithStreamingResponse:
+        return AsyncPrefixesResourceWithStreamingResponse(self._addressing.prefixes)

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 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 (
+    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,
+        )

src/cloudflare/resources/addressing/loa_documents/__init__.py

@@ -1,33 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .downloads import (
-    Downloads,
-    AsyncDownloads,
-    DownloadsWithRawResponse,
-    AsyncDownloadsWithRawResponse,
-    DownloadsWithStreamingResponse,
-    AsyncDownloadsWithStreamingResponse,
-)
-from .loa_documents import (
-    LOADocuments,
-    AsyncLOADocuments,
-    LOADocumentsWithRawResponse,
-    AsyncLOADocumentsWithRawResponse,
-    LOADocumentsWithStreamingResponse,
-    AsyncLOADocumentsWithStreamingResponse,
-)
-
-__all__ = [
-    "Downloads",
-    "AsyncDownloads",
-    "DownloadsWithRawResponse",
-    "AsyncDownloadsWithRawResponse",
-    "DownloadsWithStreamingResponse",
-    "AsyncDownloadsWithStreamingResponse",
-    "LOADocuments",
-    "AsyncLOADocuments",
-    "LOADocumentsWithRawResponse",
-    "AsyncLOADocumentsWithRawResponse",
-    "LOADocumentsWithStreamingResponse",
-    "AsyncLOADocumentsWithStreamingResponse",
-]

src/cloudflare/resources/addressing/loa_documents/downloads.py

@@ -1,158 +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 (
-    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__ = ["Downloads", "AsyncDownloads"]
-
-
-class Downloads(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> DownloadsWithRawResponse:
-        return DownloadsWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> DownloadsWithStreamingResponse:
-        return DownloadsWithStreamingResponse(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,
-    ) -> object:
-        """
-        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}")
-        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=object,
-        )
-
-
-class AsyncDownloads(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncDownloadsWithRawResponse:
-        return AsyncDownloadsWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncDownloadsWithStreamingResponse:
-        return AsyncDownloadsWithStreamingResponse(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,
-    ) -> object:
-        """
-        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}")
-        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=object,
-        )
-
-
-class DownloadsWithRawResponse:
-    def __init__(self, downloads: Downloads) -> None:
-        self._downloads = downloads
-
-        self.get = to_raw_response_wrapper(
-            downloads.get,
-        )
-
-
-class AsyncDownloadsWithRawResponse:
-    def __init__(self, downloads: AsyncDownloads) -> None:
-        self._downloads = downloads
-
-        self.get = async_to_raw_response_wrapper(
-            downloads.get,
-        )
-
-
-class DownloadsWithStreamingResponse:
-    def __init__(self, downloads: Downloads) -> None:
-        self._downloads = downloads
-
-        self.get = to_streamed_response_wrapper(
-            downloads.get,
-        )
-
-
-class AsyncDownloadsWithStreamingResponse:
-    def __init__(self, downloads: AsyncDownloads) -> None:
-        self._downloads = downloads
-
-        self.get = async_to_streamed_response_wrapper(
-            downloads.get,
-        )

src/cloudflare/resources/addressing/loa_documents/loa_documents.py

@@ -1,204 +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 .downloads import (
-    Downloads,
-    AsyncDownloads,
-    DownloadsWithRawResponse,
-    AsyncDownloadsWithRawResponse,
-    DownloadsWithStreamingResponse,
-    AsyncDownloadsWithStreamingResponse,
-)
-from ...._compat import cached_property
-from ...._resource import SyncAPIResource, AsyncAPIResource
-from ...._response 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 LOADocumentCreateResponse, loa_document_create_params
-
-__all__ = ["LOADocuments", "AsyncLOADocuments"]
-
-
-class LOADocuments(SyncAPIResource):
-    @cached_property
-    def downloads(self) -> Downloads:
-        return Downloads(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> LOADocumentsWithRawResponse:
-        return LOADocumentsWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> LOADocumentsWithStreamingResponse:
-        return LOADocumentsWithStreamingResponse(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,
-    ) -> 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}")
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[LOADocumentCreateResponse], ResultWrapper[LOADocumentCreateResponse]),
-        )
-
-
-class AsyncLOADocuments(AsyncAPIResource):
-    @cached_property
-    def downloads(self) -> AsyncDownloads:
-        return AsyncDownloads(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncLOADocumentsWithRawResponse:
-        return AsyncLOADocumentsWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncLOADocumentsWithStreamingResponse:
-        return AsyncLOADocumentsWithStreamingResponse(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,
-    ) -> 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}")
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[LOADocumentCreateResponse], ResultWrapper[LOADocumentCreateResponse]),
-        )
-
-
-class LOADocumentsWithRawResponse:
-    def __init__(self, loa_documents: LOADocuments) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = to_raw_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> DownloadsWithRawResponse:
-        return DownloadsWithRawResponse(self._loa_documents.downloads)
-
-
-class AsyncLOADocumentsWithRawResponse:
-    def __init__(self, loa_documents: AsyncLOADocuments) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = async_to_raw_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> AsyncDownloadsWithRawResponse:
-        return AsyncDownloadsWithRawResponse(self._loa_documents.downloads)
-
-
-class LOADocumentsWithStreamingResponse:
-    def __init__(self, loa_documents: LOADocuments) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = to_streamed_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> DownloadsWithStreamingResponse:
-        return DownloadsWithStreamingResponse(self._loa_documents.downloads)
-
-
-class AsyncLOADocumentsWithStreamingResponse:
-    def __init__(self, loa_documents: AsyncLOADocuments) -> None:
-        self._loa_documents = loa_documents
-
-        self.create = async_to_streamed_response_wrapper(
-            loa_documents.create,
-        )
-
-    @cached_property
-    def downloads(self) -> AsyncDownloadsWithStreamingResponse:
-        return AsyncDownloadsWithStreamingResponse(self._loa_documents.downloads)

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

@@ -1,47 +1,75 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from .bgp import (
-    BGP,
-    AsyncBGP,
-    BGPWithRawResponse,
-    AsyncBGPWithRawResponse,
-    BGPWithStreamingResponse,
-    AsyncBGPWithStreamingResponse,
-)
 from .prefixes import (
-    Prefixes,
-    AsyncPrefixes,
-    PrefixesWithRawResponse,
-    AsyncPrefixesWithRawResponse,
-    PrefixesWithStreamingResponse,
-    AsyncPrefixesWithStreamingResponse,
+    PrefixesResource,
+    AsyncPrefixesResource,
+    PrefixesResourceWithRawResponse,
+    AsyncPrefixesResourceWithRawResponse,
+    PrefixesResourceWithStreamingResponse,
+    AsyncPrefixesResourceWithStreamingResponse,
 )
 from .delegations import (
-    Delegations,
-    AsyncDelegations,
-    DelegationsWithRawResponse,
-    AsyncDelegationsWithRawResponse,
-    DelegationsWithStreamingResponse,
-    AsyncDelegationsWithStreamingResponse,
+    DelegationsResource,
+    AsyncDelegationsResource,
+    DelegationsResourceWithRawResponse,
+    AsyncDelegationsResourceWithRawResponse,
+    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__ = [
-    "BGP",
-    "AsyncBGP",
-    "BGPWithRawResponse",
-    "AsyncBGPWithRawResponse",
-    "BGPWithStreamingResponse",
-    "AsyncBGPWithStreamingResponse",
-    "Delegations",
-    "AsyncDelegations",
-    "DelegationsWithRawResponse",
-    "AsyncDelegationsWithRawResponse",
-    "DelegationsWithStreamingResponse",
-    "AsyncDelegationsWithStreamingResponse",
-    "Prefixes",
-    "AsyncPrefixes",
-    "PrefixesWithRawResponse",
-    "AsyncPrefixesWithRawResponse",
-    "PrefixesWithStreamingResponse",
-    "AsyncPrefixesWithStreamingResponse",
+    "ServiceBindingsResource",
+    "AsyncServiceBindingsResource",
+    "ServiceBindingsResourceWithRawResponse",
+    "AsyncServiceBindingsResourceWithRawResponse",
+    "ServiceBindingsResourceWithStreamingResponse",
+    "AsyncServiceBindingsResourceWithStreamingResponse",
+    "BGPPrefixesResource",
+    "AsyncBGPPrefixesResource",
+    "BGPPrefixesResourceWithRawResponse",
+    "AsyncBGPPrefixesResourceWithRawResponse",
+    "BGPPrefixesResourceWithStreamingResponse",
+    "AsyncBGPPrefixesResourceWithStreamingResponse",
+    "AdvertisementStatusResource",
+    "AsyncAdvertisementStatusResource",
+    "AdvertisementStatusResourceWithRawResponse",
+    "AsyncAdvertisementStatusResourceWithRawResponse",
+    "AdvertisementStatusResourceWithStreamingResponse",
+    "AsyncAdvertisementStatusResourceWithStreamingResponse",
+    "DelegationsResource",
+    "AsyncDelegationsResource",
+    "DelegationsResourceWithRawResponse",
+    "AsyncDelegationsResourceWithRawResponse",
+    "DelegationsResourceWithStreamingResponse",
+    "AsyncDelegationsResourceWithStreamingResponse",
+    "PrefixesResource",
+    "AsyncPrefixesResource",
+    "PrefixesResourceWithRawResponse",
+    "AsyncPrefixesResourceWithRawResponse",
+    "PrefixesResourceWithStreamingResponse",
+    "AsyncPrefixesResourceWithStreamingResponse",
 ]

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 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 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],
+            )
+        )

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

@@ -1,61 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from .bgp import (
-    BGP,
-    AsyncBGP,
-    BGPWithRawResponse,
-    AsyncBGPWithRawResponse,
-    BGPWithStreamingResponse,
-    AsyncBGPWithStreamingResponse,
-)
-from .bindings import (
-    Bindings,
-    AsyncBindings,
-    BindingsWithRawResponse,
-    AsyncBindingsWithRawResponse,
-    BindingsWithStreamingResponse,
-    AsyncBindingsWithStreamingResponse,
-)
-from .prefixes import (
-    Prefixes,
-    AsyncPrefixes,
-    PrefixesWithRawResponse,
-    AsyncPrefixesWithRawResponse,
-    PrefixesWithStreamingResponse,
-    AsyncPrefixesWithStreamingResponse,
-)
-from .statuses import (
-    Statuses,
-    AsyncStatuses,
-    StatusesWithRawResponse,
-    AsyncStatusesWithRawResponse,
-    StatusesWithStreamingResponse,
-    AsyncStatusesWithStreamingResponse,
-)
-
-__all__ = [
-    "Bindings",
-    "AsyncBindings",
-    "BindingsWithRawResponse",
-    "AsyncBindingsWithRawResponse",
-    "BindingsWithStreamingResponse",
-    "AsyncBindingsWithStreamingResponse",
-    "Prefixes",
-    "AsyncPrefixes",
-    "PrefixesWithRawResponse",
-    "AsyncPrefixesWithRawResponse",
-    "PrefixesWithStreamingResponse",
-    "AsyncPrefixesWithStreamingResponse",
-    "Statuses",
-    "AsyncStatuses",
-    "StatusesWithRawResponse",
-    "AsyncStatusesWithRawResponse",
-    "StatusesWithStreamingResponse",
-    "AsyncStatusesWithStreamingResponse",
-    "BGP",
-    "AsyncBGP",
-    "BGPWithRawResponse",
-    "AsyncBGPWithRawResponse",
-    "BGPWithStreamingResponse",
-    "AsyncBGPWithStreamingResponse",
-]

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

@@ -1,144 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from .bindings import (
-    Bindings,
-    AsyncBindings,
-    BindingsWithRawResponse,
-    AsyncBindingsWithRawResponse,
-    BindingsWithStreamingResponse,
-    AsyncBindingsWithStreamingResponse,
-)
-from .prefixes import (
-    Prefixes,
-    AsyncPrefixes,
-    PrefixesWithRawResponse,
-    AsyncPrefixesWithRawResponse,
-    PrefixesWithStreamingResponse,
-    AsyncPrefixesWithStreamingResponse,
-)
-from .statuses import (
-    Statuses,
-    AsyncStatuses,
-    StatusesWithRawResponse,
-    AsyncStatusesWithRawResponse,
-    StatusesWithStreamingResponse,
-    AsyncStatusesWithStreamingResponse,
-)
-from ....._compat import cached_property
-from ....._resource import SyncAPIResource, AsyncAPIResource
-
-__all__ = ["BGP", "AsyncBGP"]
-
-
-class BGP(SyncAPIResource):
-    @cached_property
-    def bindings(self) -> Bindings:
-        return Bindings(self._client)
-
-    @cached_property
-    def prefixes(self) -> Prefixes:
-        return Prefixes(self._client)
-
-    @cached_property
-    def statuses(self) -> Statuses:
-        return Statuses(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> BGPWithRawResponse:
-        return BGPWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BGPWithStreamingResponse:
-        return BGPWithStreamingResponse(self)
-
-
-class AsyncBGP(AsyncAPIResource):
-    @cached_property
-    def bindings(self) -> AsyncBindings:
-        return AsyncBindings(self._client)
-
-    @cached_property
-    def prefixes(self) -> AsyncPrefixes:
-        return AsyncPrefixes(self._client)
-
-    @cached_property
-    def statuses(self) -> AsyncStatuses:
-        return AsyncStatuses(self._client)
-
-    @cached_property
-    def with_raw_response(self) -> AsyncBGPWithRawResponse:
-        return AsyncBGPWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBGPWithStreamingResponse:
-        return AsyncBGPWithStreamingResponse(self)
-
-
-class BGPWithRawResponse:
-    def __init__(self, bgp: BGP) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> BindingsWithRawResponse:
-        return BindingsWithRawResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> PrefixesWithRawResponse:
-        return PrefixesWithRawResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> StatusesWithRawResponse:
-        return StatusesWithRawResponse(self._bgp.statuses)
-
-
-class AsyncBGPWithRawResponse:
-    def __init__(self, bgp: AsyncBGP) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> AsyncBindingsWithRawResponse:
-        return AsyncBindingsWithRawResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> AsyncPrefixesWithRawResponse:
-        return AsyncPrefixesWithRawResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> AsyncStatusesWithRawResponse:
-        return AsyncStatusesWithRawResponse(self._bgp.statuses)
-
-
-class BGPWithStreamingResponse:
-    def __init__(self, bgp: BGP) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> BindingsWithStreamingResponse:
-        return BindingsWithStreamingResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> PrefixesWithStreamingResponse:
-        return PrefixesWithStreamingResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> StatusesWithStreamingResponse:
-        return StatusesWithStreamingResponse(self._bgp.statuses)
-
-
-class AsyncBGPWithStreamingResponse:
-    def __init__(self, bgp: AsyncBGP) -> None:
-        self._bgp = bgp
-
-    @cached_property
-    def bindings(self) -> AsyncBindingsWithStreamingResponse:
-        return AsyncBindingsWithStreamingResponse(self._bgp.bindings)
-
-    @cached_property
-    def prefixes(self) -> AsyncPrefixesWithStreamingResponse:
-        return AsyncPrefixesWithStreamingResponse(self._bgp.prefixes)
-
-    @cached_property
-    def statuses(self) -> AsyncStatusesWithStreamingResponse:
-        return AsyncStatusesWithStreamingResponse(self._bgp.statuses)

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

@@ -1,551 +0,0 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-from __future__ import annotations
-
-from typing import Any, 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.addressing.prefixes.bgp import (
-    BindingListResponse,
-    BindingDeleteResponse,
-    AddressingServiceBinding,
-    binding_create_params,
-)
-
-__all__ = ["Bindings", "AsyncBindings"]
-
-
-class Bindings(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> BindingsWithRawResponse:
-        return BindingsWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> BindingsWithStreamingResponse:
-        return BindingsWithStreamingResponse(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,
-    ) -> AddressingServiceBinding:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
-        )
-
-    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,
-    ) -> BindingListResponse:
-        """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(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
-            ),
-            cast_to=cast(Type[BindingListResponse], ResultWrapper[BindingListResponse]),
-        )
-
-    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 cast(
-            BindingDeleteResponse,
-            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,
-                    post_parser=ResultWrapper._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[BindingDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    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,
-    ) -> AddressingServiceBinding:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
-        )
-
-
-class AsyncBindings(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncBindingsWithRawResponse:
-        return AsyncBindingsWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncBindingsWithStreamingResponse:
-        return AsyncBindingsWithStreamingResponse(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,
-    ) -> AddressingServiceBinding:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
-        )
-
-    async 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,
-    ) -> BindingListResponse:
-        """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 await self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
-            ),
-            cast_to=cast(Type[BindingListResponse], ResultWrapper[BindingListResponse]),
-        )
-
-    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 cast(
-            BindingDeleteResponse,
-            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,
-                    post_parser=ResultWrapper._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[BindingDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
-            ),
-        )
-
-    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,
-    ) -> AddressingServiceBinding:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
-        )
-
-
-class BindingsWithRawResponse:
-    def __init__(self, bindings: Bindings) -> 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 AsyncBindingsWithRawResponse:
-    def __init__(self, bindings: AsyncBindings) -> 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 BindingsWithStreamingResponse:
-    def __init__(self, bindings: Bindings) -> 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 AsyncBindingsWithStreamingResponse:
-    def __init__(self, bindings: AsyncBindings) -> 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,
-        )

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

@@ -1,406 +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 PrefixListResponse, AddressingIpamBGPPrefixes, prefix_edit_params
-
-__all__ = ["Prefixes", "AsyncPrefixes"]
-
-
-class Prefixes(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> PrefixesWithRawResponse:
-        return PrefixesWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> PrefixesWithStreamingResponse:
-        return PrefixesWithStreamingResponse(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,
-    ) -> Optional[PrefixListResponse]:
-        """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(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[PrefixListResponse]], ResultWrapper[PrefixListResponse]),
-        )
-
-    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,
-    ) -> AddressingIpamBGPPrefixes:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
-        )
-
-    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,
-    ) -> AddressingIpamBGPPrefixes:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
-        )
-
-
-class AsyncPrefixes(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncPrefixesWithRawResponse:
-        return AsyncPrefixesWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncPrefixesWithStreamingResponse:
-        return AsyncPrefixesWithStreamingResponse(self)
-
-    async 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,
-    ) -> Optional[PrefixListResponse]:
-        """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 await self._get(
-            f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
-            ),
-            cast_to=cast(Type[Optional[PrefixListResponse]], ResultWrapper[PrefixListResponse]),
-        )
-
-    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,
-    ) -> AddressingIpamBGPPrefixes:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
-        )
-
-    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,
-    ) -> AddressingIpamBGPPrefixes:
-        """
-        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._unwrapper,
-            ),
-            cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
-        )
-
-
-class PrefixesWithRawResponse:
-    def __init__(self, prefixes: Prefixes) -> 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 AsyncPrefixesWithRawResponse:
-    def __init__(self, prefixes: AsyncPrefixes) -> 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 PrefixesWithStreamingResponse:
-    def __init__(self, prefixes: Prefixes) -> 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 AsyncPrefixesWithStreamingResponse:
-    def __init__(self, prefixes: AsyncPrefixes) -> 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,
-        )

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

@@ -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, 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 StatusGetResponse, StatusEditResponse, status_edit_params
-
-__all__ = ["Statuses", "AsyncStatuses"]
-
-
-class Statuses(SyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> StatusesWithRawResponse:
-        return StatusesWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> StatusesWithStreamingResponse:
-        return StatusesWithStreamingResponse(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,
-    ) -> 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._unwrapper,
-            ),
-            cast_to=cast(Type[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,
-    ) -> 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._unwrapper,
-            ),
-            cast_to=cast(Type[StatusGetResponse], ResultWrapper[StatusGetResponse]),
-        )
-
-
-class AsyncStatuses(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncStatusesWithRawResponse:
-        return AsyncStatusesWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncStatusesWithStreamingResponse:
-        return AsyncStatusesWithStreamingResponse(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,
-    ) -> 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._unwrapper,
-            ),
-            cast_to=cast(Type[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,
-    ) -> 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._unwrapper,
-            ),
-            cast_to=cast(Type[StatusGetResponse], ResultWrapper[StatusGetResponse]),
-        )
-
-
-class StatusesWithRawResponse:
-    def __init__(self, statuses: Statuses) -> None:
-        self._statuses = statuses
-
-        self.edit = to_raw_response_wrapper(
-            statuses.edit,
-        )
-        self.get = to_raw_response_wrapper(
-            statuses.get,
-        )
-
-
-class AsyncStatusesWithRawResponse:
-    def __init__(self, statuses: AsyncStatuses) -> None:
-        self._statuses = statuses
-
-        self.edit = async_to_raw_response_wrapper(
-            statuses.edit,
-        )
-        self.get = async_to_raw_response_wrapper(
-            statuses.get,
-        )
-
-
-class StatusesWithStreamingResponse:
-    def __init__(self, statuses: Statuses) -> None:
-        self._statuses = statuses
-
-        self.edit = to_streamed_response_wrapper(
-            statuses.edit,
-        )
-        self.get = to_streamed_response_wrapper(
-            statuses.get,
-        )
-
-
-class AsyncStatusesWithStreamingResponse:
-    def __init__(self, statuses: AsyncStatuses) -> None:
-        self._statuses = statuses
-
-        self.edit = async_to_streamed_response_wrapper(
-            statuses.edit,
-        )
-        self.get = async_to_streamed_response_wrapper(
-            statuses.get,
-        )

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

@@ -0,0 +1,561 @@
+# 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 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 | 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]:
+        """
+        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 | NotGiven = NOT_GIVEN,
+        on_demand: bgp_prefix_edit_params.OnDemand | NotGiven = NOT_GIVEN,
+        withdraw_if_no_route: 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[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
+
+          withdraw_if_no_route: Controls whether the BGP prefix is automatically withdrawn when prefix is
+              withdrawn from Magic routing table (for Magic Transit customers using Direct
+              CNI)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, 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,
+                    "on_demand": on_demand,
+                    "withdraw_if_no_route": withdraw_if_no_route,
+                },
+                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 | 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]:
+        """
+        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 | NotGiven = NOT_GIVEN,
+        on_demand: bgp_prefix_edit_params.OnDemand | NotGiven = NOT_GIVEN,
+        withdraw_if_no_route: 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[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
+
+          withdraw_if_no_route: Controls whether the BGP prefix is automatically withdrawn when prefix is
+              withdrawn from Magic routing table (for Magic Transit customers using Direct
+              CNI)
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, 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,
+                    "on_demand": on_demand,
+                    "withdraw_if_no_route": withdraw_if_no_route,
+                },
+                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,
+        )

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

@@ -7,10 +7,7 @@ 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 ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -20,27 +17,34 @@ from ...._response import (
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import (
-    make_request_options,
-)
-from ....types.addressing.prefixes import (
-    DelegationListResponse,
-    DelegationDeleteResponse,
-    AddressingIpamDelegations,
-    delegation_create_params,
-)
+from ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.addressing.prefixes import delegation_create_params
+from ....types.addressing.prefixes.delegations import Delegations
+from ....types.addressing.prefixes.delegation_delete_response import DelegationDeleteResponse
 
-__all__ = ["Delegations", "AsyncDelegations"]
+__all__ = ["DelegationsResource", "AsyncDelegationsResource"]
 
 
-class Delegations(SyncAPIResource):
+class DelegationsResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> DelegationsWithRawResponse:
-        return DelegationsWithRawResponse(self)
+    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) -> DelegationsWithStreamingResponse:
-        return DelegationsWithStreamingResponse(self)
+    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(
         self,
@@ -55,14 +59,14 @@ class Delegations(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamDelegations:
+    ) -> 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.
 
@@ -94,9 +98,9 @@ class Delegations(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Delegations]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamDelegations], ResultWrapper[AddressingIpamDelegations]),
+            cast_to=cast(Type[Optional[Delegations]], ResultWrapper[Delegations]),
         )
 
     def list(
@@ -110,14 +114,14 @@ class Delegations(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DelegationListResponse]:
+    ) -> 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
 
@@ -131,16 +135,13 @@ class Delegations(SyncAPIResource):
             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(
+        return self._get_api_list(
             f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations",
+            page=SyncSinglePage[Delegations],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[DelegationListResponse]], ResultWrapper[DelegationListResponse]),
+            model=Delegations,
         )
 
     def delete(
@@ -155,16 +156,16 @@ class Delegations(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DelegationDeleteResponse:
+    ) -> 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
 
@@ -187,20 +188,31 @@ class Delegations(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[DelegationDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[DelegationDeleteResponse], ResultWrapper[DelegationDeleteResponse]),
+            cast_to=cast(Type[Optional[DelegationDeleteResponse]], ResultWrapper[DelegationDeleteResponse]),
         )
 
 
-class AsyncDelegations(AsyncAPIResource):
+class AsyncDelegationsResource(AsyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AsyncDelegationsWithRawResponse:
-        return AsyncDelegationsWithRawResponse(self)
+    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) -> AsyncDelegationsWithStreamingResponse:
-        return AsyncDelegationsWithStreamingResponse(self)
+    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(
         self,
@@ -215,14 +227,14 @@ class AsyncDelegations(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamDelegations:
+    ) -> 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.
 
@@ -254,12 +266,12 @@ class AsyncDelegations(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Delegations]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamDelegations], ResultWrapper[AddressingIpamDelegations]),
+            cast_to=cast(Type[Optional[Delegations]], ResultWrapper[Delegations]),
         )
 
-    async def list(
+    def list(
         self,
         prefix_id: str,
         *,
@@ -270,14 +282,14 @@ class AsyncDelegations(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[DelegationListResponse]:
+    ) -> 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
 
@@ -291,16 +303,13 @@ class AsyncDelegations(AsyncAPIResource):
             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(
+        return self._get_api_list(
             f"/accounts/{account_id}/addressing/prefixes/{prefix_id}/delegations",
+            page=AsyncSinglePage[Delegations],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[DelegationListResponse]], ResultWrapper[DelegationListResponse]),
+            model=Delegations,
         )
 
     async def delete(
@@ -315,16 +324,16 @@ class AsyncDelegations(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> DelegationDeleteResponse:
+    ) -> 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
 
@@ -347,14 +356,14 @@ class AsyncDelegations(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[DelegationDeleteResponse]]._unwrapper,
             ),
-            cast_to=cast(Type[DelegationDeleteResponse], ResultWrapper[DelegationDeleteResponse]),
+            cast_to=cast(Type[Optional[DelegationDeleteResponse]], ResultWrapper[DelegationDeleteResponse]),
         )
 
 
-class DelegationsWithRawResponse:
-    def __init__(self, delegations: Delegations) -> None:
+class DelegationsResourceWithRawResponse:
+    def __init__(self, delegations: DelegationsResource) -> None:
         self._delegations = delegations
 
         self.create = to_raw_response_wrapper(
@@ -368,8 +377,8 @@ class DelegationsWithRawResponse:
         )
 
 
-class AsyncDelegationsWithRawResponse:
-    def __init__(self, delegations: AsyncDelegations) -> None:
+class AsyncDelegationsResourceWithRawResponse:
+    def __init__(self, delegations: AsyncDelegationsResource) -> None:
         self._delegations = delegations
 
         self.create = async_to_raw_response_wrapper(
@@ -383,8 +392,8 @@ class AsyncDelegationsWithRawResponse:
         )
 
 
-class DelegationsWithStreamingResponse:
-    def __init__(self, delegations: Delegations) -> None:
+class DelegationsResourceWithStreamingResponse:
+    def __init__(self, delegations: DelegationsResource) -> None:
         self._delegations = delegations
 
         self.create = to_streamed_response_wrapper(
@@ -398,8 +407,8 @@ class DelegationsWithStreamingResponse:
         )
 
 
-class AsyncDelegationsWithStreamingResponse:
-    def __init__(self, delegations: AsyncDelegations) -> None:
+class AsyncDelegationsResourceWithStreamingResponse:
+    def __init__(self, delegations: AsyncDelegationsResource) -> None:
         self._delegations = delegations
 
         self.create = async_to_streamed_response_wrapper(

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

@@ -2,32 +2,20 @@
 
 from __future__ import annotations
 
-from typing import Any, Type, Optional, cast
+from typing import Type, Optional, cast
 
 import httpx
 
-from .bgp import (
-    BGP,
-    AsyncBGP,
-    BGPWithRawResponse,
-    AsyncBGPWithRawResponse,
-    BGPWithStreamingResponse,
-    AsyncBGPWithStreamingResponse,
-)
-from .bgp.bgp import BGP, AsyncBGP
 from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from ...._utils import (
-    maybe_transform,
-    async_maybe_transform,
-)
+from ...._utils import maybe_transform, async_maybe_transform
 from ...._compat import cached_property
 from .delegations import (
-    Delegations,
-    AsyncDelegations,
-    DelegationsWithRawResponse,
-    AsyncDelegationsWithRawResponse,
-    DelegationsWithStreamingResponse,
-    AsyncDelegationsWithStreamingResponse,
+    DelegationsResource,
+    AsyncDelegationsResource,
+    DelegationsResourceWithRawResponse,
+    AsyncDelegationsResourceWithRawResponse,
+    DelegationsResourceWithStreamingResponse,
+    AsyncDelegationsResourceWithStreamingResponse,
 )
 from ...._resource import SyncAPIResource, AsyncAPIResource
 from ...._response import (
@@ -37,36 +25,74 @@ from ...._response import (
     async_to_streamed_response_wrapper,
 )
 from ...._wrappers import ResultWrapper
-from ...._base_client import (
-    make_request_options,
+from .bgp_prefixes import (
+    BGPPrefixesResource,
+    AsyncBGPPrefixesResource,
+    BGPPrefixesResourceWithRawResponse,
+    AsyncBGPPrefixesResourceWithRawResponse,
+    BGPPrefixesResourceWithStreamingResponse,
+    AsyncBGPPrefixesResourceWithStreamingResponse,
 )
-from ....types.addressing import (
-    PrefixListResponse,
-    PrefixDeleteResponse,
-    AddressingIpamPrefixes,
-    prefix_edit_params,
-    prefix_create_params,
+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
 
-__all__ = ["Prefixes", "AsyncPrefixes"]
+__all__ = ["PrefixesResource", "AsyncPrefixesResource"]
 
 
-class Prefixes(SyncAPIResource):
+class PrefixesResource(SyncAPIResource):
     @cached_property
-    def bgp(self) -> BGP:
-        return BGP(self._client)
+    def service_bindings(self) -> ServiceBindingsResource:
+        return ServiceBindingsResource(self._client)
 
     @cached_property
-    def delegations(self) -> Delegations:
-        return Delegations(self._client)
+    def bgp_prefixes(self) -> BGPPrefixesResource:
+        return BGPPrefixesResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> PrefixesWithRawResponse:
-        return PrefixesWithRawResponse(self)
+    def advertisement_status(self) -> AdvertisementStatusResource:
+        return AdvertisementStatusResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> PrefixesWithStreamingResponse:
-        return PrefixesWithStreamingResponse(self)
+    def delegations(self) -> DelegationsResource:
+        return DelegationsResource(self._client)
+
+    @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,
@@ -81,12 +107,12 @@ class Prefixes(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamPrefixes:
+    ) -> 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.
 
@@ -119,9 +145,9 @@ class Prefixes(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Prefix]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
+            cast_to=cast(Type[Optional[Prefix]], ResultWrapper[Prefix]),
         )
 
     def list(
@@ -134,12 +160,12 @@ class Prefixes(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrefixListResponse]:
+    ) -> 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
 
@@ -151,16 +177,13 @@ class Prefixes(SyncAPIResource):
         """
         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}/addressing/prefixes",
+            page=SyncSinglePage[Prefix],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PrefixListResponse]], ResultWrapper[PrefixListResponse]),
+            model=Prefix,
         )
 
     def delete(
@@ -174,14 +197,14 @@ class Prefixes(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrefixDeleteResponse]:
+    ) -> 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
 
@@ -195,21 +218,12 @@ class Prefixes(SyncAPIResource):
             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 cast(
-            Optional[PrefixDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PrefixDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=PrefixDeleteResponse,
         )
 
     def edit(
@@ -224,14 +238,14 @@ class Prefixes(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamPrefixes:
+    ) -> 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.
 
@@ -255,9 +269,9 @@ class Prefixes(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Prefix]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
+            cast_to=cast(Type[Optional[Prefix]], ResultWrapper[Prefix]),
         )
 
     def get(
@@ -271,14 +285,14 @@ class Prefixes(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamPrefixes:
+    ) -> 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
 
@@ -299,28 +313,47 @@ class Prefixes(SyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Prefix]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
+            cast_to=cast(Type[Optional[Prefix]], ResultWrapper[Prefix]),
         )
 
 
-class AsyncPrefixes(AsyncAPIResource):
+class AsyncPrefixesResource(AsyncAPIResource):
     @cached_property
-    def bgp(self) -> AsyncBGP:
-        return AsyncBGP(self._client)
+    def service_bindings(self) -> AsyncServiceBindingsResource:
+        return AsyncServiceBindingsResource(self._client)
 
     @cached_property
-    def delegations(self) -> AsyncDelegations:
-        return AsyncDelegations(self._client)
+    def bgp_prefixes(self) -> AsyncBGPPrefixesResource:
+        return AsyncBGPPrefixesResource(self._client)
 
     @cached_property
-    def with_raw_response(self) -> AsyncPrefixesWithRawResponse:
-        return AsyncPrefixesWithRawResponse(self)
+    def advertisement_status(self) -> AsyncAdvertisementStatusResource:
+        return AsyncAdvertisementStatusResource(self._client)
 
     @cached_property
-    def with_streaming_response(self) -> AsyncPrefixesWithStreamingResponse:
-        return AsyncPrefixesWithStreamingResponse(self)
+    def delegations(self) -> AsyncDelegationsResource:
+        return AsyncDelegationsResource(self._client)
+
+    @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,
@@ -335,12 +368,12 @@ class AsyncPrefixes(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamPrefixes:
+    ) -> 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.
 
@@ -373,12 +406,12 @@ class AsyncPrefixes(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Prefix]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
+            cast_to=cast(Type[Optional[Prefix]], ResultWrapper[Prefix]),
         )
 
-    async def list(
+    def list(
         self,
         *,
         account_id: str,
@@ -388,12 +421,12 @@ class AsyncPrefixes(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrefixListResponse]:
+    ) -> 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
 
@@ -405,16 +438,13 @@ class AsyncPrefixes(AsyncAPIResource):
         """
         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}/addressing/prefixes",
+            page=AsyncSinglePage[Prefix],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[Optional[PrefixListResponse]], ResultWrapper[PrefixListResponse]),
+            model=Prefix,
         )
 
     async def delete(
@@ -428,14 +458,14 @@ class AsyncPrefixes(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Optional[PrefixDeleteResponse]:
+    ) -> 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
 
@@ -449,21 +479,12 @@ class AsyncPrefixes(AsyncAPIResource):
             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 cast(
-            Optional[PrefixDeleteResponse],
-            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._unwrapper,
-                ),
-                cast_to=cast(
-                    Any, ResultWrapper[PrefixDeleteResponse]
-                ),  # Union types cannot be passed in as arguments in the type system
+        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
             ),
+            cast_to=PrefixDeleteResponse,
         )
 
     async def edit(
@@ -478,14 +499,14 @@ class AsyncPrefixes(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamPrefixes:
+    ) -> 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.
 
@@ -509,9 +530,9 @@ class AsyncPrefixes(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Prefix]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
+            cast_to=cast(Type[Optional[Prefix]], ResultWrapper[Prefix]),
         )
 
     async def get(
@@ -525,14 +546,14 @@ class AsyncPrefixes(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AddressingIpamPrefixes:
+    ) -> 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
 
@@ -553,14 +574,14 @@ class AsyncPrefixes(AsyncAPIResource):
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                post_parser=ResultWrapper[Optional[Prefix]]._unwrapper,
             ),
-            cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
+            cast_to=cast(Type[Optional[Prefix]], ResultWrapper[Prefix]),
         )
 
 
-class PrefixesWithRawResponse:
-    def __init__(self, prefixes: Prefixes) -> None:
+class PrefixesResourceWithRawResponse:
+    def __init__(self, prefixes: PrefixesResource) -> None:
         self._prefixes = prefixes
 
         self.create = to_raw_response_wrapper(
@@ -580,16 +601,24 @@ class PrefixesWithRawResponse:
         )
 
     @cached_property
-    def bgp(self) -> BGPWithRawResponse:
-        return BGPWithRawResponse(self._prefixes.bgp)
+    def service_bindings(self) -> ServiceBindingsResourceWithRawResponse:
+        return ServiceBindingsResourceWithRawResponse(self._prefixes.service_bindings)
 
     @cached_property
-    def delegations(self) -> DelegationsWithRawResponse:
-        return DelegationsWithRawResponse(self._prefixes.delegations)
+    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:
+        return DelegationsResourceWithRawResponse(self._prefixes.delegations)
 
 
-class AsyncPrefixesWithRawResponse:
-    def __init__(self, prefixes: AsyncPrefixes) -> None:
+class AsyncPrefixesResourceWithRawResponse:
+    def __init__(self, prefixes: AsyncPrefixesResource) -> None:
         self._prefixes = prefixes
 
         self.create = async_to_raw_response_wrapper(
@@ -609,16 +638,24 @@ class AsyncPrefixesWithRawResponse:
         )
 
     @cached_property
-    def bgp(self) -> AsyncBGPWithRawResponse:
-        return AsyncBGPWithRawResponse(self._prefixes.bgp)
+    def service_bindings(self) -> AsyncServiceBindingsResourceWithRawResponse:
+        return AsyncServiceBindingsResourceWithRawResponse(self._prefixes.service_bindings)
 
     @cached_property
-    def delegations(self) -> AsyncDelegationsWithRawResponse:
-        return AsyncDelegationsWithRawResponse(self._prefixes.delegations)
+    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:
+        return AsyncDelegationsResourceWithRawResponse(self._prefixes.delegations)
 
 
-class PrefixesWithStreamingResponse:
-    def __init__(self, prefixes: Prefixes) -> None:
+class PrefixesResourceWithStreamingResponse:
+    def __init__(self, prefixes: PrefixesResource) -> None:
         self._prefixes = prefixes
 
         self.create = to_streamed_response_wrapper(
@@ -638,16 +675,24 @@ class PrefixesWithStreamingResponse:
         )
 
     @cached_property
-    def bgp(self) -> BGPWithStreamingResponse:
-        return BGPWithStreamingResponse(self._prefixes.bgp)
+    def service_bindings(self) -> ServiceBindingsResourceWithStreamingResponse:
+        return ServiceBindingsResourceWithStreamingResponse(self._prefixes.service_bindings)
 
     @cached_property
-    def delegations(self) -> DelegationsWithStreamingResponse:
-        return DelegationsWithStreamingResponse(self._prefixes.delegations)
+    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:
+        return DelegationsResourceWithStreamingResponse(self._prefixes.delegations)
 
 
-class AsyncPrefixesWithStreamingResponse:
-    def __init__(self, prefixes: AsyncPrefixes) -> None:
+class AsyncPrefixesResourceWithStreamingResponse:
+    def __init__(self, prefixes: AsyncPrefixesResource) -> None:
         self._prefixes = prefixes
 
         self.create = async_to_streamed_response_wrapper(
@@ -667,9 +712,17 @@ class AsyncPrefixesWithStreamingResponse:
         )
 
     @cached_property
-    def bgp(self) -> AsyncBGPWithStreamingResponse:
-        return AsyncBGPWithStreamingResponse(self._prefixes.bgp)
+    def service_bindings(self) -> AsyncServiceBindingsResourceWithStreamingResponse:
+        return AsyncServiceBindingsResourceWithStreamingResponse(self._prefixes.service_bindings)
 
     @cached_property
-    def delegations(self) -> AsyncDelegationsWithStreamingResponse:
-        return AsyncDelegationsWithStreamingResponse(self._prefixes.delegations)
+    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:
+        return AsyncDelegationsResourceWithStreamingResponse(self._prefixes.delegations)

src/cloudflare/resources/addressing/prefixes/service_bindings.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, 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 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 | 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/Cloudflare CDN/Cloudflare
+        Spectrum service binding, and only allows creating upgrade service bindings for
+        the Cloudflare CDN or Cloudflare Spectrum.
+
+        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 | 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/Cloudflare CDN/Cloudflare
+        Spectrum service binding, and only allows creating upgrade service bindings for
+        the Cloudflare CDN or Cloudflare Spectrum.
+
+        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,
+        )

src/cloudflare/resources/addressing/regional_hostnames/__init__.py

@@ -0,0 +1,33 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .regions import (
+    RegionsResource,
+    AsyncRegionsResource,
+    RegionsResourceWithRawResponse,
+    AsyncRegionsResourceWithRawResponse,
+    RegionsResourceWithStreamingResponse,
+    AsyncRegionsResourceWithStreamingResponse,
+)
+from .regional_hostnames import (
+    RegionalHostnamesResource,
+    AsyncRegionalHostnamesResource,
+    RegionalHostnamesResourceWithRawResponse,
+    AsyncRegionalHostnamesResourceWithRawResponse,
+    RegionalHostnamesResourceWithStreamingResponse,
+    AsyncRegionalHostnamesResourceWithStreamingResponse,
+)
+
+__all__ = [
+    "RegionsResource",
+    "AsyncRegionsResource",
+    "RegionsResourceWithRawResponse",
+    "AsyncRegionsResourceWithRawResponse",
+    "RegionsResourceWithStreamingResponse",
+    "AsyncRegionsResourceWithStreamingResponse",
+    "RegionalHostnamesResource",
+    "AsyncRegionalHostnamesResource",
+    "RegionalHostnamesResourceWithRawResponse",
+    "AsyncRegionalHostnamesResourceWithRawResponse",
+    "RegionalHostnamesResourceWithStreamingResponse",
+    "AsyncRegionalHostnamesResourceWithStreamingResponse",
+]

src/cloudflare/resources/addressing/regional_hostnames/regional_hostnames.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, Optional, cast
+
+import httpx
+
+from .regions import (
+    RegionsResource,
+    AsyncRegionsResource,
+    RegionsResourceWithRawResponse,
+    AsyncRegionsResourceWithRawResponse,
+    RegionsResourceWithStreamingResponse,
+    AsyncRegionsResourceWithStreamingResponse,
+)
+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 import regional_hostname_edit_params, regional_hostname_create_params
+from ....types.addressing.regional_hostname_get_response import RegionalHostnameGetResponse
+from ....types.addressing.regional_hostname_edit_response import RegionalHostnameEditResponse
+from ....types.addressing.regional_hostname_list_response import RegionalHostnameListResponse
+from ....types.addressing.regional_hostname_create_response import RegionalHostnameCreateResponse
+from ....types.addressing.regional_hostname_delete_response import RegionalHostnameDeleteResponse
+
+__all__ = ["RegionalHostnamesResource", "AsyncRegionalHostnamesResource"]
+
+
+class RegionalHostnamesResource(SyncAPIResource):
+    @cached_property
+    def regions(self) -> RegionsResource:
+        return RegionsResource(self._client)
+
+    @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(
+        self,
+        *,
+        zone_id: str,
+        hostname: str,
+        region_key: str,
+        routing: 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[RegionalHostnameCreateResponse]:
+        """Create a new Regional Hostname entry.
+
+        Cloudflare will only use data centers that
+        are physically located within the chosen region to decrypt and service HTTPS
+        traffic. Learn more about
+        [Regional Services](https://developers.cloudflare.com/data-localization/regional-services/get-started/).
+
+        Args:
+          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
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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}/addressing/regional_hostnames",
+            body=maybe_transform(
+                {
+                    "hostname": hostname,
+                    "region_key": region_key,
+                    "routing": routing,
+                },
+                regional_hostname_create_params.RegionalHostnameCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RegionalHostnameCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RegionalHostnameCreateResponse]], ResultWrapper[RegionalHostnameCreateResponse]),
+        )
+
+    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[RegionalHostnameListResponse]:
+        """
+        List all Regional Hostnames within 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}/addressing/regional_hostnames",
+            page=SyncSinglePage[RegionalHostnameListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RegionalHostnameListResponse,
+        )
+
+    def delete(
+        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,
+    ) -> RegionalHostnameDeleteResponse:
+        """
+        Delete the region configuration for a specific Regional Hostname.
+
+        Args:
+          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`
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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._delete(
+            f"/zones/{zone_id}/addressing/regional_hostnames/{hostname}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RegionalHostnameDeleteResponse,
+        )
+
+    def edit(
+        self,
+        hostname: str,
+        *,
+        zone_id: str,
+        region_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[RegionalHostnameEditResponse]:
+        """Update the configuration for a specific Regional Hostname.
+
+        Only the region_key
+        of a hostname is mutable.
+
+        Args:
+          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
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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._patch(
+            f"/zones/{zone_id}/addressing/regional_hostnames/{hostname}",
+            body=maybe_transform({"region_key": region_key}, regional_hostname_edit_params.RegionalHostnameEditParams),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RegionalHostnameEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RegionalHostnameEditResponse]], ResultWrapper[RegionalHostnameEditResponse]),
+        )
+
+    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[RegionalHostnameGetResponse]:
+        """
+        Fetch the configuration for a specific Regional Hostname, within a zone.
+
+        Args:
+          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`
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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}/addressing/regional_hostnames/{hostname}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RegionalHostnameGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RegionalHostnameGetResponse]], ResultWrapper[RegionalHostnameGetResponse]),
+        )
+
+
+class AsyncRegionalHostnamesResource(AsyncAPIResource):
+    @cached_property
+    def regions(self) -> AsyncRegionsResource:
+        return AsyncRegionsResource(self._client)
+
+    @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(
+        self,
+        *,
+        zone_id: str,
+        hostname: str,
+        region_key: str,
+        routing: 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[RegionalHostnameCreateResponse]:
+        """Create a new Regional Hostname entry.
+
+        Cloudflare will only use data centers that
+        are physically located within the chosen region to decrypt and service HTTPS
+        traffic. Learn more about
+        [Regional Services](https://developers.cloudflare.com/data-localization/regional-services/get-started/).
+
+        Args:
+          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
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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}/addressing/regional_hostnames",
+            body=await async_maybe_transform(
+                {
+                    "hostname": hostname,
+                    "region_key": region_key,
+                    "routing": routing,
+                },
+                regional_hostname_create_params.RegionalHostnameCreateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RegionalHostnameCreateResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RegionalHostnameCreateResponse]], ResultWrapper[RegionalHostnameCreateResponse]),
+        )
+
+    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[RegionalHostnameListResponse, AsyncSinglePage[RegionalHostnameListResponse]]:
+        """
+        List all Regional Hostnames within 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}/addressing/regional_hostnames",
+            page=AsyncSinglePage[RegionalHostnameListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RegionalHostnameListResponse,
+        )
+
+    async def delete(
+        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,
+    ) -> RegionalHostnameDeleteResponse:
+        """
+        Delete the region configuration for a specific Regional Hostname.
+
+        Args:
+          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`
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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._delete(
+            f"/zones/{zone_id}/addressing/regional_hostnames/{hostname}",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=RegionalHostnameDeleteResponse,
+        )
+
+    async def edit(
+        self,
+        hostname: str,
+        *,
+        zone_id: str,
+        region_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[RegionalHostnameEditResponse]:
+        """Update the configuration for a specific Regional Hostname.
+
+        Only the region_key
+        of a hostname is mutable.
+
+        Args:
+          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
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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._patch(
+            f"/zones/{zone_id}/addressing/regional_hostnames/{hostname}",
+            body=await async_maybe_transform(
+                {"region_key": region_key}, regional_hostname_edit_params.RegionalHostnameEditParams
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RegionalHostnameEditResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RegionalHostnameEditResponse]], ResultWrapper[RegionalHostnameEditResponse]),
+        )
+
+    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[RegionalHostnameGetResponse]:
+        """
+        Fetch the configuration for a specific Regional Hostname, within a zone.
+
+        Args:
+          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`
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for 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}/addressing/regional_hostnames/{hostname}",
+            options=make_request_options(
+                extra_headers=extra_headers,
+                extra_query=extra_query,
+                extra_body=extra_body,
+                timeout=timeout,
+                post_parser=ResultWrapper[Optional[RegionalHostnameGetResponse]]._unwrapper,
+            ),
+            cast_to=cast(Type[Optional[RegionalHostnameGetResponse]], ResultWrapper[RegionalHostnameGetResponse]),
+        )
+
+
+class RegionalHostnamesResourceWithRawResponse:
+    def __init__(self, regional_hostnames: RegionalHostnamesResource) -> None:
+        self._regional_hostnames = regional_hostnames
+
+        self.create = to_raw_response_wrapper(
+            regional_hostnames.create,
+        )
+        self.list = to_raw_response_wrapper(
+            regional_hostnames.list,
+        )
+        self.delete = to_raw_response_wrapper(
+            regional_hostnames.delete,
+        )
+        self.edit = to_raw_response_wrapper(
+            regional_hostnames.edit,
+        )
+        self.get = to_raw_response_wrapper(
+            regional_hostnames.get,
+        )
+
+    @cached_property
+    def regions(self) -> RegionsResourceWithRawResponse:
+        return RegionsResourceWithRawResponse(self._regional_hostnames.regions)
+
+
+class AsyncRegionalHostnamesResourceWithRawResponse:
+    def __init__(self, regional_hostnames: AsyncRegionalHostnamesResource) -> None:
+        self._regional_hostnames = regional_hostnames
+
+        self.create = async_to_raw_response_wrapper(
+            regional_hostnames.create,
+        )
+        self.list = async_to_raw_response_wrapper(
+            regional_hostnames.list,
+        )
+        self.delete = async_to_raw_response_wrapper(
+            regional_hostnames.delete,
+        )
+        self.edit = async_to_raw_response_wrapper(
+            regional_hostnames.edit,
+        )
+        self.get = async_to_raw_response_wrapper(
+            regional_hostnames.get,
+        )
+
+    @cached_property
+    def regions(self) -> AsyncRegionsResourceWithRawResponse:
+        return AsyncRegionsResourceWithRawResponse(self._regional_hostnames.regions)
+
+
+class RegionalHostnamesResourceWithStreamingResponse:
+    def __init__(self, regional_hostnames: RegionalHostnamesResource) -> None:
+        self._regional_hostnames = regional_hostnames
+
+        self.create = to_streamed_response_wrapper(
+            regional_hostnames.create,
+        )
+        self.list = to_streamed_response_wrapper(
+            regional_hostnames.list,
+        )
+        self.delete = to_streamed_response_wrapper(
+            regional_hostnames.delete,
+        )
+        self.edit = to_streamed_response_wrapper(
+            regional_hostnames.edit,
+        )
+        self.get = to_streamed_response_wrapper(
+            regional_hostnames.get,
+        )
+
+    @cached_property
+    def regions(self) -> RegionsResourceWithStreamingResponse:
+        return RegionsResourceWithStreamingResponse(self._regional_hostnames.regions)
+
+
+class AsyncRegionalHostnamesResourceWithStreamingResponse:
+    def __init__(self, regional_hostnames: AsyncRegionalHostnamesResource) -> None:
+        self._regional_hostnames = regional_hostnames
+
+        self.create = async_to_streamed_response_wrapper(
+            regional_hostnames.create,
+        )
+        self.list = async_to_streamed_response_wrapper(
+            regional_hostnames.list,
+        )
+        self.delete = async_to_streamed_response_wrapper(
+            regional_hostnames.delete,
+        )
+        self.edit = async_to_streamed_response_wrapper(
+            regional_hostnames.edit,
+        )
+        self.get = async_to_streamed_response_wrapper(
+            regional_hostnames.get,
+        )
+
+    @cached_property
+    def regions(self) -> AsyncRegionsResourceWithStreamingResponse:
+        return AsyncRegionsResourceWithStreamingResponse(self._regional_hostnames.regions)

src/cloudflare/resources/addressing/regional_hostnames/regions.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 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 ....pagination import SyncSinglePage, AsyncSinglePage
+from ...._base_client import AsyncPaginator, make_request_options
+from ....types.addressing.regional_hostnames.region_list_response import RegionListResponse
+
+__all__ = ["RegionsResource", "AsyncRegionsResource"]
+
+
+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,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this 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[RegionListResponse]:
+        """
+        List all Regional Services regions available for use by this 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}/addressing/regional_hostnames/regions",
+            page=SyncSinglePage[RegionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RegionListResponse,
+        )
+
+
+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(
+        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[RegionListResponse, AsyncSinglePage[RegionListResponse]]:
+        """
+        List all Regional Services regions available for use by this 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}/addressing/regional_hostnames/regions",
+            page=AsyncSinglePage[RegionListResponse],
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            model=RegionListResponse,
+        )
+
+
+class RegionsResourceWithRawResponse:
+    def __init__(self, regions: RegionsResource) -> None:
+        self._regions = regions
+
+        self.list = to_raw_response_wrapper(
+            regions.list,
+        )
+
+
+class AsyncRegionsResourceWithRawResponse:
+    def __init__(self, regions: AsyncRegionsResource) -> None:
+        self._regions = regions
+
+        self.list = async_to_raw_response_wrapper(
+            regions.list,
+        )
+
+
+class RegionsResourceWithStreamingResponse:
+    def __init__(self, regions: RegionsResource) -> None:
+        self._regions = regions
+
+        self.list = to_streamed_response_wrapper(
+            regions.list,
+        )
+
+
+class AsyncRegionsResourceWithStreamingResponse:
+    def __init__(self, regions: AsyncRegionsResource) -> None:
+        self._regions = regions
+
+        self.list = async_to_streamed_response_wrapper(
+            regions.list,
+        )

src/cloudflare/resources/addressing/services.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Type, cast
-
 import httpx
 
 from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
@@ -15,23 +13,32 @@ from ..._response import (
     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 ServiceListResponse
+from ...pagination import SyncSinglePage, AsyncSinglePage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.addressing.service_list_response import ServiceListResponse
 
-__all__ = ["Services", "AsyncServices"]
+__all__ = ["ServicesResource", "AsyncServicesResource"]
 
 
-class Services(SyncAPIResource):
+class ServicesResource(SyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> ServicesWithRawResponse:
-        return ServicesWithRawResponse(self)
+    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) -> ServicesWithStreamingResponse:
-        return ServicesWithStreamingResponse(self)
+    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(
         self,
@@ -43,7 +50,7 @@ class Services(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ServiceListResponse:
+    ) -> SyncSinglePage[ServiceListResponse]:
         """
         Bring-Your-Own IP (BYOIP) prefixes onboarded to Cloudflare must be bound to a
         service running on the Cloudflare network to enable a Cloudflare product on the
@@ -51,7 +58,7 @@ class Services(SyncAPIResource):
         the Cloudflare network, and their service IDs.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
@@ -63,29 +70,37 @@ class Services(SyncAPIResource):
         """
         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}/addressing/services",
+            page=SyncSinglePage[ServiceListResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[ServiceListResponse], ResultWrapper[ServiceListResponse]),
+            model=ServiceListResponse,
         )
 
 
-class AsyncServices(AsyncAPIResource):
+class AsyncServicesResource(AsyncAPIResource):
     @cached_property
-    def with_raw_response(self) -> AsyncServicesWithRawResponse:
-        return AsyncServicesWithRawResponse(self)
+    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) -> AsyncServicesWithStreamingResponse:
-        return AsyncServicesWithStreamingResponse(self)
+    def with_streaming_response(self) -> AsyncServicesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
 
-    async def list(
+        For more information, see https://www.github.com/cloudflare/cloudflare-python#with_streaming_response
+        """
+        return AsyncServicesResourceWithStreamingResponse(self)
+
+    def list(
         self,
         *,
         account_id: str,
@@ -95,7 +110,7 @@ class AsyncServices(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ServiceListResponse:
+    ) -> AsyncPaginator[ServiceListResponse, AsyncSinglePage[ServiceListResponse]]:
         """
         Bring-Your-Own IP (BYOIP) prefixes onboarded to Cloudflare must be bound to a
         service running on the Cloudflare network to enable a Cloudflare product on the
@@ -103,7 +118,7 @@ class AsyncServices(AsyncAPIResource):
         the Cloudflare network, and their service IDs.
 
         Args:
-          account_id: Identifier
+          account_id: Identifier of a Cloudflare account.
 
           extra_headers: Send extra headers
 
@@ -115,21 +130,18 @@ class AsyncServices(AsyncAPIResource):
         """
         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}/addressing/services",
+            page=AsyncSinglePage[ServiceListResponse],
             options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                post_parser=ResultWrapper._unwrapper,
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=cast(Type[ServiceListResponse], ResultWrapper[ServiceListResponse]),
+            model=ServiceListResponse,
         )
 
 
-class ServicesWithRawResponse:
-    def __init__(self, services: Services) -> None:
+class ServicesResourceWithRawResponse:
+    def __init__(self, services: ServicesResource) -> None:
         self._services = services
 
         self.list = to_raw_response_wrapper(
@@ -137,8 +149,8 @@ class ServicesWithRawResponse:
         )
 
 
-class AsyncServicesWithRawResponse:
-    def __init__(self, services: AsyncServices) -> None:
+class AsyncServicesResourceWithRawResponse:
+    def __init__(self, services: AsyncServicesResource) -> None:
         self._services = services
 
         self.list = async_to_raw_response_wrapper(
@@ -146,8 +158,8 @@ class AsyncServicesWithRawResponse:
         )
 
 
-class ServicesWithStreamingResponse:
-    def __init__(self, services: Services) -> None:
+class ServicesResourceWithStreamingResponse:
+    def __init__(self, services: ServicesResource) -> None:
         self._services = services
 
         self.list = to_streamed_response_wrapper(
@@ -155,8 +167,8 @@ class ServicesWithStreamingResponse:
         )
 
 
-class AsyncServicesWithStreamingResponse:
-    def __init__(self, services: AsyncServices) -> None:
+class AsyncServicesResourceWithStreamingResponse:
+    def __init__(self, services: AsyncServicesResource) -> None:
         self._services = services
 
         self.list = async_to_streamed_response_wrapper(