reflect and review + protections

pr_agent/agent/pr_agent.py

@@ -15,8 +15,8 @@ class PRAgent:
     async def handle_request(self, pr_url, request) -> bool:
         if any(cmd in request for cmd in ["/answer"]):
             await PRReviewer(pr_url, is_answer=True).review()
-        elif any(cmd in request for cmd in ["/review", "/review_pr"]):
-            if settings.pr_reviewer.ask_and_reflect:
+        elif any(cmd in request for cmd in ["/review", "/review_pr", "/reflect_and_review"]):
+            if settings.pr_reviewer.ask_and_reflect or any(cmd in request for cmd in ["/reflect_and_review"]):
                 await PRInformationFromUser(pr_url).generate_questions()
             else:
                 await PRReviewer(pr_url).review()

pr_agent/cli.py

@@ -18,20 +18,22 @@ For example:
 - cli.py --pr-url=... describe
 - cli.py --pr-url=... improve
 - cli.py --pr-url=... ask "write me a poem about this PR"
+- cli.py --pr-url=... reflect
 
 Supported commands:
 review / review_pr - Add a review that includes a summary of the PR and specific suggestions for improvement.
 ask / ask_question [question] - Ask a question about the PR.
 describe / describe_pr - Modify the PR title and description based on the PR's contents.
 improve / improve_code - Suggest improvements to the code in the PR as pull request comments ready to commit.
+reflect - Ask the PR author questions about the PR.
 """)
     parser.add_argument('--pr_url', type=str, help='The URL of the PR to review', required=True)
     parser.add_argument('command', type=str, help='The', choices=['review', 'review_pr',
                                                                   'ask', 'ask_question',
                                                                   'describe', 'describe_pr',
                                                                   'improve', 'improve_code',
-                                                                  'user_questions', 'user_answers'],
-                                                                  default='review')
+                                                                  'reflect', 'review_after_reflect'],
+                        default='review')
     parser.add_argument('rest', nargs=argparse.REMAINDER, default=[])
     args = parser.parse_args()
     logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO"))
@@ -57,11 +59,11 @@ improve / improve_code - Suggest improvements to the code in the PR as pull requ
         print(f"Reviewing PR: {args.pr_url}")
         reviewer = PRReviewer(args.pr_url, cli_mode=True)
         asyncio.run(reviewer.review())
-    elif command in ['user_questions']:
+    elif command in ['reflect']:
         print(f"Asking the PR author questions: {args.pr_url}")
         reviewer = PRInformationFromUser(args.pr_url)
         asyncio.run(reviewer.generate_questions())
-    elif command in ['user_answers']:
+    elif command in ['review_after_reflect']:
         print(f"Processing author's answers and sending review: {args.pr_url}")
         reviewer = PRReviewer(args.pr_url, cli_mode=True, is_answer=True)
         asyncio.run(reviewer.review())

pr_agent/servers/github_action_runner.py

@@ -56,8 +56,9 @@ async def run_action():
                     body = comment_body.strip().lower()
                     if any(cmd in body for cmd in ["/answer"]):
                         await PRReviewer(pr_url, is_answer=True).review()
-                    elif any(cmd in body for cmd in ["/review", "/review_pr", "/answer"]):
-                        if settings.pr_reviewer.ask_and_reflect:
+                    elif any(cmd in body for cmd in ["/review", "/review_pr", "/reflect_and_review"]):
+                        if settings.pr_reviewer.ask_and_reflect or \
+                                any(cmd in body for cmd in ["/reflect_and_review"]):
                             await PRInformationFromUser(pr_url).generate_questions()
                         else:
                             await PRReviewer(pr_url).review()

pr_agent/tools/pr_information_from_user.py

@@ -35,7 +35,7 @@ class PRInformationFromUser:
     async def generate_questions(self):
         logging.info('Generating question to the user...')
         if settings.config.publish_output:
-            self.git_provider.publish_comment("Preparing answer...", is_temporary=True)
+            self.git_provider.publish_comment("Preparing questions...", is_temporary=True)
         logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler)
         logging.info('Getting AI prediction...')

pr_agent/tools/pr_reviewer.py

@@ -9,7 +9,7 @@ from pr_agent.algo.pr_processing import get_pr_diff
 from pr_agent.algo.token_handler import TokenHandler
 from pr_agent.algo.utils import convert_to_markdown, try_fix_json
 from pr_agent.config_loader import settings
-from pr_agent.git_providers import get_git_provider
+from pr_agent.git_providers import get_git_provider, GithubProvider
 from pr_agent.git_providers.git_provider import get_main_pr_language
 from pr_agent.servers.help import bot_help_text, actions_help_text
 
@@ -22,6 +22,8 @@ class PRReviewer:
             self.git_provider.get_languages(), self.git_provider.get_files()
         )
         self.is_answer = is_answer
+        if self.is_answer and type(self.git_provider) != GithubProvider:
+            raise Exception("Answer mode is only supported for Github for now")
         answer_str = question_str = self._get_user_answers()
         self.ai_handler = AiHandler()
         self.patches_diff = None