fix: resolve duplicate code (#29)

Author: jharrell

src/writerai/_base_client.py

@@ -510,7 +510,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
@@ -581,7 +580,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,
         )
 
@@ -1290,11 +1288,7 @@ def post(
             url=path,
             json_data=body,
             files=to_httpx_files(files),
-            content=(
-                get_file_content(_transform_file(binary_request))
-                if binary_request is not None
-                else content
-            ),
+            content=(get_file_content(_transform_file(binary_request)) if binary_request is not None else content),
             **options,
         )
         return cast(ResponseT, self.request(cast_to, opts, stream=stream, stream_cls=stream_cls))
@@ -1876,9 +1870,7 @@ async def post(
             json_data=body,
             files=await async_to_httpx_files(files),
             content=(
-                get_file_content(await _async_transform_file(binary_request))
-                if binary_request is not None
-                else content
+                get_file_content(await _async_transform_file(binary_request)) if binary_request is not None else content
             ),
             **options,
         )

src/writerai/_models.py

@@ -45,7 +45,6 @@
     Timeout,
     NotGiven,
     AnyMapping,
-    HttpxFileContent,
     HttpxRequestFiles,
 )
 from ._utils import (
@@ -800,7 +799,6 @@ class FinalRequestOptionsInput(TypedDict, total=False):
     max_retries: int
     timeout: float | Timeout | None
     files: HttpxRequestFiles | None
-    content: HttpxFileContent | None
     idempotency_key: str
     content: Union[bytes, bytearray, IO[bytes], Iterable[bytes], AsyncIterable[bytes], None]
     json_data: Body
@@ -817,7 +815,6 @@ class FinalRequestOptions(pydantic.BaseModel):
     max_retries: Union[int, NotGiven] = NotGiven()
     timeout: Union[float, Timeout, None, NotGiven] = NotGiven()
     files: Union[HttpxRequestFiles, None] = None
-    content: Union[HttpxFileContent, None] = None
     idempotency_key: Union[str, None] = None
     post_parser: Union[Callable[[Any], Any], NotGiven] = NotGiven()
     follow_redirects: Union[bool, None] = None

src/writerai/resources/files.py

@@ -7,7 +7,6 @@
 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 path_template, maybe_transform, async_maybe_transform
 from .._compat import cached_property