Repository navigation
fix: keep statements that share a line in one PythonCodeSplitter chunk #13752
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
Open
1AbdullahButt
wants to merge
2
commits into
deepset-ai:main
Choose a base branch
from
1AbdullahButt:fix/python-code-splitter-same-line-statements
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
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
8 changes: 8 additions & 0 deletions
8
releasenotes/notes/fix-python-code-splitter-same-line-statements-77660503c859e125.yaml
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,8 @@ | ||
| --- | ||
| fixes: | ||
| - | | ||
| ``PythonCodeSplitter`` no longer emits an empty chunk, or a chunk with a wrong ``start_line``, when top-level | ||
| statements share a line separated by a semicolon (for example ``x = 1; y = 2``). The second statement was turned | ||
| into a unit with no content, which became an empty chunk at the end of the file or was merged into the next chunk | ||
| and moved its ``start_line`` back to the previous line. Such statements now stay in the chunk of the line they | ||
| are on. |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this still breaks when the statement after the
;runs onto more lines, e.g.x = 1; y = dict(\n a=1,\n)with max_effective_lines=1 gives a chunk that ends aty = dict(and a second chunka=1,\n)with start_line 1. letting the previous unit take the rest of those lines fixes it:fixed this plus a test in this commit, you can just cherry pick it instead of redoing it: its-amann@9911d85
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, good catch. I cherry-picked your commit as-is (59c6b38, authorship kept), so a statement after the
;that runs onto later lines now stays in the previous chunk. All 89 splitter tests pass locally, including your two new cases.