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

Merge pull request #1290 from Codium-ai/hl/tickets_support

Browse Source 
support more types of github ticket url / references
This commit is contained in:
Hussam Lawen
2024-10-14 14:34:45 +03:00
committed by GitHub
parent d1f4069d3f 0946da3810
commit e82afdd2cb
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pr_agent/tools/ticket_pr_compliance_check.py
View File

@ -5,6 +5,10 @@ from pr_agent.config_loader import get_settings
from pr_agent.git_providers import GithubProvider from pr_agent.git_providers import GithubProvider
from pr_agent.log import get_logger from pr_agent.log import get_logger
# Compile the regex pattern once, outside the function
GITHUB_TICKET_PATTERN = re.compile(
r'(https://github[^/]+/[^/]+/[^/]+/issues/\d+)|(\b(\w+)/(\w+)#(\d+)\b)|(#\d+)'
)
def find_jira_tickets(text): def find_jira_tickets(text):
# Regular expression patterns for JIRA tickets # Regular expression patterns for JIRA tickets
@ -28,31 +32,30 @@ def find_jira_tickets(text):
return list(tickets) return list(tickets)
def extract_ticket_links_from_pr_description(pr_description, repo_path): def extract_ticket_links_from_pr_description(pr_description, repo_path, base_url_html='https://github.com'):
""" """
Extract all ticket links from PR description Extract all ticket links from PR description
""" """
github_tickets = [] github_tickets = set()
try: try:
# example link to search for: https://github.com/Codium-ai/pr-agent-pro/issues/525 # Use the updated pattern to find matches
pattern = r'https://github[^/]+/[^/]+/[^/]+/issues/\d+' # should support also github server (for example 'https://github.company.ai/Codium-ai/pr-agent-pro/issues/525') matches = GITHUB_TICKET_PATTERN.findall(pr_description)
# Find all matches in the text for match in matches:
github_tickets = re.findall(pattern, pr_description) if match[0]: # Full URL match
github_tickets.add(match[0])
# Find all issues referenced like #123 and add them as https://github.com/{repo_path}/issues/{issue_number} elif match[1]: # Shorthand notation match: owner/repo#issue_number
issue_number_pattern = r'#\d+' owner, repo, issue_number = match[2], match[3], match[4]
issue_numbers = re.findall(issue_number_pattern, pr_description) github_tickets.add(f'{base_url_html.strip("/")}/{owner}/{repo}/issues/{issue_number}')
for issue_number in issue_numbers: else: # #123 format
issue_number = issue_number[1:] # remove # issue_number = match[5][1:] # remove #
# check if issue_number is a valid number and len(issue_number) < 5 if issue_number.isdigit() and len(issue_number) < 5 and repo_path:
if issue_number.isdigit() and len(issue_number) < 5: github_tickets.add(f'{base_url_html.strip("/")}/{repo_path}/issues/{issue_number}')
github_tickets.append(f'https://github.com/{repo_path}/issues/{issue_number}')
except Exception as e: except Exception as e:
get_logger().error(f"Error extracting tickets error= {e}", get_logger().error(f"Error extracting tickets error= {e}",
artifact={"traceback": traceback.format_exc()}) artifact={"traceback": traceback.format_exc()})
return github_tickets return list(github_tickets)
async def extract_tickets(git_provider): async def extract_tickets(git_provider):
@ -60,7 +63,7 @@ async def extract_tickets(git_provider):
try: try:
if isinstance(git_provider, GithubProvider): if isinstance(git_provider, GithubProvider):
user_description = git_provider.get_user_description() user_description = git_provider.get_user_description()
tickets = extract_ticket_links_from_pr_description(user_description, git_provider.repo) tickets = extract_ticket_links_from_pr_description(user_description, git_provider.repo, git_provider.base_url_html)
tickets_content = [] tickets_content = []
if tickets: if tickets:
for ticket in tickets: for ticket in tickets: