2023-07-15 09:30:50 +03:00
|
|
|
import copy
|
|
|
|
import json
|
|
|
|
import logging
|
|
|
|
import textwrap
|
|
|
|
|
|
|
|
from jinja2 import Environment, StrictUndefined
|
|
|
|
|
|
|
|
from pr_agent.algo.ai_handler import AiHandler
|
2023-07-23 16:16:36 +03:00
|
|
|
from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models
|
2023-07-15 09:30:50 +03:00
|
|
|
from pr_agent.algo.token_handler import TokenHandler
|
2023-08-01 14:43:26 +03:00
|
|
|
from pr_agent.algo.utils import try_fix_json
|
|
|
|
from pr_agent.config_loader import get_settings
|
2023-07-18 11:34:57 +03:00
|
|
|
from pr_agent.git_providers import BitbucketProvider, get_git_provider
|
2023-07-15 09:30:50 +03:00
|
|
|
from pr_agent.git_providers.git_provider import get_main_pr_language
|
|
|
|
|
|
|
|
|
|
|
|
class PRCodeSuggestions:
|
2023-07-30 11:43:44 +03:00
|
|
|
def __init__(self, pr_url: str, cli_mode=False, args: list = None):
|
2023-07-15 09:30:50 +03:00
|
|
|
|
|
|
|
self.git_provider = get_git_provider()(pr_url)
|
|
|
|
self.main_language = get_main_pr_language(
|
|
|
|
self.git_provider.get_languages(), self.git_provider.get_files()
|
|
|
|
)
|
2023-07-30 11:43:44 +03:00
|
|
|
|
2023-07-15 09:30:50 +03:00
|
|
|
self.ai_handler = AiHandler()
|
|
|
|
self.patches_diff = None
|
|
|
|
self.prediction = None
|
|
|
|
self.cli_mode = cli_mode
|
|
|
|
self.vars = {
|
|
|
|
"title": self.git_provider.pr.title,
|
|
|
|
"branch": self.git_provider.get_pr_branch(),
|
|
|
|
"description": self.git_provider.get_pr_description(),
|
|
|
|
"language": self.main_language,
|
|
|
|
"diff": "", # empty diff for initial calculation
|
2023-08-01 14:43:26 +03:00
|
|
|
"num_code_suggestions": get_settings().pr_code_suggestions.num_code_suggestions,
|
|
|
|
"extra_instructions": get_settings().pr_code_suggestions.extra_instructions,
|
2023-08-02 18:26:39 +03:00
|
|
|
"commit_messages_str": self.git_provider.get_commit_messages(),
|
2023-07-15 09:30:50 +03:00
|
|
|
}
|
|
|
|
self.token_handler = TokenHandler(self.git_provider.pr,
|
|
|
|
self.vars,
|
2023-08-01 14:43:26 +03:00
|
|
|
get_settings().pr_code_suggestions_prompt.system,
|
|
|
|
get_settings().pr_code_suggestions_prompt.user)
|
2023-07-15 09:30:50 +03:00
|
|
|
|
2023-08-01 14:43:26 +03:00
|
|
|
async def run(self):
|
2023-07-17 01:44:40 +03:00
|
|
|
assert type(self.git_provider) != BitbucketProvider, "Bitbucket is not supported for now"
|
2023-07-15 09:30:50 +03:00
|
|
|
|
|
|
|
logging.info('Generating code suggestions for PR...')
|
2023-08-01 14:43:26 +03:00
|
|
|
if get_settings().config.publish_output:
|
2023-07-15 09:30:50 +03:00
|
|
|
self.git_provider.publish_comment("Preparing review...", is_temporary=True)
|
2023-07-23 16:16:36 +03:00
|
|
|
await retry_with_fallback_models(self._prepare_prediction)
|
2023-07-15 09:30:50 +03:00
|
|
|
logging.info('Preparing PR review...')
|
|
|
|
data = self._prepare_pr_code_suggestions()
|
2023-08-01 14:43:26 +03:00
|
|
|
if get_settings().config.publish_output:
|
2023-07-15 09:30:50 +03:00
|
|
|
logging.info('Pushing PR review...')
|
|
|
|
self.git_provider.remove_initial_comment()
|
|
|
|
logging.info('Pushing inline code comments...')
|
|
|
|
self.push_inline_code_suggestions(data)
|
|
|
|
|
2023-07-23 16:16:36 +03:00
|
|
|
async def _prepare_prediction(self, model: str):
|
|
|
|
logging.info('Getting PR diff...')
|
|
|
|
self.patches_diff = get_pr_diff(self.git_provider,
|
|
|
|
self.token_handler,
|
|
|
|
model,
|
|
|
|
add_line_numbers_to_hunks=True,
|
|
|
|
disable_extra_lines=True)
|
2023-08-03 21:38:18 +03:00
|
|
|
|
2023-07-23 16:16:36 +03:00
|
|
|
logging.info('Getting AI prediction...')
|
|
|
|
self.prediction = await self._get_prediction(model)
|
|
|
|
|
|
|
|
async def _get_prediction(self, model: str):
|
2023-07-15 09:30:50 +03:00
|
|
|
variables = copy.deepcopy(self.vars)
|
|
|
|
variables["diff"] = self.patches_diff # update diff
|
|
|
|
environment = Environment(undefined=StrictUndefined)
|
2023-08-01 14:43:26 +03:00
|
|
|
system_prompt = environment.from_string(get_settings().pr_code_suggestions_prompt.system).render(variables)
|
|
|
|
user_prompt = environment.from_string(get_settings().pr_code_suggestions_prompt.user).render(variables)
|
|
|
|
if get_settings().config.verbosity_level >= 2:
|
2023-07-15 09:30:50 +03:00
|
|
|
logging.info(f"\nSystem prompt:\n{system_prompt}")
|
|
|
|
logging.info(f"\nUser prompt:\n{user_prompt}")
|
|
|
|
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_code_suggestions(self) -> str:
|
|
|
|
review = self.prediction.strip()
|
|
|
|
try:
|
|
|
|
data = json.loads(review)
|
|
|
|
except json.decoder.JSONDecodeError:
|
2023-08-01 14:43:26 +03:00
|
|
|
if get_settings().config.verbosity_level >= 2:
|
2023-07-15 09:30:50 +03:00
|
|
|
logging.info(f"Could not parse json response: {review}")
|
2023-07-17 01:44:40 +03:00
|
|
|
data = try_fix_json(review, code_suggestions=True)
|
2023-07-15 09:30:50 +03:00
|
|
|
return data
|
|
|
|
|
|
|
|
def push_inline_code_suggestions(self, data):
|
2023-07-19 20:57:14 +03:00
|
|
|
code_suggestions = []
|
2023-07-15 09:30:50 +03:00
|
|
|
for d in data['Code suggestions']:
|
2023-07-28 10:52:49 +03:00
|
|
|
try:
|
2023-08-01 14:43:26 +03:00
|
|
|
if get_settings().config.verbosity_level >= 2:
|
2023-07-28 10:52:49 +03:00
|
|
|
logging.info(f"suggestion: {d}")
|
|
|
|
relevant_file = d['relevant file'].strip()
|
|
|
|
relevant_lines_str = d['relevant lines'].strip()
|
2023-07-28 11:24:14 +03:00
|
|
|
if ',' in relevant_lines_str: # handling 'relevant lines': '181, 190' or '178-184, 188-194'
|
|
|
|
relevant_lines_str = relevant_lines_str.split(',')[0]
|
2023-07-28 10:52:49 +03:00
|
|
|
relevant_lines_start = int(relevant_lines_str.split('-')[0]) # absolute position
|
|
|
|
relevant_lines_end = int(relevant_lines_str.split('-')[-1])
|
|
|
|
content = d['suggestion content']
|
|
|
|
new_code_snippet = d['improved code']
|
|
|
|
|
|
|
|
if new_code_snippet:
|
|
|
|
new_code_snippet = self.dedent_code(relevant_file, relevant_lines_start, new_code_snippet)
|
|
|
|
|
|
|
|
body = f"**Suggestion:** {content}\n```suggestion\n" + new_code_snippet + "\n```"
|
|
|
|
code_suggestions.append({'body': body, 'relevant_file': relevant_file,
|
|
|
|
'relevant_lines_start': relevant_lines_start,
|
|
|
|
'relevant_lines_end': relevant_lines_end})
|
2023-08-01 14:43:26 +03:00
|
|
|
except Exception:
|
|
|
|
if get_settings().config.verbosity_level >= 2:
|
2023-07-28 10:52:49 +03:00
|
|
|
logging.info(f"Could not parse suggestion: {d}")
|
2023-07-19 20:57:14 +03:00
|
|
|
|
|
|
|
self.git_provider.publish_code_suggestions(code_suggestions)
|
|
|
|
|
|
|
|
def dedent_code(self, relevant_file, relevant_lines_start, new_code_snippet):
|
|
|
|
try: # dedent code snippet
|
|
|
|
self.diff_files = self.git_provider.diff_files if self.git_provider.diff_files \
|
|
|
|
else self.git_provider.get_diff_files()
|
|
|
|
original_initial_line = None
|
|
|
|
for file in self.diff_files:
|
|
|
|
if file.filename.strip() == relevant_file:
|
|
|
|
original_initial_line = file.head_file.splitlines()[relevant_lines_start - 1]
|
|
|
|
break
|
|
|
|
if original_initial_line:
|
|
|
|
suggested_initial_line = new_code_snippet.splitlines()[0]
|
|
|
|
original_initial_spaces = len(original_initial_line) - len(original_initial_line.lstrip())
|
|
|
|
suggested_initial_spaces = len(suggested_initial_line) - len(suggested_initial_line.lstrip())
|
|
|
|
delta_spaces = original_initial_spaces - suggested_initial_spaces
|
|
|
|
if delta_spaces > 0:
|
|
|
|
new_code_snippet = textwrap.indent(new_code_snippet, delta_spaces * " ").rstrip('\n')
|
|
|
|
except Exception as e:
|
2023-08-01 14:43:26 +03:00
|
|
|
if get_settings().config.verbosity_level >= 2:
|
2023-07-19 20:57:14 +03:00
|
|
|
logging.info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
|
|
|
|
|
|
|
|
return new_code_snippet
|
2023-07-30 11:43:44 +03:00
|
|
|
|