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

merge

Browse Source
This commit is contained in:
mrT23
2023-09-14 08:13:00 +03:00
parent 1b8349b0ef
commit bba22667f1
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pr_agent/tools/pr_description.py
View File

@ -75,17 +75,16 @@ class PRDescription:
else: else:
return None return None
pr_labels = []
if get_settings().pr_description.publish_labels: if get_settings().pr_description.publish_labels:
pr_types = self._prepare_types() pr_labels = self._prepare_labels()
if get_settings().pr_description.use_description_markers: if get_settings().pr_description.use_description_markers:
logging.info(f"Using description marker replacements {self.pr_id}") pr_title, pr_body = self._prepare_pr_answer_with_markers()
pr_title, pr_body = self._prepare_marker_replacements()
else: else:
pr_title, pr_body, = self._prepare_pr_answer() pr_title, pr_body, = self._prepare_pr_answer()
full_markdown_description = f"## Title\n\n{pr_title}\n\n___\n{pr_body}" full_markdown_description = f"## Title\n\n{pr_title}\n\n___\n{pr_body}"
if get_settings().config.publish_output: if get_settings().config.publish_output:
logging.info(f"Pushing answer {self.pr_id}") logging.info(f"Pushing answer {self.pr_id}")
if get_settings().pr_description.publish_description_as_comment: if get_settings().pr_description.publish_description_as_comment:
@ -96,7 +95,7 @@ class PRDescription:
current_labels = self.git_provider.get_labels() current_labels = self.git_provider.get_labels()
if current_labels is None: if current_labels is None:
current_labels = [] current_labels = []
self.git_provider.publish_labels(pr_types + current_labels) self.git_provider.publish_labels(pr_labels + current_labels)
self.git_provider.remove_initial_comment() self.git_provider.remove_initial_comment()
return "" return ""
@ -162,7 +161,7 @@ class PRDescription:
self.data["User Description"] = self.user_description self.data["User Description"] = self.user_description
def _prepare_types(self) -> List[str]: def _prepare_labels(self) -> List[str]:
pr_types = [] pr_types = []
# If the 'PR Type' key is present in the dictionary, split its value by comma and assign it to 'pr_types' # If the 'PR Type' key is present in the dictionary, split its value by comma and assign it to 'pr_types'
@ -174,7 +173,8 @@ class PRDescription:
return pr_types return pr_types
def _prepare_marker_replacements(self) -> Tuple[str, str]: def _prepare_pr_answer_with_markers(self) -> Tuple[str, str]:
logging.info(f"Using description marker replacements {self.pr_id}")
title = self.vars["title"] title = self.vars["title"]
body = self.user_description body = self.user_description
if get_settings().pr_description.include_generated_by_header: if get_settings().pr_description.include_generated_by_header:
@ -207,8 +207,6 @@ class PRDescription:
Returns: Returns:
- title: a string containing the PR title. - title: a string containing the PR title.
- pr_body: a string containing the PR description body in a markdown format. - pr_body: a string containing the PR description body in a markdown format.
- markdown_text: a string containing the AI prediction data in a markdown format. used for publishing a comment
- user_description: a string containing the user description
""" """
# Iterate over the dictionary items and append the key and value to 'markdown_text' in a markdown format # Iterate over the dictionary items and append the key and value to 'markdown_text' in a markdown format
@ -245,12 +243,7 @@ class PRDescription:
if idx < len(self.data) - 1: if idx < len(self.data) - 1:
pr_body += "\n___\n" pr_body += "\n___\n"
markdown_text = f"## Title\n\n{title}\n\n___\n{pr_body}"
description = data['PR Description']
if get_settings().config.verbosity_level >= 2: if get_settings().config.verbosity_level >= 2:
logging.info(f"title:\n{title}\n{pr_body}") logging.info(f"title:\n{title}\n{pr_body}")
return title, pr_body return title, pr_body
return title, pr_body, pr_types, description