Merge pull request #168 from Codium-ai/tr/further_use_commit_messages

Use commit messages in PR tools
Codium-ai · Aug 3, 2023 · cfa1417 · cfa1417
2 parents b97c4b6 + eb143ec
commit cfa1417
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2023-08-02
+
+### Enhanced
+- Updated several tools in the `pr_agent` package to use commit messages in their functionality.
+- Commit messages are now retrieved and stored in the `vars` dictionary for each tool.
+- Added a section to display the commit messages in the prompts of various tools.
+
 ## 2023-08-01
 
 ### Enhanced

diff --git a/pr_agent/settings/pr_code_suggestions_prompts.toml b/pr_agent/settings/pr_code_suggestions_prompts.toml
@@ -73,6 +73,11 @@ Description: '{{description}}'
 {%- if language %}
 Main language: {{language}}
 {%- endif %}
+{%- if commit_messages_str %}
+
+Commit messages:
+{{commit_messages_str}}
+{%- endif %}
 
 
 The PR Diff:

diff --git a/pr_agent/settings/pr_information_from_user_prompts.toml b/pr_agent/settings/pr_information_from_user_prompts.toml
@@ -21,6 +21,11 @@ Description: '{{description}}'
 {%- if language %}
 Main language: {{language}}
 {%- endif %}
+{%- if commit_messages_str %}
+
+Commit messages:
+{{commit_messages_str}}
+{%- endif %}
 
 
 The PR Git Diff:

diff --git a/pr_agent/settings/pr_questions_prompts.toml b/pr_agent/settings/pr_questions_prompts.toml
@@ -13,6 +13,11 @@ Description: '{{description}}'
 {%- if language %}
 Main language: {{language}}
 {%- endif %}
+{%- if commit_messages_str %}
+
+Commit messages:
+{{commit_messages_str}}
+{%- endif %}
 
 
 The PR Git Diff:

diff --git a/pr_agent/settings/pr_reviewer_prompts.toml b/pr_agent/settings/pr_reviewer_prompts.toml
@@ -135,6 +135,11 @@ Description: '{{description}}'
 {%- if language %}
 Main language: {{language}}
 {%- endif %}
+{%- if commit_messages_str %}
+
+Commit messages:
+{{commit_messages_str}}
+{%- endif %}
 
 {%- if question_str %}
 ######

diff --git a/pr_agent/settings/pr_update_changelog_prompts.toml b/pr_agent/settings/pr_update_changelog_prompts.toml
@@ -19,6 +19,11 @@ Description: '{{description}}'
 {%- if language %}
 Main language: {{language}}
 {%- endif %}
+{%- if commit_messages_str %}
+
+Commit messages:
+{{commit_messages_str}}
+{%- endif %}
 
 
 The PR Diff:

diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py
@@ -34,6 +34,7 @@ def __init__(self, pr_url: str, cli_mode=False, args: list = None):
             "diff": "",  # empty diff for initial calculation
             "num_code_suggestions": get_settings().pr_code_suggestions.num_code_suggestions,
             "extra_instructions": get_settings().pr_code_suggestions.extra_instructions,
+            "commit_messages_str": self.git_provider.get_commit_messages(),
         }
         self.token_handler = TokenHandler(self.git_provider.pr,
                                           self.vars,

diff --git a/pr_agent/tools/pr_description.py b/pr_agent/tools/pr_description.py
@@ -27,7 +27,6 @@ def __init__(self, pr_url: str, args: list = None):
         self.main_pr_language = get_main_pr_language(
             self.git_provider.get_languages(), self.git_provider.get_files()
         )
-        commit_messages_str = self.git_provider.get_commit_messages()
 
         # Initialize the AI handler
         self.ai_handler = AiHandler()
@@ -40,7 +39,7 @@ def __init__(self, pr_url: str, args: list = None):
             "language": self.main_pr_language,
             "diff": "",  # empty diff for initial calculation
             "extra_instructions": get_settings().pr_description.extra_instructions,
-            "commit_messages_str": commit_messages_str
+            "commit_messages_str": self.git_provider.get_commit_messages()
         }
 
         # Initialize the token handler

diff --git a/pr_agent/tools/pr_information_from_user.py b/pr_agent/tools/pr_information_from_user.py
@@ -24,6 +24,7 @@ def __init__(self, pr_url: str, args: list = None):
             "description": self.git_provider.get_pr_description(),
             "language": self.main_pr_language,
             "diff": "",  # empty diff for initial calculation
+            "commit_messages_str": self.git_provider.get_commit_messages(),
         }
         self.token_handler = TokenHandler(self.git_provider.pr,
                                           self.vars,

diff --git a/pr_agent/tools/pr_questions.py b/pr_agent/tools/pr_questions.py
@@ -27,6 +27,7 @@ def __init__(self, pr_url: str, args=None):
             "language": self.main_pr_language,
             "diff": "",  # empty diff for initial calculation
             "questions": self.question_str,
+            "commit_messages_str": self.git_provider.get_commit_messages(),
         }
         self.token_handler = TokenHandler(self.git_provider.pr,
                                           self.vars,

diff --git a/pr_agent/tools/pr_reviewer.py b/pr_agent/tools/pr_reviewer.py
@@ -59,6 +59,7 @@ def __init__(self, pr_url: str, is_answer: bool = False, args: list = None):
             'question_str': question_str,
             'answer_str': answer_str,
             "extra_instructions": get_settings().pr_reviewer.extra_instructions,
+            "commit_messages_str": self.git_provider.get_commit_messages(),
         }
 
         self.token_handler = TokenHandler(

diff --git a/pr_agent/tools/pr_update_changelog.py b/pr_agent/tools/pr_update_changelog.py
@@ -38,6 +38,7 @@ def __init__(self, pr_url: str, cli_mode=False, args=None):
             "changelog_file_str": self.changelog_file_str,
             "today": date.today(),
             "extra_instructions": get_settings().pr_update_changelog.extra_instructions,
+            "commit_messages_str": self.git_provider.get_commit_messages(),
         }
         self.token_handler = TokenHandler(self.git_provider.pr,
                                           self.vars,