xiaxinhang/pr-agent
1
0
Fork 0
mirror of https://github.com/qodo-ai/pr-agent.git synced 2025-07-04 12:50:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1132 from Codium-ai/tr/err_protections

Browse Source 
Add error handling for missing GitLab URL and improve inline comment …
This commit is contained in:
Tal
2024-08-13 19:05:00 +03:00
committed by GitHub
parent c97c39d57d a3b3d6c77a
commit 7ac9f27b70
1 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pr_agent/git_providers/gitlab_provider.py
View File

@ -26,6 +26,7 @@ class GitLabProvider(GitProvider):
gitlab_url = get_settings().get("GITLAB.URL", None) gitlab_url = get_settings().get("GITLAB.URL", None)
if not gitlab_url: if not gitlab_url:
raise ValueError("GitLab URL is not set in the config file") raise ValueError("GitLab URL is not set in the config file")
self.gitlab_url = gitlab_url
gitlab_access_token = get_settings().get("GITLAB.PERSONAL_ACCESS_TOKEN", None) gitlab_access_token = get_settings().get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
if not gitlab_access_token: if not gitlab_access_token:
raise ValueError("GitLab personal access token is not set in the config file") raise ValueError("GitLab personal access token is not set in the config file")
@ -227,8 +228,9 @@ class GitLabProvider(GitProvider):
comment = self.mr.notes.get(comment_id).body comment = self.mr.notes.get(comment_id).body
return comment return comment
def send_inline_comment(self,body: str,edit_type: str,found: bool,relevant_file: str,relevant_line_in_file: int, def send_inline_comment(self, body: str, edit_type: str, found: bool, relevant_file: str,
source_line_no: int, target_file: str,target_line_no: int, original_suggestion) -> None: relevant_line_in_file: str,
source_line_no: int, target_file: str, target_line_no: int, original_suggestion) -> None:
if not found: if not found:
get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}") get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
else: else:
@ -254,13 +256,28 @@ class GitLabProvider(GitProvider):
except Exception as e: except Exception as e:
try: try:
# fallback - create a general note on the file in the MR # fallback - create a general note on the file in the MR
line_start = original_suggestion['suggestion_orig_location']['start_line'] if 'suggestion_orig_location' in original_suggestion:
line_end = original_suggestion['suggestion_orig_location']['end_line'] line_start = original_suggestion['suggestion_orig_location']['start_line']
old_code_snippet = original_suggestion['prev_code_snippet'] line_end = original_suggestion['suggestion_orig_location']['end_line']
new_code_snippet = original_suggestion['new_code_snippet'] old_code_snippet = original_suggestion['prev_code_snippet']
content = original_suggestion['suggestion_summary'] new_code_snippet = original_suggestion['new_code_snippet']
label = original_suggestion['category'] content = original_suggestion['suggestion_summary']
score = original_suggestion['score'] label = original_suggestion['category']
if 'score' in original_suggestion:
score = original_suggestion['score']
else:
score = 7
else:
line_start = original_suggestion['relevant_lines_start']
line_end = original_suggestion['relevant_lines_end']
old_code_snippet = original_suggestion['existing_code']
new_code_snippet = original_suggestion['improved_code']
content = original_suggestion['suggestion_content']
label = original_suggestion['label']
if 'score' in original_suggestion:
score = original_suggestion['score']
else:
score = 7
if hasattr(self, 'main_language'): if hasattr(self, 'main_language'):
language = self.main_language language = self.main_language
@ -287,9 +304,9 @@ class GitLabProvider(GitProvider):
# get_logger().debug( # get_logger().debug(
# f"Failed to create comment in MR {self.id_mr} with position {pos_obj} (probably not a '+' line)") # f"Failed to create comment in MR {self.id_mr} with position {pos_obj} (probably not a '+' line)")
except Exception as e: except Exception as e:
get_logger().exception(f"Failed to create comment in MR {self.id_mr} with position {pos_obj}: {e}") get_logger().exception(f"Failed to create comment in MR {self.id_mr}")
def get_relevant_diff(self, relevant_file: str, relevant_line_in_file: int) -> Optional[dict]: def get_relevant_diff(self, relevant_file: str, relevant_line_in_file: str) -> Optional[dict]:
changes = self.mr.changes() # Retrieve the changes for the merge request once changes = self.mr.changes() # Retrieve the changes for the merge request once
if not changes: if not changes:
get_logger().error('No changes found for the merge request.') get_logger().error('No changes found for the merge request.')
@ -330,7 +347,7 @@ class GitLabProvider(GitProvider):
# edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(target_file, # edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(target_file,
# relevant_line_in_file) # relevant_line_in_file)
# for code suggestions, we want to edit the new code # for code suggestions, we want to edit the new code
source_line_no = None source_line_no = -1
target_line_no = relevant_lines_start + 1 target_line_no = relevant_lines_start + 1
found = True found = True
edit_type = 'addition' edit_type = 'addition'
@ -423,6 +440,15 @@ class GitLabProvider(GitProvider):
def get_pr_branch(self): def get_pr_branch(self):
return self.mr.source_branch return self.mr.source_branch
def get_pr_owner_id(self) -> str | None:
if not self.gitlab_url or 'gitlab.com' in self.gitlab_url:
if not self.id_project:
return None
return self.id_project.split('/')[0]
# extract host name
host = urlparse(self.gitlab_url).hostname
return host
def get_pr_description_full(self): def get_pr_description_full(self):
return self.mr.description return self.mr.description