Skip to content

fix(helper): handle negative byte counts in get_readable_size #6244

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
JSap0914 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(helper): handle negative byte counts in get_readable_size #6244

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions jina/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,16 @@ def get_readable_size(num_bytes: Union[int, float]) -> str:
:return: Human readable string representation.
"""
num_bytes = int(num_bytes)
sign = '-' if num_bytes < 0 else ''
num_bytes = abs(num_bytes)
if num_bytes < 1024:
return f'{num_bytes} Bytes'
return f'{sign}{num_bytes} Bytes'
elif num_bytes < 1024**2:
return f'{num_bytes / 1024:.1f} KB'
return f'{sign}{num_bytes / 1024:.1f} KB'
elif num_bytes < 1024**3:
return f'{num_bytes / (1024 ** 2):.1f} MB'
return f'{sign}{num_bytes / (1024 ** 2):.1f} MB'
else:
return f'{num_bytes / (1024 ** 3):.1f} GB'
return f'{sign}{num_bytes / (1024 ** 3):.1f} GB'


def batch_iterator(
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/test_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
deprecated_alias,
dunder_get,
find_request_binding,
get_readable_size,
get_ci_vendor,
is_generator,
is_port_free,
Expand Down Expand Up @@ -426,3 +427,21 @@ def test_is_generator():
assert not is_generator(async_normal_func)
assert is_generator(yield_from_generator_func)
assert is_generator(async_yield_generator_func)


@pytest.mark.parametrize(
'num_bytes, expected',
[
(0, '0 Bytes'),
(512, '512 Bytes'),
(1536, '1.5 KB'),
(2 * 1024**2, '2.0 MB'),
(3 * 1024**3, '3.0 GB'),
(-512, '-512 Bytes'),
(-1536, '-1.5 KB'),
(-2 * 1024**2, '-2.0 MB'),
(-5 * 1024**3, '-5.0 GB'),
],
)
def test_get_readable_size(num_bytes, expected):
assert get_readable_size(num_bytes) == expected