Add unique patch to according to multiple execution of publish_code_suggestions

This commit is contained in:
Nikolay Telepenin
2023-09-01 14:51:29 +01:00
parent 8b477c694c
commit 35a6eb2e52

View File

@ -4,6 +4,7 @@ import os
import pathlib import pathlib
import shutil import shutil
import subprocess import subprocess
import uuid
from collections import Counter, namedtuple from collections import Counter, namedtuple
from pathlib import Path from pathlib import Path
from tempfile import mkdtemp, NamedTemporaryFile from tempfile import mkdtemp, NamedTemporaryFile
@ -333,7 +334,7 @@ class GerritProvider(GitProvider):
def publish_code_suggestions(self, code_suggestions: list): def publish_code_suggestions(self, code_suggestions: list):
msg = [] msg = []
for i, suggestion in enumerate(code_suggestions): for suggestion in code_suggestions:
description, code = self.split_suggestion(suggestion['body']) description, code = self.split_suggestion(suggestion['body'])
add_suggestion( add_suggestion(
pathlib.Path(self.repo_path) / suggestion["relevant_file"], pathlib.Path(self.repo_path) / suggestion["relevant_file"],
@ -342,7 +343,8 @@ class GerritProvider(GitProvider):
suggestion["relevant_lines_end"], suggestion["relevant_lines_end"],
) )
patch = diff(cwd=self.repo_path) 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) full_path = upload_patch(patch, path)
reset_local_changes(self.repo_path) reset_local_changes(self.repo_path)
msg.append(f'* {description}\n{full_path}') msg.append(f'* {description}\n{full_path}')