Skip to content

chore: enhance re_findall function to handle None and empty string patterns #4165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liuruibin merged 1 commit into from
Oct 10, 2025
Merged

chore: enhance re_findall function to handle None and empty string patterns #4165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apps/common/utils/split_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,12 @@ def parse_level(text, pattern: str):


def re_findall(pattern, text):
if not pattern or not pattern.strip():
# 检查 pattern 是否为空或无效
if pattern is None:
return []

# 如果是字符串类型，检查是否为空字符串
if isinstance(pattern, str) and (not pattern or not pattern.strip()):
return []

try:
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function re_findall has several improvements to enhance readability and robustness:

  1. Early Return on Invalid Pattern:
    • Added a check for pattern is None to handle cases where the pattern might be explicitly set to None.
  2. Check for Empty String Patterns:
    • Changed the condition inside the main pattern check from using not pattern.strip() to just (not pattern). This makes it more concise.

Here's the revised version of the code with these changes:

import re

def parse_level(text, pattern: str):
    pass  # Placeholder implementation


def re_findall(pattern, text):
    # Early return if no pattern or invalid pattern is provided
    if pattern is None:
        return []

    # Check if pattern is an empty string
    if pattern == "":
        return []

    try:
        return re.findall(pattern, text)
    except Exception as e:
        print(f"Error parsing regex {pattern}: {e}")
        return []

Key Changes:

  • Pattern Null Check: Ensures that the function returns an empty list if the pattern is not provided or is explicitly set to None.
  • Empty String Check: Adds a simple comparison to check if the pattern is an empty string.

These changes make the function more defensive and easier to understand, especially when dealing with unexpected input values.

Expand Down
Loading