diff --git a/pr_agent/servers/help.py b/pr_agent/servers/help.py index fca19f97..d7a78e6e 100644 --- a/pr_agent/servers/help.py +++ b/pr_agent/servers/help.py @@ -231,3 +231,86 @@ Note that the tool does not have "memory" of previous questions, and answers eac output += f"\n\nSee the [ask usage](https://github.com/Codium-ai/pr-agent/blob/main/docs/ASK.md) page for a comprehensive guide on using this tool.\n\n" return output + + + @staticmethod + def get_improve_usage_guide(): + output = "**Overview:**\n" + output += "The improve tool scans the PR code changes, and automatically generates suggestions for improving the PR code. " + output += "The tool can be triggered [automatically](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) every time a new PR is opened, or can be invoked manually by commenting on a PR.\n" + output += """\ +When commenting, to edit [configurations](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L69) related to the improve tool (`pr_code_suggestions` section), use the following template: + +``` +/improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=... +``` + +With a [configuration file](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-app), use the following template: + +``` +[pr_code_suggestions] +some_config1=... +some_config2=... +``` + +""" + output += "\n\n" + + # automation + output += "\n\n" + + # extra instructions + output += "\n\n" + + # suggestions quality + output += "\n\n\n\n"\ + + # general + output += "\n\n\n\n" + + output += "
Enabling\\disabling automation
\n\n" + output += """\ +When you first install the app, the [default mode](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) for the improve tool is: + +``` +pr_commands = ["/improve --pr_code_suggestions.summarize=true", ...] +``` + +meaning the `improve` tool will run automatically on every PR, with summarization enabled. Delete this line to disable the tool from running automatically. +""" + output += "\n\n
Utilizing extra instructions
\n\n" + output += '''\ +Extra instructions are very important for the `improve` tool, since they enable to guide the model to suggestions that are more relevant to the specific needs of the project. + +Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on. + +Examples for extra instructions: + +``` +[pr_code_suggestions] # /improve # +extra_instructions=""" +Emphasize the following aspects: +- Does the code logic cover relevant edge cases? +- Is the code logic clear and easy to understand? +- Is the code logic efficient? +... +""" +``` + +Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable. + ''' + output += "\n\n
A note on code suggestions quality
\n\n" + output += """\ +- While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically. +- Suggestions are not meant to be simplistic. Instead, they aim to give deep feedback and raise questions, ideas and thoughts to the user, who can then use his judgment, experience, and understanding of the code base. +- Recommended to use the 'extra_instructions' field to guide the model to suggestions that are more relevant to the specific needs of the project. +- Best quality will be obtained by using 'improve --extended' mode. + +""" + output += "\n\n
More PR-Agent commands
\n\n" + output += HelpMessage.get_general_bot_help_text() + output += "\n\n
" + + output += f"\n\nSee the [improve usage](https://github.com/Codium-ai/pr-agent/blob/main/docs/IMPROVE.md) page for a more comprehensive guide on using this tool.\n\n" + + return output \ No newline at end of file diff --git a/pr_agent/settings/configuration.toml b/pr_agent/settings/configuration.toml index b0e9c295..5188ef4c 100644 --- a/pr_agent/settings/configuration.toml +++ b/pr_agent/settings/configuration.toml @@ -72,6 +72,7 @@ summarize = false include_improved_code = true extra_instructions = "" rank_suggestions = false +enable_help_text=true # params for '/improve --extended' mode auto_extended_mode=false num_code_suggestions_per_chunk=8 diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py index ddc7913e..b89301c4 100644 --- a/pr_agent/tools/pr_code_suggestions.py +++ b/pr_agent/tools/pr_code_suggestions.py @@ -13,6 +13,7 @@ from pr_agent.config_loader import get_settings from pr_agent.git_providers import get_git_provider from pr_agent.git_providers.git_provider import get_main_pr_language from pr_agent.log import get_logger +from pr_agent.servers.help import HelpMessage from pr_agent.tools.pr_description import insert_br_after_x_chars import difflib @@ -81,7 +82,18 @@ class PRCodeSuggestions: self.git_provider.remove_initial_comment() if get_settings().pr_code_suggestions.summarize: get_logger().info('Pushing summarize code suggestions...') - self.publish_summarizes_suggestions(data) + + # generate summarized suggestions + pr_body = self.generate_summarized_suggestions(data) + + # add usage guide + if self.git_provider.is_supported( + "gfm_markdown") and get_settings().pr_code_suggestions.enable_help_text: + pr_body += "
\n\n
✨ Usage guide:
\n\n" + pr_body += HelpMessage.get_improve_usage_guide() + pr_body += "\n
\n" + + self.git_provider.publish_comment(pr_body) else: get_logger().info('Pushing inline code suggestions...') self.push_inline_code_suggestions(data) @@ -298,7 +310,7 @@ class PRCodeSuggestions: return data_sorted - def publish_summarizes_suggestions(self, data: Dict): + def generate_summarized_suggestions(self, data: Dict) -> str: try: pr_body = "## PR Code Suggestions\n\n" @@ -379,6 +391,7 @@ class PRCodeSuggestions: # pr_body += "" pr_body += """""" pr_body += """""" - self.git_provider.publish_comment(pr_body) + return pr_body except Exception as e: get_logger().info(f"Failed to publish summarized code suggestions, error: {e}") + return ""