From 7348d4144ba0f097a418ef64410836c278eba6bc Mon Sep 17 00:00:00 2001 From: KennyDizi Date: Thu, 27 Jun 2024 07:05:03 +0700 Subject: [PATCH] Rename PrReviewTitle enum --- pr_agent/algo/utils.py | 6 +++--- pr_agent/git_providers/github_provider.py | 6 +++--- pr_agent/tools/pr_reviewer.py | 4 ++-- tests/unittest/test_convert_to_markdown.py | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pr_agent/algo/utils.py b/pr_agent/algo/utils.py index a1b438f6..0858afff 100644 --- a/pr_agent/algo/utils.py +++ b/pr_agent/algo/utils.py @@ -23,7 +23,7 @@ class ModelType(str, Enum): REGULAR = "regular" TURBO = "turbo" -class PrReviewTitles(str, Enum): +class PrReviewTitle(str, Enum): REGULAR = "## PR Reviewer Guide" INCREMENTAL = "## Incremental PR Reviewer Guide" @@ -90,9 +90,9 @@ def convert_to_markdown(output_data: dict, gfm_supported: bool = True, increment } markdown_text = "" if not incremental_review: - markdown_text += f"{PrReviewTitles.REGULAR} ๐Ÿ”\n\n" + markdown_text += f"{PrReviewTitle.REGULAR} ๐Ÿ”\n\n" else: - markdown_text += f"{PrReviewTitles.INCREMENTAL} ๐Ÿ”\n\n" + markdown_text += f"{PrReviewTitle.INCREMENTAL} ๐Ÿ”\n\n" markdown_text += f"โฎ๏ธ Review for commits since previous PR-Agent review {incremental_review}.\n\n" if gfm_supported: markdown_text += "\n" diff --git a/pr_agent/git_providers/github_provider.py b/pr_agent/git_providers/github_provider.py index f69648b6..1905f5cc 100644 --- a/pr_agent/git_providers/github_provider.py +++ b/pr_agent/git_providers/github_provider.py @@ -10,7 +10,7 @@ from starlette_context import context from ..algo.file_filter import filter_ignored from ..algo.language_handler import is_valid_file -from ..algo.utils import PrReviewTitles, load_large_diff, clip_tokens, find_line_number_of_relevant_line_in_file +from ..algo.utils import PrReviewTitle, load_large_diff, clip_tokens, find_line_number_of_relevant_line_in_file from ..config_loader import get_settings from ..log import get_logger from ..servers.utils import RateLimitExceeded @@ -96,9 +96,9 @@ class GithubProvider(GitProvider): self.comments = list(self.pr.get_issue_comments()) prefixes = [] if full: - prefixes.append({PrReviewTitles.REGULAR}) + prefixes.append({PrReviewTitle.REGULAR}) if incremental: - prefixes.append({PrReviewTitles.INCREMENTAL}) + prefixes.append({PrReviewTitle.INCREMENTAL}) for index in range(len(self.comments) - 1, -1, -1): if any(self.comments[index].body.startswith(prefix) for prefix in prefixes): return self.comments[index] diff --git a/pr_agent/tools/pr_reviewer.py b/pr_agent/tools/pr_reviewer.py index 120f8396..559a0f2e 100644 --- a/pr_agent/tools/pr_reviewer.py +++ b/pr_agent/tools/pr_reviewer.py @@ -8,7 +8,7 @@ from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models from pr_agent.algo.token_handler import TokenHandler -from pr_agent.algo.utils import PrReviewTitles, convert_to_markdown, github_action_output, load_yaml, ModelType, \ +from pr_agent.algo.utils import PrReviewTitle, convert_to_markdown, github_action_output, load_yaml, ModelType, \ show_relevant_configurations from pr_agent.config_loader import get_settings from pr_agent.git_providers import get_git_provider, get_git_provider_with_context @@ -134,7 +134,7 @@ class PRReviewer: if get_settings().pr_reviewer.persistent_comment and not self.incremental.is_incremental: final_update_message = get_settings().pr_reviewer.final_update_message self.git_provider.publish_persistent_comment(pr_review, - initial_header=f"{PrReviewTitles.REGULAR} ๐Ÿ”", + initial_header=f"{PrReviewTitle.REGULAR} ๐Ÿ”", update_header=True, final_update_message=final_update_message, ) else: diff --git a/tests/unittest/test_convert_to_markdown.py b/tests/unittest/test_convert_to_markdown.py index 61ed219b..0cc91ee9 100644 --- a/tests/unittest/test_convert_to_markdown.py +++ b/tests/unittest/test_convert_to_markdown.py @@ -1,5 +1,5 @@ # Generated by CodiumAI -from pr_agent.algo.utils import PrReviewTitles, convert_to_markdown +from pr_agent.algo.utils import PrReviewTitle, convert_to_markdown from pr_agent.tools.pr_description import insert_br_after_x_chars """ @@ -52,7 +52,7 @@ class TestConvertToMarkdown: 'suggestion': "Consider raising an exception or logging a warning when 'pr_url' attribute is not found. This can help in debugging issues related to the absence of 'pr_url' in instances where it's expected. [important]\n", 'relevant_line': '[return ""](https://github.com/Codium-ai/pr-agent-pro/pull/102/files#diff-52d45f12b836f77ed1aef86e972e65404634ea4e2a6083fb71a9b0f9bb9e062fR199)'}]} - expected_output = f'{PrReviewTitles.REGULAR} ๐Ÿ”\n\n
\n\n\n\n\n
โฑ๏ธ Estimated effort to review [1-5]\n1, because the changes are minimal and straightforward, focusing on a single functionality addition.\n\n\n
๐Ÿงช Relevant tests\nNo\n\n\n
โšก Possible issues\nNo\n\n\n
๐Ÿ”’ Security concerns\nNo\n\n
\n\n\n
Code feedback:\n\n
relevant filepr_agent/git_providers/git_provider.py\n
suggestion      \n\n\n\nConsider raising an exception or logging a warning when \'pr_url\' attribute is not found. This can help in debugging issues related to the absence of \'pr_url\' in instances where it\'s expected. [important]\n\n\n
relevant linereturn ""
\n\n
' + expected_output = f'{PrReviewTitle.REGULAR} ๐Ÿ”\n\n\n\n\n\n\n
โฑ๏ธ Estimated effort to review [1-5]\n1, because the changes are minimal and straightforward, focusing on a single functionality addition.\n\n\n
๐Ÿงช Relevant tests\nNo\n\n\n
โšก Possible issues\nNo\n\n\n
๐Ÿ”’ Security concerns\nNo\n\n
\n\n\n
Code feedback:\n\n
relevant filepr_agent/git_providers/git_provider.py\n
suggestion      \n\n\n\nConsider raising an exception or logging a warning when \'pr_url\' attribute is not found. This can help in debugging issues related to the absence of \'pr_url\' in instances where it\'s expected. [important]\n\n\n
relevant linereturn ""
\n\n
' assert convert_to_markdown(input_data).strip() == expected_output.strip()