Skip to content

Fix AsyncBytesReader, read when bytes are already available #414

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

Merged
merged 2 commits into from
Mar 10, 2025
Merged

Fix AsyncBytesReader, read when bytes are already available #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bae78c
Fix AsyncBytesReader, read when bytes are already available
alextwoods Mar 9, 2025
f61e683
Add test
alextwoods Mar 10, 2025
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
9 changes: 5 additions & 4 deletions packages/smithy-core/src/smithy_core/aio/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ async def _read_from_iterable(
self._remainder = b""
return result

async for element in iterator:
result += element
if len(result) >= size:
break
if len(result) < size:
async for element in iterator:
result += element
if len(result) >= size:
break

self._remainder = result[size:]
return result[:size]
Expand Down
7 changes: 6 additions & 1 deletion packages/smithy-core/tests/unit/aio/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import asyncio
from io import BytesIO
from typing import Self
from unittest.mock import Mock

import pytest

Expand Down Expand Up @@ -96,14 +97,18 @@ async def test_read_async_iterator() -> None:
assert await reader.read() == b"foo"
assert source.tell() == 3

source = BytesIO(b"foo,bar,baz\n")
source = Mock(wraps=BytesIO(b"foo,bar,baz\n"))
reader = AsyncBytesReader(_AsyncIteratorWrapper(source, chunk_size=6))
assert source.tell() == 0
assert await reader.read(4) == b"foo,"
assert source.tell() == 6
assert await reader.read(4) == b"bar,"
assert source.tell() == 12

assert source.read.call_count == 2
assert await reader.read(4) == b"baz\n"
# sufficient bytes have been read from source, assert we don't call read again
assert source.read.call_count == 2
assert source.tell() == 12


Expand Down
Loading