Compare commits

..

2 Commits

Author SHA1 Message Date
Dr.Lt.Data
338d7abfa8 more detailed message 2025-03-03 01:04:39 +09:00
Dr.Lt.Data
f8e5f5bcbb print dbg message 2025-02-14 07:36:02 +09:00
34 changed files with 4993 additions and 8345 deletions

View File

@@ -149,7 +149,6 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
@@ -302,10 +301,7 @@ The following settings are applied based on the section marked as `is_default`.
* Custom pip mapping
* When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
* Please refer to the `pip_overrides.json.template` file.
* Prevent the installation of specific pip packages
* List the package names one per line in the `pip_blacklist.list` file.
* Use `aria2` as downloader
* [howto](docs/en/use_aria2.md)
@@ -313,29 +309,6 @@ The following settings are applied based on the section marked as `is_default`.
* This option can be used if performance issues occur in a Colab+GDrive environment.
## Environment Variables
The following features can be configured using environment variables:
* **COMFYUI_PATH**: The installation path of ComfyUI
* **GITHUB_ENDPOINT**: Reverse proxy configuration for environments with limited access to GitHub
* **HF_ENDPOINT**: Reverse proxy configuration for environments with limited access to Hugging Face
### Example 1:
Redirecting `https://github.com/ltdrdata/ComfyUI-Impact-Pack` to `https://mirror.ghproxy.com/https://github.com/ltdrdata/ComfyUI-Impact-Pack`
```
GITHUB_ENDPOINT=https://mirror.ghproxy.com/https://github.com
```
#### Example 2:
Changing `https://huggingface.co/path/to/somewhere` to `https://some-hf-mirror.com/path/to/somewhere`
```
HF_ENDPOINT=https://some-hf-mirror.com
```
## Scanner
When you run the `scan.sh` script:

View File

@@ -3,6 +3,8 @@ import sys
cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
print("[DBG] point14")
if not os.path.exists(cli_mode_flag):
sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
import manager_server # noqa: F401

View File

@@ -32,7 +32,6 @@ if comfy_path is None:
print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
# This should be placed here
sys.path.append(comfy_path)
import utils.extra_config
@@ -43,7 +42,7 @@ import cnr_utils
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
cm_global.pip_overrides = {'numpy': 'numpy<2'}
@@ -52,14 +51,6 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides
cm_global.pip_overrides = json.load(json_file)
if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list")):
with open(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list"), 'r', encoding="UTF-8", errors="ignore") as f:
for x in f.readlines():
y = x.strip()
if y != '':
cm_global.pip_blacklist.add(y)
def check_comfyui_hash():
repo = git.Repo(comfy_path)
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
@@ -76,7 +67,7 @@ core.check_invalid_nodes()
def read_downgrade_blacklist():
try:
import configparser
config = configparser.ConfigParser(strict=False)
config = configparser.ConfigParser()
config.read(core.manager_config.path)
default_conf = config['default']
@@ -145,18 +136,6 @@ class Ctx:
cm_global.pip_overrides = json.load(json_file)
cm_global.pip_overrides = {'numpy': 'numpy<2'}
if os.path.exists(core.manager_pip_blacklist_path):
with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
for x in f.readlines():
y = x.strip()
if y != '':
cm_global.pip_blacklist.add(y)
def update_custom_nodes_dir(self, target_dir):
import folder_paths
a, b = folder_paths.folder_names_and_paths['custom_nodes']
folder_paths.folder_names_and_paths['custom_nodes'] = [os.path.abspath(target_dir)], set()
@staticmethod
def get_startup_scripts_path():
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
@@ -1042,17 +1021,7 @@ def save_snapshot(
] = True,
):
cmd_ctx.set_user_directory(user_directory)
if(not output.endswith('.json') and not output.endswith('.yaml')):
print("ERROR: output path should be either '.json' or '.yaml' file.")
raise typer.Exit(code=1)
dir_path = os.path.dirname(output)
if(dir_path != '' and not os.path.exists(dir_path)):
print(f"ERROR: {output} path not exists.")
raise typer.Exit(code=1)
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
path = core.save_snapshot_with_postfix('snapshot', output, not full_snapshot)
print(f"Current snapshot is saved as `{path}`")
@@ -1080,17 +1049,10 @@ def restore_snapshot(
user_directory: str = typer.Option(
None,
help="user directory"
),
restore_to: Optional[str] = typer.Option(
None,
help="Manually specify the installation path for the custom node. Ignore user directory."
)
):
cmd_ctx.set_user_directory(user_directory)
if restore_to:
cmd_ctx.update_custom_nodes_dir(restore_to)
extras = []
if pip_non_url:
extras.append('--pip-non-url')

View File

File diff suppressed because it is too large Load Diff

View File

@@ -121,9 +121,8 @@ ComfyUI-Loopchain
* If no file exists at the snapshot path, it is implicitly assumed to be in ComfyUI-Manager/snapshots.
* `--pip-non-url`: Restore for pip packages registered on PyPI.
* `--pip-non-local-url`: Restore for pip packages registered at web URLs.
* `--pip-local-url`: Restore for pip packages specified by local paths.
* `--user-directory`: Set the user directory.
* `--restore-to`: The path where the restored custom nodes will be installed. (When this option is applied, only the custom nodes installed in the target path are recognized as installed.)
* `--pip-local-url`: Restore for pip packages specified by local paths.
### 5. CLI Only Mode

View File

@@ -123,8 +123,7 @@ ComfyUI-Loopchain
* `--pip-non-url`: PyPI 에 등록된 pip 패키지들에 대해서 복구를 수행
* `--pip-non-local-url`: web URL에 등록된 pip 패키지들에 대해서 복구를 수행
* `--pip-local-url`: local 경로를 지정하고 있는 pip 패키지들에 대해서 복구를 수행
* `--user-directory`: 사용자 디렉토리 설정
* `--restore-to`: 복구될 커스텀 노드가 설치될 경로. (이 옵션을 적용할 경우 오직 대상 경로에 설치된 custom nodes 만 설치된 것으로 인식함.)
### 5. CLI only mode

View File

File diff suppressed because it is too large Load Diff

View File

@@ -154,27 +154,14 @@ def switch_to_default_branch(repo):
repo.git.checkout(default_branch)
return True
except:
# try checkout master
# try checkout main if failed
try:
repo.git.checkout(repo.heads.master)
return True
except:
try:
if remote_name is not None:
repo.git.checkout('-b', 'master', f'{remote_name}/master')
return True
except:
try:
repo.git.checkout(repo.heads.main)
return True
except:
try:
if remote_name is not None:
repo.git.checkout('-b', 'main', f'{remote_name}/main')
return True
except:
pass
pass
print("[ComfyUI Manager] Failed to switch to the default branch")
return False

View File

File diff suppressed because it is too large Load Diff

View File

@@ -173,10 +173,7 @@ def read_cnr_info(fullpath):
project = data.get('project', {})
name = project.get('name').strip().lower()
# normalize version
# for example: 2.5 -> 2.5.0
version = str(manager_util.StrictVersion(project.get('version')))
version = project.get('version')
urls = project.get('urls', {})
repository = urls.get('Repository')

View File

@@ -2,9 +2,6 @@ import os
import configparser
GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
def is_git_repo(path: str) -> bool:
""" Check if the path is a git repository. """
# NOTE: Checking it through `git.Repo` must be avoided.
@@ -40,8 +37,7 @@ def git_url(fullpath):
if not os.path.exists(git_config_path):
return None
# Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
config = configparser.ConfigParser(strict=False)
config = configparser.ConfigParser()
config.read(git_config_path)
for k, v in config.items():
@@ -50,36 +46,16 @@ def git_url(fullpath):
return None
def normalize_url(url) -> str:
github_id = normalize_to_github_id(url)
if github_id is not None:
url = f"https://github.com/{github_id}"
url = url.replace("git@github.com:", "https://github.com/")
if url.endswith('.git'):
url = url[:-4]
return url
def normalize_url_http(url) -> str:
url = url.replace("https://github.com/", "git@github.com:")
if url.endswith('.git'):
url = url[:-4]
def normalize_to_github_id(url) -> str:
if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
author = os.path.basename(os.path.dirname(url))
if author.startswith('git@github.com:'):
author = author.split(':')[1]
repo_name = os.path.basename(url)
if repo_name.endswith('.git'):
repo_name = repo_name[:-4]
return f"{author}/{repo_name}"
return None
def get_url_for_clone(url):
url = normalize_url(url)
if GITHUB_ENDPOINT is not None and url.startswith('https://github.com/'):
url = GITHUB_ENDPOINT + url[18:] # url[18:] -> remove `https://github.com`
return url
return url

View File

@@ -42,7 +42,7 @@ import manager_downloader
from node_package import InstalledNodePackage
version_code = [3, 27, 2]
version_code = [3, 21]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -177,7 +177,6 @@ manager_channel_list_path = None
manager_startup_script_path:str = None
manager_snapshot_path = None
manager_pip_overrides_path = None
manager_pip_blacklist_path = None
manager_components_path = None
def update_user_directory(user_dir):
@@ -187,7 +186,6 @@ def update_user_directory(user_dir):
global manager_startup_script_path
global manager_snapshot_path
global manager_pip_overrides_path
global manager_pip_blacklist_path
global manager_components_path
manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
@@ -205,7 +203,6 @@ def update_user_directory(user_dir):
manager_config_path = os.path.join(manager_files_path, 'config.ini')
manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
manager_components_path = os.path.join(manager_files_path, "components")
manager_util.cache_dir = os.path.join(manager_files_path, "cache")
@@ -348,7 +345,6 @@ class ManagedResult:
self.msg = None
self.target = None
self.postinstall = lambda: True
self.ver = None
def append(self, item):
self.items.append(item)
@@ -370,10 +366,6 @@ class ManagedResult:
self.postinstall = postinstall
return self
def with_ver(self, ver):
self.ver = ver
return self
class UnifiedManager:
def __init__(self):
@@ -505,8 +497,6 @@ class UnifiedManager:
def resolve_from_path(self, fullpath):
url = git_utils.git_url(fullpath)
if url:
url = git_utils.normalize_url(url)
cnr = self.get_cnr_by_repo(url)
commit_hash = git_utils.get_commit_hash(fullpath)
if cnr:
@@ -523,10 +513,7 @@ class UnifiedManager:
if info:
cnr = self.cnr_map.get(info['id'])
if cnr:
# normalize version
# for example: 2.5 -> 2.5.0
ver = str(manager_util.StrictVersion(info['version']))
return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']}
else:
return None
else:
@@ -538,8 +525,6 @@ class UnifiedManager:
if node_package.is_disabled and node_package.is_unknown:
url = git_utils.git_url(node_package.fullpath)
if url is not None:
url = git_utils.normalize_url(url)
self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
if node_package.is_disabled and node_package.is_nightly:
@@ -550,8 +535,6 @@ class UnifiedManager:
if node_package.is_enabled and node_package.is_unknown:
url = git_utils.git_url(node_package.fullpath)
if url is not None:
url = git_utils.normalize_url(url)
self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
if node_package.is_from_cnr and node_package.is_disabled:
@@ -803,7 +786,6 @@ class UnifiedManager:
node_id = v['id']
else:
node_id = v['files'][0].split('/')[-1]
v['repository'] = v['files'][0]
res[node_id] = v
elif len(v['files']) > 1:
res[v['files'][0]] = v # A custom node composed of multiple url is treated as a single repository with one representative path
@@ -830,14 +812,14 @@ class UnifiedManager:
print("Install: pip packages")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
res = True
lines = manager_util.robust_readlines(requirements_path)
for line in lines:
package_name = remap_pip_package(line.strip())
if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
self.processed_install.add(package_name)
install_cmd = manager_util.make_pip_cmd(["install", package_name])
if package_name.strip() != "" and not package_name.startswith('#'):
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
with open(requirements_path, "r") as requirements_file:
for line in requirements_file:
package_name = remap_pip_package(line.strip())
if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
self.processed_install.add(package_name)
install_cmd = manager_util.make_pip_cmd(["install", package_name])
if package_name.strip() != "" and not package_name.startswith('#'):
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
pip_fixer.fix_broken()
return res
@@ -997,7 +979,7 @@ class UnifiedManager:
return result
def unified_enable(self, node_id: str, version_spec=None):
def unified_enable(self, node_id, version_spec=None):
"""
priority if version_spec == None
1. CNR latest in disk
@@ -1009,9 +991,6 @@ class UnifiedManager:
result = ManagedResult('enable')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: enabling '{node_id}'")
if version_spec is None:
version_spec = self.resolve_unspecified_version(node_id, guess_mode='inactive')
if version is None:
@@ -1066,8 +1045,8 @@ class UnifiedManager:
# update cache
if version_spec == 'unknown':
self.unknown_active_nodes[node_id] = self.unknown_inactive_nodes[node_id][0], to_path
del self.unknown_inactive_nodes[node_id]
self.unknown_active_nodes[node_id] = to_path
return result.with_target(to_path)
elif version_spec == 'nightly':
del self.nightly_inactive_nodes[node_id]
@@ -1077,12 +1056,9 @@ class UnifiedManager:
self.active_nodes[node_id] = version_spec, to_path
return result.with_target(to_path)
def unified_disable(self, node_id: str, is_unknown):
def unified_disable(self, node_id, is_unknown):
result = ManagedResult('disable')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: disabling '{node_id}'")
if is_unknown:
version_spec = 'unknown'
else:
@@ -1138,9 +1114,6 @@ class UnifiedManager:
"""
result = ManagedResult('uninstall')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: uninstalling '{node_id}'")
if is_unknown:
# remove from actives
repo_and_path = self.unknown_active_nodes.get(node_id)
@@ -1197,12 +1170,9 @@ class UnifiedManager:
return result
def cnr_install(self, node_id: str, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
def cnr_install(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
result = ManagedResult('install-cnr')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: installing '{node_id}'")
node_info = cnr_utils.install_node(node_id, version_spec)
if node_info is None or not node_info.download_url:
return result.fail(f'not available node: {node_id}@{version_spec}')
@@ -1247,29 +1217,25 @@ class UnifiedManager:
return result
def repo_install(self, url: str, repo_path: str, instant_execution=False, no_deps=False, return_postinstall=False):
def repo_install(self, url, repo_path, instant_execution=False, no_deps=False, return_postinstall=False):
result = ManagedResult('install-git')
result.append(url)
if 'comfyui-manager' in url.lower():
return result.fail(f"ignored: installing '{url}'")
if not is_valid_url(url):
return result.fail(f"Invalid git url: {url}")
if url.endswith("/"):
url = url[:-1]
try:
# Clone the repository from the remote URL
clone_url = git_utils.get_url_for_clone(url)
print(f"Download: git clone '{clone_url}'")
print(f"Download: git clone '{url}'")
# Clone the repository from the remote URL
if not instant_execution and platform.system() == 'Windows':
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
if res != 0:
return result.fail(f"Failed to clone repo: {clone_url}")
return result.fail(f"Failed to clone repo: {url}")
else:
repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
repo.git.clear_cache()
repo.close()
@@ -1283,8 +1249,7 @@ class UnifiedManager:
return result.fail(f"Failed to execute install script: {url}")
except Exception as e:
traceback.print_exc()
return result.fail(f"Install(git-clone) error[2]: {url} / {e}")
return result.fail(f"Install(git-clone) error: {url} / {e}")
print("Installation was successful.")
return result
@@ -1365,16 +1330,16 @@ class UnifiedManager:
version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
if version_spec is None:
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}').with_ver(version_spec)
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}')
if version_spec == 'nightly':
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly').with_ver('nightly')
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly')
elif version_spec == 'unknown':
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown').with_ver('unknown')
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown')
else:
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
async def install_by_id(self, node_id: str, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
"""
priority if version_spec == None
1. CNR latest
@@ -1383,9 +1348,6 @@ class UnifiedManager:
remark: latest version_spec is not allowed. Must be resolved before call.
"""
if 'comfyui-manager' in node_id.lower():
return ManagedResult('skip').fail(f"ignored: installing '{node_id}'")
repo_url = None
if version_spec is None:
if self.is_enabled(node_id):
@@ -1423,7 +1385,7 @@ class UnifiedManager:
res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
if res.result:
if version_spec == 'unknown':
self.unknown_active_nodes[node_id] = repo_url, to_path
self.unknown_active_nodes[node_id] = to_path
elif version_spec == 'nightly':
cnr_utils.generate_cnr_id(to_path, node_id)
self.active_nodes[node_id] = 'nightly', to_path
@@ -1490,7 +1452,7 @@ def identify_node_pack_from_path(fullpath):
# cnr
cnr = cnr_utils.read_cnr_info(fullpath)
if cnr is not None:
return module_name, cnr['version'], cnr['id'], None
return module_name, cnr['version'], cnr['id']
return None
else:
@@ -1498,18 +1460,10 @@ def identify_node_pack_from_path(fullpath):
cnr_id = cnr_utils.read_cnr_id(fullpath)
commit_hash = git_utils.get_commit_hash(fullpath)
github_id = git_utils.normalize_to_github_id(repo_url)
if github_id is None:
try:
github_id = os.path.basename(repo_url)
except:
logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
github_id = module_name
if cnr_id is not None:
return module_name, commit_hash, cnr_id, github_id
return module_name, commit_hash, cnr_id
else:
return module_name, commit_hash, '', github_id
return module_name, commit_hash, ''
def get_installed_node_packs():
@@ -1527,7 +1481,7 @@ def get_installed_node_packs():
is_disabled = not y.endswith('.disabled')
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': is_disabled }
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': is_disabled }
disabled_dirs = os.path.join(x, '.disabled')
if os.path.exists(disabled_dirs):
@@ -1540,7 +1494,7 @@ def get_installed_node_packs():
if info is None:
continue
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': False }
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': False }
return res
@@ -1596,7 +1550,7 @@ manager_funcs = ManagerFuncs()
def write_config():
config = configparser.ConfigParser(strict=False)
config = configparser.ConfigParser()
config['default'] = {
'preview_method': manager_funcs.get_current_preview_method(),
@@ -1607,7 +1561,6 @@ def write_config():
'bypass_ssl': get_config()['bypass_ssl'],
"file_logging": get_config()['file_logging'],
'component_policy': get_config()['component_policy'],
'update_policy': get_config()['update_policy'],
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
'model_download_by_agent': get_config()['model_download_by_agent'],
'downgrade_blacklist': get_config()['downgrade_blacklist'],
@@ -1627,9 +1580,19 @@ def write_config():
def read_config():
try:
config = configparser.ConfigParser(strict=False)
config = configparser.ConfigParser()
config.read(manager_config_path)
default_conf = config['default']
# policy migration: disable_unsecure_features -> security_level
if 'disable_unsecure_features' in default_conf:
if default_conf['disable_unsecure_features'].lower() == 'true':
security_level = 'strong'
else:
security_level = 'normal'
else:
security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
def get_bool(key, default_value):
@@ -1637,26 +1600,26 @@ def read_config():
return {
'http_channel_enabled': get_bool('http_channel_enabled', False),
'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()),
'git_exe': default_conf.get('git_exe', ''),
'use_uv': get_bool('use_uv', False),
'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
'share_option': default_conf.get('share_option', 'all').lower(),
'share_option': default_conf.get('share_option', 'all'),
'bypass_ssl': get_bool('bypass_ssl', False),
'file_logging': get_bool('file_logging', True),
'component_policy': default_conf.get('component_policy', 'workflow').lower(),
'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
'component_policy': default_conf.get('component_policy', 'workflow'),
'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
'model_download_by_agent': get_bool('model_download_by_agent', False),
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
'downgrade_blacklist': default_conf.get('downgrade_blacklist', ''),
'skip_migration_check': get_bool('skip_migration_check', False),
'always_lazy_install': get_bool('always_lazy_install', False),
'network_mode': default_conf.get('network_mode', 'public').lower(),
'security_level': default_conf.get('security_level', 'normal').lower(),
'network_mode': default_conf.get('network_mode', 'public'),
'security_level': security_level,
}
except Exception:
traceback.print_exc()
manager_util.use_uv = False
return {
'http_channel_enabled': False,
@@ -1669,7 +1632,6 @@ def read_config():
'bypass_ssl': False,
'file_logging': True,
'component_policy': 'workflow',
'update_policy': 'stable-comfyui',
'windows_selector_event_loop_policy': False,
'model_download_by_agent': False,
'downgrade_blacklist': '',
@@ -1721,27 +1683,14 @@ def switch_to_default_branch(repo):
repo.git.checkout(default_branch)
return True
except:
# try checkout master
# try checkout main if failed
try:
repo.git.checkout(repo.heads.master)
return True
except:
try:
if remote_name is not None:
repo.git.checkout('-b', 'master', f'{remote_name}/master')
return True
except:
try:
repo.git.checkout(repo.heads.main)
return True
except:
try:
if remote_name is not None:
repo.git.checkout('-b', 'main', f'{remote_name}/main')
return True
except:
pass
pass
print("[ComfyUI Manager] Failed to switch to the default branch")
return False
@@ -1775,7 +1724,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
if platform.system() != "Windows":
try:
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
print("\n\n###################################################################")
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
@@ -2092,14 +2041,12 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
print(f"CLONE into '{repo_path}'")
# Clone the repository from the remote URL
clone_url = git_utils.get_url_for_clone(url)
if not instant_execution and platform.system() == 'Windows':
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
if res != 0:
return result.fail(f"Failed to clone '{clone_url}' into '{repo_path}'")
return result.fail(f"Failed to clone '{url}' into '{repo_path}'")
else:
repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
repo.git.clear_cache()
repo.close()
@@ -2109,8 +2056,8 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
except Exception as e:
traceback.print_exc()
print(f"Install(git-clone) error[1]: {url} / {e}", file=sys.stderr)
return result.fail(f"Install(git-clone)[1] error: {url} / {e}")
print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
return result.fail(f"Install(git-clone) error: {url} / {e}")
def git_pull(path):
@@ -2209,7 +2156,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
return False
except Exception as e:
print(f"Fix(git-clone) error: {url} / {e}", file=sys.stderr)
print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
return False
print(f"Attempt to fixing '{files}' is done.")
@@ -2393,32 +2340,6 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
return True
def update_to_stable_comfyui(repo_path):
try:
repo = git.Repo(repo_path)
repo.git.checkout(repo.heads.master)
versions, current_tag, _ = get_comfyui_versions(repo)
if len(versions) == 0 or (len(versions) == 1 and versions[0] == 'nightly'):
logging.info("[ComfyUI-Manager] Unable to update to the stable ComfyUI version.")
return "fail", None
if versions[0] == 'nightly':
latest_tag = versions[1]
else:
latest_tag = versions[0]
if current_tag == latest_tag:
return "skip", None
else:
logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
repo.git.checkout(latest_tag)
return 'updated', latest_tag
except:
traceback.print_exc()
return "fail", None
def update_path(repo_path, instant_execution=False, no_deps=False):
if not os.path.exists(os.path.join(repo_path, '.git')):
return "fail"
@@ -2426,12 +2347,9 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
# version check
repo = git.Repo(repo_path)
is_switched = False
if repo.head.is_detached:
if not switch_to_default_branch(repo):
return "fail"
else:
is_switched = True
current_branch = repo.active_branch
branch_name = current_branch.name
@@ -2470,8 +2388,6 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
git_pull(repo_path)
execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
return "updated"
elif is_switched:
return "updated"
else:
return "skipped"
@@ -2782,6 +2698,9 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
if ext == 'https://github.com/comfyanonymous/ComfyUI':
pass
elif ext is not None:
if 'Fooocus' in ext:
print(f">> {node_name}")
used_exts.add(ext)
else:
unknown_nodes.add(node_name)
@@ -3052,18 +2971,7 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
print("cm-cli: unexpected [0001]")
# for nightly restore
_git_info = info.get('git_custom_nodes')
git_info = {}
# normalize github repo
for k, v in _git_info.items():
# robust filter out comfyui-manager while restoring snapshot
if 'comfyui-manager' in k.lower():
continue
norm_k = git_utils.normalize_url(k)
git_info[norm_k] = v
git_info = info.get('git_custom_nodes')
if git_info is not None:
todo_disable = []
todo_enable = []
@@ -3076,13 +2984,20 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if v[0] == 'nightly' and cnr_repo_map.get(k):
repo_url = cnr_repo_map.get(k)
normalized_url = git_utils.normalize_url(repo_url)
if normalized_url not in git_info:
normalized_url1 = git_utils.normalize_url(repo_url)
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url1 not in git_info and normalized_url2 not in git_info:
todo_disable.append(k)
else:
commit_hash = git_info[normalized_url]['hash']
todo_checkout.append((v[1], commit_hash))
if normalized_url1 in git_info:
commit_hash = git_info[normalized_url1]['hash']
todo_checkout.append((v[1], commit_hash))
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_checkout.append((v[1], commit_hash))
for k, v in unified_manager.nightly_inactive_nodes.items():
if 'comfyui-manager' in k:
@@ -3090,12 +3005,18 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if cnr_repo_map.get(k):
repo_url = cnr_repo_map.get(k)
normalized_url = git_utils.normalize_url(repo_url)
normalized_url1 = git_utils.normalize_url(repo_url)
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url in git_info:
commit_hash = git_info[normalized_url]['hash']
if normalized_url1 in git_info:
commit_hash = git_info[normalized_url1]['hash']
todo_enable.append((k, commit_hash))
processed_urls.append(normalized_url)
processed_urls.append(normalized_url1)
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_enable.append((k, commit_hash))
processed_urls.append(normalized_url2)
for x in todo_disable:
unified_manager.unified_disable(x, False)
@@ -3148,14 +3069,21 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if repo_url is None:
continue
normalized_url = git_utils.normalize_url(repo_url)
normalized_url1 = git_utils.normalize_url(repo_url)
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url not in git_info:
if normalized_url1 not in git_info and normalized_url2 not in git_info:
todo_disable.append(k2)
else:
commit_hash = git_info[normalized_url]['hash']
todo_checkout.append((k2, commit_hash))
processed_urls.append(normalized_url)
if normalized_url1 in git_info:
commit_hash = git_info[normalized_url1]['hash']
todo_checkout.append((k2, commit_hash))
processed_urls.append(normalized_url1)
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_checkout.append((k2, commit_hash))
processed_urls.append(normalized_url2)
for k2, v2 in unified_manager.unknown_inactive_nodes.items():
repo_url = resolve_giturl_from_path(v2[1])
@@ -3163,12 +3091,18 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if repo_url is None:
continue
normalized_url = git_utils.normalize_url(repo_url)
normalized_url1 = git_utils.normalize_url(repo_url)
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url in git_info:
commit_hash = git_info[normalized_url]['hash']
if normalized_url1 in git_info:
commit_hash = git_info[normalized_url1]['hash']
todo_enable.append((k2, commit_hash))
processed_urls.append(normalized_url)
processed_urls.append(normalized_url1)
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_enable.append((k2, commit_hash))
processed_urls.append(normalized_url2)
for x in todo_disable:
unified_manager.unified_disable(x, True)
@@ -3254,26 +3188,17 @@ async def check_need_to_migrate():
need_to_migrate = True
def get_comfyui_versions(repo=None):
if repo is None:
repo = git.Repo(comfy_path)
try:
remote = get_remote_name(repo)
repo.remotes[remote].fetch()
except:
logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
def get_comfyui_versions():
repo = git.Repo(comfy_path)
versions = [x.name for x in repo.tags if x.name.startswith('v')]
versions.reverse() # nearest tag
# nearest tag
versions = sorted(versions, key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
versions = versions[:4]
current_tag = repo.git.describe('--tags')
if current_tag not in versions:
versions = sorted(versions + [current_tag], key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
versions = sorted(versions + [current_tag], reverse=True)
versions = versions[:4]
main_branch = repo.heads.master
@@ -3286,18 +3211,16 @@ def get_comfyui_versions(repo=None):
versions[0] = 'nightly'
current_tag = 'nightly'
return versions, current_tag, latest_tag
return versions, current_tag
def switch_comfyui(tag):
repo = git.Repo(comfy_path)
if tag == 'nightly':
repo.git.checkout('master')
tracking_branch = repo.active_branch.tracking_branch()
remote_name = tracking_branch.remote_name
repo.remotes[remote_name].pull()
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'master' version")
repo.git.checkout('main')
repo.remotes.origin.pull()
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'main' version")
else:
repo.git.checkout(tag)
print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")
@@ -3312,7 +3235,7 @@ def resolve_giturl_from_path(fullpath):
if not os.path.exists(git_config_path):
return "unknown"
config = configparser.ConfigParser(strict=False)
config = configparser.ConfigParser()
config.read(git_config_path)
for k, v in config.items():

View File

@@ -11,7 +11,6 @@ from tqdm.auto import tqdm
aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
HF_ENDPOINT = os.getenv('HF_ENDPOINT')
if aria2 is not None:
secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
url = urlparse(aria2)

View File

@@ -55,14 +55,8 @@ def handle_stream(stream, prefix):
from comfy.cli_args import args
import latent_preview
def is_loopback(address):
import ipaddress
try:
return ipaddress.ip_address(address).is_loopback
except ValueError:
return False
is_local_mode = is_loopback(args.listen)
is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
model_dir_name_map = {
@@ -91,11 +85,11 @@ def is_allowed_security_level(level):
return False
elif level == 'high':
if is_local_mode:
return core.get_config()['security_level'] in ['weak', 'normal-']
return core.get_config()['security_level'].lower() in ['weak', 'normal-']
else:
return core.get_config()['security_level'] == 'weak'
return core.get_config()['security_level'].lower() == 'weak'
elif level == 'middle':
return core.get_config()['security_level'] in ['weak', 'normal', 'normal-']
return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
else:
return True
@@ -187,8 +181,6 @@ set_preview_method(core.get_config()['preview_method'])
def set_component_policy(mode):
core.get_config()['component_policy'] = mode
def set_update_policy(mode):
core.get_config()['update_policy'] = mode
def print_comfyui_version():
global comfy_ui_hash
@@ -211,7 +203,7 @@ def print_comfyui_version():
comfyui_tag = core.get_comfyui_tag()
try:
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
except:
pass
@@ -418,65 +410,40 @@ async def task_worker():
traceback.print_exc()
return f"Installation failed:\n{node_spec_str}"
async def do_update(item):
async def do_update(item) -> str:
ui_id, node_name, node_ver = item
try:
res = core.unified_manager.unified_update(node_name, node_ver)
if res.ver == 'unknown':
url = core.unified_manager.unknown_active_nodes[node_name][0]
title = os.path.basename(url)
else:
url = core.unified_manager.cnr_map[node_name].get('repository')
title = core.unified_manager.cnr_map[node_name]['name']
manager_util.clear_pip_cache()
if url is not None:
base_res = {'url': url, 'title': title}
else:
base_res = {'title': title}
if res.result:
if res.action == 'skip':
base_res['msg'] = 'skip'
return base_res
return 'skip'
else:
base_res['msg'] = 'success'
return base_res
return 'success'
base_res['msg'] = f"An error occurred while updating '{node_name}'."
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
return base_res
except Exception:
traceback.print_exc()
return {'msg':f"An error occurred while updating '{node_name}'."}
return f"An error occurred while updating '{node_name}'."
async def do_update_comfyui(is_stable) -> str:
async def do_update_comfyui() -> str:
try:
repo_path = os.path.dirname(folder_paths.__file__)
latest_tag = None
if is_stable:
res, latest_tag = core.update_to_stable_comfyui(repo_path)
else:
res = core.update_path(repo_path)
res = core.update_path(repo_path)
if res == "fail":
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
return "The installed ComfyUI does not have a Git repository."
elif res == "updated":
if is_stable:
logging.info("ComfyUI is updated to latest stable version.")
return "success-stable-"+latest_tag
else:
logging.info("ComfyUI is updated to latest nightly version.")
return "success-nightly"
logging.info("ComfyUI is updated.")
return "success"
else: # skipped
logging.info("ComfyUI is up-to-date.")
return "skip"
except Exception:
traceback.print_exc()
@@ -608,7 +575,7 @@ async def task_worker():
elif kind == 'update-main':
msg = await do_update(item)
elif kind == 'update-comfyui':
msg = await do_update_comfyui(item[1])
msg = await do_update_comfyui()
elif kind == 'fix':
msg = await do_fix(item)
elif kind == 'uninstall':
@@ -632,11 +599,7 @@ async def task_worker():
nodepack_result[ui_id] = msg
ui_target = "main"
elif kind == 'update-comfyui':
nodepack_result['comfyui'] = msg
ui_target = "main"
elif kind == 'update':
nodepack_result[ui_id] = msg['msg']
ui_target = "nodepack_manager"
else:
nodepack_result[ui_id] = msg
ui_target = "nodepack_manager"
@@ -741,15 +704,6 @@ async def update_all(request):
update_item = k, k, v[0]
task_queue.put(("update-main", update_item))
for k, v in core.unified_manager.unknown_active_nodes.items():
if k == 'comfyui-manager':
# skip updating comfyui-manager if desktop version
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
continue
update_item = k, k, 'unknown'
task_queue.put(("update-main", update_item))
return web.Response(status=200)
@@ -1195,15 +1149,7 @@ async def install_custom_node(request):
git_url = None
if json_data['version'] != 'unknown':
selected_version = json_data.get('selected_version')
if skip_post_install:
if cnr_id in core.unified_manager.nightly_inactive_nodes or cnr_id in core.unified_manager.cnr_inactive_nodes:
core.unified_manager.unified_enable(cnr_id)
return web.Response(status=200)
elif selected_version is None:
selected_version = 'latest'
selected_version = json_data.get('selected_version', 'latest')
if selected_version != 'nightly':
risky_level = 'low'
node_spec_str = f"{cnr_id}@{selected_version}"
@@ -1356,15 +1302,14 @@ async def update_custom_node(request):
@routes.get("/manager/queue/update_comfyui")
async def update_comfyui(request):
is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
task_queue.put(("update-comfyui", ('comfyui', is_stable)))
task_queue.put(("update-comfyui", ('comfyui',)))
return web.Response(status=200)
@routes.get("/comfyui_manager/comfyui_versions")
async def comfyui_versions(request):
try:
res, current, latest = core.get_comfyui_versions()
res, current = core.get_comfyui_versions()
return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
except Exception as e:
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
@@ -1455,7 +1400,7 @@ async def preview_method(request):
return web.Response(status=200)
@routes.get("/manager/policy/component")
@routes.get("/manager/component/policy")
async def component_policy(request):
if "value" in request.rel_url.query:
set_component_policy(request.rel_url.query['value'])
@@ -1466,17 +1411,6 @@ async def component_policy(request):
return web.Response(status=200)
@routes.get("/manager/policy/update")
async def update_policy(request):
if "value" in request.rel_url.query:
set_update_policy(request.rel_url.query['value'])
core.write_config()
else:
return web.Response(text=core.get_config()['update_policy'], status=200)
return web.Response(status=200)
@routes.get("/manager/channel_url_list")
async def channel_url_list(request):
channels = core.get_channel_dict()
@@ -1532,11 +1466,7 @@ async def get_notice(request):
markdown_content = match.group(1)
version_tag = core.get_comfyui_tag()
if version_tag is None:
version_tag = os.environ.get('__COMFYUI_DESKTOP_VERSION__')
if version_tag is not None:
markdown_content += f"<HR>ComfyUI: {version_tag} [Desktop]"
else:
markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
else:
markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})")
@@ -1586,9 +1516,6 @@ def restart(self):
if sys.platform.startswith('win32'):
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
elif sys_argv[0].endswith("__main__.py"): # this is a python module
module_name = os.path.basename(os.path.dirname(sys_argv[0]))
cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
else:
cmds = [sys.executable] + sys_argv

View File

@@ -12,7 +12,6 @@ import subprocess
import sys
import re
import logging
import platform
cache_lock = threading.Lock()
@@ -22,16 +21,6 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also up
use_uv = False
def add_python_path_to_env():
if platform.system() != "Windows":
sep = ':'
else:
sep = ';'
os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
def make_pip_cmd(cmd):
if use_uv:
return [sys.executable, '-m', 'uv', 'pip'] + cmd
@@ -280,18 +269,27 @@ class PIPFixer:
self.prev_pip_versions = { **prev_pip_versions }
def torch_rollback(self):
print("[DBG] point(torch_rollback) 1")
spec = self.prev_pip_versions['torch'].split('+')
print("[DBG] point(torch_rollback) 2")
if len(spec) > 0:
platform = spec[1]
else:
print("[DBG] point(torch_rollback) 3")
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
subprocess.check_output(cmd, universal_newlines=True)
print("[DBG] point(torch_rollback) 4")
logging.error(cmd)
print("[DBG] point(torch_rollback) 5")
return
print("[DBG] point(torch_rollback) 6")
torch_ver = StrictVersion(spec[0])
print("[DBG] point(torch_rollback) 7")
torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
print("[DBG] point(torch_rollback) 8")
torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
print("[DBG] point(torch_rollback) 9")
if torch_torchvision_torchaudio_ver is None:
cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
@@ -303,46 +301,64 @@ class PIPFixer:
'--index-url', f"https://download.pytorch.org/whl/{platform}"])
logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
print("[DBG] point(torch_rollback) 10")
subprocess.check_output(cmd, universal_newlines=True)
print("[DBG] point(torch_rollback) 11")
def fix_broken(self):
print("[DBG] point9-1")
new_pip_versions = get_installed_packages(True)
print("[DBG] point9-2")
# remove `comfy` python package
try:
print("[DBG] point9-3")
if 'comfy' in new_pip_versions:
print("[DBG] point9-3-1")
cmd = make_pip_cmd(['uninstall', 'comfy'])
subprocess.check_output(cmd, universal_newlines=True)
logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
print("[DBG] point9-4")
except Exception as e:
print("[DBG] point9-5")
logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
logging.error(e)
# fix torch - reinstall torch packages if version is changed
print("[DBG] point9-6")
try:
print("[DBG] point9-7")
if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions:
print("[DBG] point9-8")
logging.error("[ComfyUI-Manager] PyTorch is not installed")
elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
print("[DBG] point9-9")
self.torch_rollback()
print("[DBG] point9-10")
except Exception as e:
print("[DBG] point9-11")
logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
logging.error(e)
# fix opencv
try:
print("[DBG] point9-12")
ocp = new_pip_versions.get('opencv-contrib-python')
ocph = new_pip_versions.get('opencv-contrib-python-headless')
op = new_pip_versions.get('opencv-python')
oph = new_pip_versions.get('opencv-python-headless')
print("[DBG] point9-13")
versions = [ocp, ocph, op, oph]
versions = [StrictVersion(x) for x in versions if x is not None]
versions.sort(reverse=True)
print("[DBG] point9-14")
if len(versions) > 0:
print("[DBG] point9-15")
# upgrade to maximum version
targets = []
cur = versions[0]
@@ -355,27 +371,40 @@ class PIPFixer:
if oph is not None and StrictVersion(oph) != cur:
targets.append('opencv-python-headless')
print("[DBG] point9-16")
if len(targets) > 0:
print("[DBG] point9-17")
for x in targets:
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
subprocess.check_output(cmd, universal_newlines=True)
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
print("[DBG] point9-18")
except Exception as e:
print("[DBG] point9-19")
logging.error("[ComfyUI-Manager] Failed to restore opencv")
logging.error(e)
print("[DBG] point9-20")
# fix numpy
try:
print("[DBG] point9-21")
np = new_pip_versions.get('numpy')
print("[DBG] point9-22")
if np is not None:
print("[DBG] point9-23")
if StrictVersion(np) >= StrictVersion('2'):
print("[DBG] point9-24")
cmd = make_pip_cmd(['install', "numpy<2"])
subprocess.check_output(cmd , universal_newlines=True)
print("[DBG] point9-25")
except Exception as e:
print("[DBG] point9-26")
logging.error("[ComfyUI-Manager] Failed to restore numpy")
logging.error(e)
print("[DBG] point9-28")
def sanitize(data):
return data.replace("<", "&lt;").replace(">", "&gt;")
@@ -384,23 +413,3 @@ def sanitize(data):
def sanitize_filename(input_string):
result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
return result_string
def robust_readlines(fullpath):
import chardet
try:
with open(fullpath, "r") as f:
return f.readlines()
except:
encoding = None
with open(fullpath, "rb") as f:
raw_data = f.read()
result = chardet.detect(raw_data)
encoding = result['encoding']
if encoding is not None:
with open(fullpath, "r", encoding=encoding) as f:
return f.readlines()
print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
return []

View File

@@ -21,8 +21,6 @@ import { CustomNodesManager } from "./custom-nodes-manager.js";
import { ModelManager } from "./model-manager.js";
import { SnapshotManager } from "./snapshot.js";
let manager_version = await getVersion();
var docStyle = document.createElement('style');
docStyle.innerHTML = `
.comfy-toast {
@@ -44,7 +42,7 @@ docStyle.innerHTML = `
#cm-manager-dialog {
width: 1000px;
height: 455px;
height: 450px;
box-sizing: content-box;
z-index: 1000;
overflow-y: auto;
@@ -141,7 +139,7 @@ docStyle.innerHTML = `
.cm-notice-board {
width: 290px;
height: 230px;
height: 210px;
overflow: auto;
color: var(--input-text);
border: 1px solid var(--descrip-text);
@@ -230,10 +228,9 @@ var switch_comfyui_button = null;
var fetch_updates_button = null;
var update_all_button = null;
var restart_stop_button = null;
var update_policy_combo = null;
let share_option = 'all';
var is_updating = false;
var is_updating_all = false;
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -480,8 +477,6 @@ async function updateComfyUI() {
const response = await api.fetchApi('/manager/queue/update_comfyui');
showTerminal();
is_updating = true;
await api.fetchApi('/manager/queue/start');
}
@@ -610,14 +605,8 @@ function showVersionSelectorDialog(versions, current, onSelect) {
}
async function switchComfyUI() {
switch_comfyui_button.disabled = true;
switch_comfyui_button.style.backgroundColor = "gray";
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
switch_comfyui_button.disabled = false;
switch_comfyui_button.style.backgroundColor = "";
if(res.status == 200) {
let obj = await res.json();
@@ -630,15 +619,6 @@ async function switchComfyUI() {
}
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
if(selected_version == 'nightly') {
update_policy_combo.value = 'nightly-comfyui';
api.fetchApi('/manager/policy/update?value=nightly-comfyui');
}
else {
update_policy_combo.value = 'stable-comfyui';
api.fetchApi('/manager/policy/update?value=stable-comfyui');
}
let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
if (response.status == 200) {
infoToast(`ComfyUI version is switched to ${selected_version}`);
@@ -714,72 +694,39 @@ async function onQueueStatus(event) {
else if(event.detail.status == 'done') {
reset_action_buttons();
if(!is_updating) {
if(!is_updating_all) {
return;
}
is_updating = false;
let success_list = [];
let failed_list = [];
let comfyui_state = null;
for(let k in event.detail.nodepack_result){
let v = event.detail.nodepack_result[k];
if(k == 'comfyui') {
comfyui_state = v;
continue;
}
if(v.msg == 'success') {
if(v == 'success')
success_list.push(k);
else if(v == 'skip') {
// do nothing
}
else if(v.msg != 'skip')
else
failed_list.push(k);
}
let msg = "";
if(success_list.length == 0 && !comfyui_state.startsWith('success')) {
if(success_list.length == 0) {
if(failed_list.length == 0) {
msg += "You are already up to date.";
msg += "All custom nodes are already up to date.";
}
}
else {
msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
if(comfyui_state == 'success-nightly') {
msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
infoToast("ComfyUI has been updated to the latest nightly version.");
}
else if(comfyui_state.startsWith('success-stable')) {
const ver = comfyui_state.split("-").pop();
msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
infoToast(`ComfyUI has been updated to ${ver}`);
}
else if(comfyui_state == 'skip') {
msg += "ComfyUI is already up to date.<BR><BR>"
}
else if(comfyui_state != null) {
msg += "Failed to update ComfyUI.<BR><BR>"
}
if(success_list.length > 0) {
msg += "The following custom nodes have been updated:<ul>";
for(let x in success_list) {
let k = success_list[x];
let url = event.detail.nodepack_result[k].url;
let title = event.detail.nodepack_result[k].title;
if(url) {
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
}
else {
msg += `<li>${k}</li>`;
}
}
msg += "</ul>";
msg += "The following custom nodes have been updated:<ul>";
for(let x in success_list) {
msg += '<li>'+success_list[x]+'</li>';
}
msg += "</ul>";
setNeedRestart(true);
}
@@ -787,15 +734,7 @@ async function onQueueStatus(event) {
if(failed_list.length > 0) {
msg += '<br>The update for the following custom nodes has failed:<ul>';
for(let x in failed_list) {
let k = failed_list[x];
let url = event.detail.nodepack_result[k].url;
let title = event.detail.nodepack_result[k].title;
if(url) {
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
}
else {
msg += `<li>${k}</li>`;
}
msg += '<li>'+failed_list[x]+'</li>';
}
msg += '</ul>'
@@ -837,7 +776,7 @@ async function updateAll(update_comfyui, manager_dialog) {
customAlert('Another task is already in progress. Please stop the ongoing task first.');
}
else if(response.status == 200) {
is_updating = true;
is_updating_all = true;
await api.fetchApi('/manager/queue/start');
}
}
@@ -960,19 +899,7 @@ class ManagerMenuDialog extends ComfyDialog {
}
}),
$el("button.cm-button", {
type: "button",
textContent: "Custom Nodes In Workflow",
onclick:
() => {
if(!CustomNodesManager.instance) {
CustomNodesManager.instance = new CustomNodesManager(app, self);
}
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
}
}),
$el("br", {}, []),
$el("button.cm-button", {
type: "button",
textContent: "Model Manager",
@@ -1001,7 +928,7 @@ class ManagerMenuDialog extends ComfyDialog {
update_all_button,
update_comfyui_button,
switch_comfyui_button,
// fetch_updates_button,
fetch_updates_button,
$el("br", {}, []),
restart_stop_button,
@@ -1033,8 +960,6 @@ class ManagerMenuDialog extends ComfyDialog {
}
createControlsLeft() {
const isElectron = 'electronAPI' in window;
let self = this;
this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
@@ -1113,6 +1038,25 @@ class ManagerMenuDialog extends ComfyDialog {
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
}
// default ui state
let component_policy_combo = document.createElement("select");
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
component_policy_combo.className = "cm-menu-combo";
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
api.fetchApi('/manager/component/policy')
.then(response => response.text())
.then(data => {
component_policy_combo.value = data;
set_component_policy(data);
});
component_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
set_component_policy(event.target.value);
});
api.fetchApi('/manager/share_option')
.then(response => response.text())
.then(data => {
@@ -1132,43 +1076,6 @@ class ManagerMenuDialog extends ComfyDialog {
}
});
let component_policy_combo = document.createElement("select");
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
component_policy_combo.className = "cm-menu-combo";
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
api.fetchApi('/manager/policy/component')
.then(response => response.text())
.then(data => {
component_policy_combo.value = data;
set_component_policy(data);
});
component_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
set_component_policy(event.target.value);
});
update_policy_combo = document.createElement("select");
if(isElectron)
update_policy_combo.style.display = 'none';
update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
update_policy_combo.className = "cm-menu-combo";
update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
api.fetchApi('/manager/policy/update')
.then(response => response.text())
.then(data => {
update_policy_combo.value = data;
});
update_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
});
return [
$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
$el("br", {}, []),
@@ -1177,7 +1084,6 @@ class ManagerMenuDialog extends ComfyDialog {
preview_combo,
share_combo,
component_policy_combo,
update_policy_combo,
$el("br", {}, []),
$el("br", {}, []),
@@ -1204,6 +1110,11 @@ class ManagerMenuDialog extends ComfyDialog {
install_pip(url, self);
}
}
}),
$el("button.cm-experimental-button", {
type: "button",
textContent: "Unload models",
onclick: () => { free_models(); }
})
]),
];
@@ -1332,7 +1243,7 @@ class ManagerMenuDialog extends ComfyDialog {
$el("div.comfy-modal-content",
[
$el("tr.cm-title", {}, [
$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
$el("font", {size:6, color:"white"}, [`ComfyUI Manager Menu`])]
),
$el("br", {}, []),
$el("div.cm-menu-container",
@@ -1474,12 +1385,13 @@ async function getVersion() {
return await version.text();
}
app.registerExtension({
name: "Comfy.ManagerMenu",
aboutPageBadges: [
{
label: `ComfyUI-Manager ${manager_version}`,
label: `ComfyUI-Manager ${await getVersion()}`,
url: 'https://github.com/ltdrdata/ComfyUI-Manager',
icon: 'pi pi-th-large'
}

View File

@@ -709,7 +709,7 @@ app.handleFile = handleFile;
let current_component_policy = 'workflow';
try {
api.fetchApi('/manager/policy/component')
api.fetchApi('/manager/component/policy')
.then(response => response.text())
.then(data => { current_component_policy = data; });
}

View File

@@ -363,7 +363,6 @@ const pageHtml = `
<button class="cn-manager-restart">Restart</button>
<button class="cn-manager-stop">Stop</button>
<div class="cn-flex-auto"></div>
<button class="cn-manager-used-in-workflow">Used In Workflow</button>
<button class="cn-manager-check-update">Check Update</button>
<button class="cn-manager-check-missing">Check Missing</button>
<button class="cn-manager-install-url">Install via Git URL</button>
@@ -375,8 +374,7 @@ const ShowMode = {
UPDATE: "Update",
MISSING: "Missing",
FAVORITES: "Favorites",
ALTERNATIVES: "Alternatives",
IN_WORKFLOW: "In Workflow",
ALTERNATIVES: "Alternatives"
};
export class CustomNodesManager {
@@ -588,10 +586,6 @@ export class CustomNodesManager {
label: "Update",
value: ShowMode.UPDATE,
hasData: false
}, {
label: "In Workflow",
value: ShowMode.IN_WORKFLOW,
hasData: false
}, {
label: "Missing",
value: ShowMode.MISSING,
@@ -732,7 +726,7 @@ export class CustomNodesManager {
const value = e.target.value
this.filter = value;
const item = this.getFilterItem(value);
if (item && (!item.hasData)) {
if (item && !item.hasData) {
this.loadData(value);
return;
}
@@ -785,14 +779,6 @@ export class CustomNodesManager {
}
},
".cn-manager-used-in-workflow": {
click: (e) => {
e.target.classList.add("cn-btn-loading");
this.setFilter(ShowMode.IN_WORKFLOW);
this.loadData(ShowMode.IN_WORKFLOW);
}
},
".cn-manager-check-update": {
click: (e) => {
e.target.classList.add("cn-btn-loading");
@@ -1543,110 +1529,7 @@ export class CustomNodesManager {
return extension_mappings;
}
getNodesInWorkflow() {
let usedGroupNodes = new Set();
let allUsedNodes = {};
for(let k in app.graph._nodes) {
let node = app.graph._nodes[k];
if(node.type.startsWith('workflow>')) {
usedGroupNodes.add(node.type.slice(9));
continue;
}
allUsedNodes[node.type] = node;
}
for(let k of usedGroupNodes) {
let subnodes = app.graph.extra.groupNodes[k]?.nodes;
if(subnodes) {
for(let k2 in subnodes) {
let node = subnodes[k2];
allUsedNodes[node.type] = node;
}
}
}
return allUsedNodes;
}
async getMissingNodes() {
let unresolved_missing_nodes = new Set();
let hashMap = {};
let allUsedNodes = this.getNodesInWorkflow();
const registered_nodes = new Set();
for (let i in LiteGraph.registered_node_types) {
registered_nodes.add(LiteGraph.registered_node_types[i].type);
}
let unresolved_aux_ids = {};
let outdated_comfyui = false;
for(let k in allUsedNodes) {
let node = allUsedNodes[k];
if(!registered_nodes.has(node.type)) {
// missing node
if(node.properties.cnr_id) {
if(node.properties.cnr_id == 'comfy-core') {
outdated_comfyui = true;
}
let item = this.custom_nodes[node.properties.cnr_id];
hashMap[item.hash] = true;
}
else if(node.properties.aux_id) {
unresolved_aux_ids[node.properties.aux_id] = node.type;
}
else {
unresolved_missing_nodes.add(node.type);
}
}
}
if(outdated_comfyui) {
customAlert('ComfyUI is outdated, so some built-in nodes cannot be used.');
}
if(Object.keys(unresolved_aux_ids).length > 0) {
// building aux_id to nodepack map
let aux_id_to_pack = {};
for(let k in this.custom_nodes) {
let nodepack = this.custom_nodes[k];
let aux_id;
if(nodepack.repository?.startsWith('https://github.com')) {
aux_id = nodepack.repository.split('/').slice(-2).join('/');
aux_id_to_pack[aux_id] = nodepack;
}
else if(nodepack.repository) {
aux_id = nodepack.repository.split('/').slice(-1);
aux_id_to_pack[aux_id] = nodepack;
}
}
// resolving aux_id
for(let k in unresolved_aux_ids) {
let nodepack = aux_id_to_pack[k];
if(nodepack) {
hashMap[nodepack.hash] = true;
}
else {
unresolved_missing_nodes.add(unresolved_aux_ids[k]);
}
}
}
if(unresolved_missing_nodes.size > 0) {
await this.getMissingNodesLegacy(hashMap, unresolved_missing_nodes);
}
return hashMap;
}
async getMissingNodesLegacy(hashMap, missing_nodes) {
const mode = manager_instance.datasrc_combo.value;
this.showStatus(`Loading missing nodes (${mode}) ...`);
const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
@@ -1685,29 +1568,50 @@ export class CustomNodesManager {
}
}
let unresolved_missing_nodes = new Set();
for (let node_type of missing_nodes) {
const packs = name_to_packs[node_type.trim()];
if(packs)
packs.forEach(url => {
unresolved_missing_nodes.add(url);
});
else {
for(let j in regex_to_pack) {
if(regex_to_pack[j].regex.test(node_type)) {
unresolved_missing_nodes.add(regex_to_pack[j].url);
const registered_nodes = new Set();
for (let i in LiteGraph.registered_node_types) {
registered_nodes.add(LiteGraph.registered_node_types[i].type);
}
const missing_nodes = new Set();
const workflow = app.graph.serialize();
const group_nodes = workflow.extra && workflow.extra.groupNodes ? workflow.extra.groupNodes : [];
let nodes = workflow.nodes;
for (let i in group_nodes) {
let group_node = group_nodes[i];
nodes = nodes.concat(group_node.nodes);
}
for (let i in nodes) {
const node_type = nodes[i].type;
if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
continue;
if (!registered_nodes.has(node_type)) {
const packs = name_to_packs[node_type.trim()];
if(packs)
packs.forEach(url => {
missing_nodes.add(url);
});
else {
for(let j in regex_to_pack) {
if(regex_to_pack[j].regex.test(node_type)) {
missing_nodes.add(regex_to_pack[j].url);
}
}
}
}
}
const hashMap = {};
for(let k in this.custom_nodes) {
let item = this.custom_nodes[k];
if(unresolved_missing_nodes.has(item.id)) {
if(missing_nodes.has(item.id)) {
hashMap[item.hash] = true;
}
else if (item.files?.some(file => unresolved_missing_nodes.has(file))) {
else if (item.files?.some(file => missing_nodes.has(file))) {
hashMap[item.hash] = true;
}
}
@@ -1726,41 +1630,6 @@ export class CustomNodesManager {
return hashMap;
}
async getNodepackInWorkflow() {
let allUsedNodes = this.getNodesInWorkflow();
// building aux_id to nodepack map
let aux_id_to_pack = {};
for(let k in this.custom_nodes) {
let nodepack = this.custom_nodes[k];
let aux_id;
if(nodepack.repository?.startsWith('https://github.com')) {
aux_id = nodepack.repository.split('/').slice(-2).join('/');
aux_id_to_pack[aux_id] = nodepack;
}
else if(nodepack.repository) {
aux_id = nodepack.repository.split('/').slice(-1);
aux_id_to_pack[aux_id] = nodepack;
}
}
const hashMap = {};
for(let k in allUsedNodes) {
var item;
if(allUsedNodes[k].properties.cnr_id) {
item = this.custom_nodes[allUsedNodes[k].properties.cnr_id];
}
else if(allUsedNodes[k].properties.aux_id) {
item = aux_id_to_pack[allUsedNodes[k].properties.aux_id];
}
if(item)
hashMap[item.hash] = true;
}
return hashMap;
}
async getAlternatives() {
const mode = manager_instance.datasrc_combo.value;
this.showStatus(`Loading alternatives (${mode}) ...`);
@@ -1856,14 +1725,9 @@ export class CustomNodesManager {
hashMap = await this.getAlternatives();
} else if(this.show_mode == ShowMode.FAVORITES) {
hashMap = await this.getFavorites();
} else if(this.show_mode == ShowMode.IN_WORKFLOW) {
hashMap = await this.getNodepackInWorkflow();
}
filterItem.hashMap = hashMap;
if(this.show_mode != ShowMode.IN_WORKFLOW) {
filterItem.hasData = true;
}
filterItem.hasData = true;
}
for(let k in node_packs) {
@@ -1915,6 +1779,7 @@ export class CustomNodesManager {
case "disabled":
filterTypes.add("installed");
break;
case "not-installed":
filterTypes.add("not-installed");
break;

View File

@@ -3,21 +3,12 @@
* - custom node pack version to all custom nodes used in the workflow
*
* Example metadata:
* "nodes": {
* "1": {
* type: "CheckpointLoaderSimple",
* ...
* properties: {
* cnr_id: "comfy-core",
* version: "0.3.8",
* },
* },
* }
*
* @typedef {Object} NodeInfo
* @property {string} ver - Version (git hash or semantic version)
* @property {string} cnr_id - ComfyRegistry node ID
* @property {boolean} enabled - Whether the node is enabled
"extra": {
"node_versions": {
"comfy-core": "v0.3.8-4-g0b2eb7f",
"comfyui-easy-use": "1.2.5"
}
},
*/
import { app } from "../../scripts/app.js";
@@ -32,7 +23,7 @@ class WorkflowMetadataExtension {
/**
* Get the installed nodes info
* @returns {Promise<Record<string, NodeInfo>>} The mapping from node name to its info.
* @returns {Promise<Record<string, {ver: string, cnr_id: string, enabled: boolean}>>} The mapping from node name to its info.
* ver can either be a git commit hash or a semantic version such as "1.0.0"
* cnr_id is the id of the node in the ComfyRegistry
* enabled is true if the node is enabled, false if it is disabled
@@ -42,42 +33,61 @@ class WorkflowMetadataExtension {
return await res.json();
}
async init() {
this.installedNodes = await this.getInstalledNodes();
this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
/**
* Get the node versions for the given graph
* @param {LGraph} graph The graph to get the node versions for
* @returns {Promise<Record<string, string>>} The mapping from node name to version
*/
getGraphNodeVersions(graph) {
const nodeVersions = {};
for (const node of graph.nodes) {
const nodeData = node.constructor.nodeData;
// Frontend only nodes don't have nodeData
if (!nodeData) {
continue;
}
const modules = nodeData.python_module.split(".");
if (modules[0] === "custom_nodes") {
const nodePackageName = modules[1];
const nodeInfo =
this.installedNodes[nodePackageName] ??
this.installedNodes[nodePackageName.toLowerCase()];
if (nodeInfo) {
nodeVersions[nodePackageName] = nodeInfo.ver;
}
} else if (["nodes", "comfy_extras"].includes(modules[0])) {
nodeVersions["comfy-core"] = this.comfyCoreVersion;
} else {
console.warn(`Unknown node source: ${nodeData.python_module}`);
}
}
return nodeVersions;
}
/**
* Called when any node is created
* @param {LGraphNode} node The newly created node
*/
nodeCreated(node) {
try {
// nodeData doesn't exist if node is missing or node is frontend only node
if (!node?.constructor?.nodeData?.python_module) return;
async init() {
const extension = this;
this.installedNodes = await this.getInstalledNodes();
this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
const nodeProperties = (node.properties ??= {});
const modules = node.constructor.nodeData.python_module.split(".");
const moduleType = modules[0];
// Attach metadata when app.graphToPrompt is called.
const originalSerialize = LGraph.prototype.serialize;
LGraph.prototype.serialize = function () {
const workflow = originalSerialize.apply(this, arguments);
if (moduleType === "custom_nodes") {
const nodePackageName = modules[1];
const { cnr_id, aux_id, ver } =
this.installedNodes[nodePackageName] ??
this.installedNodes[nodePackageName.toLowerCase()] ??
{};
if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
if (cnr_id) nodeProperties.cnr_id = cnr_id;
else nodeProperties.aux_id = aux_id;
if (ver) nodeProperties.ver = ver;
} else if (["nodes", "comfy_extras"].includes(moduleType)) {
nodeProperties.cnr_id = "comfy-core";
nodeProperties.ver = this.comfyCoreVersion;
// Add metadata to the workflow
if (!workflow.extra) {
workflow.extra = {};
}
} catch (e) {
console.error(e);
}
const graph = this;
try {
workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
} catch (e) {
console.error(e);
}
return workflow;
};
}
}

View File

@@ -4685,28 +4685,6 @@
"filename": "<huggingface>",
"url": "deepseek-ai/Janus-Pro-7B",
"size": "14.85GB"
},
{
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.fp16.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
"size": "167MB"
},
{
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
"size": "335MB"
}
]
}

View File

@@ -13,278 +13,6 @@
{
"author": "ZHO-ZHO-ZHO",
"title": "ComfyUI Wan2.1 [WIP]",
"reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO",
"files": [
"https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO"
],
"install_type": "git-clone",
"description": "Its estimated that ComfyUI itself will support it soon, so go ahead and give it a try!"
},
{
"author": "kijai",
"title": "ComfyUI-WanVideoWrapper [WIP]",
"reference": "https://github.com/kijai/ComfyUI-WanVideoWrapper",
"files": [
"https://github.com/kijai/ComfyUI-WanVideoWrapper"
],
"install_type": "git-clone",
"description": "ComfyUI diffusers wrapper nodes for WanVideo"
},
{
"author": "ltdrdata",
"title": "comfyui-unsafe-torch [UNSAFE]",
"reference": "https://github.com/ltdrdata/comfyui-unsafe-torch",
"files": [
"https://github.com/ltdrdata/comfyui-unsafe-torch"
],
"install_type": "git-clone",
"description": "disable torch.load's `weigths_only`"
},
{
"author": "IfnotFr",
"title": "⚡ ComfyUI Connect [WIP]",
"reference": "https://github.com/IfnotFr/ComfyUI-Connect",
"files": [
"https://github.com/IfnotFr/ComfyUI-Connect"
],
"install_type": "git-clone",
"description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
},
{
"author": "muvich3n",
"title": "ComfyUI-Crop-Border",
"reference": "https://github.com/muvich3n/ComfyUI-Crop-Border",
"files": [
"https://github.com/muvich3n/ComfyUI-Crop-Border"
],
"install_type": "git-clone",
"description": "NODES: Crop Image Borders"
},
{
"author": "masmullin2000",
"title": "ComfyUI-MMYolo",
"reference": "https://github.com/masmullin2000/ComfyUI-MMYolo",
"files": [
"https://github.com/masmullin2000/ComfyUI-MMYolo"
],
"install_type": "git-clone",
"description": "A comfy node to find faces and output a mask"
},
{
"author": "RiceRound",
"title": "RiceRound Cloud Node [UNSAFE]",
"id": "riceround",
"reference": "https://github.com/RiceRound/ComfyUI_RiceRound",
"files": [
"https://github.com/RiceRound/ComfyUI_RiceRound"
],
"install_type": "git-clone",
"description": "This is an imaginative project that allows for one-click deployment, providing both an online page and a ComfyUI cloud node.[w/This custom node is vulnerable because it can dynamically download and execute nodes.]"
},
{
"author": "Yeonri",
"title": "ComfyUI_LLM_Are_You_Listening [WIP]",
"reference": "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening",
"files": [
"https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening"
],
"install_type": "git-clone",
"description": "NODES: AYL_Node, AYL_GGUF_Node, AYL_API_Node\nNOTE: The files in the repo are not organized."
},
{
"author": "altkeyproject",
"title": "Dream Painter [WIP]",
"reference": "https://github.com/alt-key-project/comfyui-dream-painter",
"files": [
"https://github.com/alt-key-project/comfyui-dream-painter"
],
"install_type": "git-clone",
"description": "Provide utilities for 2D image generation and processing."
},
{
"author": "kimara-ai",
"title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
"reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
"files": [
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
],
"install_type": "git-clone",
"description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
},
{
"author": "krisshen2021",
"title": "comfyui_OpenRouterNodes [WIP]",
"reference": "https://github.com/krisshen2021/comfyui_OpenRouterNodes",
"files": [
"https://github.com/krisshen2021/comfyui_OpenRouterNodes"
],
"install_type": "git-clone",
"description": "LLM custom nodes for comfyui\nNOTE: The files in the repo are not organized."
},
{
"author": "Velour-Fog",
"title": "comfy-latent-nodes [UNSAFE]",
"reference": "https://github.com/Velour-Fog/comfy-latent-nodes",
"files": [
"https://github.com/Velour-Fog/comfy-latent-nodes"
],
"install_type": "git-clone",
"description": "ComfyUI nodes to save and load a latent to a specified directory. Saves time for doing operations on a latent such as upscaling without having to re-trigger the creation of the original latent.[w/This node can write files to an arbitrary path.]"
},
{
"author": "jgbyte",
"title": "ComfyUI-RandomCube [WIP]",
"reference": "https://github.com/jgbyte/ComfyUI-RandomCube",
"files": [
"https://github.com/jgbyte/ComfyUI-RandomCube"
],
"install_type": "git-clone",
"description": "NODES: RandomCubeGrid"
},
{
"author": "thot-experiment",
"title": "comfy-live-preview [WIP]",
"reference": "https://github.com/thot-experiment/comfy-live-preview",
"files": [
"https://github.com/thot-experiment/comfy-live-preview"
],
"install_type": "git-clone",
"description": "external live preview plugin for ComfyUI"
},
{
"author": "AhBumm",
"title": "ComfyUI-Upscayl",
"reference": "https://github.com/AhBumm/ComfyUI-Upscayl",
"files": [
"https://github.com/AhBumm/ComfyUI-Upscayl"
],
"nodename_pattern": "\\(BillBum\\)$",
"install_type": "git-clone",
"description": "NODES: Upscayl Upscaler"
},
{
"author": "NEZHA625",
"title": "ComfyUI-tools-by-dong [UNSAFE]",
"reference": "https://github.com/NEZHA625/ComfyUI-tools-by-dong",
"files": [
"https://github.com/NEZHA625/ComfyUI-tools-by-dong"
],
"install_type": "git-clone",
"description": "NODES: HuggingFaceUploadNode, ImageDownloader, LoraIterator, FileMoveNode, InputDetectionNode, ...\nNOTE: The files in the repo are not organized.[w/This node pack includes nodes that can modify arbitrary files.]"
},
{
"author": "if-ai",
"title": "ComfyUI-IF_Zonos [WIP]",
"reference": "https://github.com/if-ai/ComfyUI-IF_Zonos",
"files": [
"https://github.com/if-ai/ComfyUI-IF_Zonos"
],
"install_type": "git-clone",
"description": "Zonos for ComfyUI"
},
{
"author": "grinlau18",
"title": "Xiser_Nodes [WIP]",
"reference": "https://github.com/grinlau18/ComfyUI_XISER_Nodes",
"files": [
"https://github.com/grinlau18/ComfyUI_XISER_Nodes"
],
"install_type": "git-clone",
"description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
},
{
"author": "LAOGOU-666",
"title": "Comfyui_StartPatch [UNSAFE]",
"reference": "https://github.com/LAOGOU-666/Comfyui_StartPatch",
"files": [
"https://github.com/LAOGOU-666/Comfyui_StartPatch"
],
"install_type": "git-clone",
"description": "This patch plugin optimizes the node information processing mechanism of the ComfyUI server, significantly improving server performance and response speed. It greatly reduces the browser page initialization waiting time. [w/Since this patch modifies key functions of ComfyUI, it is highly likely to cause compatibility issues.]"
},
{
"author": "badmike",
"title": "Prompt Factory [CONFLICT]",
"reference": "https://github.com/badmike/comfyui-prompt-factory",
"files": [
"https://github.com/badmike/comfyui-prompt-factory"
],
"install_type": "git-clone",
"description": "A modular system that adds randomness to prompt generation [w/This node pack is causing a name conflict with https://github.com/satche/comfyui-prompt-factory]"
},
{
"author": "owengillett",
"title": "ComfyUI-tilefusion",
"reference": "https://github.com/owengillett/ComfyUI-tilefusion",
"files": [
"https://github.com/owengillett/ComfyUI-tilefusion"
],
"install_type": "git-clone",
"description": "Helper nodes for generating seamless tiles."
},
{
"author": "Scaryplasmon",
"title": "ComfTrellis [WIP]",
"reference": "https://github.com/Scaryplasmon/ComfTrellis",
"files": [
"https://github.com/Scaryplasmon/ComfTrellis"
],
"install_type": "git-clone",
"description": "1 click install to run Trellis in ComfyUI\nNOTE: The files in the repo are not organized."
},
{
"author": "fangziheng2321",
"title": "comfyuinode_chopmask [WIP]",
"reference": "https://github.com/fangziheng2321/comfyuinode_chopmask",
"files": [
"https://github.com/fangziheng2321/comfyuinode_chopmask"
],
"install_type": "git-clone",
"description": "a custom comfyui node for '/fooocusinpaint_upload'\nNOTE: The files in the repo are not organized."
},
{
"author": "D1-3105",
"title": "ComfyUI-VideoStream",
"reference": "https://github.com/D1-3105/ComfyUI-VideoStream",
"files": [
"https://github.com/D1-3105/ComfyUI-VideoStream"
],
"install_type": "git-clone",
"description": "NODES: FloWWeaverExportSingleFrameGRPC"
},
{
"author": "gmorks",
"title": "ComfyUI Animagine prompt [WIP]",
"reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
"files": [
"https://github.com/gmorks/ComfyUI-Animagine-Prompt"
],
"install_type": "git-clone",
"description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model\nNOTE: The files in the repo are not organized."
},
{
"author": "wirytiox",
"title": "ComfyUI-Qwen [CONFLICT]",
"reference": "https://github.com/mr-krak3n/ComfyUI-Qwen",
"files": [
"https://github.com/mr-krak3n/ComfyUI-Qwen"
],
"install_type": "git-clone",
"description": "This repository contains custom nodes for ComfyUI, designed to facilitate working with language models such as Qwen2.5 and DeepSeek. [w/This node pack is causing a name conflict with https://github.com/ZHO-ZHO-ZHO/ComfyUI-Qwen]"
},
{
"author": "hiusdev",
"title": "ComfyUI_Lah_Toffee",
"reference": "https://github.com/hiusdev/ComfyUI_Lah_Toffee",
"files": [
"https://github.com/hiusdev/ComfyUI_Lah_Toffee"
],
"install_type": "git-clone",
"description": "NODES: Lah LoadVideoRandom"
},
{
"author": "hdfhssg",
"title": "ComfyUI_pxtool [WIP]",
@@ -295,6 +23,16 @@
"install_type": "git-clone",
"description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
},
{
"author": "dasilva333",
"title": "ComfyUI_MarkdownImage [WIP]",
"reference": "https://github.com/dasilva333/ComfyUI_MarkdownImage",
"files": [
"https://github.com/dasilva333/ComfyUI_MarkdownImage"
],
"install_type": "git-clone",
"description": "Create an image using html and markdown in ComfyUI\nNOTE: The files in the repo are not organized."
},
{
"author": "franky519",
"title": "comfyui-redux-style",
@@ -345,6 +83,16 @@
"install_type": "git-clone",
"description": "NODES: Load TIFF"
},
{
"author": "greengerong",
"title": "ComfyUI-Lumina-Video [WIP]",
"reference": "https://github.com/greengerong/ComfyUI-Lumina-Video",
"files": [
"https://github.com/greengerong/ComfyUI-Lumina-Video"
],
"install_type": "git-clone",
"description": "This is a video generation plugin implementation for ComfyUI based on the Lumina Video model."
},
{
"author": "tc888",
"title": "ComfyUI_Save_Flux_Image",
@@ -974,7 +722,7 @@
"https://github.com/yanhuifair/ComfyUI-FairLab"
],
"install_type": "git-clone",
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize, ..."
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize"
},
{
"author": "nomcycle",
@@ -1873,6 +1621,16 @@
"install_type": "git-clone",
"description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
},
{
"author": "attashe",
"title": "ComfyUI-FluxRegionAttention [WIP]",
"reference": "https://github.com/attashe/ComfyUI-FluxRegionAttention",
"files": [
"https://github.com/attashe/ComfyUI-FluxRegionAttention"
],
"install_type": "git-clone",
"description": "Implement Region Attention for Flux model"
},
{
"author": "aria1th",
"title": "ComfyUI-SkipCFGSigmas",

View File

@@ -178,6 +178,7 @@
"https://github.com/807502278/ComfyUI_TensorRT_Merge": [
[
"BiRefNet2_tensort",
"BiRefNet_ModelLoader_TRT",
"BiRefNet_TRT",
"Building_TRT",
"Custom_Building_TRT",
@@ -188,7 +189,6 @@
"UpscalerTensorrt",
"YoloNasPoseTensorrt",
"load_BiRefNet2_tensort",
"load_BiRefNet_TRT",
"load_DepthAnything_Tensorrt",
"load_Dwpos_Tensorrt"
],
@@ -370,15 +370,6 @@
"title_aux": "comfyui-textools [WIP]"
}
],
"https://github.com/AhBumm/ComfyUI-Upscayl": [
[
"Upscayl Upscaler"
],
{
"nodename_pattern": "\\(BillBum\\)$",
"title_aux": "ComfyUI-Upscayl"
}
],
"https://github.com/AlexXi19/ComfyUI-OpenAINode": [
[
"ImageWithPrompt",
@@ -642,7 +633,6 @@
"DevToolsNodeWithBooleanInput",
"DevToolsNodeWithForceInput",
"DevToolsNodeWithOnlyOptionalInput",
"DevToolsNodeWithOptionalComboInput",
"DevToolsNodeWithOptionalInput",
"DevToolsNodeWithOutputList",
"DevToolsNodeWithSeedInput",
@@ -668,14 +658,6 @@
"title_aux": "ComfyUI OpenAI Nodes"
}
],
"https://github.com/D1-3105/ComfyUI-VideoStream": [
[
"FloWWeaverExportSingleFrameGRPC"
],
{
"title_aux": "ComfyUI-VideoStream"
}
],
"https://github.com/DataCTE/ComfyUI-DataVoid-nodes": [
[
"IPAAdapterFaceIDBatch",
@@ -751,6 +733,7 @@
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [
[
"GetBooruPost",
"TagEncode",
"TagWikiFetch"
],
{
@@ -957,11 +940,9 @@
"DeepSeekImageGeneration",
"DeepSeekImageUnderstanding",
"DeepSeekModelLoader",
"GoogleDriveUpload",
"ImagePreprocessor",
"LLM_Loader",
"OpenAICompatibleLoader",
"VideoFileUploader"
"OpenAICompatibleLoader"
],
{
"title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]"
@@ -1030,7 +1011,6 @@
"ImNodeTitleOverride",
"ImSetActionKeywordMapping",
"MergeNode",
"Molmo7BDbnbBatch",
"MuteNode",
"NewNode",
"Node2String",
@@ -1336,45 +1316,6 @@
"title_aux": "ComfyUI-APG_ImYourCFGNow"
}
],
"https://github.com/NEZHA625/ComfyUI-tools-by-dong": [
[
"A1111_FLUX_DATA_NODE",
"CategorizeNode",
"Delay_node",
"Downloader",
"FileMoveNode",
"FolderIteratorNODE",
"Get_cookies_Node",
"Get_json_value_Node",
"Get_video_Node",
"HashCalculationsNode",
"HuggingFaceUploadNode",
"IMG2URLNode",
"Image2GIFNode",
"ImageDownloader",
"InputDetectionNode",
"LLM_Node",
"LibLib_upload_Node",
"LogicToolsNode",
"LoraIterator",
"RandomNumbersNode",
"RenameNode",
"ResolutionNode",
"SaveTXTNode",
"SetAppidNode",
"TextToJsonNode",
"TranslateAPINode",
"ZIPwith7zNode",
"img_understanding_Node",
"klingai_video_Node",
"path_join_Node",
"save_img_NODE",
"set_api_Node"
],
{
"title_aux": "ComfyUI-tools-by-dong [UNSAFE]"
}
],
"https://github.com/Northerner1/ComfyUI_North_Noise": [
[
"North_Unsampler"
@@ -1474,41 +1415,6 @@
"title_aux": "comfyui-promptbymood [WIP]"
}
],
"https://github.com/RiceRound/ComfyUI_RiceRound": [
[
"RiceRoundAdvancedChoiceNode",
"RiceRoundBooleanNode",
"RiceRoundDecryptNode",
"RiceRoundDownloadImageAndMaskNode",
"RiceRoundDownloadImageNode",
"RiceRoundDownloadMaskNode",
"RiceRoundEncryptNode",
"RiceRoundFloatNode",
"RiceRoundImageBridgeNode",
"RiceRoundImageNode",
"RiceRoundImageUrlNode",
"RiceRoundInputTextNode",
"RiceRoundIntNode",
"RiceRoundMaskBridgeNode",
"RiceRoundOutputBooleanNode",
"RiceRoundOutputFloatNode",
"RiceRoundOutputImageBridgeNode",
"RiceRoundOutputImageNode",
"RiceRoundOutputIntNode",
"RiceRoundOutputMaskBridgeNode",
"RiceRoundOutputTextNode",
"RiceRoundRandomSeedNode",
"RiceRoundSimpleChoiceNode",
"RiceRoundSimpleImageNode",
"RiceRoundStrToBooleanNode",
"RiceRoundStrToFloatNode",
"RiceRoundStrToIntNode",
"RiceRoundUploadImageNode"
],
{
"title_aux": "RiceRound Cloud Node [UNSAFE]"
}
],
"https://github.com/RicherdLee/comfyui-oss-image-save": [
[
"SaveImageOSS"
@@ -1519,12 +1425,9 @@
],
"https://github.com/RobeSantoro/ComfyUI-RobeNodes": [
[
"Boolean Primitive \ud83d\udc24",
"Image Input Switch \ud83d\udc24",
"List Image Path \ud83d\udc24",
"List Model Path \ud83d\udc24",
"List Video Path \ud83d\udc24",
"Peaks Weights Generator \ud83d\udc24"
"List Video Path \ud83d\udc24"
],
{
"title_aux": "Comfy UI Robe Nodes [UNSAFE]"
@@ -1574,18 +1477,6 @@
"title_aux": "ComfyUI_Save2Discord"
}
],
"https://github.com/Scaryplasmon/ComfTrellis": [
[
"LoadTrellisModel",
"RembgSquare",
"SaveGLBFile",
"TrellisGrid",
"TrellisInference"
],
{
"title_aux": "ComfTrellis [WIP]"
}
],
"https://github.com/SeedV/ComfyUI-SeedV-Nodes": [
[
"ALL_Model_UnLoader(SEEDV)",
@@ -1593,9 +1484,7 @@
"CheckpointLoaderSimpleShared //SeedV",
"ControlNetLoaderAdvancedShared",
"LoraLoader //SeedV",
"Script",
"Switch_Any(SEEDV)",
"TCD_Sampler(SEEDV)"
"Script"
],
{
"title_aux": "ComfyUI-SeedV-Nodes [UNSAFE]"
@@ -1795,15 +1684,6 @@
"title_aux": "plugin-utils-nodes"
}
],
"https://github.com/Velour-Fog/comfy-latent-nodes": [
[
"CustomLoadLatent",
"CustomSaveLatent"
],
{
"title_aux": "comfy-latent-nodes [UNSAFE]"
}
],
"https://github.com/Video3DGenResearch/comfyui-batch-input-node": [
[
"BatchImageAndPrompt",
@@ -1857,16 +1737,6 @@
"title_aux": "visuallabs_comfyui_nodes"
}
],
"https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening": [
[
"AYL_API_Node",
"AYL_GGUF_Node",
"AYL_Node"
],
{
"title_aux": "ComfyUI_LLM_Are_You_Listening [WIP]"
}
],
"https://github.com/ZHO-ZHO-ZHO/ComfyUI-AuraSR-ZHO": [
[
"AuraSR_Lterative_Zho",
@@ -1894,15 +1764,6 @@
"title_aux": "ComfyUI-PuLID-ZHO [WIP]"
}
],
"https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO": [
[
"WanT2V_Generation_Zho",
"WanT2V_ModelLoader_Zho"
],
{
"title_aux": "ComfyUI Wan2.1 [WIP]"
}
],
"https://github.com/a-One-Fan/ComfyUI-Blenderesque-Nodes": [
[
"BlenderAlphaConvert",
@@ -1981,39 +1842,6 @@
"title_aux": "alexisrolland/ComfyUI-AuraSR"
}
],
"https://github.com/alt-key-project/comfyui-dream-painter": [
[
"Bitmap AND [DPaint]",
"Bitmap Crop Center [DPaint]",
"Bitmap Dimensions [DPaint]",
"Bitmap Edge Detect [DPaint]",
"Bitmap Expand Canvas [DPaint]",
"Bitmap Invert [DPaint]",
"Bitmap OR [DPaint]",
"Bitmap Resize [DPaint]",
"Bitmap Rotate [DPaint]",
"Bitmap To Image & Mask [DPaint]",
"Bitmap XOR [DPaint]",
"Draw Shape As Bitmap [DPaint]",
"Image To Bitmap [DPaint]",
"Random Number Generator [DPaint]",
"Shape Center & Fit [DPaint]",
"Shape Combiner [DPaint]",
"Shape Copycat Tool [DPaint]",
"Shape Find Bounds [DPaint]",
"Shape Flip [DPaint]",
"Shape Grid [DPaint]",
"Shape Resize [DPaint]",
"Shape Rotate [DPaint]",
"Shape of Circular Rays [DPaint]",
"Shape of N-Polygon [DPaint]",
"Shape of Rectangle [DPaint]",
"Shape of Star [DPaint]"
],
{
"title_aux": "Dream Painter [WIP]"
}
],
"https://github.com/alt-key-project/comfyui-dream-video-batches": [
[
"Blended Transition [DVB]",
@@ -2106,6 +1934,20 @@
"title_aux": "comfyui_segformer_b2_sleeves"
}
],
"https://github.com/attashe/ComfyUI-FluxRegionAttention": [
[
"BBoxToMaskNode",
"BoundingBoxNode",
"CLIPDebug",
"FluxRegionBBOX",
"FluxRegionMask",
"RegionAttention",
"VisualizeBBoxesNode"
],
{
"title_aux": "ComfyUI-FluxRegionAttention [WIP]"
}
],
"https://github.com/backearth1/Comfyui-MiniMax-Video": [
[
"ImageToPrompt",
@@ -2506,7 +2348,6 @@
"CLIPTextEncodeControlnet",
"CLIPTextEncodeFlux",
"CLIPTextEncodeHunyuanDiT",
"CLIPTextEncodeLumina2",
"CLIPTextEncodePixArtAlpha",
"CLIPTextEncodeSD3",
"CLIPTextEncodeSDXL",
@@ -2615,7 +2456,6 @@
"LoadAudio",
"LoadImage",
"LoadImageMask",
"LoadImageOutput",
"LoadLatent",
"LoraLoader",
"LoraLoaderModelOnly",
@@ -2623,7 +2463,6 @@
"Mahiro",
"MaskComposite",
"MaskToImage",
"ModelComputeDtype",
"ModelMergeAdd",
"ModelMergeAuraflow",
"ModelMergeBlocks",
@@ -2664,7 +2503,6 @@
"RandomNoise",
"RebatchImages",
"RebatchLatents",
"RenormCFG",
"RepeatImageBatch",
"RepeatLatentBatch",
"RescaleCFG",
@@ -2690,7 +2528,6 @@
"SaveImage",
"SaveImageWebsocket",
"SaveLatent",
"SaveWEBM",
"SelfAttentionGuidance",
"SetFirstSigma",
"SetLatentNoiseMask",
@@ -2766,7 +2603,6 @@
"VPScheduler",
"VideoLinearCFGGuidance",
"VideoTriangleCFGGuidance",
"WanImageToVideo",
"WebcamCapture",
"unCLIPCheckpointLoader",
"unCLIPConditioning"
@@ -2834,6 +2670,15 @@
"title_aux": "VoidCustomNodes"
}
],
"https://github.com/dasilva333/ComfyUI_MarkdownImage": [
[
"CreateDialogImage",
"CreateMarkdownImage"
],
{
"title_aux": "ComfyUI_MarkdownImage [WIP]"
}
],
"https://github.com/denislov/Comfyui_AutoSurvey": [
[
"AddDoc2Knowledge",
@@ -3044,14 +2889,6 @@
"title_aux": "ComfyUI-Showrunner-Utils"
}
],
"https://github.com/fangziheng2321/comfyuinode_chopmask": [
[
"cus_chopmask"
],
{
"title_aux": "comfyuinode_chopmask [WIP]"
}
],
"https://github.com/flowtyone/comfyui-flowty-lcm": [
[
"LCMSampler"
@@ -3135,16 +2972,6 @@
"title_aux": "comfyui_median_filter"
}
],
"https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
[
"AnimaginePrompt",
"MultilineTextInput",
"TextFileLoader"
],
{
"title_aux": "ComfyUI Animagine prompt [WIP]"
}
],
"https://github.com/go-package-lab/ComfyUI-Tools-Video-Combine": [
[
"Tools:CopyFile",
@@ -3171,6 +2998,16 @@
"title_aux": "loki-comfyui-node"
}
],
"https://github.com/greengerong/ComfyUI-Lumina-Video": [
[
"LuminaVideoModelLoader",
"LuminaVideoSampler",
"LuminaVideoVAEDecode"
],
{
"title_aux": "ComfyUI-Lumina-Video [WIP]"
}
],
"https://github.com/grimli333/ComfyUI_Grim": [
[
"GenerateFileName",
@@ -3180,26 +3017,6 @@
"title_aux": "ComfyUI_Grim"
}
],
"https://github.com/grinlau18/ComfyUI_XISER_Nodes": [
[
"XIS_Float_Slider",
"XIS_FromListGet1Color",
"XIS_FromListGet1Cond",
"XIS_FromListGet1Float",
"XIS_FromListGet1Image",
"XIS_FromListGet1Int",
"XIS_FromListGet1Latent",
"XIS_FromListGet1Mask",
"XIS_FromListGet1Model",
"XIS_FromListGet1String",
"XIS_INT_Slider",
"XIS_PromptsWithSwitches",
"XIS_ResizeImageOrMask"
],
{
"title_aux": "Xiser_Nodes [WIP]"
}
],
"https://github.com/haodman/ComfyUI_Rain": [
[
"Rain_ImageSize",
@@ -3238,7 +3055,6 @@
[
"ACE_AnyInputSwitchBool",
"ACE_AnyInputToAny",
"ACE_AudioCrop",
"ACE_AudioLoad",
"ACE_AudioPlay",
"ACE_AudioSave",
@@ -3249,7 +3065,6 @@
"ACE_ImageFaceCrop",
"ACE_ImageGetSize",
"ACE_ImageLoadFromCloud",
"ACE_ImageMakeSlieshow",
"ACE_ImagePixelate",
"ACE_ImageQA",
"ACE_ImageRemoveBackground",
@@ -3268,7 +3083,6 @@
"ACE_TextSelector",
"ACE_TextToResolution",
"ACE_TextTranslate",
"ACE_VideoConcat",
"ACE_VideoLoad",
"ACE_VideoPreview"
],
@@ -3278,12 +3092,10 @@
],
"https://github.com/hdfhssg/ComfyUI_pxtool": [
[
"ArtistLoader",
"CivitaiHelper",
"DanbooruCharacterTag",
"E621CharacterTag",
"NegativeTag",
"PX_Seed",
"QualityTag",
"RandomArtists",
"RandomArtistsAdvanced",
@@ -3293,14 +3105,6 @@
"title_aux": "ComfyUI_pxtool [WIP]"
}
],
"https://github.com/hiusdev/ComfyUI_Lah_Toffee": [
[
"LoadVideoRandom"
],
{
"title_aux": "ComfyUI_Lah_Toffee"
}
],
"https://github.com/horidream/ComfyUI-Horidream": [
[
"PassThroughWithSound"
@@ -3433,14 +3237,6 @@
"title_aux": "comfyui-hydit"
}
],
"https://github.com/if-ai/ComfyUI-IF_Zonos": [
[
"IF_ZonosTTS"
],
{
"title_aux": "ComfyUI-IF_Zonos [WIP]"
}
],
"https://github.com/ilovejohnwhite/Tracer": [
[
"BillyGoatNode",
@@ -3518,14 +3314,6 @@
"title_aux": "ComfyUI-ComfyFluxSize [WIP]"
}
],
"https://github.com/jgbyte/ComfyUI-RandomCube": [
[
"RandomCubeGrid"
],
{
"title_aux": "ComfyUI-RandomCube [WIP]"
}
],
"https://github.com/jimmm-ai/TimeUi-a-ComfyUi-Timeline-Node": [
[
"jimmm.ai.TimelineUI"
@@ -3633,7 +3421,6 @@
],
"https://github.com/jonnydolake/ComfyUI-AIR-Nodes": [
[
"ExtractBlackLines",
"ForceMinimumBatchSize",
"ImageCompositeChained",
"LineDetection",
@@ -3701,8 +3488,6 @@
],
"https://github.com/kandy/ComfyUI-KAndy": [
[
"KAndyBatch2Index",
"KAndyBatchIndex",
"KAndyCivitImagesAPI",
"KAndyCivitPromptAPI",
"KAndyImageSave",
@@ -3808,7 +3593,6 @@
"DownloadAndLoadHy3DDelightModel",
"DownloadAndLoadHy3DPaintModel",
"Hy3DApplyTexture",
"Hy3DBPT",
"Hy3DBakeFromMultiview",
"Hy3DCameraConfig",
"Hy3DDelightImage",
@@ -3923,27 +3707,6 @@
"title_aux": "ComfyUI-VideoNoiseWarp [WIP]"
}
],
"https://github.com/kijai/ComfyUI-WanVideoWrapper": [
[
"LoadWanVideoClipTextEncoder",
"LoadWanVideoT5TextEncoder",
"WanVideoBlockSwap",
"WanVideoDecode",
"WanVideoEmptyEmbeds",
"WanVideoEncode",
"WanVideoImageClipEncode",
"WanVideoLatentPreview",
"WanVideoLoraSelect",
"WanVideoModelLoader",
"WanVideoSampler",
"WanVideoTextEncode",
"WanVideoTorchCompileSettings",
"WanVideoVAELoader"
],
{
"title_aux": "ComfyUI-WanVideoWrapper [WIP]"
}
],
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Advanced-Watermarks": [
[
"KimaraAIBatchImages",
@@ -3963,16 +3726,13 @@
],
"https://github.com/kk8bit/KayTool": [
[
"AIO_Translater",
"Abc_Math",
"Baidu_Translater",
"Color_Adjustment",
"Custom_Save_Image",
"Display_Any",
"Image_Size_Extractor",
"Strong_Prompt",
"Tencent_Translater",
"Text"
"Strong_Prompt"
],
{
"title_aux": "KayTool"
@@ -4005,17 +3765,6 @@
"title_aux": "ComfyUI Flow Control [UNSTABLE]"
}
],
"https://github.com/krisshen2021/comfyui_OpenRouterNodes": [
[
"OpenRouterOAINode_Infer",
"OpenRouterOAINode_Models",
"OpenRouterOAINode_hunyuanPrompt",
"OpenRouterOAINode_txt2imgPrompt"
],
{
"title_aux": "comfyui_OpenRouterNodes [WIP]"
}
],
"https://github.com/kuschanow/ComfyUI-SD-Slicer": [
[
"SdSlicer"
@@ -4187,9 +3936,6 @@
"HYCreateRegionalCond",
"HYFetaEnhance",
"HYFlowEditGuider",
"HYFlowEditGuiderAdv",
"HYFlowEditGuiderCFG",
"HYFlowEditGuiderCFGAdv",
"HYFlowEditSampler",
"HYForwardODESampler",
"HYInverseModelSamplingPred",
@@ -4282,9 +4028,6 @@
],
"https://github.com/lum3on/comfyui_LLM_Polymath": [
[
"Helper",
"UCEEraserNode",
"polymath_SaveAbsolute",
"polymath_chat",
"polymath_scraper"
],
@@ -4356,14 +4099,6 @@
"title_aux": "ComfyUI mashb1t nodes"
}
],
"https://github.com/masmullin2000/ComfyUI-MMYolo": [
[
"MMFace_Finder"
],
{
"title_aux": "ComfyUI-MMYolo"
}
],
"https://github.com/mehbebe/ComfyLoraGallery": [
[
"LoraGallery"
@@ -4501,16 +4236,6 @@
"title_aux": "ComfyUI-Simple-Image-Tools [WIP]"
}
],
"https://github.com/mr-krak3n/ComfyUI-Qwen": [
[
"DeepSeekResponseParser",
"QwenLoader",
"QwenSampler"
],
{
"title_aux": "ComfyUI-Qwen [CONFLICT]"
}
],
"https://github.com/mut-ex/comfyui-gligengui-node": [
[
"GLIGEN_GUI"
@@ -4527,14 +4252,6 @@
"title_aux": "ComfyUI-Claude-I2T"
}
],
"https://github.com/muvich3n/ComfyUI-Crop-Border": [
[
"CropImageBorder"
],
{
"title_aux": "ComfyUI-Crop-Border"
}
],
"https://github.com/myAiLemon/MagicAutomaticPicture": [
[
"EditableStringNode",
@@ -4726,14 +4443,6 @@
"title_aux": "comfyui-keshigom_custom"
}
],
"https://github.com/owengillett/ComfyUI-tilefusion": [
[
"VideoGridCombine"
],
{
"title_aux": "ComfyUI-tilefusion"
}
],
"https://github.com/oyvindg/ComfyUI-TrollSuite": [
[
"BinaryImageMask",
@@ -5502,7 +5211,6 @@
[
"CLIPTranslatedNode",
"DownloadImageNode",
"FillAlphaNode",
"FixUTF8StringNode",
"ImageResizeNode",
"ImageToVideoNode",

View File

File diff suppressed because it is too large Load Diff

View File

@@ -129,16 +129,6 @@
],
"install_type": "git-clone",
"description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
},
{
"author": "Pablerdo",
"title": "ComfyUI-PSNodes",
"reference": "https://github.com/Pablerdo/ComfyUI-PSNodes",
"files": [
"https://github.com/Pablerdo/ComfyUI-PSNodes"
],
"install_type": "git-clone",
"description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
}
]
}

View File

@@ -10,58 +10,6 @@
},
{
"author": "thanhduong0213929",
"title": "ComfyUI-DeepUnlock [REMOVED]",
"reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
"files": [
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
],
"install_type": "git-clone",
"description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
},
{
"author": "pathway8-sudo",
"title": "RMBG [REMOVED]",
"reference": "https://github.com/pathway8-sudo/RMBG",
"files": [
"https://github.com/pathway8-sudo/RMBG"
],
"install_type": "git-clone",
"description": "This repository provides a custom node for ComfyUI, leveraging the BriaRMBG model to remove backgrounds from images and output a transparent PNG."
},
{
"author": "iris-Neko",
"title": "ComfyUI_ascii_art [REMOVED]",
"reference": "https://github.com/iris-Neko/ComfyUI_ascii_art",
"files": [
"https://github.com/iris-Neko/ComfyUI_ascii_art"
],
"install_type": "git-clone",
"description": "ComfyUI node for [a/ASCII art controlnet](https://civitai.com/models/986392)"
},
{
"author": "apesplat",
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
"id": "ezxy",
"reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
"files": [
"https://github.com/GMapeSplat/ComfyUI_ezXY"
],
"install_type": "git-clone",
"description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
},
{
"author": "mie",
"title": "ComfyUI_JanusProCaption [REMOVED]",
"reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
"files": [
"https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
],
"install_type": "git-clone",
"description": "Describe image or create caption files using Janus Pro Model"
},
{
"author": "Njbx",
"title": "ComfyUI-blockswap [REMOVED]",

View File

File diff suppressed because it is too large Load Diff

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,28 +1,5 @@
{
"models": [
{
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.fp16.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
"size": "167MB"
},
{
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
"size": "335MB"
},
{
"name": "deepseek-ai/Janus-Pro-1B",
"type": "Janus-Pro",

View File

@@ -291,26 +291,6 @@
],
"install_type": "git-clone",
"description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
},
{
"author": "xhiroga",
"title": "ComfyUI-TypeScript-CustomNode",
"reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
"files": [
"https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
],
"install_type": "git-clone",
"description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
},
{
"author": "zentrocdot",
"title": "ComfyUI-Turtle_Graphics_Demos",
"reference": "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo",
"files": [
"https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo"
],
"description": "ComfyUI node for creating some Turtle Graphic demos.",
"install_type": "git-clone"
}
]
}

View File

@@ -34,9 +34,7 @@ else:
security_check.security_check()
manager_util.add_python_path_to_env()
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
@@ -84,7 +82,6 @@ comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
manager_config_path = os.path.join(manager_files_path, 'config.ini')
@@ -97,7 +94,7 @@ def read_config():
global default_conf
try:
import configparser
config = configparser.ConfigParser(strict=False)
config = configparser.ConfigParser()
config.read(manager_config_path)
default_conf = config['default']
except Exception:
@@ -125,14 +122,6 @@ if os.path.exists(manager_pip_overrides_path):
cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40' # for security
if os.path.exists(manager_pip_blacklist_path):
with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
for x in f.readlines():
y = x.strip()
if y != '':
cm_global.pip_blacklist.add(y)
def remap_pip_package(pkg):
if pkg in cm_global.pip_overrides:
res = cm_global.pip_overrides[pkg]
@@ -432,33 +421,29 @@ except Exception as e:
print(f"[ComfyUI-Manager] Logging failed: {e}")
def ensure_dependencies():
try:
import git # noqa: F401
import toml # noqa: F401
import rich # noqa: F401
import chardet # noqa: F401
except ModuleNotFoundError:
my_path = os.path.dirname(__file__)
requirements_path = os.path.join(my_path, "requirements.txt")
try:
import git # noqa: F401
import toml # noqa: F401
import rich # noqa: F401
except ModuleNotFoundError:
my_path = os.path.dirname(__file__)
requirements_path = os.path.join(my_path, "requirements.txt")
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
try:
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
except subprocess.CalledProcessError:
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
try:
subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
except subprocess.CalledProcessError:
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
try:
subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
except subprocess.CalledProcessError:
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
try:
print("## ComfyUI-Manager: installing dependencies done.")
except:
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
ensure_dependencies()
try:
print("## ComfyUI-Manager: installing dependencies done.")
except:
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
print("** ComfyUI startup time:", current_timestamp())
@@ -490,6 +475,7 @@ def read_downgrade_blacklist():
read_downgrade_blacklist()
print("[DBG] point1")
def check_bypass_ssl():
try:
@@ -502,12 +488,14 @@ def check_bypass_ssl():
check_bypass_ssl()
print("[DBG] point2")
# 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())
print("[DBG] point3")
def is_installed(name):
name = name.strip()
@@ -559,6 +547,7 @@ def is_installed(name):
return True # prevent downgrade
print("[DBG] point4")
if os.path.exists(restore_snapshot_path):
try:
@@ -608,23 +597,24 @@ if os.path.exists(restore_snapshot_path):
def execute_lazy_install_script(repo_path, executable):
global processed_install
print("[DBG] point5")
install_script_path = os.path.join(repo_path, "install.py")
requirements_path = os.path.join(repo_path, "requirements.txt")
if os.path.exists(requirements_path):
print(f"Install: pip packages for '{repo_path}'")
with open(requirements_path, "r") as requirements_file:
for line in requirements_file:
package_name = remap_pip_package(line.strip())
if package_name and not is_installed(package_name):
if '--index-url' in package_name:
s = package_name.split('--index-url')
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
else:
install_cmd = manager_util.make_pip_cmd(["install", package_name])
lines = manager_util.robust_readlines(requirements_path)
for line in lines:
package_name = remap_pip_package(line.strip())
if package_name and not is_installed(package_name):
if '--index-url' in package_name:
s = package_name.split('--index-url')
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
else:
install_cmd = manager_util.make_pip_cmd(["install", package_name])
process_wrap(install_cmd, repo_path)
process_wrap(install_cmd, repo_path)
if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
processed_install.add(f'{repo_path}/install.py')
@@ -641,6 +631,8 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
import uuid
import shutil
print("[DBG] point6")
# 1. download
archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip" # should be unpredictable name - security precaution
download_path = os.path.join(custom_nodes_path, archive_name)
@@ -690,12 +682,16 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
def execute_migration(moves):
import shutil
print("[DBG] point7")
for x in moves:
if os.path.exists(x[0]) and not os.path.exists(x[1]):
shutil.move(x[0], x[1])
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
script_executed = False
print("[DBG] point8")
# Check if script_list_path exists
if os.path.exists(script_list_path):
@@ -750,46 +746,28 @@ if os.path.exists(script_list_path):
# Remove the script_list_path file
if os.path.exists(script_list_path):
script_executed = True
os.remove(script_list_path)
print("\n[ComfyUI-Manager] Startup script completed.")
print("#######################################################################\n")
print("[DBG] point9")
pip_fixer.fix_broken()
print("[DBG] point10")
del processed_install
del pip_fixer
manager_util.clear_pip_cache()
if script_executed:
# Restart
print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
if '__COMFY_CLI_SESSION__' in os.environ:
with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
pass
print("--------------------------------------------------------------------------\n")
exit(0)
else:
sys_argv = sys.argv.copy()
if sys.platform.startswith('win32'):
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
else:
cmds = [sys.executable] + sys_argv
print(f"Command: {cmds}", flush=True)
print("--------------------------------------------------------------------------\n")
os.execv(sys.executable, cmds)
print("[DBG] point11")
def check_windows_event_loop_policy():
print("[DBG] point12")
try:
import configparser
config = configparser.ConfigParser(strict=False)
config = configparser.ConfigParser()
config.read(manager_config_path)
default_conf = config['default']
@@ -804,6 +782,10 @@ def check_windows_event_loop_policy():
except Exception:
pass
print("[DBG] point13")
if platform.system() == 'Windows':
check_windows_event_loop_policy()
print("[DBG] point14")

View File

@@ -1,9 +1,9 @@
[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.2"
version = "3.21"
license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
[project.urls]
Repository = "https://github.com/ltdrdata/ComfyUI-Manager"

View File

@@ -8,4 +8,3 @@ rich
typing-extensions
toml
uv
chardet

View File

@@ -6,7 +6,7 @@ python -m venv venv
call venv/Scripts/activate
python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
python -m pip install -r requirements.txt
python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
python -m pip install -r custom_nodes/ComfyUI-Manager/requirements.txt
cd ..
echo "cd ComfyUI" >> run_gpu.bat
echo "call venv/Scripts/activate" >> run_gpu.bat

View File

@@ -1,3 +1,2 @@
.\python_embeded\python.exe -s -m pip install gitpython
.\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt