From 4cd9626217e65fb484ff0a89cb1b58a5400e395b Mon Sep 17 00:00:00 2001 From: mrT23 Date: Wed, 22 May 2024 21:47:49 +0300 Subject: [PATCH 1/3] grammar --- pr_agent/algo/git_patch_processing.py | 5 ++++- pr_agent/algo/pr_processing.py | 3 +++ pr_agent/settings/language_extensions.toml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pr_agent/algo/git_patch_processing.py b/pr_agent/algo/git_patch_processing.py index 383d488f..5ca4e12b 100644 --- a/pr_agent/algo/git_patch_processing.py +++ b/pr_agent/algo/git_patch_processing.py @@ -23,7 +23,10 @@ def extend_patch(original_file_str, patch_str, num_lines) -> str: return patch_str if type(original_file_str) == bytes: - original_file_str = original_file_str.decode('utf-8') + try: + original_file_str = original_file_str.decode('utf-8') + except UnicodeDecodeError: + return "" original_lines = original_file_str.splitlines() patch_lines = patch_str.splitlines() diff --git a/pr_agent/algo/pr_processing.py b/pr_agent/algo/pr_processing.py index 2c5a2957..d02110c7 100644 --- a/pr_agent/algo/pr_processing.py +++ b/pr_agent/algo/pr_processing.py @@ -146,6 +146,9 @@ def pr_generate_extended_diff(pr_languages: list, # extend each patch with extra lines of context extended_patch = extend_patch(original_file_content_str, patch, num_lines=patch_extra_lines) + if not extend_patch: + get_logger().warning(f"Failed to extend patch for file: {file.filename}") + continue full_extended_patch = f"\n\n## {file.filename}\n\n{extended_patch}\n" if add_line_numbers_to_hunks: diff --git a/pr_agent/settings/language_extensions.toml b/pr_agent/settings/language_extensions.toml index eadb80c8..c13992ec 100644 --- a/pr_agent/settings/language_extensions.toml +++ b/pr_agent/settings/language_extensions.toml @@ -44,6 +44,7 @@ default = [ 'ss', 'svg', 'tar', + 'tgz', 'tsv', 'ttf', 'war', From 83ff9a0b9b02774cbf53d20a276afb226e32679e Mon Sep 17 00:00:00 2001 From: mrT23 Date: Wed, 22 May 2024 21:49:33 +0300 Subject: [PATCH 2/3] final_update_message --- pr_agent/settings/configuration.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pr_agent/settings/configuration.toml b/pr_agent/settings/configuration.toml index 8ecf04ab..c50ab0f7 100644 --- a/pr_agent/settings/configuration.toml +++ b/pr_agent/settings/configuration.toml @@ -58,7 +58,7 @@ generate_ai_title=false use_bullet_points=true extra_instructions = "" enable_pr_type=true -final_update_message = false +final_update_message = true enable_help_text=false enable_help_comment=true # describe as comment @@ -152,7 +152,7 @@ override_deployment_type = true # settings for "pull_request" event handle_pr_actions = ['opened', 'reopened', 'ready_for_review'] pr_commands = [ - "/describe", + "/describe --pr_description.final_update_message=false", "/review --pr_reviewer.num_code_suggestions=0", "/improve", ] From da44bd7d5ec22f9c8822979d484be39db0270177 Mon Sep 17 00:00:00 2001 From: mrT23 Date: Wed, 22 May 2024 21:50:00 +0300 Subject: [PATCH 3/3] extended_patch --- pr_agent/algo/pr_processing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_agent/algo/pr_processing.py b/pr_agent/algo/pr_processing.py index d02110c7..59b9da26 100644 --- a/pr_agent/algo/pr_processing.py +++ b/pr_agent/algo/pr_processing.py @@ -146,7 +146,7 @@ def pr_generate_extended_diff(pr_languages: list, # extend each patch with extra lines of context extended_patch = extend_patch(original_file_content_str, patch, num_lines=patch_extra_lines) - if not extend_patch: + if not extended_patch: get_logger().warning(f"Failed to extend patch for file: {file.filename}") continue full_extended_patch = f"\n\n## {file.filename}\n\n{extended_patch}\n"