alphard/efficiency-nodes-comfyui
1
0
Fork 0
mirror of https://github.com/jags111/efficiency-nodes-comfyui.git synced 2026-03-21 21:22:13 -03:00
Code Issues Packages Projects Releases Wiki Activity

Implement fallback for pip installations

Browse Source 
This commit introduces a fallback mechanism for the package installation process. 

- If the `python_embedded` directory is not found, the installation defaults to the current Python environment.
- This ensures that packages are installed successfully regardless of the setup, enhancing compatibility across different machines.
This commit is contained in:
TSC
2023-08-08 00:07:47 -05:00
committed by GitHub
parent b2a1851950
commit d342e7228c
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tsc_utils.py
View File

@@ -470,22 +470,31 @@ def install_packages(my_dir):
target_dir = os.path.abspath(os.path.join(my_dir, '..', '..', '..', 'python_embeded', 'Lib', 'site-packages')) target_dir = os.path.abspath(os.path.join(my_dir, '..', '..', '..', 'python_embeded', 'Lib', 'site-packages'))
embedded_python_exe = os.path.abspath(os.path.join(my_dir, '..', '..', '..', 'python_embeded', 'python.exe')) embedded_python_exe = os.path.abspath(os.path.join(my_dir, '..', '..', '..', 'python_embeded', 'python.exe'))
# If embedded_python_exe exists, target the installations. Otherwise, go untargeted.
use_embedded = os.path.exists(embedded_python_exe)
# Load packages from requirements.txt # Load packages from requirements.txt
with open(os.path.join(my_dir, 'requirements.txt'), 'r') as f: with open(os.path.join(my_dir, 'requirements.txt'), 'r') as f:
required_packages = [line.strip() for line in f if line.strip()] required_packages = [line.strip() for line in f if line.strip()]
installed_packages = packages(embedded_python_exe, versions=False) installed_packages = packages(embedded_python_exe if use_embedded else None, versions=False)
for pkg in required_packages: for pkg in required_packages:
if pkg not in installed_packages: if pkg not in installed_packages:
print(f"\033[32mEfficiency Nodes:\033[0m Installing required package '{pkg}'...", end='', flush=True) print(f"\033[32mEfficiency Nodes:\033[0m Installing required package '{pkg}'...", end='', flush=True)
subprocess.check_call(['pip', 'install', pkg, '--target=' + target_dir, '--no-warn-script-location', if use_embedded: # Targeted installation
'--disable-pip-version-check'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) subprocess.check_call(['pip', 'install', pkg, '--target=' + target_dir, '--no-warn-script-location',
'--disable-pip-version-check'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
else: # Untargeted installation
subprocess.check_call(['pip', 'install', pkg], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
print(f"\r\033[32mEfficiency Nodes:\033[0m Installing required package '{pkg}'... Installed!", flush=True) print(f"\r\033[32mEfficiency Nodes:\033[0m Installing required package '{pkg}'... Installed!", flush=True)
def packages(python_exe, versions=False): def packages(python_exe=None, versions=False):
# Get packages of the embedded Python environment # Get packages of the active or embedded Python environment
return [(r.decode().split('==')[0] if not versions else r.decode()) for r in if python_exe:
subprocess.check_output([python_exe, '-m', 'pip', 'freeze']).split()] return [(r.decode().split('==')[0] if not versions else r.decode()) for r in
subprocess.check_output([python_exe, '-m', 'pip', 'freeze']).split()]
else:
return [(r.split('==')[0] if not versions else r) for r in subprocess.getoutput('pip freeze').splitlines()]
# Install missing packages # Install missing packages
install_packages(my_dir) install_packages(my_dir)