Compare commits

...

3 Commits

Author SHA1 Message Date
Dr.Lt.Data
3de17b2fa6 improve: pip fixer - support missing comfyui_frontend_package fixing 2025-03-05 12:55:39 +09:00
Dr.Lt.Data
22ecb5de95 update db 2025-03-05 08:15:03 +09:00
Dr.Lt.Data
992b8b3cb5 update DB 2025-03-04 22:24:05 +09:00
7 changed files with 2449 additions and 2421 deletions

View File

@@ -647,7 +647,7 @@ def install(
cmd_ctx.set_channel_mode(channel, mode)
cmd_ctx.set_no_deps(no_deps)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
for_each_nodes(nodes, act=install_node)
pip_fixer.fix_broken()
@@ -685,7 +685,7 @@ def reinstall(
cmd_ctx.set_channel_mode(channel, mode)
cmd_ctx.set_no_deps(no_deps)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
for_each_nodes(nodes, act=reinstall_node)
pip_fixer.fix_broken()
@@ -739,7 +739,7 @@ def update(
if 'all' in nodes:
asyncio.run(auto_save_snapshot())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
for x in nodes:
if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -840,7 +840,7 @@ def fix(
if 'all' in nodes:
asyncio.run(auto_save_snapshot())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
for_each_nodes(nodes, fix_node, allow_all=True)
pip_fixer.fix_broken()
@@ -1119,7 +1119,7 @@ def restore_snapshot(
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
exit(1)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
try:
asyncio.run(core.restore_snapshot(snapshot_path, extras))
except Exception:
@@ -1151,7 +1151,7 @@ def restore_dependencies(
total = len(node_paths)
i = 1
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
for x in node_paths:
print("----------------------------------------------------------------------------------------------------")
print(f"Restoring [{i}/{total}]: {x}")
@@ -1170,7 +1170,7 @@ def post_install(
):
path = os.path.expanduser(path)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
unified_manager.execute_install_script('', path, instant_execution=True)
pip_fixer.fix_broken()
@@ -1215,7 +1215,7 @@ def install_deps(
exit(1)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
for k in json_obj['custom_nodes'].keys():
state = core.simple_check_custom_node(k)
if state == 'installed':

View File

File diff suppressed because it is too large Load Diff

View File

@@ -42,7 +42,7 @@ import manager_downloader
from node_package import InstalledNodePackage
version_code = [3, 27, 11]
version_code = [3, 28]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -828,7 +828,7 @@ class UnifiedManager:
else:
if os.path.exists(requirements_path) and not no_deps:
print("Install: pip packages")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
res = True
lines = manager_util.robust_readlines(requirements_path)
for line in lines:
@@ -1883,7 +1883,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
else:
if os.path.exists(requirements_path) and not no_deps:
print("Install: pip packages")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
with open(requirements_path, "r") as requirements_file:
for line in requirements_file:
#handle comments

View File

@@ -276,8 +276,9 @@ torch_torchvision_torchaudio_version_map = {
class PIPFixer:
def __init__(self, prev_pip_versions):
def __init__(self, prev_pip_versions, comfyui_path):
self.prev_pip_versions = { **prev_pip_versions }
self.comfyui_path = comfyui_path
def torch_rollback(self):
spec = self.prev_pip_versions['torch'].split('+')
@@ -376,6 +377,22 @@ class PIPFixer:
logging.error("[ComfyUI-Manager] Failed to restore numpy")
logging.error(e)
# fix missing frontend
try:
front = new_pip_versions.get('comfyui_frontend_package')
if front is None:
requirements_path = os.path.join(self.comfyui_path, 'requirements.txt')
with open(requirements_path, 'r') as file:
lines = file.readlines()
front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
cmd = make_pip_cmd(['install', front_line])
subprocess.check_output(cmd , universal_newlines=True)
except Exception as e:
logging.error("[ComfyUI-Manager] Failed to restore comfyui_frontend_package")
logging.error(e)
def sanitize(data):
return data.replace("<", "&lt;").replace(">", "&gt;")

View File

@@ -2867,13 +2867,14 @@
},
{
"author": "chrisdreid",
"title": "ComfyUI_EnvAutopsyAPI [UNSAFE]",
"title": "ComfyUI_EnvAutopsyAPI Debugger [UNSAFE]",
"id": "chrisdreid",
"reference": "https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI",
"files": [
"https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI"
],
"install_type": "git-clone",
"description": "ComfyUI_EnvAutopsyAPI is a powerful debugging tool designed for ComfyUI that provides in-depth analysis of your environment and dependencies through an API interface. This tool allows you to inspect environment variables, pip packages, and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server. MUST READ [a/THIS](https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI#%EF%B8%8F-warning-security-risk-%EF%B8%8F) before install.]"
"description": "A powerful debugging tool designed to provide in-depth analysis of your environment and dependencies by exposing API endpoints. This tool allows you to inspect environment variables, pip packages, python info and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server]"
},
{
"author": "Futureversecom",

View File

@@ -507,7 +507,7 @@ check_bypass_ssl()
# Perform install
processed_install = set()
script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
def is_installed(name):

View File

@@ -1,7 +1,7 @@
[project]
name = "comfyui-manager"
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.27.11"
version = "3.28"
license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]