Skip to content

⚡️ Speed up function get_chrome_version by 1,671% #414

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 get_chrome_version by 1,671% #414

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
90 changes: 57 additions & 33 deletions marimo/_utils/health.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,24 @@ def _get_versions(

def get_chrome_version() -> Optional[str]:
def get_chrome_version_windows() -> Optional[str]:
process = subprocess.Popen(
[
"reg",
"query",
"HKEY_CURRENT_USER\\Software\\Google\\Chrome\\BLBeacon",
"/v",
"version",
],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
stdout, stderr = communicate_with_timeout(process)
# Pre-create args list for efficiency/readability
args = [
"reg",
"query",
"HKEY_CURRENT_USER\\Software\\Google\\Chrome\\BLBeacon",
"/v",
"version",
]
try:
process = subprocess.Popen(
args,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
stdout, stderr = communicate_with_timeout(process)
except Exception:
return None
if stderr:
return None
parts = stdout.strip().split()
Expand All @@ -118,16 +123,20 @@ def get_chrome_version_windows() -> Optional[str]:
return None

def get_chrome_version_mac() -> Optional[str]:
process = subprocess.Popen(
[
"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
"--version",
],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
stdout, stderr = communicate_with_timeout(process)
args = [
"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
"--version",
]
try:
process = subprocess.Popen(
args,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
stdout, stderr = communicate_with_timeout(process)
except Exception:
return None
if stderr:
return None
parts = stdout.strip().split()
Expand All @@ -136,13 +145,17 @@ def get_chrome_version_mac() -> Optional[str]:
return None

def get_chrome_version_linux() -> Optional[str]:
process = subprocess.Popen(
["google-chrome", "--version"],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
stdout, stderr = communicate_with_timeout(process)
args = ["google-chrome", "--version"]
try:
process = subprocess.Popen(
args,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
stdout, stderr = communicate_with_timeout(process)
except Exception:
return None
if stderr:
return None
parts = stdout.strip().split()
Expand All @@ -151,11 +164,13 @@ def get_chrome_version_linux() -> Optional[str]:
return None

try:
if sys.platform.startswith("win32"):
plat = sys.platform
# Use equality for win32 as 'win32' is the only value on Windows
if plat == "win32":
return get_chrome_version_windows()
elif sys.platform.startswith("darwin"):
elif plat == "darwin":
return get_chrome_version_mac()
elif sys.platform.startswith("linux"):
elif plat.startswith("linux"):
return get_chrome_version_linux()
else:
return None
Expand All @@ -178,3 +193,12 @@ def communicate_with_timeout(
except subprocess.TimeoutExpired:
process.kill()
return "", "Error: Process timed out"


def communicate_with_timeout(process: subprocess.Popen) -> tuple[str, str]:
try:
stdout, stderr = process.communicate(timeout=TIMEOUT)
except subprocess.TimeoutExpired:
process.kill()
stdout, stderr = process.communicate()
return stdout, stderr