diff --git a/pr_agent/algo/utils.py b/pr_agent/algo/utils.py index 9e12d8a1..f8eca495 100644 --- a/pr_agent/algo/utils.py +++ b/pr_agent/algo/utils.py @@ -100,8 +100,8 @@ def convert_to_markdown_v2(output_data: dict, emojis = { "Can be split": "๐Ÿ”€", - "Possible issues": "โšก", "Key issues to review": "โšก", + "Recommended review focus areas": "โšก", "Score": "๐Ÿ…", "Relevant tests": "๐Ÿงช", "Focused PR": "โœจ", @@ -192,23 +192,21 @@ def convert_to_markdown_v2(output_data: dict, if is_value_no(value): if gfm_supported: markdown_text += f"" - markdown_text += f"{emoji} No key issues to review" + markdown_text += f"{emoji} No major issues detected" markdown_text += f"\n" else: - markdown_text += f"### {emoji} No key issues to review\n\n" + markdown_text += f"### {emoji} No major issues detected\n\n" else: - # issues = value.split('\n- ') - issues =value - # for i, _ in enumerate(issues): - # issues[i] = issues[i].strip().strip('-').strip() + issues = value if gfm_supported: markdown_text += f"" - markdown_text += f"{emoji} {key_nice}

\n\n" + # markdown_text += f"{emoji} {key_nice}

\n\n" + markdown_text += f"{emoji} Recommended review focus areas

\n\n" else: - markdown_text += f"### {emoji} Key issues to review\n\n#### \n" + markdown_text += f"### {emoji} Recommended review focus areas\n\n#### \n" for i, issue in enumerate(issues): try: - if not issue: + if not issue or not isinstance(issue, dict): continue relevant_file = issue.get('relevant_file', '').strip() issue_header = issue.get('issue_header', '').strip() @@ -223,7 +221,7 @@ def convert_to_markdown_v2(output_data: dict, issue_str = f"[**{issue_header}**]({reference_link})\n\n{issue_content}\n\n" markdown_text += f"{issue_str}\n\n" except Exception as e: - get_logger().exception(f"Failed to process key issues to review: {e}") + get_logger().exception(f"Failed to process 'Recommended review focus areas': {e}") if gfm_supported: markdown_text += f"\n" else: diff --git a/pr_agent/settings/pr_reviewer_prompts.toml b/pr_agent/settings/pr_reviewer_prompts.toml index 8971bdbf..56e93ce5 100644 --- a/pr_agent/settings/pr_reviewer_prompts.toml +++ b/pr_agent/settings/pr_reviewer_prompts.toml @@ -81,10 +81,10 @@ class SubPR(BaseModel): class KeyIssuesComponentLink(BaseModel): relevant_file: str = Field(description="The full file path of the relevant file") - issue_header: str = Field(description="one or two word title for the the issue. For example: 'Possible Bug', 'Performance Issue', 'Code Smell', etc.") - issue_content: str = Field(description="a short and concise description of the issue that needs to be reviewed") - start_line: int = Field(description="the start line that corresponds to this issue in the relevant file") - end_line: int = Field(description="the end line that corresponds to this issue in the relevant file") + issue_header: str = Field(description="One or two word title for the the issue. For example: 'Possible Bug', 'Performance Issue', 'Code Smell', etc.") + issue_content: str = Field(description="A short and concise summary of what should be further inspected and validated during the PR review process for this issue. Don't state line numbers here") + start_line: int = Field(description="The start line that corresponds to this issue in the relevant file") + end_line: int = Field(description="The end line that corresponds to this issue in the relevant file") class Review(BaseModel): {%- if require_estimate_effort_to_review %}