TBNilles/ComfyUI-Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Merge branch 'main' of https://github.com/daxcay/ComfyUI-Manager""

Browse Source 
This reverts commit 89ed96f83f.
This commit is contained in:
akr1999
2024-03-22 16:50:09 +05:30
parent 89ed96f83f
commit ddaea9fc99
13 changed files with 3881 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
prestartup_script.py
View File

@@ -15,6 +15,9 @@ sys.path.append(glob_path)
import cm_global
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
def skip_pip_spam(x):
return 'Requirement already satisfied:' in x
@@ -170,11 +173,9 @@ try:
write_stderr = wrapper_stderr
pat_tqdm = r'\d+%.*\[(.*?)\]'
pat_import_fail = r'seconds \(IMPORT FAILED\):'
pat_custom_node = r'[/\\]custom_nodes[/\\](.*)$'
pat_import_fail = r'seconds \(IMPORT FAILED\):.*[/\\]custom_nodes[/\\](.*)$'
is_start_mode = True
is_import_fail_mode = False
class ComfyUIManagerLogger:
def __init__(self, is_stdout):
@@ -194,26 +195,17 @@ try:
def write(self, message):
global is_start_mode
global is_import_fail_mode
if any(f(message) for f in message_collapses):
return
if is_start_mode:
if is_import_fail_mode:
match = re.search(pat_custom_node, message)
if match:
import_failed_extensions.add(match.group(1))
is_import_fail_mode = False
else:
match = re.search(pat_import_fail, message)
if match:
is_import_fail_mode = True
else:
is_import_fail_mode = False
match = re.search(pat_import_fail, message)
if match:
import_failed_extensions.add(match.group(1))
if 'Starting server' in message:
is_start_mode = False
if 'Starting server' in message:
is_start_mode = False
if not self.is_stdout:
match = re.search(pat_tqdm, message)
@@ -350,7 +342,12 @@ def is_installed(name):
if match:
name = match.group(1)
if name in cm_global.pip_downgrade_blacklist:
if match is None or match.group(2) in ['<=', '==', '<']:
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
return True
return name.lower() in get_installed_packages()