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

Merge pull request #312 from Codium-ai/tr/fixes_20_9

Browse Source 
Enhancing error handling in PR review tools
This commit is contained in:
mrT23
2023-09-20 07:59:02 +03:00
committed by GitHub
parent de14b0e4c0 632de3f186
commit d327245edf
4 changed files with 82 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -86,14 +86,12 @@ See the [usage guide](./Usage.md) for instructions how to run the different tool
<div align="left"> <div align="left">
## Table of Contents ## Table of Contents
- [Table of Contents](#table-of-contents)
- [Overview](#overview) - [Overview](#overview)
- [Try it now](#try-it-now) - [Try it now](#try-it-now)
- [Installation](#installation) - [Installation](#installation)
- [How it works](#how-it-works) - [How it works](#how-it-works)
- [Why use PR-Agent?](#why-use-pr-agent) - [Why use PR-Agent?](#why-use-pr-agent)
- [Roadmap](#roadmap) - [Roadmap](#roadmap)
- [Similar Projects](#similar-projects)
</div> </div>

42
pr_agent/tools/pr_code_suggestions.py
View File

@ -48,27 +48,33 @@ class PRCodeSuggestions:
get_settings().pr_code_suggestions_prompt.user) get_settings().pr_code_suggestions_prompt.user)
async def run(self): async def run(self):
logging.info('Generating code suggestions for PR...') try:
if get_settings().config.publish_output: logging.info('Generating code suggestions for PR...')
self.git_provider.publish_comment("Preparing review...", is_temporary=True) if get_settings().config.publish_output:
self.git_provider.publish_comment("Preparing review...", is_temporary=True)
logging.info('Preparing PR review...') logging.info('Preparing PR review...')
if not self.is_extended: if not self.is_extended:
await retry_with_fallback_models(self._prepare_prediction) await retry_with_fallback_models(self._prepare_prediction)
data = self._prepare_pr_code_suggestions() data = self._prepare_pr_code_suggestions()
else: else:
data = await retry_with_fallback_models(self._prepare_prediction_extended) data = await retry_with_fallback_models(self._prepare_prediction_extended)
if (not data) or (not 'Code suggestions' in data):
logging.info('No code suggestions found for PR.')
return
if (not self.is_extended and get_settings().pr_code_suggestions.rank_suggestions) or \ if (not self.is_extended and get_settings().pr_code_suggestions.rank_suggestions) or \
(self.is_extended and get_settings().pr_code_suggestions.rank_extended_suggestions): (self.is_extended and get_settings().pr_code_suggestions.rank_extended_suggestions):
logging.info('Ranking Suggestions...') logging.info('Ranking Suggestions...')
data['Code suggestions'] = await self.rank_suggestions(data['Code suggestions']) data['Code suggestions'] = await self.rank_suggestions(data['Code suggestions'])
if get_settings().config.publish_output: if get_settings().config.publish_output:
logging.info('Pushing PR review...') logging.info('Pushing PR review...')
self.git_provider.remove_initial_comment() self.git_provider.remove_initial_comment()
logging.info('Pushing inline code suggestions...') logging.info('Pushing inline code suggestions...')
self.push_inline_code_suggestions(data) self.push_inline_code_suggestions(data)
except Exception as e:
logging.error(f"Failed to generate code suggestions for PR, error: {e}")
async def _prepare_prediction(self, model: str): async def _prepare_prediction(self, model: str):
logging.info('Getting PR diff...') logging.info('Getting PR diff...')

64
pr_agent/tools/pr_description.py
View File

@ -63,40 +63,44 @@ class PRDescription:
""" """
Generates a PR description using an AI model and publishes it to the PR. Generates a PR description using an AI model and publishes it to the PR.
""" """
logging.info(f"Generating a PR description {self.pr_id}")
if get_settings().config.publish_output:
self.git_provider.publish_comment("Preparing pr description...", is_temporary=True)
await retry_with_fallback_models(self._prepare_prediction) try:
logging.info(f"Generating a PR description {self.pr_id}")
if get_settings().config.publish_output:
self.git_provider.publish_comment("Preparing pr description...", is_temporary=True)
logging.info(f"Preparing answer {self.pr_id}") await retry_with_fallback_models(self._prepare_prediction)
if self.prediction:
self._prepare_data()
else:
return None
pr_labels = [] logging.info(f"Preparing answer {self.pr_id}")
if get_settings().pr_description.publish_labels: if self.prediction:
pr_labels = self._prepare_labels() self._prepare_data()
if get_settings().pr_description.use_description_markers:
pr_title, pr_body = self._prepare_pr_answer_with_markers()
else:
pr_title, pr_body, = self._prepare_pr_answer()
full_markdown_description = f"## Title\n\n{pr_title}\n\n___\n{pr_body}"
if get_settings().config.publish_output:
logging.info(f"Pushing answer {self.pr_id}")
if get_settings().pr_description.publish_description_as_comment:
self.git_provider.publish_comment(full_markdown_description)
else: else:
self.git_provider.publish_description(pr_title, pr_body) return None
if get_settings().pr_description.publish_labels and self.git_provider.is_supported("get_labels"):
current_labels = self.git_provider.get_labels() pr_labels = []
if current_labels is None: if get_settings().pr_description.publish_labels:
current_labels = [] pr_labels = self._prepare_labels()
self.git_provider.publish_labels(pr_labels + current_labels)
self.git_provider.remove_initial_comment() if get_settings().pr_description.use_description_markers:
pr_title, pr_body = self._prepare_pr_answer_with_markers()
else:
pr_title, pr_body, = self._prepare_pr_answer()
full_markdown_description = f"## Title\n\n{pr_title}\n\n___\n{pr_body}"
if get_settings().config.publish_output:
logging.info(f"Pushing answer {self.pr_id}")
if get_settings().pr_description.publish_description_as_comment:
self.git_provider.publish_comment(full_markdown_description)
else:
self.git_provider.publish_description(pr_title, pr_body)
if get_settings().pr_description.publish_labels and self.git_provider.is_supported("get_labels"):
current_labels = self.git_provider.get_labels()
if current_labels is None:
current_labels = []
self.git_provider.publish_labels(pr_labels + current_labels)
self.git_provider.remove_initial_comment()
except Exception as e:
logging.error(f"Error generating PR description {self.pr_id}: {e}")
return "" return ""

44
pr_agent/tools/pr_reviewer.py
View File

@ -95,28 +95,32 @@ class PRReviewer:
""" """
Review the pull request and generate feedback. Review the pull request and generate feedback.
""" """
if self.is_auto and not get_settings().pr_reviewer.automatic_review:
logging.info(f'Automatic review is disabled {self.pr_url}')
return None
logging.info(f'Reviewing PR: {self.pr_url} ...') try:
if self.is_auto and not get_settings().pr_reviewer.automatic_review:
logging.info(f'Automatic review is disabled {self.pr_url}')
return None
if get_settings().config.publish_output: logging.info(f'Reviewing PR: {self.pr_url} ...')
self.git_provider.publish_comment("Preparing review...", is_temporary=True)
if get_settings().config.publish_output:
await retry_with_fallback_models(self._prepare_prediction) self.git_provider.publish_comment("Preparing review...", is_temporary=True)
logging.info('Preparing PR review...') await retry_with_fallback_models(self._prepare_prediction)
pr_comment = self._prepare_pr_review()
logging.info('Preparing PR review...')
if get_settings().config.publish_output: pr_comment = self._prepare_pr_review()
logging.info('Pushing PR review...')
self.git_provider.publish_comment(pr_comment) if get_settings().config.publish_output:
self.git_provider.remove_initial_comment() logging.info('Pushing PR review...')
self.git_provider.publish_comment(pr_comment)
if get_settings().pr_reviewer.inline_code_comments: self.git_provider.remove_initial_comment()
logging.info('Pushing inline code comments...')
self._publish_inline_code_comments() if get_settings().pr_reviewer.inline_code_comments:
logging.info('Pushing inline code comments...')
self._publish_inline_code_comments()
except Exception as e:
logging.error(f"Failed to review PR: {e}")
async def _prepare_prediction(self, model: str) -> None: async def _prepare_prediction(self, model: str) -> None:
""" """