Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions src/openai/_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@ def is_base64_file_input(obj: object) -> TypeGuard[Base64FileInput]:


def is_file_content(obj: object) -> TypeGuard[FileContent]:
return (
isinstance(obj, bytes) or isinstance(obj, tuple) or isinstance(obj, io.IOBase) or isinstance(obj, os.PathLike)
)
return isinstance(obj, bytes) or isinstance(obj, io.IOBase) or isinstance(obj, os.PathLike)


def assert_is_file_content(obj: object, *, key: str | None = None) -> None:
if not is_file_content(obj):
if not (is_file_content(obj) or isinstance(obj, tuple)):
prefix = f"Expected entry at `{key}`" if key is not None else f"Expected file input `{obj!r}`"
raise RuntimeError(
f"{prefix} to be bytes, an io.IOBase instance, PathLike or a tuple but received {type(obj)} instead. See https://github.com/openai/openai-python/tree/main#file-uploads"
Expand Down
13 changes: 13 additions & 0 deletions tests/test_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ async def test_async_tuple_input() -> None:
assert result == IsList(IsTuple("file", IsTuple("README.md", IsBytes())))


def test_tuple_in_mapping_normalizes_path() -> None:
result = to_httpx_files({"file": ("custom_name.txt", readme_path)})
print(result)
assert result == IsDict({"file": IsTuple("custom_name.txt", IsBytes())})


@pytest.mark.asyncio
async def test_async_tuple_in_mapping_normalizes_path() -> None:
result = await async_to_httpx_files({"file": ("custom_name.txt", readme_path)})
print(result)
assert result == IsDict({"file": IsTuple("custom_name.txt", IsBytes())})


def test_string_not_allowed() -> None:
with pytest.raises(TypeError, match="Expected file types input to be a FileContent type or to be a tuple"):
to_httpx_files(
Expand Down