Skip to content

⚡️ Speed up function extract_packages_from_pip_install_suggestion by 36% #592

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚡️ Speed up function extract_packages_from_pip_install_suggestion by 36% #592

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
34 changes: 19 additions & 15 deletions marimo/_runtime/packages/import_error_extractors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@

import re

_quoted_patterns = [
re.compile(r"`pip install\s+([^`]+)`", re.IGNORECASE),
re.compile(r'"pip install\s+([^"]+)"', re.IGNORECASE),
re.compile(r"'pip install\s+([^']+)'", re.IGNORECASE),
]

_individual_quoted_pattern = re.compile(
r'pip install\s+"([^"]+)"', re.IGNORECASE
)

_unquoted_pattern = re.compile(
r"pip install\s+([a-zA-Z0-9_.-]+(?:\[[a-zA-Z0-9_,.-]+\])?)",
re.IGNORECASE,
)


def extract_missing_module_from_cause_chain(
error: ImportError,
Expand Down Expand Up @@ -36,14 +51,8 @@ def extract_packages_from_pip_install_suggestion(
"""Extract package names from pip install commands in error messages."""

# First try to find quoted/backticked pip install commands (complete commands)
quoted_patterns = [
r"`pip install\s+([^`]+)`", # backticks
r'"pip install\s+([^"]+)"', # double quotes
r"'pip install\s+([^']+)'", # single quotes
]

for pattern in quoted_patterns:
match = re.search(pattern, message, re.IGNORECASE)
for pattern in _quoted_patterns:
match = pattern.search(message)
if match:
args_part = match.group(1)
args = args_part.split()
Expand All @@ -62,17 +71,12 @@ def extract_packages_from_pip_install_suggestion(
return packages

# Look for pip install with quoted individual packages
individual_quoted_pattern = r'pip install\s+"([^"]+)"'
match = re.search(individual_quoted_pattern, message, re.IGNORECASE)
match = _individual_quoted_pattern.search(message)
if match:
return [match.group(1)]

# If no quoted command found, look for unquoted and take only first positional arg
unquoted_pattern = (
r"pip install\s+([a-zA-Z0-9_.-]+(?:\[[a-zA-Z0-9_,.-]+\])?)"
)

match = re.search(unquoted_pattern, message, re.IGNORECASE)
match = _unquoted_pattern.search(message)

if match:
return [match.group(1)]
Expand Down