Compare commits
43 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c6153ea67d | ||
|
|
191bffedcb | ||
|
|
9ddda81372 | ||
|
|
ddb3c4e3ce | ||
|
|
c87d27630b | ||
|
|
c1d0bb830e | ||
|
|
93dde4c985 | ||
|
|
0eb1cbce43 | ||
|
|
a935c8bb35 | ||
|
|
03eea8ce15 | ||
|
|
76b1adebc4 | ||
|
|
3be8f685bd | ||
|
|
4a392395ab | ||
|
|
fd9755e4a0 | ||
|
|
34151b03ef | ||
|
|
f63205f86c | ||
|
|
5e5867528d | ||
|
|
05623b0e13 | ||
|
|
12602da16c | ||
|
|
2b6dee9949 | ||
|
|
11fa305508 | ||
|
|
b532a3e784 | ||
|
|
f37f5b0ae2 | ||
|
|
c779573204 | ||
|
|
897debb106 | ||
|
|
0b43716c56 | ||
|
|
4ad1c8a238 | ||
|
|
9578ce0820 | ||
|
|
c5d8a1b3ad | ||
|
|
99049db807 | ||
|
|
70de42ccea | ||
|
|
fb74f39793 | ||
|
|
ef130b23ef | ||
|
|
2549dc7d20 | ||
|
|
85a03e6249 | ||
|
|
0903f28b0c | ||
|
|
c663907e37 | ||
|
|
830be27eb2 | ||
|
|
041f4e4bb5 | ||
|
|
d3fa87fd94 | ||
|
|
4dffb5d593 | ||
|
|
b114672e03 | ||
|
|
3c3713553e |
10
README.md
10
README.md
@@ -146,7 +146,15 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
|
|||||||
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
|
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
|
||||||
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
|
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
|
||||||
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
|
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
|
||||||
|
|
||||||
|
|
||||||
|
## `extra_model_paths.yaml` Configuration
|
||||||
|
The following settings are applied based on the section marked as `is_default`.
|
||||||
|
|
||||||
|
* `custom_nodes`: Path for installing custom nodes
|
||||||
|
* Importing does not need to adhere to the path set as `is_default`, but this is the path where custom nodes are installed by the `ComfyUI Nodes Manager`.
|
||||||
|
* `download_model_base`: Path for downloading models
|
||||||
|
|
||||||
|
|
||||||
## Snapshot-Manager
|
## Snapshot-Manager
|
||||||
* When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
|
* When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
|
||||||
|
|||||||
30
cm-cli.py
30
cm-cli.py
@@ -37,7 +37,6 @@ from manager_core import unified_manager
|
|||||||
import cnr_utils
|
import cnr_utils
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
comfy_path = os.environ.get('COMFYUI_PATH')
|
comfy_path = os.environ.get('COMFYUI_PATH')
|
||||||
|
|
||||||
@@ -96,6 +95,7 @@ class Ctx:
|
|||||||
self.mode = 'cache'
|
self.mode = 'cache'
|
||||||
self.user_directory = None
|
self.user_directory = None
|
||||||
self.custom_nodes_paths = [os.path.join(core.comfy_path, 'custom_nodes')]
|
self.custom_nodes_paths = [os.path.join(core.comfy_path, 'custom_nodes')]
|
||||||
|
self.manager_files_directory = os.path.dirname(__file__)
|
||||||
|
|
||||||
if Ctx.folder_paths is None:
|
if Ctx.folder_paths is None:
|
||||||
try:
|
try:
|
||||||
@@ -118,7 +118,7 @@ class Ctx:
|
|||||||
if channel is not None:
|
if channel is not None:
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
|
|
||||||
asyncio.run(unified_manager.reload(cache_mode=self.mode == 'cache'))
|
asyncio.run(unified_manager.reload(cache_mode=self.mode == 'cache', dont_wait=False))
|
||||||
asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
|
asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
|
||||||
|
|
||||||
def set_no_deps(self, no_deps):
|
def set_no_deps(self, no_deps):
|
||||||
@@ -537,7 +537,7 @@ def get_all_installed_node_specs():
|
|||||||
res.append(node_spec_str)
|
res.append(node_spec_str)
|
||||||
processed.add(k)
|
processed.add(k)
|
||||||
|
|
||||||
for k, _ in unified_manager.cnr_inactive_nodes.keys():
|
for k in unified_manager.cnr_inactive_nodes.keys():
|
||||||
if k in processed:
|
if k in processed:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@@ -546,7 +546,7 @@ def get_all_installed_node_specs():
|
|||||||
node_spec_str = f"{k}@{str(latest[0])}"
|
node_spec_str = f"{k}@{str(latest[0])}"
|
||||||
res.append(node_spec_str)
|
res.append(node_spec_str)
|
||||||
|
|
||||||
for k, _ in unified_manager.nightly_inactive_nodes.keys():
|
for k in unified_manager.nightly_inactive_nodes.keys():
|
||||||
if k in processed:
|
if k in processed:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@@ -624,7 +624,10 @@ def install(
|
|||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
cmd_ctx.set_channel_mode(channel, mode)
|
cmd_ctx.set_channel_mode(channel, mode)
|
||||||
cmd_ctx.set_no_deps(no_deps)
|
cmd_ctx.set_no_deps(no_deps)
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
for_each_nodes(nodes, act=install_node)
|
for_each_nodes(nodes, act=install_node)
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@app.command(help="Reinstall custom nodes")
|
@app.command(help="Reinstall custom nodes")
|
||||||
@@ -659,7 +662,10 @@ def reinstall(
|
|||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
cmd_ctx.set_channel_mode(channel, mode)
|
cmd_ctx.set_channel_mode(channel, mode)
|
||||||
cmd_ctx.set_no_deps(no_deps)
|
cmd_ctx.set_no_deps(no_deps)
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
for_each_nodes(nodes, act=reinstall_node)
|
for_each_nodes(nodes, act=reinstall_node)
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@app.command(help="Uninstall custom nodes")
|
@app.command(help="Uninstall custom nodes")
|
||||||
@@ -711,12 +717,15 @@ def update(
|
|||||||
if 'all' in nodes:
|
if 'all' in nodes:
|
||||||
asyncio.run(auto_save_snapshot())
|
asyncio.run(auto_save_snapshot())
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
|
|
||||||
for x in nodes:
|
for x in nodes:
|
||||||
if x.lower() in ['comfyui', 'comfy', 'all']:
|
if x.lower() in ['comfyui', 'comfy', 'all']:
|
||||||
update_comfyui()
|
update_comfyui()
|
||||||
break
|
break
|
||||||
|
|
||||||
update_parallel(nodes)
|
update_parallel(nodes)
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@app.command(help="Disable custom nodes")
|
@app.command(help="Disable custom nodes")
|
||||||
@@ -809,7 +818,9 @@ def fix(
|
|||||||
if 'all' in nodes:
|
if 'all' in nodes:
|
||||||
asyncio.run(auto_save_snapshot())
|
asyncio.run(auto_save_snapshot())
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
for_each_nodes(nodes, fix_node, allow_all=True)
|
for_each_nodes(nodes, fix_node, allow_all=True)
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@app.command("show-versions", help="Show all available versions of the node")
|
@app.command("show-versions", help="Show all available versions of the node")
|
||||||
@@ -1060,12 +1071,14 @@ def restore_snapshot(
|
|||||||
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
|
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
try:
|
try:
|
||||||
asyncio.run(core.restore_snapshot(snapshot_path, extras))
|
asyncio.run(core.restore_snapshot(snapshot_path, extras))
|
||||||
except Exception:
|
except Exception:
|
||||||
print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")
|
print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
raise typer.Exit(code=1)
|
raise typer.Exit(code=1)
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@app.command(
|
@app.command(
|
||||||
@@ -1089,11 +1102,14 @@ def restore_dependencies(
|
|||||||
|
|
||||||
total = len(node_paths)
|
total = len(node_paths)
|
||||||
i = 1
|
i = 1
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
for x in node_paths:
|
for x in node_paths:
|
||||||
print("----------------------------------------------------------------------------------------------------")
|
print("----------------------------------------------------------------------------------------------------")
|
||||||
print(f"Restoring [{i}/{total}]: {x}")
|
print(f"Restoring [{i}/{total}]: {x}")
|
||||||
unified_manager.execute_install_script('', x, instant_execution=True)
|
unified_manager.execute_install_script('', x, instant_execution=True)
|
||||||
i += 1
|
i += 1
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@app.command(
|
@app.command(
|
||||||
@@ -1105,7 +1121,10 @@ def post_install(
|
|||||||
)
|
)
|
||||||
):
|
):
|
||||||
path = os.path.expanduser(path)
|
path = os.path.expanduser(path)
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
unified_manager.execute_install_script('', path, instant_execution=True)
|
unified_manager.execute_install_script('', path, instant_execution=True)
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@app.command(
|
@app.command(
|
||||||
@@ -1147,6 +1166,8 @@ def install_deps(
|
|||||||
print(f"[bold red]Invalid json file: {deps}[/bold red]")
|
print(f"[bold red]Invalid json file: {deps}[/bold red]")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||||
for k in json_obj['custom_nodes'].keys():
|
for k in json_obj['custom_nodes'].keys():
|
||||||
state = core.simple_check_custom_node(k)
|
state = core.simple_check_custom_node(k)
|
||||||
if state == 'installed':
|
if state == 'installed':
|
||||||
@@ -1155,6 +1176,7 @@ def install_deps(
|
|||||||
asyncio.run(core.gitclone_install(k, instant_execution=True))
|
asyncio.run(core.gitclone_install(k, instant_execution=True))
|
||||||
else: # disabled
|
else: # disabled
|
||||||
core.gitclone_set_active([k], False)
|
core.gitclone_set_active([k], False)
|
||||||
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
print("Dependency installation and activation complete.")
|
print("Dependency installation and activation complete.")
|
||||||
|
|
||||||
|
|||||||
796
custom-node-list.json
Normal file → Executable file
796
custom-node-list.json
Normal file → Executable file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -9,7 +9,7 @@
|
|||||||
"comfyui-layerdiffuse",
|
"comfyui-layerdiffuse",
|
||||||
"comfyui-liveportraitkj",
|
"comfyui-liveportraitkj",
|
||||||
"aigodlike-comfyui-translation",
|
"aigodlike-comfyui-translation",
|
||||||
"comfyui-reactor-node",
|
"comfyui-reactor",
|
||||||
"comfyui_instantid",
|
"comfyui_instantid",
|
||||||
"sd-dynamic-thresholding",
|
"sd-dynamic-thresholding",
|
||||||
"pr-was-node-suite-comfyui-47064894",
|
"pr-was-node-suite-comfyui-47064894",
|
||||||
|
|||||||
@@ -124,18 +124,47 @@ def gitcheck(path, do_fetch=False):
|
|||||||
print("CUSTOM NODE CHECK: Error")
|
print("CUSTOM NODE CHECK: Error")
|
||||||
|
|
||||||
|
|
||||||
|
def get_remote_name(repo):
|
||||||
|
available_remotes = [remote.name for remote in repo.remotes]
|
||||||
|
if 'origin' in available_remotes:
|
||||||
|
return 'origin'
|
||||||
|
elif 'upstream' in available_remotes:
|
||||||
|
return 'upstream'
|
||||||
|
elif len(available_remotes) > 0:
|
||||||
|
return available_remotes[0]
|
||||||
|
|
||||||
|
if not available_remotes:
|
||||||
|
print(f"[ComfyUI-Manager] No remotes are configured for this repository: {repo.working_dir}")
|
||||||
|
else:
|
||||||
|
print(f"[ComfyUI-Manager] Available remotes in '{repo.working_dir}': ")
|
||||||
|
for remote in available_remotes:
|
||||||
|
print(f"- {remote}")
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def switch_to_default_branch(repo):
|
def switch_to_default_branch(repo):
|
||||||
|
remote_name = get_remote_name(repo)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
|
if remote_name is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
|
||||||
repo.git.checkout(default_branch)
|
repo.git.checkout(default_branch)
|
||||||
|
return True
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
repo.git.checkout(repo.heads.master)
|
repo.git.checkout(repo.heads.master)
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
repo.git.checkout('-b', 'master', 'origin/master')
|
if remote_name is not None:
|
||||||
|
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
||||||
except:
|
except:
|
||||||
print("[ComfyUI Manager] Failed to switch to the default branch")
|
pass
|
||||||
|
|
||||||
|
print("[ComfyUI Manager] Failed to switch to the default branch")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def gitpull(path):
|
def gitpull(path):
|
||||||
@@ -166,7 +195,11 @@ def gitpull(path):
|
|||||||
branch_name = current_branch.name
|
branch_name = current_branch.name
|
||||||
|
|
||||||
remote.fetch()
|
remote.fetch()
|
||||||
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
if f'{remote_name}/{branch_name}' in repo.refs:
|
||||||
|
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
||||||
|
else:
|
||||||
|
print("CUSTOM NODE PULL: Fail") # update fail
|
||||||
|
return
|
||||||
|
|
||||||
if commit_hash == remote_commit_hash:
|
if commit_hash == remote_commit_hash:
|
||||||
print("CUSTOM NODE PULL: None") # there is no update
|
print("CUSTOM NODE PULL: None") # there is no update
|
||||||
|
|||||||
5615
github-stats.json
5615
github-stats.json
File diff suppressed because it is too large
Load Diff
@@ -110,3 +110,6 @@ def add_on_revision_detected(k, f):
|
|||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
else:
|
else:
|
||||||
variables['cm.on_revision_detected_handler'].append((k, f))
|
variables['cm.on_revision_detected_handler'].append((k, f))
|
||||||
|
|
||||||
|
|
||||||
|
error_dict = {}
|
||||||
@@ -4,23 +4,72 @@ from typing import List
|
|||||||
import manager_util
|
import manager_util
|
||||||
import toml
|
import toml
|
||||||
import os
|
import os
|
||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
|
||||||
base_url = "https://api.comfy.org"
|
base_url = "https://api.comfy.org"
|
||||||
|
|
||||||
|
|
||||||
async def get_cnr_data(page=1, limit=1000, cache_mode=True):
|
lock = asyncio.Lock()
|
||||||
try:
|
|
||||||
uri = f'{base_url}/nodes?page={page}&limit={limit}'
|
|
||||||
json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
|
|
||||||
|
|
||||||
for v in json_obj['nodes']:
|
is_cache_loading = False
|
||||||
|
|
||||||
|
async def get_cnr_data(cache_mode=True, dont_wait=True):
|
||||||
|
global is_cache_loading
|
||||||
|
|
||||||
|
uri = f'{base_url}/nodes'
|
||||||
|
|
||||||
|
async def fetch_all():
|
||||||
|
remained = True
|
||||||
|
page = 1
|
||||||
|
|
||||||
|
full_nodes = {}
|
||||||
|
while remained:
|
||||||
|
sub_uri = f'{base_url}/nodes?page={page}&limit=30'
|
||||||
|
sub_json_obj = await manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True)
|
||||||
|
remained = page < sub_json_obj['totalPages']
|
||||||
|
|
||||||
|
for x in sub_json_obj['nodes']:
|
||||||
|
full_nodes[x['id']] = x
|
||||||
|
|
||||||
|
if page % 5 == 0:
|
||||||
|
print(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
|
||||||
|
page += 1
|
||||||
|
|
||||||
|
print("FETCH ComfyRegistry Data [DONE]")
|
||||||
|
|
||||||
|
for v in full_nodes.values():
|
||||||
if 'latest_version' not in v:
|
if 'latest_version' not in v:
|
||||||
v['latest_version'] = dict(version='nightly')
|
v['latest_version'] = dict(version='nightly')
|
||||||
|
|
||||||
|
return {'nodes': list(full_nodes.values())}
|
||||||
|
|
||||||
|
if cache_mode:
|
||||||
|
is_cache_loading = True
|
||||||
|
cache_state = manager_util.get_cache_state(uri)
|
||||||
|
|
||||||
|
if dont_wait:
|
||||||
|
if cache_state == 'not-cached':
|
||||||
|
return {}
|
||||||
|
else:
|
||||||
|
print("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
|
||||||
|
with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
|
return json.load(json_file)['nodes']
|
||||||
|
|
||||||
|
if cache_state == 'cached':
|
||||||
|
with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
|
return json.load(json_file)['nodes']
|
||||||
|
|
||||||
|
try:
|
||||||
|
json_obj = await fetch_all()
|
||||||
|
manager_util.save_to_cache(uri, json_obj)
|
||||||
return json_obj['nodes']
|
return json_obj['nodes']
|
||||||
except:
|
except:
|
||||||
res = {}
|
res = {}
|
||||||
print("Cannot connect to comfyregistry.")
|
print("Cannot connect to comfyregistry.")
|
||||||
|
finally:
|
||||||
|
if cache_mode:
|
||||||
|
is_cache_loading = False
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@@ -92,7 +141,7 @@ def install_node(node_id, version=None):
|
|||||||
|
|
||||||
|
|
||||||
def all_versions_of_node(node_id):
|
def all_versions_of_node(node_id):
|
||||||
url = f"https://api.comfy.org/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"
|
url = f"{base_url}/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"
|
||||||
|
|
||||||
response = requests.get(url)
|
response = requests.get(url)
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
@@ -113,7 +162,7 @@ def read_cnr_info(fullpath):
|
|||||||
data = toml.load(f)
|
data = toml.load(f)
|
||||||
|
|
||||||
project = data.get('project', {})
|
project = data.get('project', {})
|
||||||
name = project.get('name')
|
name = project.get('name').strip().lower()
|
||||||
version = project.get('version')
|
version = project.get('version')
|
||||||
|
|
||||||
urls = project.get('urls', {})
|
urls = project.get('urls', {})
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ import manager_downloader
|
|||||||
from node_package import InstalledNodePackage
|
from node_package import InstalledNodePackage
|
||||||
|
|
||||||
|
|
||||||
version_code = [3, 5]
|
version_code = [3, 9]
|
||||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||||
|
|
||||||
|
|
||||||
@@ -122,7 +122,6 @@ def check_invalid_nodes():
|
|||||||
if subdir in ['.disabled', '__pycache__']:
|
if subdir in ['.disabled', '__pycache__']:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
||||||
package = unified_manager.installed_node_packages.get(subdir)
|
package = unified_manager.installed_node_packages.get(subdir)
|
||||||
if not package:
|
if not package:
|
||||||
continue
|
continue
|
||||||
@@ -233,7 +232,7 @@ def remap_pip_package(pkg):
|
|||||||
def is_blacklisted(name):
|
def is_blacklisted(name):
|
||||||
name = name.strip()
|
name = name.strip()
|
||||||
|
|
||||||
pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
|
pattern = r'([^<>!~=]+)([<>!~=]=?)([^ ]*)'
|
||||||
match = re.search(pattern, name)
|
match = re.search(pattern, name)
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
@@ -248,7 +247,7 @@ def is_blacklisted(name):
|
|||||||
if match is None:
|
if match is None:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
return True
|
return True
|
||||||
elif match.group(2) in ['<=', '==', '<']:
|
elif match.group(2) in ['<=', '==', '<', '~=']:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
||||||
return True
|
return True
|
||||||
@@ -262,7 +261,7 @@ def is_installed(name):
|
|||||||
if name.startswith('#'):
|
if name.startswith('#'):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
|
pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
|
||||||
match = re.search(pattern, name)
|
match = re.search(pattern, name)
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
@@ -277,7 +276,7 @@ def is_installed(name):
|
|||||||
if match is None:
|
if match is None:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
return True
|
return True
|
||||||
elif match.group(2) in ['<=', '==', '<']:
|
elif match.group(2) in ['<=', '==', '<', '~=']:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
||||||
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
||||||
@@ -368,6 +367,16 @@ class UnifiedManager:
|
|||||||
self.custom_node_map_cache = {} # (channel, mode) -> augmented custom node list json
|
self.custom_node_map_cache = {} # (channel, mode) -> augmented custom node list json
|
||||||
self.processed_install = set()
|
self.processed_install = set()
|
||||||
|
|
||||||
|
def get_module_name(self, x):
|
||||||
|
info = self.active_nodes.get(x)
|
||||||
|
if info is None:
|
||||||
|
for url, fullpath in self.unknown_active_nodes.values():
|
||||||
|
if url == x:
|
||||||
|
return os.path.basename(fullpath)
|
||||||
|
else:
|
||||||
|
return os.path.basename(info[1])
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
def get_cnr_by_repo(self, url):
|
def get_cnr_by_repo(self, url):
|
||||||
return self.repo_cnr_map.get(git_utils.normalize_url(url))
|
return self.repo_cnr_map.get(git_utils.normalize_url(url))
|
||||||
@@ -501,18 +510,18 @@ class UnifiedManager:
|
|||||||
self.installed_node_packages[node_package.id] = node_package
|
self.installed_node_packages[node_package.id] = node_package
|
||||||
|
|
||||||
if node_package.is_disabled and node_package.is_unknown:
|
if node_package.is_disabled and node_package.is_unknown:
|
||||||
# NOTE: unknown package does not have an url.
|
url = git_utils.git_url(node_package.fullpath)
|
||||||
self.unknown_inactive_nodes[node_package.id] = ('', node_package.fullpath)
|
self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
|
||||||
|
|
||||||
if node_package.is_disabled and node_package.is_nightly:
|
if node_package.is_disabled and node_package.is_nightly:
|
||||||
self.nightly_inactive_nodes[node_package.id] = node_package.fullpath
|
self.nightly_inactive_nodes[node_package.id] = node_package.fullpath
|
||||||
|
|
||||||
if node_package.is_enabled:
|
if node_package.is_enabled and not node_package.is_unknown:
|
||||||
self.active_nodes[node_package.id] = node_package.version, node_package.fullpath
|
self.active_nodes[node_package.id] = node_package.version, node_package.fullpath
|
||||||
|
|
||||||
if node_package.is_enabled and node_package.is_unknown:
|
if node_package.is_enabled and node_package.is_unknown:
|
||||||
# NOTE: unknown package does not have an url.
|
url = git_utils.git_url(node_package.fullpath)
|
||||||
self.unknown_active_nodes[node_package.id] = ('', node_package.fullpath)
|
self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
|
||||||
|
|
||||||
if node_package.is_from_cnr and node_package.is_disabled:
|
if node_package.is_from_cnr and node_package.is_disabled:
|
||||||
self.add_to_cnr_inactive_nodes(node_package.id, node_package.version, node_package.fullpath)
|
self.add_to_cnr_inactive_nodes(node_package.id, node_package.version, node_package.fullpath)
|
||||||
@@ -664,7 +673,7 @@ class UnifiedManager:
|
|||||||
|
|
||||||
return latest
|
return latest
|
||||||
|
|
||||||
async def reload(self, cache_mode):
|
async def reload(self, cache_mode, dont_wait=True):
|
||||||
self.custom_node_map_cache = {}
|
self.custom_node_map_cache = {}
|
||||||
self.cnr_inactive_nodes = {} # node_id -> node_version -> fullpath
|
self.cnr_inactive_nodes = {} # node_id -> node_version -> fullpath
|
||||||
self.nightly_inactive_nodes = {} # node_id -> fullpath
|
self.nightly_inactive_nodes = {} # node_id -> fullpath
|
||||||
@@ -673,11 +682,10 @@ class UnifiedManager:
|
|||||||
self.active_nodes = {} # node_id -> node_version * fullpath
|
self.active_nodes = {} # node_id -> node_version * fullpath
|
||||||
|
|
||||||
# reload 'cnr_map' and 'repo_cnr_map'
|
# reload 'cnr_map' and 'repo_cnr_map'
|
||||||
cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode)
|
cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
|
||||||
|
|
||||||
for x in cnrs:
|
for x in cnrs:
|
||||||
self.cnr_map[x['id']] = x
|
self.cnr_map[x['id']] = x
|
||||||
|
|
||||||
if 'repository' in x:
|
if 'repository' in x:
|
||||||
normalized_url = git_utils.normalize_url(x['repository'])
|
normalized_url = git_utils.normalize_url(x['repository'])
|
||||||
self.repo_cnr_map[normalized_url] = x
|
self.repo_cnr_map[normalized_url] = x
|
||||||
@@ -723,8 +731,11 @@ class UnifiedManager:
|
|||||||
return res
|
return res
|
||||||
|
|
||||||
async def get_custom_nodes(self, channel, mode):
|
async def get_custom_nodes(self, channel, mode):
|
||||||
default_channel = normalize_channel('default')
|
# default_channel = normalize_channel('default')
|
||||||
cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
|
# cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
|
||||||
|
|
||||||
|
channel = normalize_channel(channel)
|
||||||
|
cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel.
|
||||||
|
|
||||||
if cache is not None:
|
if cache is not None:
|
||||||
return cache
|
return cache
|
||||||
@@ -749,6 +760,8 @@ class UnifiedManager:
|
|||||||
v['title'] = cnr['name']
|
v['title'] = cnr['name']
|
||||||
v['description'] = cnr['description']
|
v['description'] = cnr['description']
|
||||||
v['health'] = '-'
|
v['health'] = '-'
|
||||||
|
if 'repository' in cnr:
|
||||||
|
v['repository'] = cnr['repository']
|
||||||
added_cnr.add(cnr['id'])
|
added_cnr.add(cnr['id'])
|
||||||
node_id = v['id']
|
node_id = v['id']
|
||||||
else:
|
else:
|
||||||
@@ -824,7 +837,11 @@ class UnifiedManager:
|
|||||||
|
|
||||||
result = ManagedResult('fix')
|
result = ManagedResult('fix')
|
||||||
|
|
||||||
info = self.active_nodes.get(node_id)
|
if version_spec == 'unknown':
|
||||||
|
info = self.unknown_active_nodes.get(node_id)
|
||||||
|
else:
|
||||||
|
info = self.active_nodes.get(node_id)
|
||||||
|
|
||||||
if info is None or not os.path.exists(info[1]):
|
if info is None or not os.path.exists(info[1]):
|
||||||
return result.fail(f'not found: {node_id}@{version_spec}')
|
return result.fail(f'not found: {node_id}@{version_spec}')
|
||||||
|
|
||||||
@@ -889,7 +906,7 @@ class UnifiedManager:
|
|||||||
|
|
||||||
archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip" # should be unpredictable name - security precaution
|
archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip" # should be unpredictable name - security precaution
|
||||||
download_path = os.path.join(get_default_custom_nodes_path(), archive_name)
|
download_path = os.path.join(get_default_custom_nodes_path(), archive_name)
|
||||||
manager_downloader.download_url(node_info.download_url, get_default_custom_nodes_path(), archive_name)
|
manager_downloader.basic_download_url(node_info.download_url, get_default_custom_nodes_path(), archive_name)
|
||||||
|
|
||||||
# 2. extract files into <node_id>
|
# 2. extract files into <node_id>
|
||||||
install_path = self.active_nodes[node_id][1]
|
install_path = self.active_nodes[node_id][1]
|
||||||
@@ -1227,16 +1244,21 @@ class UnifiedManager:
|
|||||||
repo = git.Repo(repo_path)
|
repo = git.Repo(repo_path)
|
||||||
|
|
||||||
if repo.head.is_detached:
|
if repo.head.is_detached:
|
||||||
switch_to_default_branch(repo)
|
if not switch_to_default_branch(repo):
|
||||||
|
return result.fail(f"Failed to switch to default branch: {repo_path}")
|
||||||
|
|
||||||
current_branch = repo.active_branch
|
current_branch = repo.active_branch
|
||||||
branch_name = current_branch.name
|
branch_name = current_branch.name
|
||||||
|
|
||||||
if current_branch.tracking_branch() is None:
|
if current_branch.tracking_branch() is None:
|
||||||
print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
|
print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
|
||||||
remote_name = 'origin'
|
remote_name = get_remote_name(repo)
|
||||||
else:
|
else:
|
||||||
remote_name = current_branch.tracking_branch().remote_name
|
remote_name = current_branch.tracking_branch().remote_name
|
||||||
|
|
||||||
|
if remote_name is None:
|
||||||
|
return result.fail(f"Failed to get remote when installing: {repo_path}")
|
||||||
|
|
||||||
remote = repo.remote(name=remote_name)
|
remote = repo.remote(name=remote_name)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -1255,7 +1277,10 @@ class UnifiedManager:
|
|||||||
"-----------------------------------------------------------------------------------------\n")
|
"-----------------------------------------------------------------------------------------\n")
|
||||||
|
|
||||||
commit_hash = repo.head.commit.hexsha
|
commit_hash = repo.head.commit.hexsha
|
||||||
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
if f'{remote_name}/{branch_name}' in repo.refs:
|
||||||
|
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
||||||
|
else:
|
||||||
|
return result.fail(f"Not updatable branch: {branch_name}")
|
||||||
|
|
||||||
if commit_hash != remote_commit_hash:
|
if commit_hash != remote_commit_hash:
|
||||||
git_pull(repo_path)
|
git_pull(repo_path)
|
||||||
@@ -1316,7 +1341,10 @@ class UnifiedManager:
|
|||||||
custom_nodes = await self.get_custom_nodes(channel, mode)
|
custom_nodes = await self.get_custom_nodes(channel, mode)
|
||||||
the_node = custom_nodes.get(node_id)
|
the_node = custom_nodes.get(node_id)
|
||||||
if the_node is not None:
|
if the_node is not None:
|
||||||
repo_url = the_node['files'][0]
|
if version_spec == 'unknown':
|
||||||
|
repo_url = the_node['files'][0]
|
||||||
|
else: # nightly
|
||||||
|
repo_url = the_node['repository']
|
||||||
else:
|
else:
|
||||||
result = ManagedResult('install')
|
result = ManagedResult('install')
|
||||||
return result.fail(f"Node '{node_id}@{version_spec}' not found in [{channel}, {mode}]")
|
return result.fail(f"Node '{node_id}@{version_spec}' not found in [{channel}, {mode}]")
|
||||||
@@ -1341,6 +1369,8 @@ class UnifiedManager:
|
|||||||
elif version_spec == 'nightly':
|
elif version_spec == 'nightly':
|
||||||
cnr_utils.generate_cnr_id(to_path, node_id)
|
cnr_utils.generate_cnr_id(to_path, node_id)
|
||||||
self.active_nodes[node_id] = 'nightly', to_path
|
self.active_nodes[node_id] = 'nightly', to_path
|
||||||
|
else:
|
||||||
|
return res
|
||||||
|
|
||||||
return res.with_target(version_spec)
|
return res.with_target(version_spec)
|
||||||
|
|
||||||
@@ -1586,18 +1616,47 @@ def get_config():
|
|||||||
return cached_config
|
return cached_config
|
||||||
|
|
||||||
|
|
||||||
|
def get_remote_name(repo):
|
||||||
|
available_remotes = [remote.name for remote in repo.remotes]
|
||||||
|
if 'origin' in available_remotes:
|
||||||
|
return 'origin'
|
||||||
|
elif 'upstream' in available_remotes:
|
||||||
|
return 'upstream'
|
||||||
|
elif len(available_remotes) > 0:
|
||||||
|
return available_remotes[0]
|
||||||
|
|
||||||
|
if not available_remotes:
|
||||||
|
print(f"[ComfyUI-Manager] No remotes are configured for this repository: {repo.working_dir}")
|
||||||
|
else:
|
||||||
|
print(f"[ComfyUI-Manager] Available remotes in '{repo.working_dir}': ")
|
||||||
|
for remote in available_remotes:
|
||||||
|
print(f"- {remote}")
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def switch_to_default_branch(repo):
|
def switch_to_default_branch(repo):
|
||||||
|
remote_name = get_remote_name(repo)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
|
if remote_name is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
|
||||||
repo.git.checkout(default_branch)
|
repo.git.checkout(default_branch)
|
||||||
|
return True
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
repo.git.checkout(repo.heads.master)
|
repo.git.checkout(repo.heads.master)
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
repo.git.checkout('-b', 'master', 'origin/master')
|
if remote_name is not None:
|
||||||
|
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
||||||
except:
|
except:
|
||||||
print("[ComfyUI Manager] Failed to switch to the default branch")
|
pass
|
||||||
|
|
||||||
|
print("[ComfyUI Manager] Failed to switch to the default branch")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
||||||
@@ -1778,7 +1837,11 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
|
|||||||
# Fetch the latest commits from the remote repository
|
# Fetch the latest commits from the remote repository
|
||||||
repo = git.Repo(path)
|
repo = git.Repo(path)
|
||||||
|
|
||||||
remote_name = 'origin'
|
remote_name = get_remote_name(repo)
|
||||||
|
|
||||||
|
if remote_name is None:
|
||||||
|
raise ValueError(f"No remotes are configured for this repository: {path}")
|
||||||
|
|
||||||
remote = repo.remote(name=remote_name)
|
remote = repo.remote(name=remote_name)
|
||||||
|
|
||||||
if not do_update and repo.head.is_detached:
|
if not do_update and repo.head.is_detached:
|
||||||
@@ -1788,7 +1851,8 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
|
|||||||
return True, True # detached branch is treated as updatable
|
return True, True # detached branch is treated as updatable
|
||||||
|
|
||||||
if repo.head.is_detached:
|
if repo.head.is_detached:
|
||||||
switch_to_default_branch(repo)
|
if not switch_to_default_branch(repo):
|
||||||
|
raise ValueError(f"Failed to switch detached branch to default branch: {path}")
|
||||||
|
|
||||||
current_branch = repo.active_branch
|
current_branch = repo.active_branch
|
||||||
branch_name = current_branch.name
|
branch_name = current_branch.name
|
||||||
@@ -1805,11 +1869,16 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
|
|||||||
repo.git.stash()
|
repo.git.stash()
|
||||||
|
|
||||||
if f'{remote_name}/{branch_name}' not in repo.refs:
|
if f'{remote_name}/{branch_name}' not in repo.refs:
|
||||||
switch_to_default_branch(repo)
|
if not switch_to_default_branch(repo):
|
||||||
|
raise ValueError(f"Failed to switch to default branch while updating: {path}")
|
||||||
|
|
||||||
current_branch = repo.active_branch
|
current_branch = repo.active_branch
|
||||||
branch_name = current_branch.name
|
branch_name = current_branch.name
|
||||||
|
|
||||||
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
if f'{remote_name}/{branch_name}' in repo.refs:
|
||||||
|
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
||||||
|
else:
|
||||||
|
return False, False
|
||||||
|
|
||||||
if commit_hash == remote_commit_hash:
|
if commit_hash == remote_commit_hash:
|
||||||
repo.close()
|
repo.close()
|
||||||
@@ -1964,7 +2033,8 @@ def git_pull(path):
|
|||||||
repo.git.stash()
|
repo.git.stash()
|
||||||
|
|
||||||
if repo.head.is_detached:
|
if repo.head.is_detached:
|
||||||
switch_to_default_branch(repo)
|
if not switch_to_default_branch(repo):
|
||||||
|
raise ValueError(f"Failed to switch to default branch while pulling: {path}")
|
||||||
|
|
||||||
current_branch = repo.active_branch
|
current_branch = repo.active_branch
|
||||||
remote_name = current_branch.tracking_branch().remote_name
|
remote_name = current_branch.tracking_branch().remote_name
|
||||||
@@ -2228,14 +2298,15 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
|
|||||||
repo = git.Repo(repo_path)
|
repo = git.Repo(repo_path)
|
||||||
|
|
||||||
if repo.head.is_detached:
|
if repo.head.is_detached:
|
||||||
switch_to_default_branch(repo)
|
if not switch_to_default_branch(repo):
|
||||||
|
return "fail"
|
||||||
|
|
||||||
current_branch = repo.active_branch
|
current_branch = repo.active_branch
|
||||||
branch_name = current_branch.name
|
branch_name = current_branch.name
|
||||||
|
|
||||||
if current_branch.tracking_branch() is None:
|
if current_branch.tracking_branch() is None:
|
||||||
print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
|
print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
|
||||||
remote_name = 'origin'
|
remote_name = get_remote_name(repo)
|
||||||
else:
|
else:
|
||||||
remote_name = current_branch.tracking_branch().remote_name
|
remote_name = current_branch.tracking_branch().remote_name
|
||||||
remote = repo.remote(name=remote_name)
|
remote = repo.remote(name=remote_name)
|
||||||
@@ -2254,9 +2325,14 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
|
|||||||
f"-----------------------------------------------------------------------------------------\n"
|
f"-----------------------------------------------------------------------------------------\n"
|
||||||
f'git config --global --add safe.directory "{safedir_path}"\n'
|
f'git config --global --add safe.directory "{safedir_path}"\n'
|
||||||
f"-----------------------------------------------------------------------------------------\n")
|
f"-----------------------------------------------------------------------------------------\n")
|
||||||
|
return "fail"
|
||||||
|
|
||||||
commit_hash = repo.head.commit.hexsha
|
commit_hash = repo.head.commit.hexsha
|
||||||
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
|
||||||
|
if f'{remote_name}/{branch_name}' in repo.refs:
|
||||||
|
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
|
||||||
|
else:
|
||||||
|
return "fail"
|
||||||
|
|
||||||
if commit_hash != remote_commit_hash:
|
if commit_hash != remote_commit_hash:
|
||||||
git_pull(repo_path)
|
git_pull(repo_path)
|
||||||
@@ -2323,11 +2399,14 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr
|
|||||||
|
|
||||||
if dir_path and os.path.exists(dir_path):
|
if dir_path and os.path.exists(dir_path):
|
||||||
if do_update_check:
|
if do_update_check:
|
||||||
update_state, success = git_repo_update_check_with(dir_path, do_fetch, do_update)
|
try:
|
||||||
if (do_update_check or do_update) and update_state:
|
update_state, success = git_repo_update_check_with(dir_path, do_fetch, do_update)
|
||||||
item['update-state'] = 'true'
|
if (do_update_check or do_update) and update_state:
|
||||||
elif do_update and not success:
|
item['update-state'] = 'true'
|
||||||
item['update-state'] = 'fail'
|
elif do_update and not success:
|
||||||
|
item['update-state'] = 'fail'
|
||||||
|
except Exception:
|
||||||
|
print(f"[ComfyUI-Manager] Failed to check state of the git node pack: {dir_path}")
|
||||||
|
|
||||||
|
|
||||||
def get_installed_pip_packages():
|
def get_installed_pip_packages():
|
||||||
@@ -2397,8 +2476,21 @@ async def get_current_snapshot():
|
|||||||
cnr_custom_nodes[info['id']] = info['ver']
|
cnr_custom_nodes[info['id']] = info['ver']
|
||||||
else:
|
else:
|
||||||
repo = git.Repo(fullpath)
|
repo = git.Repo(fullpath)
|
||||||
|
|
||||||
|
if repo.head.is_detached:
|
||||||
|
remote_name = get_remote_name(repo)
|
||||||
|
else:
|
||||||
|
current_branch = repo.active_branch
|
||||||
|
|
||||||
|
if current_branch.tracking_branch() is None:
|
||||||
|
remote_name = get_remote_name(repo)
|
||||||
|
else:
|
||||||
|
remote_name = current_branch.tracking_branch().remote_name
|
||||||
|
|
||||||
commit_hash = repo.head.commit.hexsha
|
commit_hash = repo.head.commit.hexsha
|
||||||
url = repo.remotes.origin.url
|
|
||||||
|
url = repo.remotes[remote_name].url
|
||||||
|
|
||||||
git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
|
git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
|
||||||
except:
|
except:
|
||||||
print(f"Failed to extract snapshots for the custom node '{path}'.")
|
print(f"Failed to extract snapshots for the custom node '{path}'.")
|
||||||
@@ -2603,8 +2695,8 @@ def map_to_unified_keys(json_obj):
|
|||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
async def get_unified_total_nodes(channel, mode):
|
async def get_unified_total_nodes(channel, mode, regsitry_cache_mode='cache'):
|
||||||
await unified_manager.reload(mode)
|
await unified_manager.reload(regsitry_cache_mode)
|
||||||
|
|
||||||
res = await unified_manager.get_custom_nodes(channel, mode)
|
res = await unified_manager.get_custom_nodes(channel, mode)
|
||||||
|
|
||||||
@@ -2687,6 +2779,7 @@ async def get_unified_total_nodes(channel, mode):
|
|||||||
author = cnr['publisher']['name']
|
author = cnr['publisher']['name']
|
||||||
title = cnr['name']
|
title = cnr['name']
|
||||||
reference = f"https://registry.comfy.org/nodes/{cnr['id']}"
|
reference = f"https://registry.comfy.org/nodes/{cnr['id']}"
|
||||||
|
repository = cnr.get('repository', '')
|
||||||
install_type = "cnr"
|
install_type = "cnr"
|
||||||
description = cnr.get('description', '')
|
description = cnr.get('description', '')
|
||||||
|
|
||||||
@@ -2718,7 +2811,7 @@ async def get_unified_total_nodes(channel, mode):
|
|||||||
if ver is None:
|
if ver is None:
|
||||||
ver = cnr['latest_version']['version']
|
ver = cnr['latest_version']['version']
|
||||||
|
|
||||||
item = dict(author=author, title=title, reference=reference, install_type=install_type,
|
item = dict(author=author, title=title, reference=reference, repository=repository, install_type=install_type,
|
||||||
description=description, state=state, updatable=updatable, version=ver)
|
description=description, state=state, updatable=updatable, version=ver)
|
||||||
|
|
||||||
if active_version:
|
if active_version:
|
||||||
|
|||||||
@@ -16,7 +16,11 @@ if aria2 is not None:
|
|||||||
aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))
|
aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))
|
||||||
|
|
||||||
|
|
||||||
def basic_download_url(url, dest_folder, filename):
|
def basic_download_url(url, dest_folder: str, filename: str):
|
||||||
|
'''
|
||||||
|
Download file from url to dest_folder with filename
|
||||||
|
using requests library.
|
||||||
|
'''
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
# Ensure the destination folder exists
|
# Ensure the destination folder exists
|
||||||
@@ -111,4 +115,4 @@ def download_url_with_agent(url, save_path):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
print("Installation was successful.")
|
print("Installation was successful.")
|
||||||
return True
|
return True
|
||||||
|
|||||||
@@ -566,7 +566,7 @@ async def fetch_customnode_list(request):
|
|||||||
else:
|
else:
|
||||||
channel = core.get_config()['channel_url']
|
channel = core.get_config()['channel_url']
|
||||||
|
|
||||||
node_packs = await core.get_unified_total_nodes(channel, request.rel_url.query["mode"])
|
node_packs = await core.get_unified_total_nodes(channel, request.rel_url.query["mode"], 'cache')
|
||||||
json_obj_github = core.get_data_by_mode(request.rel_url.query["mode"], 'github-stats.json', 'default')
|
json_obj_github = core.get_data_by_mode(request.rel_url.query["mode"], 'github-stats.json', 'default')
|
||||||
json_obj_extras = core.get_data_by_mode(request.rel_url.query["mode"], 'extras.json', 'default')
|
json_obj_extras = core.get_data_by_mode(request.rel_url.query["mode"], 'extras.json', 'default')
|
||||||
|
|
||||||
@@ -839,6 +839,23 @@ async def get_disabled_versions(request):
|
|||||||
return web.Response(status=400)
|
return web.Response(status=400)
|
||||||
|
|
||||||
|
|
||||||
|
@routes.post("/customnode/import_fail_info")
|
||||||
|
async def import_fail_info(request):
|
||||||
|
json_data = await request.json()
|
||||||
|
|
||||||
|
if 'cnr_id' in json_data:
|
||||||
|
module_name = core.unified_manager.get_module_name(json_data['cnr_id'])
|
||||||
|
else:
|
||||||
|
module_name = core.unified_manager.get_module_name(json_data['url'])
|
||||||
|
|
||||||
|
if module_name is not None:
|
||||||
|
info = cm_global.error_dict.get(module_name)
|
||||||
|
if info is not None:
|
||||||
|
return web.json_response(info)
|
||||||
|
|
||||||
|
return web.Response(status=400)
|
||||||
|
|
||||||
|
|
||||||
@routes.post("/customnode/reinstall")
|
@routes.post("/customnode/reinstall")
|
||||||
async def reinstall_custom_node(request):
|
async def reinstall_custom_node(request):
|
||||||
await uninstall_custom_node(request)
|
await uninstall_custom_node(request)
|
||||||
@@ -858,6 +875,8 @@ async def install_custom_node(request):
|
|||||||
cnr_id = json_data.get('id')
|
cnr_id = json_data.get('id')
|
||||||
skip_post_install = json_data.get('skip_post_install')
|
skip_post_install = json_data.get('skip_post_install')
|
||||||
|
|
||||||
|
git_url = None
|
||||||
|
|
||||||
if json_data['version'] != 'unknown':
|
if json_data['version'] != 'unknown':
|
||||||
selected_version = json_data.get('selected_version', 'latest')
|
selected_version = json_data.get('selected_version', 'latest')
|
||||||
if selected_version != 'nightly':
|
if selected_version != 'nightly':
|
||||||
@@ -865,14 +884,22 @@ async def install_custom_node(request):
|
|||||||
node_spec_str = f"{cnr_id}@{selected_version}"
|
node_spec_str = f"{cnr_id}@{selected_version}"
|
||||||
else:
|
else:
|
||||||
node_spec_str = f"{cnr_id}@nightly"
|
node_spec_str = f"{cnr_id}@nightly"
|
||||||
|
git_url = [json_data.get('repository')]
|
||||||
|
if git_url is None:
|
||||||
|
logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
|
||||||
|
return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
|
||||||
else:
|
else:
|
||||||
# unknown
|
# unknown
|
||||||
unknown_name = os.path.basename(json_data['files'][0])
|
unknown_name = os.path.basename(json_data['files'][0])
|
||||||
node_spec_str = f"{unknown_name}@unknown"
|
node_spec_str = f"{unknown_name}@unknown"
|
||||||
|
git_url = json_data.get('files')
|
||||||
|
|
||||||
# apply security policy if not cnr node (nightly isn't regarded as cnr node)
|
# apply security policy if not cnr node (nightly isn't regarded as cnr node)
|
||||||
if risky_level is None:
|
if risky_level is None:
|
||||||
risky_level = await get_risky_level(json_data['files'], json_data.get('pip', []))
|
if git_url is not None:
|
||||||
|
risky_level = await get_risky_level(git_url, json_data.get('pip', []))
|
||||||
|
else:
|
||||||
|
return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
|
||||||
|
|
||||||
if not is_allowed_security_level(risky_level):
|
if not is_allowed_security_level(risky_level):
|
||||||
logging.error(SECURITY_MESSAGE_GENERAL)
|
logging.error(SECURITY_MESSAGE_GENERAL)
|
||||||
@@ -888,7 +915,11 @@ async def install_custom_node(request):
|
|||||||
# discard post install if skip_post_install mode
|
# discard post install if skip_post_install mode
|
||||||
|
|
||||||
if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
|
if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
|
||||||
return web.Response(status=400, text=f"Installation failed: {res}")
|
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
|
||||||
|
return web.Response(status=400, text=res.msg)
|
||||||
|
elif not res.result:
|
||||||
|
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
|
||||||
|
return web.Response(status=400, text=res.msg)
|
||||||
|
|
||||||
return web.Response(status=200, text="Installation success.")
|
return web.Response(status=200, text="Installation success.")
|
||||||
|
|
||||||
@@ -912,10 +943,12 @@ async def fix_custom_node(request):
|
|||||||
res = core.unified_manager.unified_fix(node_name, node_ver)
|
res = core.unified_manager.unified_fix(node_name, node_ver)
|
||||||
|
|
||||||
if res.result:
|
if res.result:
|
||||||
logging.info("After restarting ComfyUI, please refresh the browser.")
|
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||||
return web.json_response({}, content_type='application/json')
|
return web.json_response({}, content_type='application/json')
|
||||||
|
else:
|
||||||
|
logging.error(res.msg)
|
||||||
|
|
||||||
logging.error(f"ERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
|
logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
|
||||||
return web.Response(status=400, text=f"An error occurred while fixing '{node_name}@{node_ver}'.")
|
return web.Response(status=400, text=f"An error occurred while fixing '{node_name}@{node_ver}'.")
|
||||||
|
|
||||||
|
|
||||||
@@ -929,10 +962,10 @@ async def install_custom_node_git_url(request):
|
|||||||
res = await core.gitclone_install(url)
|
res = await core.gitclone_install(url)
|
||||||
|
|
||||||
if res.action == 'skip':
|
if res.action == 'skip':
|
||||||
logging.info(f"Already installed: '{res.target}'")
|
logging.info(f"\nAlready installed: '{res.target}'")
|
||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
elif res.result:
|
elif res.result:
|
||||||
logging.info("After restarting ComfyUI, please refresh the browser.")
|
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
logging.error(res.msg)
|
logging.error(res.msg)
|
||||||
@@ -971,10 +1004,10 @@ async def uninstall_custom_node(request):
|
|||||||
res = core.unified_manager.unified_uninstall(node_name, is_unknown)
|
res = core.unified_manager.unified_uninstall(node_name, is_unknown)
|
||||||
|
|
||||||
if res.result:
|
if res.result:
|
||||||
logging.info("After restarting ComfyUI, please refresh the browser.")
|
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||||
return web.json_response({}, content_type='application/json')
|
return web.json_response({}, content_type='application/json')
|
||||||
|
|
||||||
logging.error(f"ERROR: An error occurred while uninstalling '{node_name}'.")
|
logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
|
||||||
return web.Response(status=400, text=f"An error occurred while uninstalling '{node_name}'.")
|
return web.Response(status=400, text=f"An error occurred while uninstalling '{node_name}'.")
|
||||||
|
|
||||||
|
|
||||||
@@ -998,10 +1031,10 @@ async def update_custom_node(request):
|
|||||||
manager_util.clear_pip_cache()
|
manager_util.clear_pip_cache()
|
||||||
|
|
||||||
if res.result:
|
if res.result:
|
||||||
logging.info("After restarting ComfyUI, please refresh the browser.")
|
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||||
return web.json_response({}, content_type='application/json')
|
return web.json_response({}, content_type='application/json')
|
||||||
|
|
||||||
logging.error(f"ERROR: An error occurred while updating '{node_name}'.")
|
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
|
||||||
return web.Response(status=400, text=f"An error occurred while updating '{node_name}'.")
|
return web.Response(status=400, text=f"An error occurred while updating '{node_name}'.")
|
||||||
|
|
||||||
|
|
||||||
@@ -1400,6 +1433,10 @@ async def default_cache_update():
|
|||||||
|
|
||||||
await asyncio.gather(a, b, c, d, e)
|
await asyncio.gather(a, b, c, d, e)
|
||||||
|
|
||||||
|
# load at least once
|
||||||
|
await core.unified_manager.reload('remote', dont_wait=False)
|
||||||
|
await core.unified_manager.get_custom_nodes('default', 'remote')
|
||||||
|
|
||||||
# NOTE: hide migration button temporarily.
|
# NOTE: hide migration button temporarily.
|
||||||
# if not core.get_config()['skip_migration_check']:
|
# if not core.get_config()['skip_migration_check']:
|
||||||
# await core.check_need_to_migrate()
|
# await core.check_need_to_migrate()
|
||||||
@@ -1419,3 +1456,4 @@ cm_global.register_extension('ComfyUI-Manager',
|
|||||||
'nodes': {},
|
'nodes': {},
|
||||||
'description': 'This extension provides the ability to manage custom nodes in ComfyUI.', })
|
'description': 'This extension provides the ability to manage custom nodes in ComfyUI.', })
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ from datetime import datetime
|
|||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
|
import logging
|
||||||
|
|
||||||
|
|
||||||
cache_lock = threading.Lock()
|
cache_lock = threading.Lock()
|
||||||
|
|
||||||
@@ -128,20 +130,56 @@ async def get_data(uri, silent=False):
|
|||||||
return json_obj
|
return json_obj
|
||||||
|
|
||||||
|
|
||||||
async def get_data_with_cache(uri, silent=False, cache_mode=True):
|
def get_cache_path(uri):
|
||||||
cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
|
cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
|
||||||
cache_uri = os.path.join(cache_dir, cache_uri+'.json')
|
return os.path.join(cache_dir, cache_uri+'.json')
|
||||||
|
|
||||||
|
|
||||||
|
def get_cache_state(uri):
|
||||||
|
cache_uri = get_cache_path(uri)
|
||||||
|
|
||||||
|
if not os.path.exists(cache_uri):
|
||||||
|
return "not-cached"
|
||||||
|
elif is_file_created_within_one_day(cache_uri):
|
||||||
|
return "cached"
|
||||||
|
|
||||||
|
return "expired"
|
||||||
|
|
||||||
|
|
||||||
|
def save_to_cache(uri, json_obj, silent=False):
|
||||||
|
cache_uri = get_cache_path(uri)
|
||||||
|
|
||||||
|
with cache_lock:
|
||||||
|
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||||
|
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||||
|
if not silent:
|
||||||
|
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
||||||
|
|
||||||
|
|
||||||
|
async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
|
||||||
|
cache_uri = get_cache_path(uri)
|
||||||
|
|
||||||
|
if cache_mode and dont_wait:
|
||||||
|
# NOTE: return the cache if possible, even if it is expired, so do not cache
|
||||||
|
if not os.path.exists(cache_uri):
|
||||||
|
logging.error(f"[ComfyUI-Manager] The network connection is unstable, so it is operating in fallback mode: {uri}")
|
||||||
|
|
||||||
|
return {}
|
||||||
|
else:
|
||||||
|
if not is_file_created_within_one_day(cache_uri):
|
||||||
|
logging.error(f"[ComfyUI-Manager] The network connection is unstable, so it is operating in outdated cache mode: {uri}")
|
||||||
|
|
||||||
|
return await get_data(cache_uri, silent=silent)
|
||||||
|
|
||||||
if cache_mode and is_file_created_within_one_day(cache_uri):
|
if cache_mode and is_file_created_within_one_day(cache_uri):
|
||||||
json_obj = await get_data(cache_uri, silent=silent)
|
json_obj = await get_data(cache_uri, silent=silent)
|
||||||
else:
|
else:
|
||||||
json_obj = await get_data(uri, silent=silent)
|
json_obj = await get_data(uri, silent=silent)
|
||||||
|
|
||||||
with cache_lock:
|
with cache_lock:
|
||||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||||
if not silent:
|
if not silent:
|
||||||
print(f"[ComfyUI-Manager] default cache updated: {uri}")
|
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
||||||
|
|
||||||
return json_obj
|
return json_obj
|
||||||
|
|
||||||
@@ -156,10 +194,10 @@ def extract_package_as_zip(file_path, extract_path):
|
|||||||
with zipfile.ZipFile(file_path, "r") as zip_ref:
|
with zipfile.ZipFile(file_path, "r") as zip_ref:
|
||||||
zip_ref.extractall(extract_path)
|
zip_ref.extractall(extract_path)
|
||||||
extracted_files = zip_ref.namelist()
|
extracted_files = zip_ref.namelist()
|
||||||
print(f"Extracted zip file to {extract_path}")
|
logging.info(f"Extracted zip file to {extract_path}")
|
||||||
return extracted_files
|
return extracted_files
|
||||||
except zipfile.BadZipFile:
|
except zipfile.BadZipFile:
|
||||||
print(f"File '{file_path}' is not a zip or is corrupted.")
|
logging.error(f"File '{file_path}' is not a zip or is corrupted.")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
@@ -183,7 +221,7 @@ def get_installed_packages(renew=False):
|
|||||||
|
|
||||||
pip_map[y[0]] = y[1]
|
pip_map[y[0]] = y[1]
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
print("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
|
logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
|
||||||
return set()
|
return set()
|
||||||
|
|
||||||
return pip_map
|
return pip_map
|
||||||
@@ -223,7 +261,7 @@ class PIPFixer:
|
|||||||
else:
|
else:
|
||||||
cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
|
cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
print(cmd)
|
logging.error(cmd)
|
||||||
return
|
return
|
||||||
|
|
||||||
torch_ver = StrictVersion(spec[0])
|
torch_ver = StrictVersion(spec[0])
|
||||||
@@ -234,12 +272,12 @@ class PIPFixer:
|
|||||||
cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
|
cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
|
||||||
'torch', 'torchvision', 'torchaudio',
|
'torch', 'torchvision', 'torchaudio',
|
||||||
'--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
|
'--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
|
||||||
print("[manager-core] restore PyTorch to nightly version")
|
logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
|
||||||
else:
|
else:
|
||||||
cmd = [sys.executable, '-m', 'pip', 'install',
|
cmd = [sys.executable, '-m', 'pip', 'install',
|
||||||
f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_ver}",
|
f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_ver}",
|
||||||
'--index-url', f"https://download.pytorch.org/whl/{platform}"]
|
'--index-url', f"https://download.pytorch.org/whl/{platform}"]
|
||||||
print(f"[manager-core] restore PyTorch to {torch_ver}+{platform}")
|
logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
|
||||||
|
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
@@ -252,20 +290,22 @@ class PIPFixer:
|
|||||||
cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
|
cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
print("[manager-core] '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.")
|
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.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("[manager-core] Failed to uninstall `comfy` python package")
|
logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
|
||||||
print(e)
|
logging.error(e)
|
||||||
|
|
||||||
# fix torch - reinstall torch packages if version is changed
|
# fix torch - reinstall torch packages if version is changed
|
||||||
try:
|
try:
|
||||||
if self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
|
if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions:
|
||||||
|
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['torchvision'] != new_pip_versions['torchvision'] \
|
||||||
or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
|
or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
|
||||||
self.torch_rollback()
|
self.torch_rollback()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("[manager-core] Failed to restore PyTorch")
|
logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
|
||||||
print(e)
|
logging.error(e)
|
||||||
|
|
||||||
# fix opencv
|
# fix opencv
|
||||||
try:
|
try:
|
||||||
@@ -296,10 +336,10 @@ class PIPFixer:
|
|||||||
cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
|
cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
print(f"[manager-core] 'opencv' dependencies were fixed: {targets}")
|
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("[manager-core] Failed to restore opencv")
|
logging.error("[ComfyUI-Manager] Failed to restore opencv")
|
||||||
print(e)
|
logging.error(e)
|
||||||
|
|
||||||
# fix numpy
|
# fix numpy
|
||||||
try:
|
try:
|
||||||
@@ -308,8 +348,8 @@ class PIPFixer:
|
|||||||
if StrictVersion(np) >= StrictVersion('2'):
|
if StrictVersion(np) >= StrictVersion('2'):
|
||||||
subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True)
|
subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("[manager-core] Failed to restore numpy")
|
logging.error("[ComfyUI-Manager] Failed to restore numpy")
|
||||||
print(e)
|
logging.error(e)
|
||||||
|
|
||||||
|
|
||||||
def sanitize(data):
|
def sanitize(data):
|
||||||
|
|||||||
@@ -45,6 +45,11 @@ async function tryInstallCustomNode(event) {
|
|||||||
show_message('This action is not allowed with this security level configuration.');
|
show_message('This action is not allowed with this security level configuration.');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
else if(response.status == 400) {
|
||||||
|
let msg = await res.text();
|
||||||
|
show_message(msg);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let response = await api.fetchApi("/manager/reboot");
|
let response = await api.fetchApi("/manager/reboot");
|
||||||
|
|||||||
@@ -963,7 +963,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
this.datasrc_combo.className = "cm-menu-combo";
|
this.datasrc_combo.className = "cm-menu-combo";
|
||||||
this.datasrc_combo.appendChild($el('option', { value: 'cache', text: 'DB: Channel (1day cache)' }, []));
|
this.datasrc_combo.appendChild($el('option', { value: 'cache', text: 'DB: Channel (1day cache)' }, []));
|
||||||
this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
|
this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
|
||||||
this.datasrc_combo.appendChild($el('option', { value: 'url', text: 'DB: Channel (remote)' }, []));
|
this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
|
||||||
|
|
||||||
// preview method
|
// preview method
|
||||||
let preview_combo = document.createElement("select");
|
let preview_combo = document.createElement("select");
|
||||||
|
|||||||
11
js/common.js
11
js/common.js
@@ -96,7 +96,7 @@ function internalCustomConfirm(message, confirmMessage, cancelMessage) {
|
|||||||
|
|
||||||
export function show_message(msg) {
|
export function show_message(msg) {
|
||||||
app.ui.dialog.show(msg);
|
app.ui.dialog.show(msg);
|
||||||
app.ui.dialog.element.style.zIndex = 1099;
|
app.ui.dialog.element.style.zIndex = 1100;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function sleep(ms) {
|
export async function sleep(ms) {
|
||||||
@@ -397,3 +397,12 @@ export const icons = {
|
|||||||
passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
|
passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
|
||||||
download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
|
download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function sanitizeHTML(str) {
|
||||||
|
return str
|
||||||
|
.replace(/&/g, "&")
|
||||||
|
.replace(/</g, "<")
|
||||||
|
.replace(/>/g, ">")
|
||||||
|
.replace(/"/g, """)
|
||||||
|
.replace(/'/g, "'");
|
||||||
|
}
|
||||||
@@ -4,7 +4,7 @@ import { api } from "../../scripts/api.js";
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
manager_instance, rebootAPI, install_via_git_url,
|
manager_instance, rebootAPI, install_via_git_url,
|
||||||
fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt
|
fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt, sanitizeHTML
|
||||||
} from "./common.js";
|
} from "./common.js";
|
||||||
|
|
||||||
// https://cenfun.github.io/turbogrid/api.html
|
// https://cenfun.github.io/turbogrid/api.html
|
||||||
@@ -250,6 +250,13 @@ const pageCss = `
|
|||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-import-failed {
|
||||||
|
background-color: #AA1111;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
.cn-manager .cn-btn-install {
|
.cn-manager .cn-btn-install {
|
||||||
background-color: black;
|
background-color: black;
|
||||||
color: white;
|
color: white;
|
||||||
@@ -872,6 +879,38 @@ export class CustomNodesManager {
|
|||||||
return this.filter === ShowMode.ALTERNATIVES
|
return this.filter === ShowMode.ALTERNATIVES
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async handleImportFail(rowItem) {
|
||||||
|
var info;
|
||||||
|
if(rowItem.version == 'unknown'){
|
||||||
|
info = {
|
||||||
|
'url': rowItem.originalData.files[0]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
info = {
|
||||||
|
'cnr_id': rowItem.originalData.id
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await api.fetchApi(`/customnode/import_fail_info`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify(info)
|
||||||
|
});
|
||||||
|
|
||||||
|
let res = await response.json();
|
||||||
|
|
||||||
|
let title = `<FONT COLOR=GREEN><B>Error message occurred while importing the '${rowItem.title}' module.</B></FONT><BR><HR><BR>`
|
||||||
|
|
||||||
|
if(res.code == 400)
|
||||||
|
{
|
||||||
|
show_message(title+'The information is not available.')
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
show_message(title+sanitizeHTML(res['msg']).replace(/ /g, ' ').replace(/\n/g, '<BR>'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
renderGrid() {
|
renderGrid() {
|
||||||
|
|
||||||
// update theme
|
// update theme
|
||||||
@@ -905,6 +944,7 @@ export class CustomNodesManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let self = this;
|
||||||
const columns = [{
|
const columns = [{
|
||||||
id: 'id',
|
id: 'id',
|
||||||
name: 'ID',
|
name: 'ID',
|
||||||
@@ -918,16 +958,32 @@ export class CustomNodesManager {
|
|||||||
maxWidth: 500,
|
maxWidth: 500,
|
||||||
classMap: 'cn-node-name',
|
classMap: 'cn-node-name',
|
||||||
formatter: (title, rowItem, columnItem) => {
|
formatter: (title, rowItem, columnItem) => {
|
||||||
var prefix = '';
|
const container = document.createElement('div');
|
||||||
if(rowItem.action === 'invalid-installation') {
|
|
||||||
prefix = '<font color="red"><B>(INVALID)</B></font>';
|
|
||||||
}
|
|
||||||
|
|
||||||
else if(rowItem.action === 'import-fail') {
|
if (rowItem.action === 'invalid-installation') {
|
||||||
prefix = '<font color="red"><B>(IMPORT FAILED)</B></font>';
|
const invalidTag = document.createElement('span');
|
||||||
}
|
invalidTag.style.color = 'red';
|
||||||
|
invalidTag.innerHTML = '<b>(INVALID)</b>';
|
||||||
|
container.appendChild(invalidTag);
|
||||||
|
} else if (rowItem.action === 'import-fail') {
|
||||||
|
const button = document.createElement('button');
|
||||||
|
button.className = 'cn-btn-import-failed';
|
||||||
|
button.innerText = 'IMPORT FAILED ↗';
|
||||||
|
button.onclick = () => self.handleImportFail(rowItem);
|
||||||
|
container.appendChild(button);
|
||||||
|
container.appendChild(document.createElement('br'));
|
||||||
|
}
|
||||||
|
|
||||||
return `${prefix}<a href=${rowItem.reference} target="_blank"><b>${title}</b></a>`;
|
const link = document.createElement('a');
|
||||||
|
if(rowItem.originalData.repository)
|
||||||
|
link.href = rowItem.originalData.repository;
|
||||||
|
else
|
||||||
|
link.href = rowItem.reference;
|
||||||
|
link.target = '_blank';
|
||||||
|
link.innerHTML = `<b>${title}</b>`;
|
||||||
|
container.appendChild(link);
|
||||||
|
|
||||||
|
return container;
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
id: 'version',
|
id: 'version',
|
||||||
@@ -1281,7 +1337,7 @@ export class CustomNodesManager {
|
|||||||
body: JSON.stringify(data)
|
body: JSON.stringify(data)
|
||||||
});
|
});
|
||||||
|
|
||||||
if (res.error) {
|
if (res.status != 200) {
|
||||||
|
|
||||||
errorMsg = `${item.title} ${mode} failed: `;
|
errorMsg = `${item.title} ${mode} failed: `;
|
||||||
if(res.status == 403) {
|
if(res.status == 403) {
|
||||||
@@ -1289,7 +1345,7 @@ export class CustomNodesManager {
|
|||||||
} else if(res.status == 404) {
|
} else if(res.status == 404) {
|
||||||
errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.`;
|
errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.`;
|
||||||
} else {
|
} else {
|
||||||
errorMsg += res.error.message;
|
errorMsg += await res.text();
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -1310,6 +1366,7 @@ export class CustomNodesManager {
|
|||||||
|
|
||||||
if (errorMsg) {
|
if (errorMsg) {
|
||||||
this.showError(errorMsg);
|
this.showError(errorMsg);
|
||||||
|
show_message("Installation Error:\n"+errorMsg);
|
||||||
} else {
|
} else {
|
||||||
this.showStatus(`${label} ${list.length} custom node(s) successfully`);
|
this.showStatus(`${label} ${list.length} custom node(s) successfully`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,9 @@ class WorkflowMetadataExtension {
|
|||||||
const nodeInfo =
|
const nodeInfo =
|
||||||
this.installedNodes[nodePackageName] ??
|
this.installedNodes[nodePackageName] ??
|
||||||
this.installedNodes[nodePackageName.toLowerCase()];
|
this.installedNodes[nodePackageName.toLowerCase()];
|
||||||
nodeVersions[nodePackageName] = nodeInfo.ver;
|
if (nodeInfo) {
|
||||||
|
nodeVersions[nodePackageName] = nodeInfo.ver;
|
||||||
|
}
|
||||||
} else if (["nodes", "comfy_extras"].includes(modules[0])) {
|
} else if (["nodes", "comfy_extras"].includes(modules[0])) {
|
||||||
nodeVersions["comfy-core"] = this.comfyCoreVersion;
|
nodeVersions["comfy-core"] = this.comfyCoreVersion;
|
||||||
} else {
|
} else {
|
||||||
@@ -78,7 +80,11 @@ class WorkflowMetadataExtension {
|
|||||||
workflow.extra = {};
|
workflow.extra = {};
|
||||||
}
|
}
|
||||||
const graph = this;
|
const graph = this;
|
||||||
workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
|
try {
|
||||||
|
workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
}
|
||||||
|
|
||||||
return workflow;
|
return workflow;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4040,7 +4040,7 @@
|
|||||||
"name": "Comfy-Org/hunyuan_video_vae_bf16.safetensors",
|
"name": "Comfy-Org/hunyuan_video_vae_bf16.safetensors",
|
||||||
"type": "VAE",
|
"type": "VAE",
|
||||||
"base": "Hunyuan Video",
|
"base": "Hunyuan Video",
|
||||||
"save_path": "VAE",
|
"save_path": "default",
|
||||||
"description": "Huyuan Video VAE model. repackaged version.",
|
"description": "Huyuan Video VAE model. repackaged version.",
|
||||||
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
"filename": "hunyuan_video_vae_bf16.safetensors",
|
"filename": "hunyuan_video_vae_bf16.safetensors",
|
||||||
|
|||||||
@@ -9,7 +9,208 @@
|
|||||||
"description": "If you see this message, your ComfyUI-Manager is outdated.\nDev channel provides only the list of the developing nodes. If you want to find the complete node list, please go to the Default channel."
|
"description": "If you see this message, your ComfyUI-Manager is outdated.\nDev channel provides only the list of the developing nodes. If you want to find the complete node list, please go to the Default channel."
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"author": "kijai",
|
||||||
|
"title": "ComfyUI-VideoNoiseWarp [WIP]",
|
||||||
|
"reference": "https://github.com/kijai/ComfyUI-VideoNoiseWarp",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/kijai/ComfyUI-VideoNoiseWarp"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI node to create warped noise from vide\nNOTE:Raft optical flow model is automatically downloaded upon execution."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "muvich3n",
|
||||||
|
"title": "ComfyUI-Claude-I2T",
|
||||||
|
"reference": "https://github.com/muvich3n/ComfyUI-Claude-I2T",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/muvich3n/ComfyUI-Claude-I2T"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Claude Image to Prompt Generator"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "maekawataiki",
|
||||||
|
"title": "ComfyUI-ALB-Login",
|
||||||
|
"reference": "https://github.com/maekawataiki/ComfyUI-ALB-Login",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/maekawataiki/ComfyUI-ALB-Login"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Auth library to inspect token provided by ALB to protect ComfyUI."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "HellerCommaA",
|
||||||
|
"title": "ComfyUI-VideoResolutions",
|
||||||
|
"reference": "https://github.com/HellerCommaA/ComfyUI-VideoResolutions",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/HellerCommaA/ComfyUI-VideoResolutions"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: HunyuanResolutions"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ArmandAlbert",
|
||||||
|
"title": "Kwai_font_comfyui",
|
||||||
|
"reference": "https://github.com/ArmandAlbert/Kwai_font_comfyui",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ArmandAlbert/Kwai_font_comfyui"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Kwaifont_Resnet50_Runner, Kwaifont_Resnet50_Loader, Kwaifont_Resnet101_Runner, Kwaifont_Resnet101_Loader, Kwaifont_Image_Cropper"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "SpatialDeploy",
|
||||||
|
"title": "ComfyUI-Voxels [WIP]",
|
||||||
|
"reference": "https://github.com/SpatialDeploy/ComfyUI-Voxels",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/SpatialDeploy/ComfyUI-Voxels"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Tools for creating voxel based videos"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Njbx",
|
||||||
|
"title": "ComfyUI-blockswap",
|
||||||
|
"reference": "https://github.com/Njbx/ComfyUI-blockswap",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Njbx/ComfyUI-blockswap"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Block Swap"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "PATATAJEC",
|
||||||
|
"title": "Patatajec-Nodes [WIP]",
|
||||||
|
"reference": "https://github.com/PATATAJEC/Patatajec-Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/PATATAJEC/Patatajec-Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: HyVid Switcher\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "sourceful-official",
|
||||||
|
"title": "comfyui-sourceful-official",
|
||||||
|
"reference": "https://github.com/sourceful-official/comfyui-sourceful-official",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/sourceful-official/comfyui-sourceful-official"
|
||||||
|
],
|
||||||
|
"description": "NODES: SourcefulOfficialComfyuiIncontextThreePanels, FalFluxLoraSourcefulOfficial, FalIcLightV2SourcefulOfficial",
|
||||||
|
"install_type": "git-clone"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Alvaroeai",
|
||||||
|
"title": "ComfyUI-SunoAI-Mds",
|
||||||
|
"reference": "https://github.com/Alvaroeai/ComfyUI-SunoAI-Mds",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Alvaroeai/ComfyUI-SunoAI-Mds"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Suno Generate, Suno Download, Suno Proxy Generate, Suno Proxy Download"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "parmarjh",
|
||||||
|
"title": "ComfyUI-MochiWrapper-I2V [WIP]",
|
||||||
|
"reference": "https://github.com/parmarjh/ComfyUI-MochiWrapper-I2V",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/parmarjh/ComfyUI-MochiWrapper-I2V"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI wrapper nodes for [a/Mochi](https://github.com/genmoai/models) video generator"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Symbiomatrix",
|
||||||
|
"title": "Comfyui-Sort-Files",
|
||||||
|
"reference": "https://github.com/Symbiomatrix/Comfyui-Sort-Files",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Symbiomatrix/Comfyui-Sort-Files"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Monkeypatch file sort to date modified or custom instead of lexicographic."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "x3bits",
|
||||||
|
"title": "ComfyUI-Power-Flow [UNSAFE]",
|
||||||
|
"reference": "https://github.com/x3bits/ComfyUI-Power-Flow",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/x3bits/ComfyUI-Power-Flow"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A ComfyUI node package that introduces common programming logic to enhance the flexibility of ComfyUI workflows. It supports features such as function definition and execution, 'for' loops, 'while' loops, and Python code execution.\n[w/This extension allows the execution of arbitrary Python code from a workflow.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "EmilioPlumed",
|
||||||
|
"title": "ComfyUI-Math [WIP]",
|
||||||
|
"reference": "https://github.com/EmilioPlumed/ComfyUI-Math",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/EmilioPlumed/ComfyUI-Math"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Custom nodes that take 2 float inputs and calculates greatest common denominator and least common multiple, returning them as ints.\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "mliand",
|
||||||
|
"title": "ComfyUI-Calendar-Node [WIP]",
|
||||||
|
"reference": "https://github.com/mliand/ComfyUI-Calendar-Node",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/mliand/ComfyUI-Calendar-Node"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A custom node for Comfyui to create a Calendar like grid\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "phamngoctukts",
|
||||||
|
"title": "ComyUI-Tupham",
|
||||||
|
"reference": "https://github.com/phamngoctukts/ComyUI-Tupham",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/phamngoctukts/ComyUI-Tupham"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Ghép Ảnh, Multi Prompt v2.0, Condition Upscale, Multi sampler, Run node selected"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "5x00",
|
||||||
|
"title": "ComfyUI-Prompt-Plus [WIP]",
|
||||||
|
"reference": "https://github.com/5x00/ComfyUI-Prompt-Plus",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/5x00/ComfyUI-Prompt-Plus"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Prompt Plus is a collection of LLM and VLM nodes that make prompting easier for image and video generation.\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "aria1th",
|
||||||
|
"title": "ComfyUI-CairoSVG",
|
||||||
|
"reference": "https://github.com/aria1th/ComfyUI-CairoSVG",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/aria1th/ComfyUI-CairoSVG"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: VectorizedUpscaleScaling, VectorizedUpscaleSize"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "gitmylo",
|
||||||
|
"title": "FlowNodes [WIP]",
|
||||||
|
"reference": "https://github.com/gitmylo/FlowNodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/gitmylo/FlowNodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A ComfyUI node pack containing nodes for basic programming logic."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "chengzeyi",
|
||||||
|
"title": "Comfy-WaveSpeed [WIP]",
|
||||||
|
"reference": "https://github.com/chengzeyi/Comfy-WaveSpeed",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/chengzeyi/Comfy-WaveSpeed"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "The all in one inference optimization solution for ComfyUI, universal, flexible, and fast."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"author": "zyd232",
|
"author": "zyd232",
|
||||||
"title": "ComfyUI-zyd232-Nodes",
|
"title": "ComfyUI-zyd232-Nodes",
|
||||||
@@ -40,16 +241,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Very early W.I.P of clustered ComfyUI inference."
|
"description": "Very early W.I.P of clustered ComfyUI inference."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "5x00",
|
|
||||||
"title": "ComfyUI-LLM-Concat [WIP]",
|
|
||||||
"reference": "https://github.com/5x00/ComfyUI-LLM-Concat",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/5x00/ComfyUI-LLM-Concat"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Simple ComfyUI node to combine strings using ChatGPT / Claude. Can be helpful to combine multiple keywords into a single prompt.\nNOTE: The files in the repo are not organized."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "waynepimpzhang",
|
"author": "waynepimpzhang",
|
||||||
"title": "FindBrightestSpot [WIP]",
|
"title": "FindBrightestSpot [WIP]",
|
||||||
@@ -60,16 +251,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Analyze the image to find the x and y coordinates of the brightest point.\nNOTE: The files in the repo are not organized."
|
"description": "Analyze the image to find the x and y coordinates of the brightest point.\nNOTE: The files in the repo are not organized."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "nmlen",
|
|
||||||
"title": "comfyui-mosaic-blur [WIP]",
|
|
||||||
"reference": "https://github.com/nmlen/comfyui-mosaic-blur",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/nmlen/comfyui-mosaic-blur"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "A simple mosaic blur node for ComfyUI that uses CV2 or Pillow\nNOTE: The files in the repo are not organized."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "power88",
|
"author": "power88",
|
||||||
"title": "ComfyUI-PDiD-Nodes [WIP]",
|
"title": "ComfyUI-PDiD-Nodes [WIP]",
|
||||||
@@ -269,7 +450,7 @@
|
|||||||
"https://github.com/warshanks/Shank-Tools"
|
"https://github.com/warshanks/Shank-Tools"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES: Tile Calculator"
|
"description": "NODES: Tile Calculator, Resolution Divider"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "BaronVonBoolean",
|
"author": "BaronVonBoolean",
|
||||||
@@ -1035,7 +1216,7 @@
|
|||||||
"https://github.com/m-ai-studio/mai-prompt-progress"
|
"https://github.com/m-ai-studio/mai-prompt-progress"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "mai-prompt-progress"
|
"description": "ComfyUI extensions for sending prompt progress to webhook"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "neeltheninja",
|
"author": "neeltheninja",
|
||||||
@@ -1105,7 +1286,7 @@
|
|||||||
"https://github.com/Poukpalaova/ComfyUI-FRED-Nodes"
|
"https://github.com/Poukpalaova/ComfyUI-FRED-Nodes"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "This repository contains custom nodes for ComfyUI. This is a work in progress (WIP).\nNOTE: The files in the repo are not organized."
|
"description": "Multiple nodes that ease the process.\nNOTE: The files in the repo are not organized."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "blurymind",
|
"author": "blurymind",
|
||||||
@@ -1238,11 +1419,11 @@
|
|||||||
"description": "for preprocessing images, presented in a visual way. It also calculates the corresponding image area."
|
"description": "for preprocessing images, presented in a visual way. It also calculates the corresponding image area."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "void15700",
|
"author": "cwebbi1",
|
||||||
"title": "VoidCustomNodes",
|
"title": "VoidCustomNodes",
|
||||||
"reference": "https://github.com/void15700/VoidCustomNodes",
|
"reference": "https://github.com/cwebbi1/VoidCustomNodes",
|
||||||
"files": [
|
"files": [
|
||||||
"https://github.com/void15700/VoidCustomNodes"
|
"https://github.com/cwebbi1/VoidCustomNodes"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES:Prompt Parser, String Combiner"
|
"description": "NODES:Prompt Parser, String Combiner"
|
||||||
@@ -1308,17 +1489,6 @@
|
|||||||
"install_type": "copy",
|
"install_type": "copy",
|
||||||
"description": "This platform extension provides ZhipuAI nodes, enabling you to configure a workflow for online video generation."
|
"description": "This platform extension provides ZhipuAI nodes, enabling you to configure a workflow for online video generation."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "jetchopper",
|
|
||||||
"title": "ComfyUI-GeneraNodes",
|
|
||||||
"id": "genera",
|
|
||||||
"reference": "https://github.com/evolox/ComfyUI-GeneraNodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/evolox/ComfyUI-GeneraNodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Genera custom nodes and extensions"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "HavocsCall",
|
"author": "HavocsCall",
|
||||||
"title": "comfyui_HavocsCall_Custom_Nodes",
|
"title": "comfyui_HavocsCall_Custom_Nodes",
|
||||||
@@ -1548,7 +1718,7 @@
|
|||||||
"https://github.com/hgabha/WWAA-CustomNodes"
|
"https://github.com/hgabha/WWAA-CustomNodes"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Custom Nodes for ComfyUI made by the team at [a/WeirdWonderfulAI.Art](https://weirdwonderfulai.art/) These are developed based on the needs where there was a gap to make our workflows better. You are welcome to use it as you see fit."
|
"description": "Custom Nodes for ComfyUI made by the team at [a/WeirdWonderfulAI.Art](https://weirdwonderfulai.art/). Line Count, Join String, Dither Image, Image Batch Loader"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "IgPoly",
|
"author": "IgPoly",
|
||||||
@@ -1789,7 +1959,7 @@
|
|||||||
"https://github.com/jimstudt/ComfyUI-Jims-Nodes"
|
"https://github.com/jimstudt/ComfyUI-Jims-Nodes"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Zoom and Enhance Nodes, Text Dictionary Nodes"
|
"description": "NODES: Zoom and Enhance Nodes, Text To String List, Choose String, Define Word, Lookup Word, Substitute Words, Dictionary to JSON, JSON file to Dictionary, JSON to Dictionary, Load Image And Info From Path, CubbyHack, Image to Solid Background"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "hananbeer",
|
"author": "hananbeer",
|
||||||
@@ -2140,17 +2310,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Stable Diffusion is an image generation technique based on diffusion models. Its core idea involves simulating diffusion processes by iteratively adding noise and using neural networks to predict and remove the noise, thereby generating high-quality images. This approach is not limited to image generation; with appropriate network architecture and training data, it can be adapted for various other tasks. The application of neural networks extends beyond image generation. By adjusting network structures and loss functions, neural networks can also perform tasks such as classification and regression. This flexibility makes neural networks a powerful tool for handling a wide range of machine learning tasks. This project aims to expand custom neural network layers (such as linear layers, convolutional layers, etc.) within ComfyUI and provide simplified task training functionalities. Through this project, users can easily construct custom neural network layers and perform training in ComfyUI using a graphical interface."
|
"description": "Stable Diffusion is an image generation technique based on diffusion models. Its core idea involves simulating diffusion processes by iteratively adding noise and using neural networks to predict and remove the noise, thereby generating high-quality images. This approach is not limited to image generation; with appropriate network architecture and training data, it can be adapted for various other tasks. The application of neural networks extends beyond image generation. By adjusting network structures and loss functions, neural networks can also perform tasks such as classification and regression. This flexibility makes neural networks a powerful tool for handling a wide range of machine learning tasks. This project aims to expand custom neural network layers (such as linear layers, convolutional layers, etc.) within ComfyUI and provide simplified task training functionalities. Through this project, users can easily construct custom neural network layers and perform training in ComfyUI using a graphical interface."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "alexgenovese",
|
|
||||||
"title": "comfyui_CfgPlusPlus [WIP]",
|
|
||||||
"id": "cfgpp",
|
|
||||||
"reference": "https://gitea.com/NotEvilGirl/cfgpp",
|
|
||||||
"files": [
|
|
||||||
"https://gitea.com/NotEvilGirl/cfgpp"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "CFG++ implemented according to [a/https://cfgpp-diffusion.github.io](https://cfgpp-diffusion.github.io). Basically modified DDIM sampler that makes sampling work at low CFG values (0 ~ 2). Read the CFG++ paper for more details"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "Fucci-Mateo",
|
"author": "Fucci-Mateo",
|
||||||
"title": "ComfyUI-Airtable [WIP]",
|
"title": "ComfyUI-Airtable [WIP]",
|
||||||
@@ -3297,16 +3456,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Unofficial ComfyUI extension of clip-interrogator"
|
"description": "Unofficial ComfyUI extension of clip-interrogator"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "prismwastaken",
|
|
||||||
"title": "prism-tools",
|
|
||||||
"reference": "https://github.com/prismwastaken/prism-comfyui-tools",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/prismwastaken/prism-comfyui-tools"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "prism-tools"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "poisenbery",
|
"author": "poisenbery",
|
||||||
"title": "NudeNet-Detector-Provider [WIP]",
|
"title": "NudeNet-Detector-Provider [WIP]",
|
||||||
|
|||||||
@@ -1,12 +1,4 @@
|
|||||||
{
|
{
|
||||||
"https://gitea.com/NotEvilGirl/cfgpp": [
|
|
||||||
[
|
|
||||||
"CFG++"
|
|
||||||
],
|
|
||||||
{
|
|
||||||
"title_aux": "comfyui_CfgPlusPlus [WIP]"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"https://github.com/17Retoucher/ComfyUI_Fooocus": [
|
"https://github.com/17Retoucher/ComfyUI_Fooocus": [
|
||||||
[
|
[
|
||||||
"BasicScheduler",
|
"BasicScheduler",
|
||||||
@@ -154,12 +146,20 @@
|
|||||||
"title_aux": "ComfyUI_Fooocus"
|
"title_aux": "ComfyUI_Fooocus"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"https://github.com/5x00/ComfyUI-LLM-Concat": [
|
"https://github.com/5x00/ComfyUI-Prompt-Plus": [
|
||||||
[
|
[
|
||||||
"LLMConcate"
|
"LoadAPI",
|
||||||
|
"LoadCustomModel",
|
||||||
|
"LoadFlorenceModel",
|
||||||
|
"Prompt",
|
||||||
|
"RunAPIVLM",
|
||||||
|
"RunCustomVLM",
|
||||||
|
"TriggerToPromptAPI",
|
||||||
|
"TriggerToPromptCustom",
|
||||||
|
"TriggerToPromptSimple"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "ComfyUI-LLM-Concat [WIP]"
|
"title_aux": "ComfyUI-Prompt-Plus [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"https://github.com/A4P7J1N7M05OT/ComfyUI-ManualSigma": [
|
"https://github.com/A4P7J1N7M05OT/ComfyUI-ManualSigma": [
|
||||||
@@ -366,6 +366,17 @@
|
|||||||
"title_aux": "ComfyUI-Xorbis-nodes [WIP]"
|
"title_aux": "ComfyUI-Xorbis-nodes [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/Alvaroeai/ComfyUI-SunoAI-Mds": [
|
||||||
|
[
|
||||||
|
"Mideas_SunoAI_AudioManager",
|
||||||
|
"Mideas_SunoAI_Generator",
|
||||||
|
"Mideas_SunoAI_ProxyDownloadNode",
|
||||||
|
"Mideas_SunoAI_ProxyNode"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-SunoAI-Mds"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/Anze-/ComfyUI-OIDN": [
|
"https://github.com/Anze-/ComfyUI-OIDN": [
|
||||||
[
|
[
|
||||||
"OIDN Denoise"
|
"OIDN Denoise"
|
||||||
@@ -382,6 +393,18 @@
|
|||||||
"title_aux": "ComfyUI_deepDeband [WIP]"
|
"title_aux": "ComfyUI_deepDeband [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/ArmandAlbert/Kwai_font_comfyui": [
|
||||||
|
[
|
||||||
|
"Kwaifont_Image_Cropper",
|
||||||
|
"Kwaifont_Resnet101_Loader",
|
||||||
|
"Kwaifont_Resnet101_Runner",
|
||||||
|
"Kwaifont_Resnet50_Loader",
|
||||||
|
"Kwaifont_Resnet50_Runner"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "Kwai_font_comfyui"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/ArthusLiang/comfyui-face-remap": [
|
"https://github.com/ArthusLiang/comfyui-face-remap": [
|
||||||
[
|
[
|
||||||
"FaceRemap"
|
"FaceRemap"
|
||||||
@@ -698,6 +721,7 @@
|
|||||||
"AD_mockup-maker",
|
"AD_mockup-maker",
|
||||||
"AD_poster-maker",
|
"AD_poster-maker",
|
||||||
"AD_prompt-saver",
|
"AD_prompt-saver",
|
||||||
|
"ImageCaptioner",
|
||||||
"ImageResize",
|
"ImageResize",
|
||||||
"Incrementer \ud83e\udeb4",
|
"Incrementer \ud83e\udeb4",
|
||||||
"TextAppendNode",
|
"TextAppendNode",
|
||||||
@@ -723,6 +747,15 @@
|
|||||||
"title_aux": "ComfyUI-MusicGen [WIP]"
|
"title_aux": "ComfyUI-MusicGen [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/EmilioPlumed/ComfyUI-Math": [
|
||||||
|
[
|
||||||
|
"GreatestCommonDenominator",
|
||||||
|
"LowestCommonMultiple"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-Math [WIP]"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/ExponentialML/ComfyUI_LiveDirector": [
|
"https://github.com/ExponentialML/ComfyUI_LiveDirector": [
|
||||||
[
|
[
|
||||||
"LiveDirector"
|
"LiveDirector"
|
||||||
@@ -848,6 +881,14 @@
|
|||||||
"title_aux": "comfyui_HavocsCall_Custom_Nodes"
|
"title_aux": "comfyui_HavocsCall_Custom_Nodes"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/HellerCommaA/ComfyUI-VideoResolutions": [
|
||||||
|
[
|
||||||
|
"HunyuanResolutions"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-VideoResolutions"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/IgPoly/ComfyUI-igTools": [
|
"https://github.com/IgPoly/ComfyUI-igTools": [
|
||||||
[
|
[
|
||||||
"IGT_SimpleTilesCalc"
|
"IGT_SimpleTilesCalc"
|
||||||
@@ -1141,6 +1182,23 @@
|
|||||||
"title_aux": "ComfyUI-APG_ImYourCFGNow"
|
"title_aux": "ComfyUI-APG_ImYourCFGNow"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/Njbx/ComfyUI-blockswap": [
|
||||||
|
[
|
||||||
|
"BlockSwap"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-blockswap"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"https://github.com/PATATAJEC/Patatajec-Nodes": [
|
||||||
|
[
|
||||||
|
"HyvidSwitcher",
|
||||||
|
"MidiAnalyzer"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "Patatajec-Nodes [WIP]"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/PluMaZero/ComfyUI-SpaceFlower": [
|
"https://github.com/PluMaZero/ComfyUI-SpaceFlower": [
|
||||||
[
|
[
|
||||||
"SpaceFlower_HangulPrompt",
|
"SpaceFlower_HangulPrompt",
|
||||||
@@ -1368,6 +1426,15 @@
|
|||||||
"title_aux": "ComfyUI_Remaker_FaceSwap"
|
"title_aux": "ComfyUI_Remaker_FaceSwap"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/SpatialDeploy/ComfyUI-Voxels": [
|
||||||
|
[
|
||||||
|
"MeshToVoxelGrid",
|
||||||
|
"VoxelGridsToVoxelVideo"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-Voxels [WIP]"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/StartHua/Comfyui_CSDMT_CXH": [
|
"https://github.com/StartHua/Comfyui_CSDMT_CXH": [
|
||||||
[
|
[
|
||||||
"CSD"
|
"CSD"
|
||||||
@@ -1631,6 +1698,7 @@
|
|||||||
"https://github.com/backearth1/Comfyui-MiniMax-Video": [
|
"https://github.com/backearth1/Comfyui-MiniMax-Video": [
|
||||||
[
|
[
|
||||||
"MiniMaxAIAPIClient",
|
"MiniMaxAIAPIClient",
|
||||||
|
"MiniMaxImage2Prompt",
|
||||||
"MiniMaxImage2Video",
|
"MiniMaxImage2Video",
|
||||||
"MiniMaxPreviewVideo"
|
"MiniMaxPreviewVideo"
|
||||||
],
|
],
|
||||||
@@ -1954,6 +2022,20 @@
|
|||||||
"title_aux": "ComfyUI_StepFun"
|
"title_aux": "ComfyUI_StepFun"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/chengzeyi/Comfy-WaveSpeed": [
|
||||||
|
[
|
||||||
|
"ApplyFBCacheOnModel",
|
||||||
|
"EnhancedCompileModel",
|
||||||
|
"EnhancedLoadDiffusionModel",
|
||||||
|
"VelocatorCompileModel",
|
||||||
|
"VelocatorLoadAndQuantizeClip",
|
||||||
|
"VelocatorLoadAndQuantizeDiffusionModel",
|
||||||
|
"VelocatorQuantizeModel"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "Comfy-WaveSpeed [WIP]"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/christian-byrne/infinite-zoom-parallax-nodes": [
|
"https://github.com/christian-byrne/infinite-zoom-parallax-nodes": [
|
||||||
[
|
[
|
||||||
"Create Parallax Video",
|
"Create Parallax Video",
|
||||||
@@ -2030,6 +2112,7 @@
|
|||||||
"ControlNetApplySD3",
|
"ControlNetApplySD3",
|
||||||
"ControlNetInpaintingAliMamaApply",
|
"ControlNetInpaintingAliMamaApply",
|
||||||
"ControlNetLoader",
|
"ControlNetLoader",
|
||||||
|
"CosmosImageToVideoLatent",
|
||||||
"CropMask",
|
"CropMask",
|
||||||
"DiffControlNetLoader",
|
"DiffControlNetLoader",
|
||||||
"DifferentialDiffusion",
|
"DifferentialDiffusion",
|
||||||
@@ -2037,6 +2120,7 @@
|
|||||||
"DisableNoise",
|
"DisableNoise",
|
||||||
"DualCFGGuider",
|
"DualCFGGuider",
|
||||||
"DualCLIPLoader",
|
"DualCLIPLoader",
|
||||||
|
"EmptyCosmosLatentVideo",
|
||||||
"EmptyHunyuanLatentVideo",
|
"EmptyHunyuanLatentVideo",
|
||||||
"EmptyImage",
|
"EmptyImage",
|
||||||
"EmptyLTXVLatentVideo",
|
"EmptyLTXVLatentVideo",
|
||||||
@@ -2180,6 +2264,7 @@
|
|||||||
"SaveImageWebsocket",
|
"SaveImageWebsocket",
|
||||||
"SaveLatent",
|
"SaveLatent",
|
||||||
"SelfAttentionGuidance",
|
"SelfAttentionGuidance",
|
||||||
|
"SetFirstSigma",
|
||||||
"SetLatentNoiseMask",
|
"SetLatentNoiseMask",
|
||||||
"SetUnionControlNetType",
|
"SetUnionControlNetType",
|
||||||
"SkipLayerGuidanceDiT",
|
"SkipLayerGuidanceDiT",
|
||||||
@@ -2303,6 +2388,15 @@
|
|||||||
"title_aux": "ComfyUI-Better-Dimensions"
|
"title_aux": "ComfyUI-Better-Dimensions"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/cwebbi1/VoidCustomNodes": [
|
||||||
|
[
|
||||||
|
"Prompt Parser",
|
||||||
|
"String Combiner"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "VoidCustomNodes"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/denislov/Comfyui_AutoSurvey": [
|
"https://github.com/denislov/Comfyui_AutoSurvey": [
|
||||||
[
|
[
|
||||||
"AddDoc2Knowledge",
|
"AddDoc2Knowledge",
|
||||||
@@ -2471,7 +2565,6 @@
|
|||||||
[
|
[
|
||||||
"DownloadAndLoadHyVideoTextEncoder",
|
"DownloadAndLoadHyVideoTextEncoder",
|
||||||
"HyVideoBlockSwap",
|
"HyVideoBlockSwap",
|
||||||
"HyVideoCustomPromptTemplate",
|
|
||||||
"HyVideoDecode",
|
"HyVideoDecode",
|
||||||
"HyVideoEncode",
|
"HyVideoEncode",
|
||||||
"HyVideoModelLoader",
|
"HyVideoModelLoader",
|
||||||
@@ -2485,19 +2578,6 @@
|
|||||||
"title_aux": "ComfyUI-HunyuanVideoWrapper-Extended [WIP]"
|
"title_aux": "ComfyUI-HunyuanVideoWrapper-Extended [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"https://github.com/evolox/ComfyUI-GeneraNodes": [
|
|
||||||
[
|
|
||||||
"Genera.BatchPreviewer",
|
|
||||||
"Genera.BatchTester",
|
|
||||||
"Genera.GCPStorageNode",
|
|
||||||
"Genera.MaskDrawer",
|
|
||||||
"Genera.Utils",
|
|
||||||
"PainterNode"
|
|
||||||
],
|
|
||||||
{
|
|
||||||
"title_aux": "ComfyUI-GeneraNodes"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"https://github.com/exectails/comfyui-et_scripting": [
|
"https://github.com/exectails/comfyui-et_scripting": [
|
||||||
[
|
[
|
||||||
"ETPythonTextScript3Node"
|
"ETPythonTextScript3Node"
|
||||||
@@ -2801,11 +2881,16 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/hy134300/comfyui-hydit": [
|
"https://github.com/hy134300/comfyui-hydit": [
|
||||||
[
|
[
|
||||||
|
"DiffusersCLIPLoader",
|
||||||
|
"DiffusersCheckpointLoader",
|
||||||
"DiffusersClipTextEncode",
|
"DiffusersClipTextEncode",
|
||||||
|
"DiffusersControlNetLoader",
|
||||||
|
"DiffusersLoraLoader",
|
||||||
"DiffusersModelMakeup",
|
"DiffusersModelMakeup",
|
||||||
"DiffusersPipelineLoader",
|
"DiffusersPipelineLoader",
|
||||||
"DiffusersSampler",
|
"DiffusersSampler",
|
||||||
"DiffusersSchedulerLoader"
|
"DiffusersSchedulerLoader",
|
||||||
|
"DiffusersVAELoader"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "comfyui-hydit"
|
"title_aux": "comfyui-hydit"
|
||||||
@@ -2862,13 +2947,20 @@
|
|||||||
"ImageLatentCreator",
|
"ImageLatentCreator",
|
||||||
"ImageResolutionAdjuster",
|
"ImageResolutionAdjuster",
|
||||||
"ImageSizeCreator",
|
"ImageSizeCreator",
|
||||||
|
"ImageToBase64",
|
||||||
"MaskPreview",
|
"MaskPreview",
|
||||||
"MultilineTextInput",
|
"MultilineTextInput",
|
||||||
|
"PaintingCoder::ImageSwitch",
|
||||||
|
"PaintingCoder::LatentSwitch",
|
||||||
|
"PaintingCoder::MaskSwitch",
|
||||||
|
"PaintingCoder::TextSwitch",
|
||||||
|
"PaintingCoder::WebImageLoader",
|
||||||
"RemoveEmptyLinesAndLeadingSpaces",
|
"RemoveEmptyLinesAndLeadingSpaces",
|
||||||
"RemoveEmptyLinesAndLeadingSpacesAdvance",
|
"RemoveEmptyLinesAndLeadingSpacesAdvance",
|
||||||
"ShowTextPlus",
|
"ShowTextPlus",
|
||||||
"SimpleTextInput",
|
"SimpleTextInput",
|
||||||
"TextCombiner"
|
"TextCombiner",
|
||||||
|
"WebImageLoader"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "ComfyUI PaintingCoderUtils Nodes [WIP]"
|
"title_aux": "ComfyUI PaintingCoderUtils Nodes [WIP]"
|
||||||
@@ -2897,6 +2989,7 @@
|
|||||||
"DefineWord",
|
"DefineWord",
|
||||||
"DictFromJSON",
|
"DictFromJSON",
|
||||||
"DictionaryToJSON",
|
"DictionaryToJSON",
|
||||||
|
"ImageToSolidBackground",
|
||||||
"JSONToDictionary",
|
"JSONToDictionary",
|
||||||
"LoadImageAndInfoFromPath",
|
"LoadImageAndInfoFromPath",
|
||||||
"LookupWord",
|
"LookupWord",
|
||||||
@@ -3043,7 +3136,10 @@
|
|||||||
"KAndyCivitPromptAPI",
|
"KAndyCivitPromptAPI",
|
||||||
"KAndyImagesByCss",
|
"KAndyImagesByCss",
|
||||||
"KAndyLoadImageFromUrl",
|
"KAndyLoadImageFromUrl",
|
||||||
"KAndyNoiseCondition"
|
"KAndyNoiseCondition",
|
||||||
|
"KCivitaiPostAPI",
|
||||||
|
"KPornImageAPI",
|
||||||
|
"KPromtGen"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "ComfyUI-KAndy"
|
"title_aux": "ComfyUI-KAndy"
|
||||||
@@ -3206,6 +3302,14 @@
|
|||||||
"title_aux": "ComfyUI nodes for VEnhancer [WIP]"
|
"title_aux": "ComfyUI nodes for VEnhancer [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/kijai/ComfyUI-VideoNoiseWarp": [
|
||||||
|
[
|
||||||
|
"GetWarpedNoiseFromVideo"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-VideoNoiseWarp [WIP]"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Advanced-Watermarks": [
|
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Advanced-Watermarks": [
|
||||||
[
|
[
|
||||||
"KimaraAIBatchImages",
|
"KimaraAIBatchImages",
|
||||||
@@ -3217,8 +3321,11 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/kk8bit/KayTool": [
|
"https://github.com/kk8bit/KayTool": [
|
||||||
[
|
[
|
||||||
|
"Baidu_Translater",
|
||||||
"Color_Adjustment",
|
"Color_Adjustment",
|
||||||
"Custom_Save_Image"
|
"Custom_Save_Image",
|
||||||
|
"Display_Any",
|
||||||
|
"Strong_Prompt"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "KayTool"
|
"title_aux": "KayTool"
|
||||||
@@ -3659,6 +3766,14 @@
|
|||||||
"title_aux": "ComfyUI-LLM-Evaluation [WIP]"
|
"title_aux": "ComfyUI-LLM-Evaluation [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/mliand/ComfyUI-Calendar-Node": [
|
||||||
|
[
|
||||||
|
"Comfy Calendar Node"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-Calendar-Node [WIP]"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/monate0615/ComfyUI-Affine-Transform": [
|
"https://github.com/monate0615/ComfyUI-Affine-Transform": [
|
||||||
[
|
[
|
||||||
"AffineTransform"
|
"AffineTransform"
|
||||||
@@ -3684,6 +3799,14 @@
|
|||||||
"title_aux": "ComfyUI GLIGEN GUI Node"
|
"title_aux": "ComfyUI GLIGEN GUI Node"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/muvich3n/ComfyUI-Claude-I2T": [
|
||||||
|
[
|
||||||
|
"ClaudeImageToPrompt"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-Claude-I2T"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/neeltheninja/ComfyUI-TempFileDeleter": [
|
"https://github.com/neeltheninja/ComfyUI-TempFileDeleter": [
|
||||||
[
|
[
|
||||||
"TempCleaner"
|
"TempCleaner"
|
||||||
@@ -3786,14 +3909,6 @@
|
|||||||
"title_aux": "ComfyUI-PromptUtilities"
|
"title_aux": "ComfyUI-PromptUtilities"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"https://github.com/nmlen/comfyui-mosaic-blur": [
|
|
||||||
[
|
|
||||||
"ImageMosaic"
|
|
||||||
],
|
|
||||||
{
|
|
||||||
"title_aux": "comfyui-mosaic-blur [WIP]"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"https://github.com/nomcycle/ComfyUI_Cluster": [
|
"https://github.com/nomcycle/ComfyUI_Cluster": [
|
||||||
[
|
[
|
||||||
"FenceClusteredWorkflow"
|
"FenceClusteredWorkflow"
|
||||||
@@ -3863,6 +3978,26 @@
|
|||||||
"title_aux": "ComfyUI-ppm"
|
"title_aux": "ComfyUI-ppm"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/parmarjh/ComfyUI-MochiWrapper-I2V": [
|
||||||
|
[
|
||||||
|
"DownloadAndLoadMochiModel",
|
||||||
|
"MochiDecode",
|
||||||
|
"MochiDecodeSpatialTiling",
|
||||||
|
"MochiFasterCache",
|
||||||
|
"MochiImageEncode",
|
||||||
|
"MochiLatentPreview",
|
||||||
|
"MochiModelLoader",
|
||||||
|
"MochiSampler",
|
||||||
|
"MochiSigmaSchedule",
|
||||||
|
"MochiTextEncode",
|
||||||
|
"MochiTorchCompileSettings",
|
||||||
|
"MochiVAEEncoderLoader",
|
||||||
|
"MochiVAELoader"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComfyUI-MochiWrapper-I2V [WIP]"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/paulhoux/Smart-Prompting": [
|
"https://github.com/paulhoux/Smart-Prompting": [
|
||||||
[
|
[
|
||||||
"SaveImageWithPrefix",
|
"SaveImageWithPrefix",
|
||||||
@@ -3879,6 +4014,18 @@
|
|||||||
"title_aux": "List Data Helper Nodes"
|
"title_aux": "List Data Helper Nodes"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/phamngoctukts/ComyUI-Tupham": [
|
||||||
|
[
|
||||||
|
"AreaCondition_v2",
|
||||||
|
"ConditionUpscale",
|
||||||
|
"MultiLatent",
|
||||||
|
"Runnodeselected",
|
||||||
|
"ghepanh"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "ComyUI-Tupham"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/poisenbery/NudeNet-Detector-Provider": [
|
"https://github.com/poisenbery/NudeNet-Detector-Provider": [
|
||||||
[
|
[
|
||||||
"NudeNetDetectorProvider"
|
"NudeNetDetectorProvider"
|
||||||
@@ -3913,14 +4060,6 @@
|
|||||||
"title_aux": "anyPython [UNSAFE]"
|
"title_aux": "anyPython [UNSAFE]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"https://github.com/prismwastaken/prism-comfyui-tools": [
|
|
||||||
[
|
|
||||||
"Prism-RandomNormal"
|
|
||||||
],
|
|
||||||
{
|
|
||||||
"title_aux": "prism-tools"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"https://github.com/prodogape/ComfyUI-clip-interrogator": [
|
"https://github.com/prodogape/ComfyUI-clip-interrogator": [
|
||||||
[
|
[
|
||||||
"ComfyUIClipInterrogator",
|
"ComfyUIClipInterrogator",
|
||||||
@@ -4161,6 +4300,16 @@
|
|||||||
"title_aux": "ComfyUI_InstructPixToPixConditioningLatent [WIP]"
|
"title_aux": "ComfyUI_InstructPixToPixConditioningLatent [WIP]"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"https://github.com/sourceful-official/comfyui-sourceful-official": [
|
||||||
|
[
|
||||||
|
"FalFluxLoraSourcefulOfficial",
|
||||||
|
"FalIcLightV2SourcefulOfficial",
|
||||||
|
"SourcefulOfficialComfyuiIncontextThreePanels"
|
||||||
|
],
|
||||||
|
{
|
||||||
|
"title_aux": "comfyui-sourceful-official"
|
||||||
|
}
|
||||||
|
],
|
||||||
"https://github.com/sswink/comfyui-lingshang": [
|
"https://github.com/sswink/comfyui-lingshang": [
|
||||||
[
|
[
|
||||||
"LS_ALY_Seg_Body_Utils",
|
"LS_ALY_Seg_Body_Utils",
|
||||||
@@ -4205,7 +4354,9 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/sugarkwork/comfyui_psd": [
|
"https://github.com/sugarkwork/comfyui_psd": [
|
||||||
[
|
[
|
||||||
"SavePSD"
|
"Convert PSD to Image",
|
||||||
|
"PSDLayer",
|
||||||
|
"Save PSD"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "comfyui_psd [WIP]"
|
"title_aux": "comfyui_psd [WIP]"
|
||||||
@@ -4348,15 +4499,6 @@
|
|||||||
"title_aux": "ComfyUI-My-Handy-Nodes"
|
"title_aux": "ComfyUI-My-Handy-Nodes"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"https://github.com/void15700/VoidCustomNodes": [
|
|
||||||
[
|
|
||||||
"Prompt Parser",
|
|
||||||
"String Combiner"
|
|
||||||
],
|
|
||||||
{
|
|
||||||
"title_aux": "VoidCustomNodes"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"https://github.com/walterFeng/ComfyUI-Image-Utils": [
|
"https://github.com/walterFeng/ComfyUI-Image-Utils": [
|
||||||
[
|
[
|
||||||
"Calculate Image Brightness",
|
"Calculate Image Brightness",
|
||||||
@@ -4365,6 +4507,7 @@
|
|||||||
"Color Similarity Checker",
|
"Color Similarity Checker",
|
||||||
"Crop Mask Util",
|
"Crop Mask Util",
|
||||||
"Displace Filter",
|
"Displace Filter",
|
||||||
|
"Image Fix (tensor shape convert)",
|
||||||
"Load Image (By Url)",
|
"Load Image (By Url)",
|
||||||
"Mask Refine (Aliyun)"
|
"Mask Refine (Aliyun)"
|
||||||
],
|
],
|
||||||
@@ -4374,6 +4517,7 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/warshanks/Shank-Tools": [
|
"https://github.com/warshanks/Shank-Tools": [
|
||||||
[
|
[
|
||||||
|
"ResolutionDivider",
|
||||||
"TileCalculator"
|
"TileCalculator"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
@@ -4457,17 +4601,20 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/yanhuifair/ComfyUI-FairLab": [
|
"https://github.com/yanhuifair/ComfyUI-FairLab": [
|
||||||
[
|
[
|
||||||
"CLIPTranslatedClass",
|
"CLIPTranslatedNode",
|
||||||
"DownloadImageClass",
|
"DownloadImageNode",
|
||||||
"FixUTF8StringClass",
|
"FixUTF8StringNode",
|
||||||
"ImageResizeClass",
|
"ImageResizeNode",
|
||||||
"LoadImageFromFolderClass",
|
"ImagesToVideoNode",
|
||||||
"SaveImageToFolderClass",
|
"LoadImageFromFolderNode",
|
||||||
"SaveImagesToFolderClass",
|
"SaveImageToFolderNode",
|
||||||
"SaveStringToFolderClass",
|
"SaveImagesToFolderNode",
|
||||||
"StringCombineClass",
|
"SaveStringToFolderNode",
|
||||||
"StringFieldClass",
|
"SequenceStringListNode",
|
||||||
"TranslateStringClass"
|
"StringCombineNode",
|
||||||
|
"StringFieldNode",
|
||||||
|
"TranslateStringNode",
|
||||||
|
"VideoToImagesNode"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "ComfyUI-FairLab"
|
"title_aux": "ComfyUI-FairLab"
|
||||||
@@ -4513,7 +4660,7 @@
|
|||||||
],
|
],
|
||||||
"https://github.com/zyd232/ComfyUI-zyd232-Nodes": [
|
"https://github.com/zyd232/ComfyUI-zyd232-Nodes": [
|
||||||
[
|
[
|
||||||
"ImageCompareNode"
|
"zyd232 ImagesPixelsCompare"
|
||||||
],
|
],
|
||||||
{
|
{
|
||||||
"title_aux": "ComfyUI-zyd232-Nodes"
|
"title_aux": "ComfyUI-zyd232-Nodes"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -11,6 +11,101 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"author": "alexgenovese",
|
||||||
|
"title": "comfyui_CfgPlusPlus [REMOVED]",
|
||||||
|
"id": "cfgpp",
|
||||||
|
"reference": "https://gitea.com/NotEvilGirl/cfgpp",
|
||||||
|
"files": [
|
||||||
|
"https://gitea.com/NotEvilGirl/cfgpp"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "CFG++ implemented according to [a/https://cfgpp-diffusion.github.io](https://cfgpp-diffusion.github.io). Basically modified DDIM sampler that makes sampling work at low CFG values (0 ~ 2). Read the CFG++ paper for more details"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "hosterosi",
|
||||||
|
"title": "ComfyUI OpenAI Node",
|
||||||
|
"reference": "https://github.com/hosterosi/ComfyUI_OpenAI [REMOVED]",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/hosterosi/ComfyUI_OpenAI"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This custom node for ComfyUI allows users to input multiline text and select a specific line by its number. The node processes the input and returns the selected line along with its index."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Gourieff",
|
||||||
|
"title": "ReActor Node for ComfyUI [DISABLED]",
|
||||||
|
"id": "reactor",
|
||||||
|
"reference": "https://github.com/Gourieff/comfyui-reactor-node",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Gourieff/comfyui-reactor-node"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "The Fast and Simple 'roop-like' Face Swap Extension Node for ComfyUI, based on ReActor (ex Roop-GE) SD-WebUI Face Swap Extension"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "prismwastaken",
|
||||||
|
"title": "prism-tools [REMOVED]",
|
||||||
|
"reference": "https://github.com/prismwastaken/prism-comfyui-tools",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/prismwastaken/prism-comfyui-tools"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "prism-tools"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "42lux",
|
||||||
|
"title": "ComfyUI-safety-checker [DEPRECATED]",
|
||||||
|
"reference": "https://github.com/42lux/ComfyUI-safety-checker",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/42lux/ComfyUI-safety-checker"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A NSFW/Safety Checker Node for ComfyUI."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "riverolls",
|
||||||
|
"title": "ComfyUI-FJDH",
|
||||||
|
"reference": "https://github.com/riverolls/ComfyUI-FJDH [REMOVED]",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/riverolls/ComfyUI-FJDH"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "bbox tools, image tools, mask generators, point tools"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "jetchopper",
|
||||||
|
"title": "ComfyUI-GeneraNodes",
|
||||||
|
"id": "genera",
|
||||||
|
"reference": "https://github.com/evolox/ComfyUI-GeneraNodes [REMOVED]",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/evolox/ComfyUI-GeneraNodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Genera custom nodes and extensions"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Pos13",
|
||||||
|
"title": "Cyclist [DEPRECATED]",
|
||||||
|
"id": "cyclist",
|
||||||
|
"reference": "https://github.com/Pos13/comfyui-cyclist",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Pos13/comfyui-cyclist"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This extension provides tools to iterate generation results between runs. In general, it's for cycles."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "leiweiqiang",
|
||||||
|
"title": "ComfyUI-TRA",
|
||||||
|
"id": "tra",
|
||||||
|
"reference": "https://github.com/leiweiqiang/ComfyUI-TRA",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/leiweiqiang/ComfyUI-TRA"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Nodes:TCL EbSynth, TCL Extract Frames (From File), TCL Extract Frames (From Video), TCL Combine Frames, TCL Save Video (From Frames)"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"author": "ai-business-hql",
|
"author": "ai-business-hql",
|
||||||
"title": "comfyUIAgent [REMOVED]",
|
"title": "comfyUIAgent [REMOVED]",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -270,6 +270,27 @@
|
|||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "A node for demonstration."
|
"description": "A node for demonstration."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "amorano",
|
||||||
|
"title": "cozy_spoke",
|
||||||
|
"reference": "https://github.com/cozy-comfyui/cozy_spoke",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/cozy-comfyui/cozy_spoke"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Example node communicating between ComfyUI Javascript and Python."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "amorano",
|
||||||
|
"title": "Cozy Link Toggle",
|
||||||
|
"id": "cozyLinkToggle",
|
||||||
|
"reference": "https://github.com/cozy-comfyui/cozy_link_toggle",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/cozy-comfyui/cozy_link_toggle"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -9,6 +9,7 @@ import platform
|
|||||||
import json
|
import json
|
||||||
import ast
|
import ast
|
||||||
import logging
|
import logging
|
||||||
|
import traceback
|
||||||
|
|
||||||
glob_path = os.path.join(os.path.dirname(__file__), "glob")
|
glob_path = os.path.join(os.path.dirname(__file__), "glob")
|
||||||
sys.path.append(glob_path)
|
sys.path.append(glob_path)
|
||||||
@@ -17,9 +18,19 @@ import security_check
|
|||||||
import manager_util
|
import manager_util
|
||||||
import cm_global
|
import cm_global
|
||||||
import manager_downloader
|
import manager_downloader
|
||||||
from datetime import datetime
|
|
||||||
import folder_paths
|
import folder_paths
|
||||||
|
|
||||||
|
try:
|
||||||
|
from datetime import datetime
|
||||||
|
def current_timestamp():
|
||||||
|
return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
|
||||||
|
except:
|
||||||
|
import time
|
||||||
|
import datetime
|
||||||
|
logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n datetime module is invalid: '{datetime.__file__}'")
|
||||||
|
def current_timestamp():
|
||||||
|
return str(time.time()).split('.')[0]
|
||||||
|
|
||||||
security_check.security_check()
|
security_check.security_check()
|
||||||
|
|
||||||
cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
|
cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
|
||||||
@@ -136,6 +147,48 @@ def process_wrap(cmd_str, cwd_path, handler=None, env=None):
|
|||||||
return process.wait()
|
return process.wait()
|
||||||
|
|
||||||
|
|
||||||
|
original_stdout = sys.stdout
|
||||||
|
|
||||||
|
|
||||||
|
def try_get_custom_nodes(x):
|
||||||
|
for custom_nodes_dir in folder_paths.get_folder_paths('custom_nodes'):
|
||||||
|
if x.startswith(custom_nodes_dir):
|
||||||
|
relative_path = os.path.relpath(x, custom_nodes_dir)
|
||||||
|
next_segment = relative_path.split(os.sep)[0]
|
||||||
|
if next_segment.lower() != 'comfyui-manager':
|
||||||
|
return next_segment, os.path.join(custom_nodes_dir, next_segment)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def extract_origin_module():
|
||||||
|
stack = traceback.extract_stack()[:-2]
|
||||||
|
for frame in reversed(stack):
|
||||||
|
info = try_get_custom_nodes(frame.filename)
|
||||||
|
if info is None:
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
return info
|
||||||
|
return None
|
||||||
|
|
||||||
|
def extract_origin_module_from_strings(file_paths):
|
||||||
|
for filepath in file_paths:
|
||||||
|
info = try_get_custom_nodes(filepath)
|
||||||
|
if info is None:
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
return info
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def finalize_startup():
|
||||||
|
res = {}
|
||||||
|
for k, v in cm_global.error_dict.items():
|
||||||
|
if v['path'] in import_failed_extensions:
|
||||||
|
res[k] = v
|
||||||
|
|
||||||
|
cm_global.error_dict = res
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if '--port' in sys.argv:
|
if '--port' in sys.argv:
|
||||||
port_index = sys.argv.index('--port')
|
port_index = sys.argv.index('--port')
|
||||||
@@ -215,8 +268,16 @@ try:
|
|||||||
if match:
|
if match:
|
||||||
import_failed_extensions.add(match.group(1).strip())
|
import_failed_extensions.add(match.group(1).strip())
|
||||||
|
|
||||||
if 'Starting server' in message:
|
if not self.is_stdout:
|
||||||
is_start_mode = False
|
origin_info = extract_origin_module()
|
||||||
|
if origin_info is not None:
|
||||||
|
name, origin_path = origin_info
|
||||||
|
|
||||||
|
if name != 'comfyui-manager':
|
||||||
|
if name not in cm_global.error_dict:
|
||||||
|
cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
|
||||||
|
|
||||||
|
cm_global.error_dict[name]['msg'] += message
|
||||||
|
|
||||||
if not self.is_stdout:
|
if not self.is_stdout:
|
||||||
match = re.search(pat_tqdm, message)
|
match = re.search(pat_tqdm, message)
|
||||||
@@ -235,7 +296,7 @@ try:
|
|||||||
|
|
||||||
def sync_write(self, message, file_only=False):
|
def sync_write(self, message, file_only=False):
|
||||||
with log_lock:
|
with log_lock:
|
||||||
timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
|
timestamp = current_timestamp()
|
||||||
if self.last_char != '\n':
|
if self.last_char != '\n':
|
||||||
log_file.write(message)
|
log_file.write(message)
|
||||||
else:
|
else:
|
||||||
@@ -301,12 +362,34 @@ try:
|
|||||||
if match:
|
if match:
|
||||||
import_failed_extensions.add(match.group(1).strip())
|
import_failed_extensions.add(match.group(1).strip())
|
||||||
|
|
||||||
|
if 'Traceback' in message:
|
||||||
|
file_lists = self._extract_file_paths(message)
|
||||||
|
origin_info = extract_origin_module_from_strings(file_lists)
|
||||||
|
if origin_info is not None:
|
||||||
|
name, origin_path = origin_info
|
||||||
|
|
||||||
|
if name != 'comfyui-manager':
|
||||||
|
if name not in cm_global.error_dict:
|
||||||
|
cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
|
||||||
|
|
||||||
|
cm_global.error_dict[name]['msg'] += message
|
||||||
|
|
||||||
if 'Starting server' in message:
|
if 'Starting server' in message:
|
||||||
is_start_mode = False
|
is_start_mode = False
|
||||||
|
finalize_startup()
|
||||||
|
|
||||||
if stderr_wrapper:
|
if stderr_wrapper:
|
||||||
stderr_wrapper.sync_write(message+'\n', file_only=True)
|
stderr_wrapper.sync_write(message+'\n', file_only=True)
|
||||||
|
|
||||||
|
def _extract_file_paths(self, msg):
|
||||||
|
file_paths = []
|
||||||
|
for line in msg.split('\n'):
|
||||||
|
match = re.findall(r'File \"(.*?)\", line \d+', line)
|
||||||
|
for x in match:
|
||||||
|
if not x.startswith('<'):
|
||||||
|
file_paths.extend(match)
|
||||||
|
return file_paths
|
||||||
|
|
||||||
|
|
||||||
logging.getLogger().addHandler(LoggingHandler())
|
logging.getLogger().addHandler(LoggingHandler())
|
||||||
|
|
||||||
@@ -339,7 +422,7 @@ except:
|
|||||||
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("## [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:", datetime.now())
|
print("** ComfyUI startup time:", current_timestamp())
|
||||||
print("** Platform:", platform.system())
|
print("** Platform:", platform.system())
|
||||||
print("** Python version:", sys.version)
|
print("** Python version:", sys.version)
|
||||||
print("** Python executable:", sys.executable)
|
print("** Python executable:", sys.executable)
|
||||||
@@ -403,7 +486,7 @@ def is_installed(name):
|
|||||||
if name.startswith('#'):
|
if name.startswith('#'):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
|
pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
|
||||||
match = re.search(pattern, name)
|
match = re.search(pattern, name)
|
||||||
|
|
||||||
if match:
|
if match:
|
||||||
@@ -418,7 +501,7 @@ def is_installed(name):
|
|||||||
if match is None:
|
if match is None:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
return True
|
return True
|
||||||
elif match.group(2) in ['<=', '==', '<']:
|
elif match.group(2) in ['<=', '==', '<', '~=']:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
||||||
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "comfyui-manager"
|
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."
|
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
||||||
version = "3.5"
|
version = "3.9"
|
||||||
license = { file = "LICENSE.txt" }
|
license = { file = "LICENSE.txt" }
|
||||||
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
|
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ python -m venv venv
|
|||||||
source venv/bin/activate
|
source venv/bin/activate
|
||||||
python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
|
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 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 ..
|
cd ..
|
||||||
echo "#!/bin/bash" > run_gpu.sh
|
echo "#!/bin/bash" > run_gpu.sh
|
||||||
echo "cd ComfyUI" >> run_gpu.sh
|
echo "cd ComfyUI" >> run_gpu.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user