Add Incremental Review

This commit is contained in:
Hussam.lawen
2023-07-18 23:14:47 +03:00
parent 5d45632247
commit dc4bf13d39
8 changed files with 94 additions and 26 deletions

View File

@ -9,10 +9,11 @@ from pr_agent.config_loader import settings
from .git_provider import FilePatchInfo, GitProvider
from ..algo.language_handler import is_valid_file
from ..algo.utils import load_large_diff
class GithubProvider(GitProvider):
def __init__(self, pr_url: Optional[str] = None):
def __init__(self, pr_url: Optional[str] = None, incremental: Optional[bool] = False):
self.installation_id = settings.get("GITHUB.INSTALLATION_ID")
self.github_client = self._get_github_client()
self.repo = None
@ -20,6 +21,7 @@ class GithubProvider(GitProvider):
self.pr = None
self.github_user_id = None
self.diff_files = None
self.incremental = incremental
if pr_url:
self.set_pr(pr_url)
self.last_commit_id = list(self.pr.get_commits())[-1]
@ -30,18 +32,60 @@ class GithubProvider(GitProvider):
def set_pr(self, pr_url: str):
self.repo, self.pr_num = self._parse_pr_url(pr_url)
self.pr = self._get_pr()
if self.incremental:
self.commits = list(self.pr.get_commits())
self.comments = list(self.pr.get_issue_comments())
self.previous_review = None
self.first_new_commit_sha = None
self.incremental_files = None
for index in range(len(self.comments) - 1, -1, -1):
if self.comments[index].user.login == "github-actions[bot]" or \
self.comments[index].user.login == "CodiumAI-Agent" and \
self.comments[index].body.startswith("## PR Analysis"):
self.previous_review = self.comments[index]
break
if self.previous_review:
last_review_time = self.previous_review.created_at
first_new_commit_index = 0
self.last_seen_commit_sha = None
for index in range(len(self.commits) - 1, -1, -1):
if self.commits[index].commit.author.date > last_review_time:
self.first_new_commit_sha = self.commits[index].sha
first_new_commit_index = index
else:
self.last_seen_commit_sha = self.commits[index].sha
break
self.commits = self.commits[first_new_commit_index:]
self.file_set = dict()
for commit in self.commits:
self.file_set.update({file.filename: file for file in commit.files})
def get_files(self):
if self.incremental and self.file_set:
return self.file_set.values()
return self.pr.get_files()
def get_diff_files(self) -> list[FilePatchInfo]:
files = self.pr.get_files()
files = self.get_files()
diff_files = []
for file in files:
if is_valid_file(file.filename):
original_file_content_str = self._get_pr_file_content(file, self.pr.base.sha)
new_file_content_str = self._get_pr_file_content(file, self.pr.head.sha)
diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str, file.patch, file.filename))
patch = file.patch
if self.incremental and self.file_set:
original_file_content_str = self._get_pr_file_content(file, self.last_seen_commit_sha)
patch = load_large_diff(file,
new_file_content_str,
original_file_content_str,
None)
self.file_set[file.filename] = patch
else:
original_file_content_str = self._get_pr_file_content(file, self.pr.base.sha)
diff_files.append(
FilePatchInfo(original_file_content_str, new_file_content_str, patch, file.filename))
self.diff_files = diff_files
return diff_files
@ -90,7 +134,7 @@ class GithubProvider(GitProvider):
logging.exception(f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}")
return False
if relevant_lines_end<relevant_lines_start:
if relevant_lines_end < relevant_lines_start:
if settings.config.verbosity_level >= 2:
logging.exception(f"Failed to publish code suggestion, "
f"relevant_lines_end is {relevant_lines_end} and "