Merge pull request #520 from Codium-ai/tr/bitbucket_app

Refactor auto tool execution order and enhance logging and documentation
Codium-ai · Dec 12, 2023 · 1853b4e · 1853b4e
2 parents 73a2007 + 2f10b4f
commit 1853b4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Usage.md b/Usage.md
@@ -240,17 +240,17 @@ inline_code_comments = true
 Each time you invoke a `/review` tool, it will use inline code comments.
 
 #### BitBucket Self-Hosted App automatic tools
-You can configure in your local `.pr_agent.toml` file conditions for which tools will **run automatically**.
+You can configure in your local `.pr_agent.toml` file which tools will **run automatically** when a new PR is opened.
 
-Specifically, start by setting the following environment variables:
+Specifically, set the following values:
 ```yaml
 [bitbucket_app]
 auto_review = true    # set as config var in .pr_agent.toml
 auto_describe = true  # set as config var in .pr_agent.toml
 auto_improve = true   # set as config var in .pr_agent.toml
 ```
 
-`bitbucket_app.auto_review`, `bitbucket_app.auto_describe` and `bitbucket_app.auto_improve` are used to enable/disable automatic tools that run when a new PR is opened.
+`bitbucket_app.auto_review`, `bitbucket_app.auto_describe` and `bitbucket_app.auto_improve` are used to enable/disable automatic tools.
 If not set, the default option is that only the `review` tool will run automatically when a new PR is opened.
 
 ### Changing a model

diff --git a/pr_agent/servers/bitbucket_app.py b/pr_agent/servers/bitbucket_app.py
@@ -100,12 +100,12 @@ async def inner():
                         auto_review = get_setting_or_env("BITBUCKET_APP.AUTO_REVIEW", None)
                         if auto_review is None or is_true(auto_review):  # by default, auto review is enabled
                             await PRReviewer(pr_url).run()
-                        auto_describe = get_setting_or_env("BITBUCKET_APP.AUTO_DESCRIBE", None)
-                        if is_true(auto_describe):  # by default, auto describe is disabled
-                            await PRDescription(pr_url).run()
                         auto_improve = get_setting_or_env("BITBUCKET_APP.AUTO_IMPROVE", None)
                         if is_true(auto_improve):  # by default, auto improve is disabled
                             await PRCodeSuggestions(pr_url).run()
+                        auto_describe = get_setting_or_env("BITBUCKET_APP.AUTO_DESCRIBE", None)
+                        if is_true(auto_describe):  # by default, auto describe is disabled
+                            await PRDescription(pr_url).run()
                 # with get_logger().contextualize(**log_context):
                 #     await agent.handle_request(pr_url, "review")
             elif event == "pullrequest:comment_created":

diff --git a/pr_agent/tools/pr_description.py b/pr_agent/tools/pr_description.py
@@ -102,6 +102,7 @@ async def run(self):
             if get_settings().config.publish_output:
                 get_logger().info(f"Pushing answer {self.pr_id}")
                 if get_settings().pr_description.publish_description_as_comment:
+                    get_logger().info(f"Publishing answer as comment")
                     self.git_provider.publish_comment(full_markdown_description)
                 else:
                     self.git_provider.publish_description(pr_title, pr_body)