From 05827d125b93bf586fc4417f1266ed3a713bb7f3 Mon Sep 17 00:00:00 2001 From: mrT23 Date: Sun, 13 Oct 2024 08:19:14 +0300 Subject: [PATCH] fix: handle missing issue body and improve error logging in ticket compliance check --- pr_agent/tools/ticket_pr_compliance_check.py | 30 +++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pr_agent/tools/ticket_pr_compliance_check.py b/pr_agent/tools/ticket_pr_compliance_check.py index f00e2334..5dafecc1 100644 --- a/pr_agent/tools/ticket_pr_compliance_check.py +++ b/pr_agent/tools/ticket_pr_compliance_check.py @@ -32,21 +32,25 @@ def extract_ticket_links_from_pr_description(pr_description, repo_path): """ Extract all ticket links from PR description """ + github_tickets = [] + try: + # example link to search for: https://github.com/Codium-ai/pr-agent-pro/issues/525 + pattern = r'https://github[^/]+/[^/]+/[^/]+/issues/\d+' # should support also github server (for example 'https://github.company.ai/Codium-ai/pr-agent-pro/issues/525') - # example link to search for: https://github.com/Codium-ai/pr-agent-pro/issues/525 - pattern = r'https://github[^/]+/[^/]+/[^/]+/issues/\d+' # should support also github server (for example 'https://github.company.ai/Codium-ai/pr-agent-pro/issues/525') + # Find all matches in the text + github_tickets = re.findall(pattern, pr_description) - # Find all matches in the text - github_tickets = re.findall(pattern, pr_description) - - # Find all issues referenced like #123 and add them as https://github.com/{repo_path}/issues/{issue_number} - issue_number_pattern = r'#\d+' - issue_numbers = re.findall(issue_number_pattern, pr_description) - for issue_number in issue_numbers: - issue_number = issue_number[1:] # remove # - # check if issue_number is a valid number and len(issue_number) < 5 - if issue_number.isdigit() and len(issue_number) < 5: - github_tickets.append(f'https://github.com/{repo_path}/issues/{issue_number}') + # Find all issues referenced like #123 and add them as https://github.com/{repo_path}/issues/{issue_number} + issue_number_pattern = r'#\d+' + issue_numbers = re.findall(issue_number_pattern, pr_description) + for issue_number in issue_numbers: + issue_number = issue_number[1:] # remove # + # check if issue_number is a valid number and len(issue_number) < 5 + if issue_number.isdigit() and len(issue_number) < 5: + github_tickets.append(f'https://github.com/{repo_path}/issues/{issue_number}') + except Exception as e: + get_logger().error(f"Error extracting tickets error= {e}", + artifact={"traceback": traceback.format_exc()}) return github_tickets