fix: remove custom binary_request handling superseded by codegen (#28)

* fix: remove custom binary_request handling superseded by codegen

The codegen now natively supports a `content` parameter for binary
request streaming. Remove the custom `binary_request` parameter and
content routing that conflicts with this new codegen feature. Move
file transformation to the call site in resources/files.py.

* style: fix import ordering

Author: jharrell

src/writerai/_base_client.py

@@ -40,15 +40,14 @@
 
 from . import _exceptions
 from ._qs import Querystring
-from ._files import to_httpx_files, _transform_file, get_file_content, async_to_httpx_files, _async_transform_file
+from ._files import to_httpx_files, async_to_httpx_files
 from ._types import (
     Body,
     Omit,
     Query,
     Headers,
     Timeout,
     NotGiven,
-    FileTypes,
     ResponseT,
     AnyMapping,
     PostParser,
@@ -495,7 +494,6 @@ def _build_request(
         params = _merge_mappings(self.default_query, options.params)
         content_type = headers.get("Content-Type")
         files = options.files
-        content = options.content
 
         # If the given Content-Type header is multipart/form-data then it
         # has to be removed so that httpx can generate the header with
@@ -554,7 +552,6 @@ def _build_request(
             # so that passing a `TypedDict` doesn't cause an error.
             # https://github.com/microsoft/pyright/issues/3526#event-6715453066
             params=self.qs.stringify(cast(Mapping[str, Any], params)) if params else None,
-            content=content,
             **kwargs,
         )
 
@@ -1199,7 +1196,6 @@ def post(
         body: Body | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         stream: Literal[False] = False,
     ) -> ResponseT: ...
 
@@ -1212,7 +1208,6 @@ def post(
         body: Body | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         stream: Literal[True],
         stream_cls: type[_StreamT],
     ) -> _StreamT: ...
@@ -1226,7 +1221,6 @@ def post(
         body: Body | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         stream: bool,
         stream_cls: type[_StreamT] | None = None,
     ) -> ResponseT | _StreamT: ...
@@ -1239,7 +1233,6 @@ def post(
         body: Body | None = None,
         options: RequestOptions = {},
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         stream: bool = False,
         stream_cls: type[_StreamT] | None = None,
     ) -> ResponseT | _StreamT:
@@ -1248,7 +1241,6 @@ def post(
             url=path,
             json_data=body,
             files=to_httpx_files(files),
-            content=get_file_content(_transform_file(binary_request)) if binary_request else None,
             **options,
         )
         return cast(ResponseT, self.request(cast_to, opts, stream=stream, stream_cls=stream_cls))
@@ -1730,7 +1722,6 @@ async def post(
         cast_to: Type[ResponseT],
         body: Body | None = None,
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         options: RequestOptions = {},
         stream: Literal[False] = False,
     ) -> ResponseT: ...
@@ -1743,7 +1734,6 @@ async def post(
         cast_to: Type[ResponseT],
         body: Body | None = None,
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         options: RequestOptions = {},
         stream: Literal[True],
         stream_cls: type[_AsyncStreamT],
@@ -1757,7 +1747,6 @@ async def post(
         cast_to: Type[ResponseT],
         body: Body | None = None,
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         options: RequestOptions = {},
         stream: bool,
         stream_cls: type[_AsyncStreamT] | None = None,
@@ -1770,7 +1759,6 @@ async def post(
         cast_to: Type[ResponseT],
         body: Body | None = None,
         files: RequestFiles | None = None,
-        binary_request: FileTypes | None = None,
         options: RequestOptions = {},
         stream: bool = False,
         stream_cls: type[_AsyncStreamT] | None = None,
@@ -1780,7 +1768,6 @@ async def post(
             url=path,
             json_data=body,
             files=await async_to_httpx_files(files),
-            content=get_file_content(await _async_transform_file(binary_request)) if binary_request else None,
             **options,
         )
         return await self.request(cast_to, opts, stream=stream, stream_cls=stream_cls)

src/writerai/resources/files.py

@@ -7,6 +7,7 @@
 import httpx
 
 from ..types import file_list_params, file_retry_params, file_upload_params
+from .._files import _transform_file, get_file_content, _async_transform_file
 from .._types import Body, Omit, Query, Headers, NotGiven, FileTypes, SequenceNotStr, omit, not_given
 from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
@@ -310,14 +311,14 @@ def upload(
         }
         return self._post(
             "/v1/files",
+            body=get_file_content(_transform_file(content)),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
                 query=maybe_transform({"graph_id": graph_id}, file_upload_params.FileUploadParams),
             ),
-            binary_request=content,
             cast_to=File,
         )
 
@@ -598,14 +599,14 @@ async def upload(
         }
         return await self._post(
             "/v1/files",
+            body=get_file_content(await _async_transform_file(content)),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
                 query=await async_maybe_transform({"graph_id": graph_id}, file_upload_params.FileUploadParams),
             ),
-            binary_request=content,
             cast_to=File,
         )