Unverified Commit 639ccf25 authored Dec 04, 2023 by illtellyoulater Committed by GitHub Dec 04, 2023

Update launch_utils.py to fix wrong dep. checks and reinstalls

Fixes failing dependency checks for extensions having a different package name and import name (for example ffmpeg-python / ffmpeg), which currently is causing the unneeded reinstall of packages at runtime.

In fact with current code, the same string is used when installing a package and when checking for its presence, as you can see in the following example:

> launch_utils.run_pip("install ffmpeg-python", "required package")
[ Installing required package: "ffmpeg-python" ... ]
[ Installed ]

> launch_utils.is_installed("ffmpeg-python")
False

... which would actually return true with:

> launch_utils.is_installed("ffmpeg")
True

parent 4afaaf8a

modules/launch_utils.py

+10 −4

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ import os
		import shutil
		import sys
		import importlib.util
		import importlib.metadata
		import platform
		import json
		from functools import lru_cache
		@@ -118,6 +119,9 @@ def run(command, desc=None, errdesc=None, custom_env=None, live: bool = default_


		def is_installed(package):
		try:
		dist = importlib.metadata.distribution(package)
		except importlib.metadata.PackageNotFoundError:
		try:
		spec = importlib.util.find_spec(package)
		except ModuleNotFoundError:
		@@ -125,6 +129,8 @@ def is_installed(package):

		return spec is not None

		return dist is not None


		def repo_dir(name):
		return os.path.join(script_path, dir_repos, name)

Admin message