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

Lint fixes

Browse Source
This commit is contained in:
Ori Kotek
2023-07-18 11:34:57 +03:00
parent 9e0f5f0ccc
commit 90f97b0226
15 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pr_agent/agent/pr_agent.py
View File

@ -1,11 +1,11 @@
import re import re
from pr_agent.config_loader import settings
from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions
from pr_agent.tools.pr_description import PRDescription from pr_agent.tools.pr_description import PRDescription
from pr_agent.tools.pr_information_from_user import PRInformationFromUser from pr_agent.tools.pr_information_from_user import PRInformationFromUser
from pr_agent.tools.pr_questions import PRQuestions from pr_agent.tools.pr_questions import PRQuestions
from pr_agent.tools.pr_reviewer import PRReviewer from pr_agent.tools.pr_reviewer import PRReviewer
from pr_agent.config_loader import settings
class PRAgent: class PRAgent:

4
pr_agent/algo/git_patch_processing.py
View File

@ -158,7 +158,7 @@ def convert_to_hunks_with_lines_numbers(patch: str, file) -> str:
patch_with_lines_str += f"{start2 + i} {line_new}\n" patch_with_lines_str += f"{start2 + i} {line_new}\n"
if old_content_lines: if old_content_lines:
patch_with_lines_str += '--old hunk--\n' patch_with_lines_str += '--old hunk--\n'
for i, line_old in enumerate(old_content_lines): for line_old in old_content_lines:
patch_with_lines_str += f"{line_old}\n" patch_with_lines_str += f"{line_old}\n"
new_content_lines = [] new_content_lines = []
old_content_lines = [] old_content_lines = []
@ -179,7 +179,7 @@ def convert_to_hunks_with_lines_numbers(patch: str, file) -> str:
patch_with_lines_str += f"{start2 + i} {line_new}\n" patch_with_lines_str += f"{start2 + i} {line_new}\n"
if old_content_lines: if old_content_lines:
patch_with_lines_str += '\n--old hunk--\n' patch_with_lines_str += '\n--old hunk--\n'
for i, line_old in enumerate(old_content_lines): for line_old in old_content_lines:
patch_with_lines_str += f"{line_old}\n" patch_with_lines_str += f"{line_old}\n"
return patch_with_lines_str.strip() return patch_with_lines_str.strip()

3
pr_agent/algo/pr_processing.py
View File

@ -4,8 +4,7 @@ import difflib
import logging import logging
from typing import Any, Tuple, Union from typing import Any, Tuple, Union
from pr_agent.algo.git_patch_processing import extend_patch, handle_patch_deletions, \ from pr_agent.algo.git_patch_processing import convert_to_hunks_with_lines_numbers, extend_patch, handle_patch_deletions
convert_to_hunks_with_lines_numbers
from pr_agent.algo.language_handler import sort_files_by_main_languages from pr_agent.algo.language_handler import sort_files_by_main_languages
from pr_agent.algo.token_handler import TokenHandler from pr_agent.algo.token_handler import TokenHandler
from pr_agent.config_loader import settings from pr_agent.config_loader import settings

4
pr_agent/algo/utils.py
View File

@ -89,8 +89,8 @@ def try_fix_json(review, max_iter=10, code_suggestions=False):
data = {} data = {}
return data return data
def fix_json_escape_char(json_message=None): def fix_json_escape_char(json_message=None):
result = None
try: try:
result = json.loads(json_message) result = json.loads(json_message)
except Exception as e: except Exception as e:
@ -100,5 +100,5 @@ def fix_json_escape_char(json_message=None):
json_message = list(json_message) json_message = list(json_message)
json_message[idx_to_replace] = ' ' json_message[idx_to_replace] = ' '
new_message = ''.join(json_message) new_message = ''.join(json_message)
return fix_JSON(json_message=new_message) return fix_json_escape_char(json_message=new_message)
return result return result

2
pr_agent/git_providers/__init__.py
View File

@ -1,7 +1,7 @@
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
from pr_agent.git_providers.bitbucket_provider import BitbucketProvider
from pr_agent.git_providers.github_provider import GithubProvider from pr_agent.git_providers.github_provider import GithubProvider
from pr_agent.git_providers.gitlab_provider import GitLabProvider from pr_agent.git_providers.gitlab_provider import GitLabProvider
from pr_agent.git_providers.bitbucket_provider import BitbucketProvider
_GIT_PROVIDERS = { _GIT_PROVIDERS = {
'github': GithubProvider, 'github': GithubProvider,

5
pr_agent/git_providers/bitbucket_provider.py
View File

@ -1,5 +1,4 @@
import logging import logging
from datetime import datetime
from typing import Optional, Tuple from typing import Optional, Tuple
from urllib.parse import urlparse from urllib.parse import urlparse
@ -10,6 +9,7 @@ from pr_agent.config_loader import settings
from .git_provider import FilePatchInfo from .git_provider import FilePatchInfo
class BitbucketProvider: class BitbucketProvider:
def __init__(self, pr_url: Optional[str] = None): def __init__(self, pr_url: Optional[str] = None):
s = requests.Session() s = requests.Session()
@ -45,7 +45,8 @@ class BitbucketProvider:
for index, diff in enumerate(diffs): for index, diff in enumerate(diffs):
original_file_content_str = self._get_pr_file_content(diff.old.get_data('links')) original_file_content_str = self._get_pr_file_content(diff.old.get_data('links'))
new_file_content_str = self._get_pr_file_content(diff.new.get_data('links')) new_file_content_str = self._get_pr_file_content(diff.new.get_data('links'))
diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str, diff_split[index], diff.new.path)) diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str,
diff_split[index], diff.new.path))
return diff_files return diff_files
def publish_comment(self, pr_comment: str, is_temporary: bool = False): def publish_comment(self, pr_comment: str, is_temporary: bool = False):

3
pr_agent/git_providers/git_provider.py
View File

@ -3,12 +3,15 @@ from dataclasses import dataclass
# enum EDIT_TYPE (ADDED, DELETED, MODIFIED, RENAMED) # enum EDIT_TYPE (ADDED, DELETED, MODIFIED, RENAMED)
from enum import Enum from enum import Enum
class EDIT_TYPE(Enum): class EDIT_TYPE(Enum):
ADDED = 1 ADDED = 1
DELETED = 2 DELETED = 2
MODIFIED = 3 MODIFIED = 3
RENAMED = 4 RENAMED = 4
@dataclass @dataclass
class FilePatchInfo: class FilePatchInfo:
base_file: str base_file: str

10
pr_agent/git_providers/gitlab_provider.py
View File

@ -8,7 +8,7 @@ from gitlab import GitlabGetError
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
from .git_provider import FilePatchInfo, GitProvider, EDIT_TYPE from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
class GitLabProvider(GitProvider): class GitLabProvider(GitProvider):
@ -51,7 +51,8 @@ class GitLabProvider(GitProvider):
try: try:
return self.gl.projects.get(self.id_project).files.get(file_path, branch).decode() return self.gl.projects.get(self.id_project).files.get(file_path, branch).decode()
except GitlabGetError: except GitlabGetError:
# In case of file creation the method returns GitlabGetError (404 file not found). In this case we return an empty string for the diff. # In case of file creation the method returns GitlabGetError (404 file not found).
# In this case we return an empty string for the diff.
return '' return ''
def get_diff_files(self) -> list[FilePatchInfo]: def get_diff_files(self) -> list[FilePatchInfo]:
@ -137,7 +138,8 @@ class GitLabProvider(GitProvider):
lines = target_file.head_file.splitlines() lines = target_file.head_file.splitlines()
relevant_line_in_file = lines[relevant_lines_start - 1] relevant_line_in_file = lines[relevant_lines_start - 1]
edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(target_file, relevant_line_in_file) edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(target_file,
relevant_line_in_file)
self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no, self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
target_file, target_line_no) target_file, target_line_no)
@ -159,7 +161,7 @@ class GitLabProvider(GitProvider):
target_file = file target_file = file
patch = file.patch patch = file.patch
patch_lines = patch.splitlines() patch_lines = patch.splitlines()
for i, line in enumerate(patch_lines): for line in patch_lines:
if line.startswith('@@'): if line.startswith('@@'):
match = self.RE_HUNK_HEADER.match(line) match = self.RE_HUNK_HEADER.match(line)
if not match: if not match:

5
pr_agent/servers/github_action_runner.py
View File

@ -1,14 +1,9 @@
import asyncio import asyncio
import json import json
import os import os
import re
from pr_agent.agent.pr_agent import PRAgent from pr_agent.agent.pr_agent import PRAgent
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions
from pr_agent.tools.pr_description import PRDescription
from pr_agent.tools.pr_information_from_user import PRInformationFromUser
from pr_agent.tools.pr_questions import PRQuestions
from pr_agent.tools.pr_reviewer import PRReviewer from pr_agent.tools.pr_reviewer import PRReviewer

6
pr_agent/servers/github_polling.py
View File

@ -1,6 +1,5 @@
import asyncio import asyncio
import logging import logging
import re
import sys import sys
from datetime import datetime, timezone from datetime import datetime, timezone
@ -10,10 +9,6 @@ from pr_agent.agent.pr_agent import PRAgent
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
from pr_agent.git_providers import get_git_provider from pr_agent.git_providers import get_git_provider
from pr_agent.servers.help import bot_help_text from pr_agent.servers.help import bot_help_text
from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions
from pr_agent.tools.pr_description import PRDescription
from pr_agent.tools.pr_questions import PRQuestions
from pr_agent.tools.pr_reviewer import PRReviewer
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
NOTIFICATION_URL = "https://api.github.com/notifications" NOTIFICATION_URL = "https://api.github.com/notifications"
@ -103,5 +98,6 @@ async def polling_loop():
except Exception as e: except Exception as e:
logging.error(f"Exception during processing of a notification: {e}") logging.error(f"Exception during processing of a notification: {e}")
if __name__ == '__main__': if __name__ == '__main__':
asyncio.run(polling_loop()) asyncio.run(polling_loop())

11
pr_agent/tools/pr_code_suggestions.py
View File

@ -8,9 +8,9 @@ from jinja2 import Environment, StrictUndefined
from pr_agent.algo.ai_handler import AiHandler from pr_agent.algo.ai_handler import AiHandler
from pr_agent.algo.pr_processing import get_pr_diff from pr_agent.algo.pr_processing import get_pr_diff
from pr_agent.algo.token_handler import TokenHandler from pr_agent.algo.token_handler import TokenHandler
from pr_agent.algo.utils import convert_to_markdown, try_fix_json from pr_agent.algo.utils import try_fix_json
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
from pr_agent.git_providers import get_git_provider, BitbucketProvider from pr_agent.git_providers import BitbucketProvider, get_git_provider
from pr_agent.git_providers.git_provider import get_main_pr_language from pr_agent.git_providers.git_provider import get_main_pr_language
@ -62,7 +62,6 @@ class PRCodeSuggestions:
logging.info('Pushing inline code comments...') logging.info('Pushing inline code comments...')
self.push_inline_code_suggestions(data) self.push_inline_code_suggestions(data)
async def _get_prediction(self): async def _get_prediction(self):
variables = copy.deepcopy(self.vars) variables = copy.deepcopy(self.vars)
variables["diff"] = self.patches_diff # update diff variables["diff"] = self.patches_diff # update diff
@ -98,12 +97,12 @@ class PRCodeSuggestions:
relevant_lines_start = int(relevant_lines_str.split('-')[0]) # absolute position relevant_lines_start = int(relevant_lines_str.split('-')[0]) # absolute position
relevant_lines_end = int(relevant_lines_str.split('-')[-1]) relevant_lines_end = int(relevant_lines_str.split('-')[-1])
content = d['suggestion content'] content = d['suggestion content']
existing_code_snippet = d['existing code']
new_code_snippet = d['improved code'] new_code_snippet = d['improved code']
if new_code_snippet: if new_code_snippet:
try: # dedent code snippet try: # dedent code snippet
self.diff_files = self.git_provider.diff_files if self.git_provider.diff_files else self.git_provider.get_diff_files() self.diff_files = self.git_provider.diff_files if self.git_provider.diff_files \
else self.git_provider.get_diff_files()
original_initial_line = None original_initial_line = None
for file in self.diff_files: for file in self.diff_files:
if file.filename.strip() == relevant_file: if file.filename.strip() == relevant_file:
@ -121,7 +120,7 @@ class PRCodeSuggestions:
logging.info(f"Could not dedent code snippet for file {relevant_file}, error: {e}") logging.info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
body = f"**Suggestion:** {content}\n```suggestion\n" + new_code_snippet + "\n```" body = f"**Suggestion:** {content}\n```suggestion\n" + new_code_snippet + "\n```"
success = self.git_provider.publish_code_suggestion(body=body, self.git_provider.publish_code_suggestion(body=body,
relevant_file=relevant_file, relevant_file=relevant_file,
relevant_lines_start=relevant_lines_start, relevant_lines_start=relevant_lines_start,
relevant_lines_end=relevant_lines_end) relevant_lines_end=relevant_lines_end)

1
pr_agent/tools/pr_description.py
View File

@ -7,7 +7,6 @@ from jinja2 import Environment, StrictUndefined
from pr_agent.algo.ai_handler import AiHandler from pr_agent.algo.ai_handler import AiHandler
from pr_agent.algo.pr_processing import get_pr_diff from pr_agent.algo.pr_processing import get_pr_diff
from pr_agent.algo.token_handler import TokenHandler from pr_agent.algo.token_handler import TokenHandler
from pr_agent.algo.utils import convert_to_markdown
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
from pr_agent.git_providers import get_git_provider from pr_agent.git_providers import get_git_provider
from pr_agent.git_providers.git_provider import get_main_pr_language from pr_agent.git_providers.git_provider import get_main_pr_language

2
pr_agent/tools/pr_information_from_user.py
View File

@ -67,5 +67,5 @@ class PRInformationFromUser:
if settings.config.verbosity_level >= 2: if settings.config.verbosity_level >= 2:
logging.info(f"answer_str:\n{model_output}") logging.info(f"answer_str:\n{model_output}")
answer_str = f"{model_output}\n\n Please respond to the questions above in the following format:\n\n" +\ answer_str = f"{model_output}\n\n Please respond to the questions above in the following format:\n\n" +\
f"\n>/answer\n>1) ...\n>2) ...\n>...\n" "\n>/answer\n>1) ...\n>2) ...\n>...\n"
return answer_str return answer_str

2
pr_agent/tools/pr_reviewer.py
View File

@ -11,7 +11,7 @@ from pr_agent.algo.utils import convert_to_markdown, try_fix_json
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
from pr_agent.git_providers import get_git_provider from pr_agent.git_providers import get_git_provider
from pr_agent.git_providers.git_provider import get_main_pr_language from pr_agent.git_providers.git_provider import get_main_pr_language
from pr_agent.servers.help import bot_help_text, actions_help_text from pr_agent.servers.help import actions_help_text, bot_help_text
class PRReviewer: class PRReviewer:

11
tests/unit/test_fix_output.py
View File

@ -1,13 +1,12 @@
# Generated by CodiumAI # Generated by CodiumAI
from pr_agent.algo.utils import try_fix_json from pr_agent.algo.utils import try_fix_json
import pytest
class TestTryFixJson: class TestTryFixJson:
# Tests that JSON with complete 'Code suggestions' section returns expected output # Tests that JSON with complete 'Code suggestions' section returns expected output
def test_incomplete_code_suggestions(self): def test_incomplete_code_suggestions(self):
review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"}, {"suggestion number": 2, "relevant file": "yyy.py", "suggestion content": "yyy [incomp...' review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"}, {"suggestion number": 2, "relevant file": "yyy.py", "suggestion content": "yyy [incomp...' # noqa: E501
expected_output = { expected_output = {
'PR Analysis': { 'PR Analysis': {
'Main theme': 'xxx', 'Main theme': 'xxx',
@ -26,7 +25,7 @@ class TestTryFixJson:
assert try_fix_json(review) == expected_output assert try_fix_json(review) == expected_output
def test_incomplete_code_suggestions_new_line(self): def test_incomplete_code_suggestions_new_line(self):
review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"} \n\t, {"suggestion number": 2, "relevant file": "yyy.py", "suggestion content": "yyy [incomp...' review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"} \n\t, {"suggestion number": 2, "relevant file": "yyy.py", "suggestion content": "yyy [incomp...' # noqa: E501
expected_output = { expected_output = {
'PR Analysis': { 'PR Analysis': {
'Main theme': 'xxx', 'Main theme': 'xxx',
@ -45,7 +44,7 @@ class TestTryFixJson:
assert try_fix_json(review) == expected_output assert try_fix_json(review) == expected_output
def test_incomplete_code_suggestions_many_close_brackets(self): def test_incomplete_code_suggestions_many_close_brackets(self):
review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"} \n, {"suggestion number": 2, "relevant file": "yyy.py", "suggestion content": "yyy }, [}\n ,incomp.} ,..' review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"} \n, {"suggestion number": 2, "relevant file": "yyy.py", "suggestion content": "yyy }, [}\n ,incomp.} ,..' # noqa: E501
expected_output = { expected_output = {
'PR Analysis': { 'PR Analysis': {
'Main theme': 'xxx', 'Main theme': 'xxx',
@ -64,7 +63,7 @@ class TestTryFixJson:
assert try_fix_json(review) == expected_output assert try_fix_json(review) == expected_output
def test_incomplete_code_suggestions_relevant_file(self): def test_incomplete_code_suggestions_relevant_file(self):
review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"}, {"suggestion number": 2, "relevant file": "yyy.p' review = '{"PR Analysis": {"Main theme": "xxx", "Type of PR": "Bug fix"}, "PR Feedback": {"General PR suggestions": "..., `xxx`...", "Code suggestions": [{"relevant file": "xxx.py", "suggestion content": "xxx [important]"}, {"suggestion number": 2, "relevant file": "yyy.p' # noqa: E501
expected_output = { expected_output = {
'PR Analysis': { 'PR Analysis': {
'Main theme': 'xxx', 'Main theme': 'xxx',