From 78b11c80c7c1ffa4a1fed856f0dfd397df944b51 Mon Sep 17 00:00:00 2001 From: mrT23 Date: Tue, 13 Aug 2024 11:42:07 +0300 Subject: [PATCH 1/5] Add error handling for empty secrets in GitLab webhook and lower log level for Google Cloud Storage secret retrieval errors --- .../secret_providers/google_cloud_storage_secret_provider.py | 2 +- pr_agent/servers/gitlab_webhook.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pr_agent/secret_providers/google_cloud_storage_secret_provider.py b/pr_agent/secret_providers/google_cloud_storage_secret_provider.py index 2dfb71f6d..8cbaebe31 100644 --- a/pr_agent/secret_providers/google_cloud_storage_secret_provider.py +++ b/pr_agent/secret_providers/google_cloud_storage_secret_provider.py @@ -22,7 +22,7 @@ def get_secret(self, secret_name: str) -> str: blob = self.bucket.blob(secret_name) return blob.download_as_string() except Exception as e: - get_logger().error(f"Failed to get secret {secret_name} from Google Cloud Storage: {e}") + get_logger().warning(f"Failed to get secret {secret_name} from Google Cloud Storage: {e}") return "" def store_secret(self, secret_name: str, secret_value: str): diff --git a/pr_agent/servers/gitlab_webhook.py b/pr_agent/servers/gitlab_webhook.py index 2c525858a..4a814e9f2 100644 --- a/pr_agent/servers/gitlab_webhook.py +++ b/pr_agent/servers/gitlab_webhook.py @@ -87,6 +87,10 @@ async def inner(data: dict): if request.headers.get("X-Gitlab-Token") and secret_provider: request_token = request.headers.get("X-Gitlab-Token") secret = secret_provider.get_secret(request_token) + if not secret: + get_logger().warning(f"Empty secret retrieved, request_token: {request_token}") + return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, + content=jsonable_encoder({"message": "unauthorized"})) try: secret_dict = json.loads(secret) gitlab_token = secret_dict["gitlab_token"] From 8038eaf8763094d1afc55f60de4dd9a0cdf3da6f Mon Sep 17 00:00:00 2001 From: mrT23 Date: Tue, 13 Aug 2024 12:16:52 +0300 Subject: [PATCH 2/5] Add error handling for missing required fields in file label dictionary in pr_description.py --- pr_agent/tools/pr_description.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pr_agent/tools/pr_description.py b/pr_agent/tools/pr_description.py index 7ba35fa4c..2214085a7 100644 --- a/pr_agent/tools/pr_description.py +++ b/pr_agent/tools/pr_description.py @@ -510,6 +510,12 @@ def _prepare_file_labels(self): file_label_dict = {} for file in self.data['pr_files']: try: + required_fields = ['changes_summary', 'changes_title', 'filename', 'label'] + if not all(field in file for field in required_fields): + # can happen for example if a YAML generation was interrupted in the middle (no more tokens) + get_logger().warning(f"Missing required fields in file label dict {self.pr_id}, skipping file", + artifact={"file": file}) + continue filename = file['filename'].replace("'", "`").replace('"', '`') changes_summary = file['changes_summary'] changes_title = file['changes_title'].strip() From a2fb415c5318f1b91023313df136d2245215259c Mon Sep 17 00:00:00 2001 From: mrT23 Date: Tue, 13 Aug 2024 12:39:45 +0300 Subject: [PATCH 3/5] Add git_files attribute to Bitbucket provider class for enhanced file handling --- pr_agent/git_providers/bitbucket_provider.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pr_agent/git_providers/bitbucket_provider.py b/pr_agent/git_providers/bitbucket_provider.py index 779aea66e..a76624dc3 100644 --- a/pr_agent/git_providers/bitbucket_provider.py +++ b/pr_agent/git_providers/bitbucket_provider.py @@ -46,6 +46,7 @@ def __init__( self.temp_comments = [] self.incremental = incremental self.diff_files = None + self.git_files = None if pr_url: self.set_pr(pr_url) self.bitbucket_comment_api_url = self.pr._BitbucketBase__data["links"]["comments"]["href"] From 26f3bd89008d9313e8c4e708e96056dfec1e40b6 Mon Sep 17 00:00:00 2001 From: mrT23 Date: Tue, 13 Aug 2024 12:57:31 +0300 Subject: [PATCH 4/5] Add error handling for out-of-range relevant_lines_start and missing head_file in pr_code_suggestions.py --- pr_agent/tools/pr_code_suggestions.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py index f7bb3315d..911f6227f 100644 --- a/pr_agent/tools/pr_code_suggestions.py +++ b/pr_agent/tools/pr_code_suggestions.py @@ -450,8 +450,24 @@ def dedent_code(self, relevant_file, relevant_lines_start, new_code_snippet): original_initial_line = None for file in self.diff_files: if file.filename.strip() == relevant_file: - if file.head_file: # in bitbucket, head_file is empty. toDo: fix this - original_initial_line = file.head_file.splitlines()[relevant_lines_start - 1] + if file.head_file: + file_lines = file.head_file.splitlines() + if len(file_lines) >= relevant_lines_start: + get_logger().warning( + "Could not dedent code snippet, because relevant_lines_start is out of range", + artifact={'filename': file.filename, + 'file_content': file.head_file, + 'relevant_lines_start': relevant_lines_start, + 'new_code_snippet': new_code_snippet}) + return new_code_snippet + else: + original_initial_line = file_lines[relevant_lines_start - 1] + else: + get_logger().warning("Could not dedent code snippet, because head_file is missing", + artifact={'filename': file.filename, + 'relevant_lines_start': relevant_lines_start, + 'new_code_snippet': new_code_snippet}) + return new_code_snippet break if original_initial_line: suggested_initial_line = new_code_snippet.splitlines()[0] @@ -461,7 +477,7 @@ def dedent_code(self, relevant_file, relevant_lines_start, new_code_snippet): if delta_spaces > 0: new_code_snippet = textwrap.indent(new_code_snippet, delta_spaces * " ").rstrip('\n') except Exception as e: - get_logger().error(f"Could not dedent code snippet for file {relevant_file}, error: {e}") + get_logger().error(f"Error when dedenting code snippet for file {relevant_file}, error: {e}") return new_code_snippet From 38638bd1c4675701e4bceb2e1b844fd8d1f95d60 Mon Sep 17 00:00:00 2001 From: mrT23 Date: Tue, 13 Aug 2024 12:59:51 +0300 Subject: [PATCH 5/5] relevant_lines_start > len(file_lines): --- pr_agent/tools/pr_code_suggestions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py index 911f6227f..c0f3c0bf9 100644 --- a/pr_agent/tools/pr_code_suggestions.py +++ b/pr_agent/tools/pr_code_suggestions.py @@ -452,7 +452,7 @@ def dedent_code(self, relevant_file, relevant_lines_start, new_code_snippet): if file.filename.strip() == relevant_file: if file.head_file: file_lines = file.head_file.splitlines() - if len(file_lines) >= relevant_lines_start: + if relevant_lines_start > len(file_lines): get_logger().warning( "Could not dedent code snippet, because relevant_lines_start is out of range", artifact={'filename': file.filename,