Repository navigation
fix: redirect streamed log lines without waiting for the next message #1219
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.
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
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
bf1d30a
refactor: redirect each streamed log line as soon as its newline arrives
claude 6f306fe
refactor: keep the indentation of continuation lines in streamed logs
claude 70d3ae4
refactor: drop handling of log lines without a timestamp marker
claude a4c9b39
refactor: tidy streamed log docstring and tests
vdusek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| from __future__ import annotations | ||
|
|
||
| import logging | ||
| from unittest.mock import Mock | ||
|
|
||
| import pytest | ||
|
|
||
| from apify_client._streamed_log import StreamedLogBase | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| ('chunks', 'expected_calls'), | ||
| [ | ||
| pytest.param( | ||
| [b'2025-05-13T07:24:12.588Z first\n2025-05-13T07:24:13', b'.588Z second\n'], | ||
| [(logging.INFO, '2025-05-13T07:24:12.588Z first'), (logging.INFO, '2025-05-13T07:24:13.588Z second')], | ||
| id='marker-split-across-chunks', | ||
| ), | ||
| pytest.param( | ||
| [b'2025-05-13T07:24:12.588Z unterminated'], | ||
| [], | ||
| id='unterminated-line-waits-for-newline', | ||
| ), | ||
| pytest.param( | ||
| [b'preamble without marker\n', b'2025-05-13T07:24:12.588Z first\n'], | ||
| [(logging.INFO, '2025-05-13T07:24:12.588Z first')], | ||
| id='text-before-first-message-is-skipped', | ||
| ), | ||
| ], | ||
| ) | ||
| def test_streamed_log_redirects_each_complete_line(chunks: list[bytes], expected_calls: list[tuple[int, str]]) -> None: | ||
| """Each chunk redirects the messages its newlines complete and keeps only the unterminated rest.""" | ||
| to_logger = Mock(spec=logging.Logger) | ||
| streamed_log = StreamedLogBase(to_logger) | ||
|
|
||
| for chunk in chunks: | ||
| streamed_log._process_new_data(chunk) | ||
|
|
||
| calls = [(call.kwargs['level'], call.kwargs['msg']) for call in to_logger.log.call_args_list] | ||
| assert calls == expected_calls |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.