Skip to content

Commit 988df86

Browse files
feat: chore: remove account_id and zone_id client options
* fix: remove account_id and zone_id client options
1 parent 511b508 commit 988df86

1,625 files changed

Lines changed: 6427 additions & 14471 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.stats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
configured_endpoints: 2193
22
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-0ce49e6bb0d3819f135b9a567b661205fdf5df21cff157eab2b7abd7b5b50347.yml
33
openapi_spec_hash: 512a5bb3a32860590c8949765605d65a
4-
config_hash: a9df5f26701f581fbf876dcc7094ab00
4+
config_hash: 854b0636d09f3765445cc618faf31dde

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ It is generated with [Stainless](https://www.stainless.com/).
1313

1414
Use the Cloudflare MCP Server to enable AI assistants to interact with this API, allowing them to explore endpoints, make test requests, and use documentation to help integrate this SDK into your application.
1515

16-
[![Add to Cursor](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en-US/install-mcp?name=cloudflare-mcp&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsImNsb3VkZmxhcmUtbWNwIl0sImVudiI6eyJDTE9VREZMQVJFX0FQSV9UT0tFTiI6IlNuM2xaSlRCWDZra2c3T2RjQlVBeE9POTYzR0VJeUdRcW5GVE9GWVkiLCJDTE9VREZMQVJFX0FQSV9LRVkiOiIxNDRjOWRlZmFjMDQ5NjljN2JmYWQ4ZWZhYThlYTE5NCIsIkNMT1VERkxBUkVfRU1BSUwiOiJ1c2VyQGV4YW1wbGUuY29tIiwiQ0xPVURGTEFSRV9BUElfVVNFUl9TRVJWSUNFX0tFWSI6InYxLjAtMTQ0YzlkZWZhYzA0OTY5YzdiZmFkOGVmLTYzMWE0MWQwMDNhMzJkMjVmZTg3ODA4MWVmMzY1YzQ5NTAzZjdmYWRhNjAwZGE5MzVlMjg1MWExYzczMjYwODRiODVjYmY2NDI5YzRiODU5ZGU4NDc1NzMxZGM5MmE5YzMyOTYzMWU2ZDU5ZTZjNzNkYTdiMTk4NDk3MTcyYjRjZWZlMDcxZDkwZDBmNWQyNzE5IiwiQ0xPVURGTEFSRV9BQ0NPVU5UX0lEIjoiZjAzN2U1NmU4OTI5M2EwNTc3NDBkZTY4MWFjOWFjY3AiLCJDTE9VREZMQVJFX1pPTkVfSUQiOiJmMDM3ZTU2ZTg5MjkzYTA1Nzc0MGRlNjgxYWM5YWNjcCJ9fQ)
17-
[![Install in VS Code](https://img.shields.io/badge/_-Add_to_VS_Code-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9Im5vbmUiIHZpZXdCb3g9IjAgMCA0MCA0MCI+PHBhdGggZmlsbD0iI0VFRSIgZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMzAuMjM1IDM5Ljg4NGEyLjQ5MSAyLjQ5MSAwIDAgMS0xLjc4MS0uNzNMMTIuNyAyNC43OGwtMy40NiAyLjYyNC0zLjQwNiAyLjU4MmExLjY2NSAxLjY2NSAwIDAgMS0xLjA4Mi4zMzggMS42NjQgMS42NjQgMCAwIDEtMS4wNDYtLjQzMWwtMi4yLTJhMS42NjYgMS42NjYgMCAwIDEgMC0yLjQ2M0w3LjQ1OCAyMCA0LjY3IDE3LjQ1MyAxLjUwNyAxNC41N2ExLjY2NSAxLjY2NSAwIDAgMSAwLTIuNDYzbDIuMi0yYTEuNjY1IDEuNjY1IDAgMCAxIDIuMTMtLjA5N2w2Ljg2MyA1LjIwOUwyOC40NTIuODQ0YTIuNDg4IDIuNDg4IDAgMCAxIDEuODQxLS43MjljLjM1MS4wMDkuNjk5LjA5MSAxLjAxOS4yNDVsOC4yMzYgMy45NjFhMi41IDIuNSAwIDAgMSAxLjQxNSAyLjI1M3YuMDk5LS4wNDVWMzMuMzd2LS4wNDUuMDk1YTIuNTAxIDIuNTAxIDAgMCAxLTEuNDE2IDIuMjU3bC04LjIzNSAzLjk2MWEyLjQ5MiAyLjQ5MiAwIDAgMS0xLjA3Ny4yNDZabS43MTYtMjguOTQ3LTExLjk0OCA5LjA2MiAxMS45NTIgOS4wNjUtLjAwNC0xOC4xMjdaIi8+PC9zdmc+)](https://vscode.stainless.com/mcp/%7B%22name%22%3A%22cloudflare-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22cloudflare-mcp%22%5D%2C%22env%22%3A%7B%22CLOUDFLARE_API_TOKEN%22%3A%22Sn3lZJTBX6kkg7OdcBUAxOO963GEIyGQqnFTOFYY%22%2C%22CLOUDFLARE_API_KEY%22%3A%22144c9defac04969c7bfad8efaa8ea194%22%2C%22CLOUDFLARE_EMAIL%22%3A%22user%40example.com%22%2C%22CLOUDFLARE_API_USER_SERVICE_KEY%22%3A%22v1.0-144c9defac04969c7bfad8ef-631a41d003a32d25fe878081ef365c49503f7fada600da935e2851a1c7326084b85cbf6429c4b859de8475731dc92a9c329631e6d59e6c73da7b198497172b4cefe071d90d0f5d2719%22%2C%22CLOUDFLARE_ACCOUNT_ID%22%3A%22f037e56e89293a057740de681ac9accp%22%2C%22CLOUDFLARE_ZONE_ID%22%3A%22f037e56e89293a057740de681ac9accp%22%7D%7D)
16+
[![Add to Cursor](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en-US/install-mcp?name=cloudflare-mcp&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsImNsb3VkZmxhcmUtbWNwIl0sImVudiI6eyJDTE9VREZMQVJFX0FQSV9UT0tFTiI6IlNuM2xaSlRCWDZra2c3T2RjQlVBeE9POTYzR0VJeUdRcW5GVE9GWVkiLCJDTE9VREZMQVJFX0FQSV9LRVkiOiIxNDRjOWRlZmFjMDQ5NjljN2JmYWQ4ZWZhYThlYTE5NCIsIkNMT1VERkxBUkVfRU1BSUwiOiJ1c2VyQGV4YW1wbGUuY29tIiwiQ0xPVURGTEFSRV9BUElfVVNFUl9TRVJWSUNFX0tFWSI6InYxLjAtMTQ0YzlkZWZhYzA0OTY5YzdiZmFkOGVmLTYzMWE0MWQwMDNhMzJkMjVmZTg3ODA4MWVmMzY1YzQ5NTAzZjdmYWRhNjAwZGE5MzVlMjg1MWExYzczMjYwODRiODVjYmY2NDI5YzRiODU5ZGU4NDc1NzMxZGM5MmE5YzMyOTYzMWU2ZDU5ZTZjNzNkYTdiMTk4NDk3MTcyYjRjZWZlMDcxZDkwZDBmNWQyNzE5In19)
17+
[![Install in VS Code](https://img.shields.io/badge/_-Add_to_VS_Code-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9Im5vbmUiIHZpZXdCb3g9IjAgMCA0MCA0MCI+PHBhdGggZmlsbD0iI0VFRSIgZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMzAuMjM1IDM5Ljg4NGEyLjQ5MSAyLjQ5MSAwIDAgMS0xLjc4MS0uNzNMMTIuNyAyNC43OGwtMy40NiAyLjYyNC0zLjQwNiAyLjU4MmExLjY2NSAxLjY2NSAwIDAgMS0xLjA4Mi4zMzggMS42NjQgMS42NjQgMCAwIDEtMS4wNDYtLjQzMWwtMi4yLTJhMS42NjYgMS42NjYgMCAwIDEgMC0yLjQ2M0w3LjQ1OCAyMCA0LjY3IDE3LjQ1MyAxLjUwNyAxNC41N2ExLjY2NSAxLjY2NSAwIDAgMSAwLTIuNDYzbDIuMi0yYTEuNjY1IDEuNjY1IDAgMCAxIDIuMTMtLjA5N2w2Ljg2MyA1LjIwOUwyOC40NTIuODQ0YTIuNDg4IDIuNDg4IDAgMCAxIDEuODQxLS43MjljLjM1MS4wMDkuNjk5LjA5MSAxLjAxOS4yNDVsOC4yMzYgMy45NjFhMi41IDIuNSAwIDAgMSAxLjQxNSAyLjI1M3YuMDk5LS4wNDVWMzMuMzd2LS4wNDUuMDk1YTIuNTAxIDIuNTAxIDAgMCAxLTEuNDE2IDIuMjU3bC04LjIzNSAzLjk2MWEyLjQ5MiAyLjQ5MiAwIDAgMS0xLjA3Ny4yNDZabS43MTYtMjguOTQ3LTExLjk0OCA5LjA2MiAxMS45NTIgOS4wNjUtLjAwNC0xOC4xMjdaIi8+PC9zdmc+)](https://vscode.stainless.com/mcp/%7B%22name%22%3A%22cloudflare-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22cloudflare-mcp%22%5D%2C%22env%22%3A%7B%22CLOUDFLARE_API_TOKEN%22%3A%22Sn3lZJTBX6kkg7OdcBUAxOO963GEIyGQqnFTOFYY%22%2C%22CLOUDFLARE_API_KEY%22%3A%22144c9defac04969c7bfad8efaa8ea194%22%2C%22CLOUDFLARE_EMAIL%22%3A%22user%40example.com%22%2C%22CLOUDFLARE_API_USER_SERVICE_KEY%22%3A%22v1.0-144c9defac04969c7bfad8ef-631a41d003a32d25fe878081ef365c49503f7fada600da935e2851a1c7326084b85cbf6429c4b859de8475731dc92a9c329631e6d59e6c73da7b198497172b4cefe071d90d0f5d2719%22%7D%7D)
1818

1919
> Note: You may need to set environment variables in your MCP client.
2020

src/cloudflare/_client.py

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,6 @@ class Cloudflare(SyncAPIClient):
311311
api_key: str | None
312312
api_email: str | None
313313
user_service_key: str | None
314-
account_id: str | None
315-
zone_id: str | None
316314

317315
def __init__(
318316
self,
@@ -321,8 +319,6 @@ def __init__(
321319
api_key: str | None = None,
322320
api_email: str | None = None,
323321
user_service_key: str | None = None,
324-
account_id: str | None = None,
325-
zone_id: str | None = None,
326322
base_url: str | httpx.URL | None = None,
327323
api_version: str | None = None,
328324
timeout: float | Timeout | None | NotGiven = not_given,
@@ -350,8 +346,6 @@ def __init__(
350346
- `api_key` from `CLOUDFLARE_API_KEY`
351347
- `api_email` from `CLOUDFLARE_EMAIL`
352348
- `user_service_key` from `CLOUDFLARE_API_USER_SERVICE_KEY`
353-
- `account_id` from `CLOUDFLARE_ACCOUNT_ID`
354-
- `zone_id` from `CLOUDFLARE_ZONE_ID`
355349
"""
356350
if api_token is None:
357351
api_token = os.environ.get("CLOUDFLARE_API_TOKEN")
@@ -369,14 +363,6 @@ def __init__(
369363
user_service_key = os.environ.get("CLOUDFLARE_API_USER_SERVICE_KEY")
370364
self.user_service_key = user_service_key
371365

372-
if account_id is None:
373-
account_id = os.environ.get("CLOUDFLARE_ACCOUNT_ID")
374-
self.account_id = account_id
375-
376-
if zone_id is None:
377-
zone_id = os.environ.get("CLOUDFLARE_ZONE_ID")
378-
self.zone_id = zone_id
379-
380366
if base_url is None:
381367
base_url = os.environ.get("CLOUDFLARE_BASE_URL")
382368
if base_url is None:
@@ -1123,8 +1109,6 @@ def copy(
11231109
api_key: str | None = None,
11241110
api_email: str | None = None,
11251111
user_service_key: str | None = None,
1126-
account_id: str | None = None,
1127-
zone_id: str | None = None,
11281112
base_url: str | httpx.URL | None = None,
11291113
api_version: str | None = None,
11301114
timeout: float | Timeout | None | NotGiven = not_given,
@@ -1163,8 +1147,6 @@ def copy(
11631147
api_key=api_key or self.api_key,
11641148
api_email=api_email or self.api_email,
11651149
user_service_key=user_service_key or self.user_service_key,
1166-
account_id=account_id or self.account_id,
1167-
zone_id=zone_id or self.zone_id,
11681150
base_url=base_url or self.base_url,
11691151
api_version=api_version or self.api_version,
11701152
timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
@@ -1179,24 +1161,6 @@ def copy(
11791161
# client.with_options(timeout=10).foo.create(...)
11801162
with_options = copy
11811163

1182-
def _get_account_id_path_param(self) -> str:
1183-
from_client = self.account_id
1184-
if from_client is not None:
1185-
return from_client
1186-
1187-
raise ValueError(
1188-
"Missing account_id argument; Please provide it at the client level, e.g. Cloudflare(account_id='abcd') or per method."
1189-
)
1190-
1191-
def _get_zone_id_path_param(self) -> str:
1192-
from_client = self.zone_id
1193-
if from_client is not None:
1194-
return from_client
1195-
1196-
raise ValueError(
1197-
"Missing zone_id argument; Please provide it at the client level, e.g. Cloudflare(zone_id='abcd') or per method."
1198-
)
1199-
12001164
@override
12011165
def _make_status_error(
12021166
self,
@@ -1237,8 +1201,6 @@ class AsyncCloudflare(AsyncAPIClient):
12371201
api_key: str | None
12381202
api_email: str | None
12391203
user_service_key: str | None
1240-
account_id: str | None
1241-
zone_id: str | None
12421204

12431205
def __init__(
12441206
self,
@@ -1247,8 +1209,6 @@ def __init__(
12471209
api_key: str | None = None,
12481210
api_email: str | None = None,
12491211
user_service_key: str | None = None,
1250-
account_id: str | None = None,
1251-
zone_id: str | None = None,
12521212
base_url: str | httpx.URL | None = None,
12531213
api_version: str | None = None,
12541214
timeout: float | Timeout | None | NotGiven = not_given,
@@ -1276,8 +1236,6 @@ def __init__(
12761236
- `api_key` from `CLOUDFLARE_API_KEY`
12771237
- `api_email` from `CLOUDFLARE_EMAIL`
12781238
- `user_service_key` from `CLOUDFLARE_API_USER_SERVICE_KEY`
1279-
- `account_id` from `CLOUDFLARE_ACCOUNT_ID`
1280-
- `zone_id` from `CLOUDFLARE_ZONE_ID`
12811239
"""
12821240
if api_token is None:
12831241
api_token = os.environ.get("CLOUDFLARE_API_TOKEN")
@@ -1295,14 +1253,6 @@ def __init__(
12951253
user_service_key = os.environ.get("CLOUDFLARE_API_USER_SERVICE_KEY")
12961254
self.user_service_key = user_service_key
12971255

1298-
if account_id is None:
1299-
account_id = os.environ.get("CLOUDFLARE_ACCOUNT_ID")
1300-
self.account_id = account_id
1301-
1302-
if zone_id is None:
1303-
zone_id = os.environ.get("CLOUDFLARE_ZONE_ID")
1304-
self.zone_id = zone_id
1305-
13061256
if base_url is None:
13071257
base_url = os.environ.get("CLOUDFLARE_BASE_URL")
13081258
if base_url is None:
@@ -2049,8 +1999,6 @@ def copy(
20491999
api_key: str | None = None,
20502000
api_email: str | None = None,
20512001
user_service_key: str | None = None,
2052-
account_id: str | None = None,
2053-
zone_id: str | None = None,
20542002
base_url: str | httpx.URL | None = None,
20552003
api_version: str | None = None,
20562004
timeout: float | Timeout | None | NotGiven = not_given,
@@ -2089,8 +2037,6 @@ def copy(
20892037
api_key=api_key or self.api_key,
20902038
api_email=api_email or self.api_email,
20912039
user_service_key=user_service_key or self.user_service_key,
2092-
account_id=account_id or self.account_id,
2093-
zone_id=zone_id or self.zone_id,
20942040
base_url=base_url or self.base_url,
20952041
api_version=api_version or self.api_version,
20962042
timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
@@ -2105,24 +2051,6 @@ def copy(
21052051
# client.with_options(timeout=10).foo.create(...)
21062052
with_options = copy
21072053

2108-
def _get_account_id_path_param(self) -> str:
2109-
from_client = self.account_id
2110-
if from_client is not None:
2111-
return from_client
2112-
2113-
raise ValueError(
2114-
"Missing account_id argument; Please provide it at the client level, e.g. AsyncCloudflare(account_id='abcd') or per method."
2115-
)
2116-
2117-
def _get_zone_id_path_param(self) -> str:
2118-
from_client = self.zone_id
2119-
if from_client is not None:
2120-
return from_client
2121-
2122-
raise ValueError(
2123-
"Missing zone_id argument; Please provide it at the client level, e.g. AsyncCloudflare(zone_id='abcd') or per method."
2124-
)
2125-
21262054
@override
21272055
def _make_status_error(
21282056
self,

0 commit comments

Comments
 (0)