From 35a6eb2e5250995d2c51c7a8a9705ae3b0ab7635 Mon Sep 17 00:00:00 2001 From: Nikolay Telepenin Date: Fri, 1 Sep 2023 14:51:29 +0100 Subject: [PATCH] Add unique patch to according to multiple execution of `publish_code_suggestions` --- pr_agent/git_providers/gerrit_provider.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pr_agent/git_providers/gerrit_provider.py b/pr_agent/git_providers/gerrit_provider.py index 5ec2e3c8..af754719 100644 --- a/pr_agent/git_providers/gerrit_provider.py +++ b/pr_agent/git_providers/gerrit_provider.py @@ -4,6 +4,7 @@ import os import pathlib import shutil import subprocess +import uuid from collections import Counter, namedtuple from pathlib import Path from tempfile import mkdtemp, NamedTemporaryFile @@ -333,7 +334,7 @@ class GerritProvider(GitProvider): def publish_code_suggestions(self, code_suggestions: list): msg = [] - for i, suggestion in enumerate(code_suggestions): + for suggestion in code_suggestions: description, code = self.split_suggestion(suggestion['body']) add_suggestion( pathlib.Path(self.repo_path) / suggestion["relevant_file"], @@ -342,7 +343,8 @@ class GerritProvider(GitProvider): suggestion["relevant_lines_end"], ) patch = diff(cwd=self.repo_path) - path = "/".join(["codium-ai", self.refspec, str(i)]) + patch_id = uuid.uuid4().hex[0:4] + path = "/".join(["codium-ai", self.refspec, patch_id]) full_path = upload_patch(patch, path) reset_local_changes(self.repo_path) msg.append(f'* {description}\n{full_path}')