forked from Codium-ai/pr-agent
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into hl/gitlab_fix
- Loading branch information
Showing
14 changed files
with
155 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| [pr_description_prompt] | ||
| system="""You are CodiumAI-PR-Reviewer, a language model designed to review git pull requests. | ||
| Your task is to provide full description of the PR content. | ||
| - Make sure not to focus the new PR code (the '+' lines). | ||
| You must use the following JSON schema to format your answer: | ||
| ```json | ||
| { | ||
| "PR Title": { | ||
| "type": "string", | ||
| "description": "an informative title for the PR, describing its main theme" | ||
| }, | ||
| "Type of PR": { | ||
| "type": "string", | ||
| "enum": ["Bug fix", "Tests", "Bug fix with tests", "Refactoring", "Enhancement", "Documentation", "Other"] | ||
| }, | ||
| "PR Description": { | ||
| "type": "string", | ||
| "description": "an informative and concise description of the PR" | ||
| }, | ||
| "PR Main Files Walkthrough": { | ||
| "type": "string", | ||
| "description": "a walkthrough of the PR changes. Review main files, in bullet points, and shortly describe the changes in each file (up to 10 most important files). Format: -`filename`: description of changes\n..." | ||
| } | ||
| } | ||
| Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'description' fields. | ||
| """ | ||
|
|
||
| user="""PR Info: | ||
| Branch: '{{branch}}' | ||
| {%- if language %} | ||
| Main language: {{language}} | ||
| {%- endif %} | ||
| The PR Git Diff: | ||
| ``` | ||
| {{diff}} | ||
| ``` | ||
| Note that lines in the diff body are prefixed with a symbol that represents the type of change: '-' for deletions, '+' for additions, and ' ' (a space) for unchanged lines. | ||
| Response (should be a valid JSON, and nothing else): | ||
| ```json | ||
| """ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| import copy | ||
| import json | ||
| import logging | ||
|
|
||
| from jinja2 import Environment, StrictUndefined | ||
|
|
||
| from pr_agent.algo.ai_handler import AiHandler | ||
| 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 | ||
| from pr_agent.config_loader import settings | ||
| from pr_agent.git_providers import get_git_provider | ||
| from pr_agent.git_providers.git_provider import get_main_pr_language | ||
|
|
||
|
|
||
| class PRDescription: | ||
| def __init__(self, pr_url: str): | ||
| self.git_provider = get_git_provider()(pr_url) | ||
| self.main_pr_language = get_main_pr_language( | ||
| self.git_provider.get_languages(), self.git_provider.get_files() | ||
| ) | ||
| self.ai_handler = AiHandler() | ||
| self.vars = { | ||
| "title": self.git_provider.pr.title, | ||
| "branch": self.git_provider.get_pr_branch(), | ||
| "description": self.git_provider.get_description(), | ||
| "language": self.main_pr_language, | ||
| "diff": "", # empty diff for initial calculation | ||
| } | ||
| self.token_handler = TokenHandler(self.git_provider.pr, | ||
| self.vars, | ||
| settings.pr_description_prompt.system, | ||
| settings.pr_description_prompt.user) | ||
| self.patches_diff = None | ||
| self.prediction = None | ||
|
|
||
| async def describe(self): | ||
| logging.info('Answering a PR question...') | ||
| if settings.config.publish_review: | ||
| self.git_provider.publish_comment("Preparing pr description...", 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...') | ||
| self.prediction = await self._get_prediction() | ||
| logging.info('Preparing answer...') | ||
| pr_title, pr_body = self._prepare_pr_answer() | ||
| if settings.config.publish_review: | ||
| logging.info('Pushing answer...') | ||
| self.git_provider.publish_description(pr_title, pr_body) | ||
| self.git_provider.remove_initial_comment() | ||
| return "" | ||
|
|
||
| async def _get_prediction(self): | ||
| variables = copy.deepcopy(self.vars) | ||
| variables["diff"] = self.patches_diff # update diff | ||
| environment = Environment(undefined=StrictUndefined) | ||
| system_prompt = environment.from_string(settings.pr_description_prompt.system).render(variables) | ||
| user_prompt = environment.from_string(settings.pr_description_prompt.user).render(variables) | ||
| if settings.config.verbosity_level >= 2: | ||
| logging.info(f"\nSystem prompt:\n{system_prompt}") | ||
| logging.info(f"\nUser prompt:\n{user_prompt}") | ||
| model = settings.config.model | ||
| response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2, | ||
| system=system_prompt, user=user_prompt) | ||
| return response | ||
|
|
||
| def _prepare_pr_answer(self): | ||
| data = json.loads(self.prediction) | ||
| pr_body = "" | ||
| # for key, value in data.items(): | ||
| # markdown_text += f"## {key}\n\n" | ||
| # markdown_text += f"{value}\n\n" | ||
| title = data['PR Title'] | ||
| del data['PR Title'] | ||
| for key, value in data.items(): | ||
| pr_body += f"{key}:\n" | ||
| if 'walkthrough' in key.lower(): | ||
| pr_body += f"{value}\n" | ||
| else: | ||
| pr_body += f"**{value}**\n\n___\n" | ||
| if settings.config.verbosity_level >= 2: | ||
| logging.info(f"title:\n{title}\n{pr_body}") | ||
| return title, pr_body |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters