feat(client): support file upload requests

Author: stainless-app[bot]

api.md

@@ -6346,7 +6346,7 @@ from cloudflare.types.zero_trust.dlp.datasets import NewVersion
 Methods:
 
 - <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload">client.zero_trust.dlp.datasets.upload.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/upload.py">create</a>(dataset_id, \*, account_id) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/new_version.py">Optional[NewVersion]</a></code>
-- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}">client.zero_trust.dlp.datasets.upload.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/upload.py">edit</a>(version, \*, account_id, dataset_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset.py">Optional[Dataset]</a></code>
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}">client.zero_trust.dlp.datasets.upload.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/upload.py">edit</a>(version, body, \*, account_id, dataset_id, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/dataset.py">Optional[Dataset]</a></code>
 
 #### Versions
 
@@ -6370,7 +6370,7 @@ from cloudflare.types.zero_trust.dlp.datasets.versions import EntryCreateRespons
 
 Methods:
 
-- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}">client.zero_trust.dlp.datasets.versions.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/versions/entries.py">create</a>(entry_id, \*, account_id, dataset_id, version, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_response.py">Optional[EntryCreateResponse]</a></code>
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}">client.zero_trust.dlp.datasets.versions.entries.<a href="./src/cloudflare/resources/zero_trust/dlp/datasets/versions/entries.py">create</a>(entry_id, body, \*, account_id, dataset_id, version, \*\*<a href="src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_params.py">params</a>) -> <a href="./src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_response.py">Optional[EntryCreateResponse]</a></code>
 
 ### Patterns
 
@@ -7114,7 +7114,7 @@ from cloudflare.types.radar.ai import ToMarkdownCreateResponse
 
 Methods:
 
-- <code title="post /accounts/{account_id}/ai/tomarkdown">client.radar.ai.to_markdown.<a href="./src/cloudflare/resources/radar/ai/to_markdown.py">create</a>(\*, account_id, \*\*<a href="src/cloudflare/types/radar/ai/to_markdown_create_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/to_markdown_create_response.py">SyncSinglePage[ToMarkdownCreateResponse]</a></code>
+- <code title="post /accounts/{account_id}/ai/tomarkdown">client.radar.ai.to_markdown.<a href="./src/cloudflare/resources/radar/ai/to_markdown.py">create</a>(body, \*, account_id, \*\*<a href="src/cloudflare/types/radar/ai/to_markdown_create_params.py">params</a>) -> <a href="./src/cloudflare/types/radar/ai/to_markdown_create_response.py">SyncSinglePage[ToMarkdownCreateResponse]</a></code>
 
 ### Inference
 

src/cloudflare/_base_client.py

@@ -556,7 +556,10 @@ def _build_request(
         is_body_allowed = options.method.lower() != "get"
 
         if is_body_allowed:
-            kwargs["json"] = json_data if is_given(json_data) else None
+            if isinstance(json_data, bytes):
+                kwargs["content"] = json_data
+            else:
+                kwargs["json"] = json_data if is_given(json_data) else None
             kwargs["files"] = files
         else:
             headers.pop("Content-Type", None)

src/cloudflare/_files.py

@@ -69,12 +69,12 @@ def _transform_file(file: FileTypes) -> HttpxFileTypes:
         return file
 
     if is_tuple_t(file):
-        return (file[0], _read_file_content(file[1]), *file[2:])
+        return (file[0], read_file_content(file[1]), *file[2:])
 
     raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
-def _read_file_content(file: FileContent) -> HttpxFileContent:
+def read_file_content(file: FileContent) -> HttpxFileContent:
     if isinstance(file, os.PathLike):
         return pathlib.Path(file).read_bytes()
     return file
@@ -111,12 +111,12 @@ async def _async_transform_file(file: FileTypes) -> HttpxFileTypes:
         return file
 
     if is_tuple_t(file):
-        return (file[0], await _async_read_file_content(file[1]), *file[2:])
+        return (file[0], await async_read_file_content(file[1]), *file[2:])
 
     raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
-async def _async_read_file_content(file: FileContent) -> HttpxFileContent:
+async def async_read_file_content(file: FileContent) -> HttpxFileContent:
     if isinstance(file, os.PathLike):
         return await anyio.Path(file).read_bytes()
 

src/cloudflare/resources/radar/ai/to_markdown.py

@@ -44,9 +44,9 @@ def with_streaming_response(self) -> ToMarkdownResourceWithStreamingResponse:
 
     def create(
         self,
+        body: FileTypes | NotGiven = NOT_GIVEN,
         *,
         account_id: str,
-        body: FileTypes | 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,
@@ -102,9 +102,9 @@ def with_streaming_response(self) -> AsyncToMarkdownResourceWithStreamingRespons
 
     def create(
         self,
+        body: FileTypes | NotGiven = NOT_GIVEN,
         *,
         account_id: str,
-        body: FileTypes | 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,

src/cloudflare/resources/zero_trust/dlp/datasets/upload.py

@@ -6,8 +6,8 @@
 
 import httpx
 
-from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
-from ....._utils import maybe_transform, async_maybe_transform
+from ....._files import read_file_content, async_read_file_content
+from ....._types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileContent
 from ....._compat import cached_property
 from ....._resource import SyncAPIResource, AsyncAPIResource
 from ....._response import (
@@ -19,7 +19,6 @@
 from ....._wrappers import ResultWrapper
 from ....._base_client import make_request_options
 from .....types.zero_trust.dlp.dataset import Dataset
-from .....types.zero_trust.dlp.datasets import upload_edit_params
 from .....types.zero_trust.dlp.datasets.new_version import NewVersion
 
 __all__ = ["UploadResource", "AsyncUploadResource"]
@@ -88,10 +87,10 @@ def create(
     def edit(
         self,
         version: int,
+        body: FileContent,
         *,
         account_id: str,
         dataset_id: str,
-        body: FileTypes,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -119,9 +118,10 @@ def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dataset_id:
             raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
         return self._post(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}",
-            body=maybe_transform(body, upload_edit_params.UploadEditParams),
+            body=read_file_content(body),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -196,10 +196,10 @@ async def create(
     async def edit(
         self,
         version: int,
+        body: FileContent,
         *,
         account_id: str,
         dataset_id: str,
-        body: FileTypes,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -227,9 +227,10 @@ async def edit(
             raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
         if not dataset_id:
             raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
         return await self._post(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}",
-            body=await async_maybe_transform(body, upload_edit_params.UploadEditParams),
+            body=await async_read_file_content(body),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

src/cloudflare/resources/zero_trust/dlp/datasets/versions/entries.py

@@ -6,8 +6,8 @@
 
 import httpx
 
-from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileTypes
-from ......_utils import maybe_transform, async_maybe_transform
+from ......_files import read_file_content, async_read_file_content
+from ......_types import NOT_GIVEN, Body, Query, Headers, NotGiven, FileContent
 from ......_compat import cached_property
 from ......_resource import SyncAPIResource, AsyncAPIResource
 from ......_response import (
@@ -18,7 +18,6 @@
 )
 from ......_wrappers import ResultWrapper
 from ......_base_client import make_request_options
-from ......types.zero_trust.dlp.datasets.versions import entry_create_params
 from ......types.zero_trust.dlp.datasets.versions.entry_create_response import EntryCreateResponse
 
 __all__ = ["EntriesResource", "AsyncEntriesResource"]
@@ -47,11 +46,11 @@ def with_streaming_response(self) -> EntriesResourceWithStreamingResponse:
     def create(
         self,
         entry_id: str,
+        body: FileContent,
         *,
         account_id: str,
         dataset_id: str,
         version: int,
-        body: FileTypes,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -79,9 +78,10 @@ def create(
             raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
         if not entry_id:
             raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
         return self._post(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}",
-            body=maybe_transform(body, entry_create_params.EntryCreateParams),
+            body=read_file_content(body),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -116,11 +116,11 @@ def with_streaming_response(self) -> AsyncEntriesResourceWithStreamingResponse:
     async def create(
         self,
         entry_id: str,
+        body: FileContent,
         *,
         account_id: str,
         dataset_id: str,
         version: int,
-        body: FileTypes,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -148,9 +148,10 @@ async def create(
             raise ValueError(f"Expected a non-empty value for `dataset_id` but received {dataset_id!r}")
         if not entry_id:
             raise ValueError(f"Expected a non-empty value for `entry_id` but received {entry_id!r}")
+        extra_headers = {"Content-Type": "application/octet-stream", **(extra_headers or {})}
         return await self._post(
             f"/accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}",
-            body=await async_maybe_transform(body, entry_create_params.EntryCreateParams),
+            body=await async_read_file_content(body),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

src/cloudflare/types/radar/ai/to_markdown_create_params.py

@@ -4,12 +4,8 @@
 
 from typing_extensions import Required, TypedDict
 
-from ...._types import FileTypes
-
 __all__ = ["ToMarkdownCreateParams"]
 
 
 class ToMarkdownCreateParams(TypedDict, total=False):
     account_id: Required[str]
-
-    body: FileTypes

src/cloudflare/types/zero_trust/dlp/datasets/upload_edit_params.py

@@ -4,14 +4,10 @@
 
 from typing_extensions import Required, TypedDict
 
-from ....._types import FileTypes
-
 __all__ = ["UploadEditParams"]
 
 
 class UploadEditParams(TypedDict, total=False):
     account_id: Required[str]
 
     dataset_id: Required[str]
-
-    body: Required[FileTypes]

src/cloudflare/types/zero_trust/dlp/datasets/versions/entry_create_params.py

@@ -4,8 +4,6 @@
 
 from typing_extensions import Required, TypedDict
 
-from ......_types import FileTypes
-
 __all__ = ["EntryCreateParams"]
 
 
@@ -15,5 +13,3 @@ class EntryCreateParams(TypedDict, total=False):
     dataset_id: Required[str]
 
     version: Required[int]
-
-    body: Required[FileTypes]

tests/api_resources/radar/ai/test_to_markdown.py

@@ -30,8 +30,8 @@ def test_method_create(self, client: Cloudflare) -> None:
     @parametrize
     def test_method_create_with_all_params(self, client: Cloudflare) -> None:
         to_markdown = client.radar.ai.to_markdown.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body=b"raw file contents",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(SyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])
 
@@ -87,8 +87,8 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None:
     @parametrize
     async def test_method_create_with_all_params(self, async_client: AsyncCloudflare) -> None:
         to_markdown = await async_client.radar.ai.to_markdown.create(
-            account_id="023e105f4ecef8ad9ca31a8372d0c353",
             body=b"raw file contents",
+            account_id="023e105f4ecef8ad9ca31a8372d0c353",
         )
         assert_matches_type(AsyncSinglePage[ToMarkdownCreateResponse], to_markdown, path=["response"])