Skip to content

fix(files): check is_tuple_t before is_file_content to fix PathLike inside file tuples #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IgnazioDS wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −6
Open

fix(files): check is_tuple_t before is_file_content to fix PathLike inside file tuples #1322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/anthropic/_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,19 @@ def to_httpx_files(files: RequestFiles | None) -> HttpxRequestFiles | None:


def _transform_file(file: FileTypes) -> HttpxFileTypes:
# Check tuple FIRST: is_file_content() also returns True for tuples, so placing
# the tuple branch second makes it unreachable — PathLike values inside a tuple
# would never be read. See https://github.com/anthropics/anthropic-sdk-python/issues/1318
if is_tuple_t(file):
return (file[0], read_file_content(file[1]), *file[2:])

if is_file_content(file):
if isinstance(file, os.PathLike):
path = pathlib.Path(file)
return (path.name, path.read_bytes())

return file

if is_tuple_t(file):
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")


Expand Down Expand Up @@ -103,16 +106,19 @@ async def async_to_httpx_files(files: RequestFiles | None) -> HttpxRequestFiles


async def _async_transform_file(file: FileTypes) -> HttpxFileTypes:
# Check tuple FIRST: is_file_content() also returns True for tuples, so placing
# the tuple branch second makes it unreachable — PathLike values inside a tuple
# would never be read. See https://github.com/anthropics/anthropic-sdk-python/issues/1318
if is_tuple_t(file):
return (file[0], await async_read_file_content(file[1]), *file[2:])

if is_file_content(file):
if isinstance(file, os.PathLike):
path = anyio.Path(file)
return (path.name, await path.read_bytes())

return file

if is_tuple_t(file):
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")


Expand Down