xiaxinhang/pr-agent
1
0
Fork 0
mirror of https://github.com/qodo-ai/pr-agent.git synced 2025-07-02 03:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: cap patch extra lines and update documentation with separators and context adjustments

Browse Source
This commit is contained in:
mrT23
2024-09-12 09:01:36 +03:00
parent dd8d78e7d8
commit a1582b5338
4 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pr_agent/algo/pr_processing.py
View File

@ -23,7 +23,7 @@ ADDED_FILES_ = "Additional added files (insufficient token budget to process):\n
OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD = 1500
OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD = 1000
MAX_EXTRA_LINES = 10
def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler,
@ -38,6 +38,12 @@ def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler,
else:
PATCH_EXTRA_LINES_BEFORE = get_settings().config.patch_extra_lines_before
PATCH_EXTRA_LINES_AFTER = get_settings().config.patch_extra_lines_after
if PATCH_EXTRA_LINES_BEFORE > MAX_EXTRA_LINES:
PATCH_EXTRA_LINES_BEFORE = MAX_EXTRA_LINES
get_logger().warning(f"patch_extra_lines_before was {PATCH_EXTRA_LINES_BEFORE}, capping to {MAX_EXTRA_LINES}")
if PATCH_EXTRA_LINES_AFTER > MAX_EXTRA_LINES:
PATCH_EXTRA_LINES_AFTER = MAX_EXTRA_LINES
get_logger().warning(f"patch_extra_lines_after was {PATCH_EXTRA_LINES_AFTER}, capping to {MAX_EXTRA_LINES}")
try:
diff_files_original = git_provider.get_diff_files()
@ -408,11 +414,21 @@ def get_pr_multi_diffs(git_provider: GitProvider,
for lang in pr_languages:
sorted_files.extend(sorted(lang['files'], key=lambda x: x.tokens, reverse=True))
# Get the maximum number of extra lines before and after the patch
PATCH_EXTRA_LINES_BEFORE = get_settings().config.patch_extra_lines_before
PATCH_EXTRA_LINES_AFTER = get_settings().config.patch_extra_lines_after
if PATCH_EXTRA_LINES_BEFORE > MAX_EXTRA_LINES:
PATCH_EXTRA_LINES_BEFORE = MAX_EXTRA_LINES
get_logger().warning(f"patch_extra_lines_before was {PATCH_EXTRA_LINES_BEFORE}, capping to {MAX_EXTRA_LINES}")
if PATCH_EXTRA_LINES_AFTER > MAX_EXTRA_LINES:
PATCH_EXTRA_LINES_AFTER = MAX_EXTRA_LINES
get_logger().warning(f"patch_extra_lines_after was {PATCH_EXTRA_LINES_AFTER}, capping to {MAX_EXTRA_LINES}")
# try first a single run with standard diff string, with patch extension, and no deletions
patches_extended, total_tokens, patches_extended_tokens = pr_generate_extended_diff(
pr_languages, token_handler, add_line_numbers_to_hunks=True,
patch_extra_lines_before=get_settings().config.patch_extra_lines_before,
patch_extra_lines_after=get_settings().config.patch_extra_lines_after)
patch_extra_lines_before=PATCH_EXTRA_LINES_BEFORE,
patch_extra_lines_after=PATCH_EXTRA_LINES_AFTER)
# if we are under the limit, return the full diff
if total_tokens + OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD < get_max_tokens(model):