Compare commits

...

87 Commits
3.10 ... 3.22

Author SHA1 Message Date
Dr.Lt.Data
fa1b514440 improved: Update All - Show link on the result board
fixed: Update All - Updates for unknown nodes were not being applied
fixed: corner case crash whilte install/updating

https://github.com/ltdrdata/ComfyUI-Manager/issues/1168
2025-02-16 14:25:57 +09:00
Dr.Lt.Data
1579c58876 fixed: ensure chardet dependency
https://github.com/ltdrdata/ComfyUI-Manager/discussions/1553
2025-02-16 13:04:56 +09:00
Dr.Lt.Data
153d044331 update DB 2025-02-16 10:30:18 +09:00
wirytiox
f2496f7054 Update custom-node-list.json (#1551) 2025-02-16 10:11:11 +09:00
Sssnap
99022f4f3d Update custom-node-list.json (#1549)
* Update custom-node-list.json

* Update custom-node-list.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-02-16 10:10:57 +09:00
Dr.Lt.Data
60a5e4f261 fixed: address abnormal encoding of 'requirements.txt'
improved: better error message

https://github.com/ltdrdata/ComfyUI-Manager/issues/1513
2025-02-16 10:05:29 +09:00
Dr.Lt.Data
661586d3b6 update DB 2025-02-15 17:42:39 +09:00
Dr.Lt.Data
abc26cf906 fixed: pre_startup - restart if script is executed
fixed: normalize cnr versions via StrictVersion
- 2.5 and 2.5.0 were regarded as different version
2025-02-15 17:27:09 +09:00
Dr.Lt.Data
12351bada7 improved: is_local_mode - use ipaddress module instead of string match
refactor: get_config() - ensure lowercase option when returning dict

https://github.com/ltdrdata/ComfyUI-Manager/issues/1546
2025-02-15 10:02:25 +09:00
Dr.Lt.Data
a6816d53d7 update DB 2025-02-15 09:47:42 +09:00
Dr.Lt.Data
3b0709f5f2 improved: cm-cli.py save-snapshot - validate output path
fixed: Update all - Properly display the results of the ComfyUI update.
fixed: Update all - An issue where the action results of the custom nodes manager were reflected in the main dialog.

https://github.com/ltdrdata/ComfyUI-Manager/issues/1548
2025-02-15 09:23:04 +09:00
Dr.Lt.Data
d7af7e2917 update DB 2025-02-14 07:43:16 +09:00
Dr.Lt.Data
6516e62d33 version marker 2025-02-14 07:29:48 +09:00
CenFun
6b832edd2f store user's column width (#1541)
* Resolving conflicts

* ruff --fix
2025-02-14 07:29:11 +09:00
Robin Huang
eebace1652 Add support for custom node only snapshots (#4) (#1542)
* Add support for custom node only snapshots (#4)

* Fix ruff lint.

---------

Co-authored-by: pythongosssss <125205205+pythongosssss@users.noreply.github.com>
2025-02-14 07:26:35 +09:00
Dr.Lt.Data
6ff6e05408 improve: update all - background updating
modified: update all - don't update ComfyUI
2025-02-13 22:34:36 +09:00
Dr.Lt.Data
aaf569ca8c update DB 2025-02-13 21:28:39 +09:00
benjamin-bertram
31eef6222e Add LLM-Polymath (#1534)
* Add LLM-Polymath

* Update custom-node-list.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-02-13 21:06:30 +09:00
Dr.Lt.Data
9963afa558 modified: remove comfyui-manager from list if desktop mode 2025-02-13 08:46:18 +09:00
Dr.Lt.Data
5b2e2fcf9d feat: config.ini - network_mode is added.
- public | private | offline

https://github.com/ltdrdata/ComfyUI-Manager/issues/1537
2025-02-13 08:24:54 +09:00
Dr.Lt.Data
cc746e59a1 update DB 2025-02-11 21:33:54 +09:00
Shun.L
2cdb1c519d Add comfy-portal-endpoint entry to custom-node-list.json (#1533) 2025-02-11 21:07:37 +09:00
Eric W. Burns
426074ded9 New custom node entry for custom-node-list.json (#1536)
* Update custom-node-list.json (EBU-LMStudio)

request to add EBU-LMStudio to the custom node list

* Update custom-node-list.json

My new ComfyUI EBU PromptHelper custom nodes added to the list. Took the opportunity to clean up the description of my LMStudio module listing.

* Update custom-node-list.json

fixed typo
2025-02-11 21:06:33 +09:00
Alexander G. Morano
772a096615 Update custom-node-list.json (#1532)
Updating the old description which seems to be used when the repo is hand installed?
2025-02-11 21:04:29 +09:00
Dr.Lt.Data
e113e011cb improved: Display the terminal when starting the installation of a model or node packs 2025-02-10 02:56:55 +09:00
Dr.Lt.Data
22266484bd update DB 2025-02-10 02:48:46 +09:00
Dr.Lt.Data
559c011420 feat: support huggingface snapshot downloader
fixed: An issue where JS did not properly handle model download errors.
fixed: better security message for model downloading
2025-02-10 02:24:08 +09:00
Dr.Lt.Data
411c0633a3 update DB 2025-02-09 08:24:38 +09:00
Dr.Lt.Data
488f023bdf fixed: install.py wasn't executed properly
https://github.com/comfyanonymous/ComfyUI/issues/6734#issuecomment-2645819264
2025-02-09 07:50:31 +09:00
Dr.Lt.Data
22878f4ef8 fixed: robust install if db is broken 2025-02-08 07:18:57 +09:00
Dr.Lt.Data
e732a39fea fixed: robust loading if db is broken 2025-02-08 07:16:33 +09:00
Dr.Lt.Data
62b4bf7af4 fix broken DB 2025-02-08 07:14:17 +09:00
Dr.Lt.Data
47a525ddb4 update DB 2025-02-08 07:09:47 +09:00
DiaoDaiaChan
f4360725e0 update noevlai node (#1514)
Co-authored-by: Jashin chan <diaohutao@gmail.com>
2025-02-08 06:49:52 +09:00
Dr.Lt.Data
b86607cd41 update DB 2025-02-08 06:48:49 +09:00
Dr.Lt.Data
bf57de85c3 fixed: datetime import error
https://github.com/ltdrdata/ComfyUI-Manager/issues/1517
2025-02-07 09:19:05 +09:00
Dr.Lt.Data
2dd6118ff4 update DB 2025-02-03 22:54:30 +09:00
Dr.Lt.Data
816a53a7b1 fixed: add uv to requirements.txt
fixed: invalid interpretation of use_uv config item on prestartup_script

https://github.com/ltdrdata/ComfyUI-Manager/issues/1511
2025-02-03 09:21:20 +09:00
Dr.Lt.Data
ced93b0525 fixed: prestartup_script.py error when config.ini is not exists 2025-02-02 23:41:01 +09:00
Dr.Lt.Data
524ff9a4a6 modified: change default_cache_is_channel_url config option to default_cache_as_channel_url 2025-02-02 23:23:36 +09:00
Dr.Lt.Data
f15032f905 feat: add default_cache_is_channel_url config option 2025-02-02 23:19:25 +09:00
Dr.Lt.Data
d7d31a19e5 update DB 2025-02-02 23:11:04 +09:00
Dr.Lt.Data
df2a7ddca4 fixed: auto dependencies installation
- missing `rich` module
2025-02-02 21:17:35 +09:00
Dr.Lt.Data
ba9c71ffa4 fixed: close dialogs before restart
fixed: visual bug
2025-02-02 18:57:23 +09:00
Dr.Lt.Data
21b6c6569c feat: show restart confirm window when reconnected
fixed: `uv` related crash
2025-02-02 18:36:04 +09:00
Dr.Lt.Data
92aba9565a version marker 2025-02-02 18:17:27 +09:00
HuangYongliang
6ea0aebb0b fix channel_url config (#1501)
* 1.fix channel_url not effecte for default_cache_update
2.support http channel url for airgap env

* fix pylint
2025-02-02 18:16:39 +09:00
Dr.Lt.Data
b5cdcb75b4 feat: add always_lazy_install config option. 2025-02-02 18:01:16 +09:00
Dr.Lt.Data
bd9aae40b8 update DB 2025-02-02 17:40:07 +09:00
Dr.Lt.Data
33f931c0a4 feat: Support for uv has been added.
Set `use_uv` in `config.ini`.
2025-02-02 17:26:29 +09:00
Dr.Lt.Data
ede8279c17 remove legacy ui components
- default_ui
- a1111
2025-02-02 15:27:29 +09:00
Dr.Lt.Data
268b84a2b6 fixed: broken db item
fixed: robust getlist

https://github.com/ltdrdata/ComfyUI-Manager/issues/1508
2025-02-02 14:52:46 +09:00
Dr.Lt.Data
0a67145d80 code formatting 2025-02-02 14:40:11 +09:00
bymyself
2e55bc470c Add commands to toggle visibility of manager and custom nodes manager menus (#1505)
* Add commands for manager keybindings

* use more consistent isVisible condition check

* remove hide method in favor of super class's close method

* fix formatting

* fix tabs formatting
2025-02-02 14:37:04 +09:00
Dr.Lt.Data
cf0d038978 update DB 2025-02-02 14:33:35 +09:00
Dr.Lt.Data
92e7db1082 update DB 2025-02-02 14:30:30 +09:00
aiartvn
c45c47f935 Add A2V Multi Image Composite node (#1507)
* Update custom-node-list.json

* Update custom-node-list.json

* Update custom-node-list.json

* Update custom-node-list.json

* Update custom-node-list.json

* Update custom-node-list.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-02-02 14:29:27 +09:00
Dr.Lt.Data
341e27f9a3 update DB 2025-02-02 11:07:09 +09:00
ProGamerGov
ab167175c9 Add Preview 360 Panorma custom node (#1506)
* Update custom-node-list.json

* Update extension-node-map.json

* Update custom-node-list.json

* Update custom-node-list.json

* Update extension-node-map.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-02-02 10:46:17 +09:00
Dr.Lt.Data
3c2933338f fixed: /manager/queue/status - race condition issue 2025-02-02 10:38:05 +09:00
Robin Huang
829784fa50 Fix conditional for switch ComfyUI. 2025-02-01 16:16:37 -08:00
Robin Huang
3c45f8dc91 Hide update comfyui buttons in electron. 2025-02-01 16:15:27 -08:00
Dr.Lt.Data
f8ebf7c6ad update DB 2025-02-01 16:45:24 +09:00
Dr.Lt.Data
510c364607 feat: stop feature
feat: model-manager - support background tasking
2025-02-01 16:35:56 +09:00
Dr.Lt.Data
a3d6fcccb7 update DB 2025-02-01 14:01:18 +09:00
Dr.Lt.Data
42c8082edd fixed: duplicate endpoint function name 2025-02-01 11:39:48 +09:00
Dr.Lt.Data
1a7edf7f0e fixed: datetime.datetime crash - use hasattr instead of exception handling
https://github.com/ltdrdata/ComfyUI-Manager/issues/1503
2025-02-01 11:37:53 +09:00
Dr.Lt.Data
4760deaf9c feat: custom-nodes-manager - background tasks(install/update/fix/disable/enable) 2025-02-01 11:22:01 +09:00
Dr.Lt.Data
0f7b9d02a0 improved: more friendly log messages. 2025-01-31 21:42:26 +09:00
Dr.Lt.Data
adc86c7945 update DB 2025-01-31 21:36:24 +09:00
Dr.Lt.Data
12969eda07 version marker 2025-01-31 09:12:05 +09:00
Dr.Lt.Data
e07952455f fixed: PIPFixer - crash if dev was installed. 2025-01-31 09:10:51 +09:00
Dr.Lt.Data
4494230854 improved: PIPFixer - support pytorch 2.6.0 2025-01-31 09:05:31 +09:00
Dr.Lt.Data
e8dd21c0c3 update DB 2025-01-31 08:48:59 +09:00
ProGamerGov
36ef1b2fd6 Fix import collision (#1500)
* Fix import collision

* Update custom-node-list.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-01-31 08:32:14 +09:00
Dr.Lt.Data
c3d2bd8ed1 update DB 2025-01-30 21:57:13 +09:00
Dr.Lt.Data
da2b4be539 update DB 2025-01-30 18:21:13 +09:00
Dr.Lt.Data
b5e11f85d5 update DB 2025-01-30 18:17:08 +09:00
Dr.Lt.Data
9e1b2f8912 update DB 2025-01-30 10:09:09 +09:00
Dr.Lt.Data
1e5f4b0267 update DB 2025-01-30 10:01:47 +09:00
ProGamerGov
4fedd03074 Improve extension description (#1496)
* Improve description

* Update extension-node-map.json
2025-01-30 10:01:15 +09:00
RyanOnTheInside
f6feaeea85 Update custom-node-list.json (#1497) 2025-01-30 10:00:49 +09:00
Jay Swanson
c8743c0ab7 Add checkbin custom nodes (#1498) 2025-01-30 10:00:17 +09:00
Dr.Lt.Data
3d80ed95ca update DB 2025-01-29 23:31:59 +09:00
Dr.Lt.Data
0a28bfa9c2 fixed: ruff violation 2025-01-29 23:17:15 +09:00
Dr.Lt.Data
6d771f77e6 improved: Model-Manager now robustly recognizes installed models.
https://github.com/ltdrdata/ComfyUI-Manager/issues/1391
2025-01-29 23:13:17 +09:00
Dr.Lt.Data
717ca1bb18 update DB 2025-01-29 11:57:49 +09:00
30 changed files with 10495 additions and 6351 deletions

View File

@@ -5,6 +5,7 @@
![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg) ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
## NOTICE ## NOTICE
* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
* V3.10: `double-click feature` is removed * V3.10: `double-click feature` is removed
* This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/). * V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
@@ -246,6 +247,32 @@ The following settings are applied based on the section marked as `is_default`.
![missing-list](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg) ![missing-list](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg)
# Config
* You can modify the `config.ini` file to apply the settings for ComfyUI-Manager.
* The path to the `config.ini` used by ComfyUI-Manager is displayed in the startup log messages.
* See also: [https://github.com/ltdrdata/ComfyUI-Manager#paths]
* Configuration options:
```
[default]
git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
use_uv = <Use uv instead of pip for dependency installation.>
default_cache_as_channel_url = <Determines whether to retrieve the DB designated as channel_url at startup>
bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
security_level = <Set the security level => strong|normal|normal-|weak>
always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
network_mode = <Set the network mode => public|private|offline>
```
* network_mode:
- public: An environment that uses a typical public network.
- private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
- offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
## Additional Feature ## Additional Feature
* Logging to file feature * Logging to file feature
* This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`. * This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.

View File

@@ -31,8 +31,7 @@ if comfy_path is None:
except: except:
print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr) print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..')) comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
sys.path.append(comfy_path)
sys.path.append(comfy_path)
import utils.extra_config import utils.extra_config
import cm_global import cm_global
@@ -1012,17 +1011,32 @@ def save_snapshot(
user_directory: str = typer.Option( user_directory: str = typer.Option(
None, None,
help="user directory" help="user directory"
) ),
full_snapshot: Annotated[
bool,
typer.Option(
show_default=False, help="If the snapshot should include custom node, ComfyUI version and pip versions (default), or only custom node details"
),
] = True,
): ):
cmd_ctx.set_user_directory(user_directory) cmd_ctx.set_user_directory(user_directory)
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output)) if(not output.endswith('.json') and not output.endswith('.yaml')):
print("ERROR: output path should be either '.json' or '.yaml' file.")
raise typer.Exit(code=1)
dir_path = os.path.dirname(output)
if(dir_path != '' and not os.path.exists(dir_path)):
print(f"ERROR: {output} path not exists.")
raise typer.Exit(code=1)
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
print(f"Current snapshot is saved as `{path}`") print(f"Current snapshot is saved as `{path}`")
@app.command("restore-snapshot", help="Restore snapshot from snapshot file") @app.command("restore-snapshot", help="Restore snapshot from snapshot file")
def restore_snapshot( def restore_snapshot(
snapshot_name: str, snapshot_name: str,
pip_non_url: Optional[bool] = typer.Option( pip_non_url: Optional[bool] = typer.Option(
default=None, default=None,
show_default=False, show_default=False,

View File

File diff suppressed because it is too large Load Diff

View File

File diff suppressed because it is too large Load Diff

View File

@@ -389,12 +389,13 @@ def apply_snapshot(path):
git_custom_node_infos = info['git_custom_nodes'] git_custom_node_infos = info['git_custom_nodes']
file_custom_node_infos = info['file_custom_nodes'] file_custom_node_infos = info['file_custom_nodes']
checkout_comfyui_hash(comfyui_hash) if comfyui_hash:
checkout_comfyui_hash(comfyui_hash)
checkout_custom_node_hash(git_custom_node_infos) checkout_custom_node_hash(git_custom_node_infos)
invalidate_custom_node_file(file_custom_node_infos) invalidate_custom_node_file(file_custom_node_infos)
print("APPLY SNAPSHOT: True") print("APPLY SNAPSHOT: True")
if 'pips' in info: if 'pips' in info and info['pips']:
return info['pips'] return info['pips']
else: else:
return None return None

View File

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -4,6 +4,7 @@ description:
""" """
import json import json
import logging
import os import os
import sys import sys
import subprocess import subprocess
@@ -41,7 +42,7 @@ import manager_downloader
from node_package import InstalledNodePackage from node_package import InstalledNodePackage
version_code = [3, 9, 5] version_code = [3, 22]
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 '')
@@ -173,7 +174,7 @@ git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py
manager_files_path = None manager_files_path = None
manager_config_path = None manager_config_path = None
manager_channel_list_path = None manager_channel_list_path = None
manager_startup_script_path = None manager_startup_script_path:str = None
manager_snapshot_path = None manager_snapshot_path = None
manager_pip_overrides_path = None manager_pip_overrides_path = None
manager_components_path = None manager_components_path = None
@@ -324,6 +325,8 @@ def normalize_channel(channel):
return None return None
elif channel.startswith('https://'): elif channel.startswith('https://'):
return channel return channel
elif channel.startswith('http://') and get_config()['http_channel_enabled'] == True:
return channel
tmp_dict = get_channel_dict() tmp_dict = get_channel_dict()
channel_url = tmp_dict.get(channel) channel_url = tmp_dict.get(channel)
@@ -342,6 +345,7 @@ class ManagedResult:
self.msg = None self.msg = None
self.target = None self.target = None
self.postinstall = lambda: True self.postinstall = lambda: True
self.ver = None
def append(self, item): def append(self, item):
self.items.append(item) self.items.append(item)
@@ -363,6 +367,10 @@ class ManagedResult:
self.postinstall = postinstall self.postinstall = postinstall
return self return self
def with_ver(self, ver):
self.ver = ver
return self
class UnifiedManager: class UnifiedManager:
def __init__(self): def __init__(self):
@@ -510,7 +518,10 @@ class UnifiedManager:
if info: if info:
cnr = self.cnr_map.get(info['id']) cnr = self.cnr_map.get(info['id'])
if cnr: if cnr:
return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']} # normalize version
# for example: 2.5 -> 2.5.0
ver = str(manager_util.StrictVersion(info['version']))
return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
else: else:
return None return None
else: else:
@@ -692,6 +703,9 @@ class UnifiedManager:
self.unknown_active_nodes = {} # node_id -> repo url * fullpath self.unknown_active_nodes = {} # node_id -> repo url * fullpath
self.active_nodes = {} # node_id -> node_version * fullpath self.active_nodes = {} # node_id -> node_version * fullpath
if get_config()['network_mode'] != 'public':
dont_wait = True
# 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=='cache', dont_wait=dont_wait) cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
@@ -730,14 +744,17 @@ class UnifiedManager:
json_obj = await get_data_by_mode(mode, 'custom-node-list.json', channel_url=channel_url) json_obj = await get_data_by_mode(mode, 'custom-node-list.json', channel_url=channel_url)
for x in json_obj['custom_nodes']: for x in json_obj['custom_nodes']:
for y in x['files']: try:
if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')): for y in x['files']:
repo_name = y.split('/')[-1] if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
res[repo_name] = (x, False) repo_name = y.split('/')[-1]
res[repo_name] = (x, False)
if 'id' in x: if 'id' in x:
if x['id'] not in res: if x['id'] not in res:
res[x['id']] = (x, True) res[x['id']] = (x, True)
except:
logging.error(f"[ComfyUI-Manager] broken item:{x}")
return res return res
@@ -777,6 +794,7 @@ class UnifiedManager:
node_id = v['id'] node_id = v['id']
else: else:
node_id = v['files'][0].split('/')[-1] node_id = v['files'][0].split('/')[-1]
v['repository'] = v['files'][0]
res[node_id] = v res[node_id] = v
elif len(v['files']) > 1: elif len(v['files']) > 1:
res[v['files'][0]] = v # A custom node composed of multiple url is treated as a single repository with one representative path res[v['files'][0]] = v # A custom node composed of multiple url is treated as a single repository with one representative path
@@ -803,14 +821,14 @@ class UnifiedManager:
print("Install: pip packages") print("Install: pip packages")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages()) pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
res = True res = True
with open(requirements_path, "r") as requirements_file: lines = manager_util.robust_readlines(requirements_path)
for line in requirements_file: for line in lines:
package_name = remap_pip_package(line.strip()) package_name = remap_pip_package(line.strip())
if package_name and not package_name.startswith('#') and package_name not in self.processed_install: if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
self.processed_install.add(package_name) self.processed_install.add(package_name)
install_cmd = [sys.executable, "-m", "pip", "install", package_name] install_cmd = manager_util.make_pip_cmd(["install", package_name])
if package_name.strip() != "" and not package_name.startswith('#'): if package_name.strip() != "" and not package_name.startswith('#'):
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution) res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
pip_fixer.fix_broken() pip_fixer.fix_broken()
return res return res
@@ -1240,7 +1258,8 @@ class UnifiedManager:
return result.fail(f"Failed to execute install script: {url}") return result.fail(f"Failed to execute install script: {url}")
except Exception as e: except Exception as e:
return result.fail(f"Install(git-clone) error: {url} / {e}") traceback.print_exc()
return result.fail(f"Install(git-clone) error[2]: {url} / {e}")
print("Installation was successful.") print("Installation was successful.")
return result return result
@@ -1321,14 +1340,14 @@ class UnifiedManager:
version_spec = self.resolve_unspecified_version(node_id, guess_mode='active') version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
if version_spec is None: if version_spec is None:
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}') return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}').with_ver(version_spec)
if version_spec == 'nightly': if version_spec == 'nightly':
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly') return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly').with_ver('nightly')
elif version_spec == 'unknown': elif version_spec == 'unknown':
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown') return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown').with_ver('unknown')
else: else:
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall) return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')
async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False): async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
""" """
@@ -1542,20 +1561,23 @@ manager_funcs = ManagerFuncs()
def write_config(): def write_config():
config = configparser.ConfigParser() config = configparser.ConfigParser()
config['default'] = { config['default'] = {
'preview_method': manager_funcs.get_current_preview_method(), 'preview_method': manager_funcs.get_current_preview_method(),
'git_exe': get_config()['git_exe'], 'git_exe': get_config()['git_exe'],
'use_uv': get_config()['use_uv'],
'channel_url': get_config()['channel_url'], 'channel_url': get_config()['channel_url'],
'share_option': get_config()['share_option'], 'share_option': get_config()['share_option'],
'bypass_ssl': get_config()['bypass_ssl'], 'bypass_ssl': get_config()['bypass_ssl'],
"file_logging": get_config()['file_logging'], "file_logging": get_config()['file_logging'],
'default_ui': get_config()['default_ui'],
'component_policy': get_config()['component_policy'], 'component_policy': get_config()['component_policy'],
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'], 'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
'model_download_by_agent': get_config()['model_download_by_agent'], 'model_download_by_agent': get_config()['model_download_by_agent'],
'downgrade_blacklist': get_config()['downgrade_blacklist'], 'downgrade_blacklist': get_config()['downgrade_blacklist'],
'security_level': get_config()['security_level'], 'security_level': get_config()['security_level'],
'skip_migration_check': get_config()['skip_migration_check'], 'skip_migration_check': get_config()['skip_migration_check'],
'always_lazy_install': get_config()['always_lazy_install'],
'network_mode': get_config()['network_mode']
} }
directory = os.path.dirname(manager_config_path) directory = os.path.dirname(manager_config_path)
@@ -1571,47 +1593,51 @@ def read_config():
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(manager_config_path) config.read(manager_config_path)
default_conf = config['default'] default_conf = config['default']
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
# policy migration: disable_unsecure_features -> security_level def get_bool(key, default_value):
if 'disable_unsecure_features' in default_conf: return default_conf[key].lower() == 'true' if key in default_conf else False
if default_conf['disable_unsecure_features'].lower() == 'true':
security_level = 'strong'
else:
security_level = 'normal'
else:
security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
return { return {
'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(), 'http_channel_enabled': get_bool('http_channel_enabled', False),
'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '', 'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL, 'git_exe': default_conf.get('git_exe', ''),
'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all', 'use_uv': get_bool('use_uv', False),
'bypass_ssl': default_conf['bypass_ssl'].lower() == 'true' if 'bypass_ssl' in default_conf else False, 'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
'file_logging': default_conf['file_logging'].lower() == 'true' if 'file_logging' in default_conf else True, 'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
'default_ui': default_conf['default_ui'] if 'default_ui' in default_conf else 'none', 'share_option': default_conf.get('share_option', 'all').lower(),
'component_policy': default_conf['component_policy'] if 'component_policy' in default_conf else 'workflow', 'bypass_ssl': get_bool('bypass_ssl', False),
'windows_selector_event_loop_policy': default_conf['windows_selector_event_loop_policy'].lower() == 'true' if 'windows_selector_event_loop_policy' in default_conf else False, 'file_logging': get_bool('file_logging', True),
'model_download_by_agent': default_conf['model_download_by_agent'].lower() == 'true' if 'model_download_by_agent' in default_conf else False, 'component_policy': default_conf.get('component_policy', 'workflow').lower(),
'downgrade_blacklist': default_conf['downgrade_blacklist'] if 'downgrade_blacklist' in default_conf else '', 'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
'skip_migration_check': default_conf['skip_migration_check'].lower() == 'true' if 'skip_migration_check' in default_conf else False, 'model_download_by_agent': get_bool('model_download_by_agent', False),
'security_level': security_level 'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
'skip_migration_check': get_bool('skip_migration_check', False),
'always_lazy_install': get_bool('always_lazy_install', False),
'network_mode': default_conf.get('network_mode', 'public').lower(),
'security_level': default_conf.get('security_level', 'normal').lower(),
} }
except Exception: except Exception:
manager_util.use_uv = False
return { return {
'http_channel_enabled': False,
'preview_method': manager_funcs.get_current_preview_method(), 'preview_method': manager_funcs.get_current_preview_method(),
'git_exe': '', 'git_exe': '',
'use_uv': False,
'channel_url': DEFAULT_CHANNEL, 'channel_url': DEFAULT_CHANNEL,
'default_cache_as_channel_url': False,
'share_option': 'all', 'share_option': 'all',
'bypass_ssl': False, 'bypass_ssl': False,
'file_logging': True, 'file_logging': True,
'default_ui': 'none',
'component_policy': 'workflow', 'component_policy': 'workflow',
'windows_selector_event_loop_policy': False, 'windows_selector_event_loop_policy': False,
'model_download_by_agent': False, 'model_download_by_agent': False,
'downgrade_blacklist': '', 'downgrade_blacklist': '',
'skip_migration_check': False, 'skip_migration_check': False,
'security_level': 'normal', 'always_lazy_install': False,
'network_mode': 'public', # public | private | offline
'security_level': 'normal', # strong | normal | normal- | weak
} }
@@ -1620,6 +1646,8 @@ def get_config():
if cached_config is None: if cached_config is None:
cached_config = read_config() cached_config = read_config()
if cached_config['http_channel_enabled']:
print("[ComfyUI-Manager] Warning: http channel enabled, make sure server in secure env")
return cached_config return cached_config
@@ -1668,7 +1696,9 @@ def switch_to_default_branch(repo):
def try_install_script(url, repo_path, install_cmd, instant_execution=False): def try_install_script(url, repo_path, install_cmd, instant_execution=False):
if not instant_execution and ((len(install_cmd) > 0 and install_cmd[0].startswith('#')) or (platform.system() == "Windows" and comfy_ui_commit_datetime.date() >= comfy_ui_required_commit_datetime.date())): if not instant_execution and (
(len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
):
if not os.path.exists(manager_startup_script_path): if not os.path.exists(manager_startup_script_path):
os.makedirs(manager_startup_script_path) os.makedirs(manager_startup_script_path)
@@ -1683,6 +1713,10 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
if is_blacklisted(install_cmd[4]): if is_blacklisted(install_cmd[4]):
print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[4]}'") print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[4]}'")
return True return True
elif len(install_cmd) == 6 and install_cmd[3:5] == ['pip', 'install']: # uv mode
if is_blacklisted(install_cmd[5]):
print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[5]}'")
return True
print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}") print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
code = manager_funcs.run_script(install_cmd, cwd=repo_path) code = manager_funcs.run_script(install_cmd, cwd=repo_path)
@@ -1799,9 +1833,9 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
if package_name and not package_name.startswith('#'): if package_name and not package_name.startswith('#'):
if '--index-url' in package_name: if '--index-url' in package_name:
s = package_name.split('--index-url') s = package_name.split('--index-url')
install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()] install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
else: else:
install_cmd = [sys.executable, "-m", "pip", "install", package_name] install_cmd = manager_util.make_pip_cmd(["install", package_name])
if package_name.strip() != "" and not package_name.startswith('#'): if package_name.strip() != "" and not package_name.startswith('#'):
try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution) try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
@@ -2021,8 +2055,8 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
except Exception as e: except Exception as e:
traceback.print_exc() traceback.print_exc()
print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr) print(f"Install(git-clone) error[1]: {url} / {e}", file=sys.stderr)
return result.fail(f"Install(git-clone) error: {url} / {e}") return result.fail(f"Install(git-clone)[1] error: {url} / {e}")
def git_pull(path): def git_pull(path):
@@ -2061,9 +2095,10 @@ async def get_data_by_mode(mode, filename, channel_url=None):
channel_url = get_channel_dict()[channel_url] channel_url = get_channel_dict()[channel_url]
try: try:
local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
if mode == "local": if mode == "local":
uri = os.path.join(manager_util.comfyui_manager_path, filename) json_obj = await manager_util.get_data(local_uri)
json_obj = await manager_util.get_data(uri)
else: else:
if channel_url is None: if channel_url is None:
uri = get_config()['channel_url'] + '/' + filename uri = get_config()['channel_url'] + '/' + filename
@@ -2073,19 +2108,25 @@ async def get_data_by_mode(mode, filename, channel_url=None):
cache_uri = str(manager_util.simple_hash(uri))+'_'+filename cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
cache_uri = os.path.join(manager_util.cache_dir, cache_uri) cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
if mode == "cache": if get_config()['network_mode'] == 'offline':
if manager_util.is_file_created_within_one_day(cache_uri): # offline network mode
if os.path.exists(cache_uri):
json_obj = await manager_util.get_data(cache_uri)
else:
local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
if os.path.exists(local_uri):
json_obj = await manager_util.get_data(local_uri)
else:
json_obj = {} # fallback
else:
# public network mode
if mode == "cache" and manager_util.is_file_created_within_one_day(cache_uri):
json_obj = await manager_util.get_data(cache_uri) json_obj = await manager_util.get_data(cache_uri)
else: else:
json_obj = await manager_util.get_data(uri) json_obj = await manager_util.get_data(uri)
with manager_util.cache_lock: with manager_util.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)
else:
json_obj = await manager_util.get_data(uri)
with manager_util.cache_lock:
with open(cache_uri, "w", encoding='utf-8') as file:
json.dump(json_obj, file, indent=4, sort_keys=True)
except Exception as e: except Exception as e:
print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}") print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
uri = os.path.join(manager_util.comfyui_manager_path, filename) uri = os.path.join(manager_util.comfyui_manager_path, filename)
@@ -2114,7 +2155,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
return False return False
except Exception as e: except Exception as e:
print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr) print(f"Fix(git-clone) error: {url} / {e}", file=sys.stderr)
return False return False
print(f"Attempt to fixing '{files}' is done.") print(f"Attempt to fixing '{files}' is done.")
@@ -2122,7 +2163,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
def pip_install(packages): def pip_install(packages):
install_cmd = ['#FORCE', sys.executable, "-m", "pip", "install", '-U'] + packages install_cmd = ['#FORCE'] + manager_util.make_pip_cmd(["install", '-U']) + packages
try_install_script('pip install via manager', '..', install_cmd) try_install_script('pip install via manager', '..', install_cmd)
@@ -2419,7 +2460,8 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr
def get_installed_pip_packages(): def get_installed_pip_packages():
# extract pip package infos # extract pip package infos
pips = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'], text=True).split('\n') cmd = manager_util.make_pip_cmd(['freeze'])
pips = subprocess.check_output(cmd, text=True).split('\n')
res = {} res = {}
for x in pips: for x in pips:
@@ -2435,7 +2477,7 @@ def get_installed_pip_packages():
return res return res
async def get_current_snapshot(): async def get_current_snapshot(custom_nodes_only = False):
await unified_manager.reload('cache') await unified_manager.reload('cache')
await unified_manager.get_custom_nodes('default', 'cache') await unified_manager.get_custom_nodes('default', 'cache')
@@ -2446,8 +2488,10 @@ async def get_current_snapshot():
print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.") print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
return {} return {}
repo = git.Repo(repo_path) comfyui_commit_hash = None
comfyui_commit_hash = repo.head.commit.hexsha if not custom_nodes_only:
repo = git.Repo(repo_path)
comfyui_commit_hash = repo.head.commit.hexsha
git_custom_nodes = {} git_custom_nodes = {}
cnr_custom_nodes = {} cnr_custom_nodes = {}
@@ -2513,7 +2557,7 @@ async def get_current_snapshot():
file_custom_nodes.append(item) file_custom_nodes.append(item)
pip_packages = get_installed_pip_packages() pip_packages = None if custom_nodes_only else get_installed_pip_packages()
return { return {
'comfyui': comfyui_commit_hash, 'comfyui': comfyui_commit_hash,
@@ -2524,7 +2568,7 @@ async def get_current_snapshot():
} }
async def save_snapshot_with_postfix(postfix, path=None): async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = False):
if path is None: if path is None:
now = datetime.now() now = datetime.now()
@@ -2536,7 +2580,7 @@ async def save_snapshot_with_postfix(postfix, path=None):
file_name = path.replace('\\', '/').split('/')[-1] file_name = path.replace('\\', '/').split('/')[-1]
file_name = file_name.split('.')[-2] file_name = file_name.split('.')[-2]
snapshot = await get_current_snapshot() snapshot = await get_current_snapshot(custom_nodes_only)
if path.endswith('.json'): if path.endswith('.json'):
with open(path, "w") as json_file: with open(path, "w") as json_file:
json.dump(snapshot, json_file, indent=4) json.dump(snapshot, json_file, indent=4)
@@ -2835,15 +2879,18 @@ async def get_unified_total_nodes(channel, mode, regsitry_cache_mode='cache'):
def populate_github_stats(node_packs, json_obj_github): def populate_github_stats(node_packs, json_obj_github):
for k, v in node_packs.items(): for k, v in node_packs.items():
url = v['reference'] try:
if url in json_obj_github: url = v['reference']
v['stars'] = json_obj_github[url]['stars'] if url in json_obj_github:
v['last_update'] = json_obj_github[url]['last_update'] v['stars'] = json_obj_github[url]['stars']
v['trust'] = json_obj_github[url]['author_account_age_days'] > 600 v['last_update'] = json_obj_github[url]['last_update']
else: v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
v['stars'] = -1 else:
v['last_update'] = -1 v['stars'] = -1
v['trust'] = False v['last_update'] = -1
v['trust'] = False
except:
logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
def populate_favorites(node_packs, json_obj_extras): def populate_favorites(node_packs, json_obj_extras):

View File

@@ -3,6 +3,11 @@ from urllib.parse import urlparse
import urllib import urllib
import sys import sys
import logging import logging
import requests
from huggingface_hub import HfApi
from tqdm.auto import tqdm
aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER') aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
HF_ENDPOINT = os.getenv('HF_ENDPOINT') HF_ENDPOINT = os.getenv('HF_ENDPOINT')
@@ -117,3 +122,37 @@ def download_url_with_agent(url, save_path):
print("Installation was successful.") print("Installation was successful.")
return True return True
# NOTE: snapshot_download doesn't provide file size tqdm.
def download_repo_in_bytes(repo_id, local_dir):
api = HfApi()
repo_info = api.repo_info(repo_id=repo_id, files_metadata=True)
os.makedirs(local_dir, exist_ok=True)
total_size = 0
for file_info in repo_info.siblings:
if file_info.size is not None:
total_size += file_info.size
pbar = tqdm(total=total_size, unit="B", unit_scale=True, desc="Downloading")
for file_info in repo_info.siblings:
out_path = os.path.join(local_dir, file_info.rfilename)
os.makedirs(os.path.dirname(out_path), exist_ok=True)
if file_info.size is None:
continue
download_url = f"https://huggingface.co/{repo_id}/resolve/main/{file_info.rfilename}"
with requests.get(download_url, stream=True) as r, open(out_path, "wb") as f:
r.raise_for_status()
for chunk in r.iter_content(chunk_size=65536):
if chunk:
f.write(chunk)
pbar.update(len(chunk))
pbar.close()

View File

@@ -18,9 +18,14 @@ import manager_core as core
import manager_util import manager_util
import cm_global import cm_global
import logging import logging
import asyncio
import queue
import manager_downloader
logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})") logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
logging.info("[ComfyUI-Manager] network_mode: " + core.get_config()['network_mode'])
comfy_ui_hash = "-" comfy_ui_hash = "-"
comfyui_tag = None comfyui_tag = None
@@ -28,10 +33,10 @@ comfyui_tag = None
SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy" SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy" SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy" SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower."
routes = PromptServer.instance.routes routes = PromptServer.instance.routes
def handle_stream(stream, prefix): def handle_stream(stream, prefix):
stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace') stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
for msg in stream: for msg in stream:
@@ -50,8 +55,35 @@ def handle_stream(stream, prefix):
from comfy.cli_args import args from comfy.cli_args import args
import latent_preview import latent_preview
def is_loopback(address):
import ipaddress
try:
return ipaddress.ip_address(address).is_loopback
except ValueError:
return False
is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.') is_local_mode = is_loopback(args.listen)
model_dir_name_map = {
"checkpoints": "checkpoints",
"checkpoint": "checkpoints",
"unclip": "checkpoints",
"text_encoders": "text_encoders",
"clip": "text_encoders",
"vae": "vae",
"lora": "loras",
"t2i-adapter": "controlnet",
"t2i-style": "controlnet",
"controlnet": "controlnet",
"clip_vision": "clip_vision",
"gligen": "gligen",
"upscale": "upscale_models",
"embedding": "embeddings",
"embeddings": "embeddings",
"unet": "diffusion_models",
"diffusion_model": "diffusion_models",
}
def is_allowed_security_level(level): def is_allowed_security_level(level):
@@ -59,11 +91,11 @@ def is_allowed_security_level(level):
return False return False
elif level == 'high': elif level == 'high':
if is_local_mode: if is_local_mode:
return core.get_config()['security_level'].lower() in ['weak', 'normal-'] return core.get_config()['security_level'] in ['weak', 'normal-']
else: else:
return core.get_config()['security_level'].lower() == 'weak' return core.get_config()['security_level'] == 'weak'
elif level == 'middle': elif level == 'middle':
return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-'] return core.get_config()['security_level'] in ['weak', 'normal', 'normal-']
else: else:
return True return True
@@ -74,7 +106,7 @@ async def get_risky_level(files, pip_packages):
all_urls = set() all_urls = set()
for x in json_data1['custom_nodes'] + json_data2['custom_nodes']: for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
all_urls.update(x['files']) all_urls.update(x.get('files', []))
for x in files: for x in files:
if x not in all_urls: if x not in all_urls:
@@ -82,8 +114,7 @@ async def get_risky_level(files, pip_packages):
all_pip_packages = set() all_pip_packages = set()
for x in json_data1['custom_nodes'] + json_data2['custom_nodes']: for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
if "pip" in x: all_pip_packages.update(x.get('pip', []))
all_pip_packages.update(x['pip'])
for p in pip_packages: for p in pip_packages:
if p not in all_pip_packages: if p not in all_pip_packages:
@@ -147,16 +178,12 @@ def set_preview_method(method):
else: else:
args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
core.get_config()['preview_method'] = args.preview_method core.get_config()['preview_method'] = method
set_preview_method(core.get_config()['preview_method']) set_preview_method(core.get_config()['preview_method'])
def set_default_ui_mode(mode):
core.get_config()['default_ui'] = mode
def set_component_policy(mode): def set_component_policy(mode):
core.get_config()['component_policy'] = mode core.get_config()['component_policy'] = mode
@@ -274,43 +301,9 @@ def get_model_dir(data, show_log=False):
else: else:
base_model = os.path.join(models_base, data['save_path']) base_model = os.path.join(models_base, data['save_path'])
else: else:
model_type = data['type'] model_dir_name = model_dir_name_map.get(data['type'].lower())
if model_type == "checkpoints" or model_type == "checkpoint": if model_dir_name is not None:
base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0] base_model = folder_paths.folder_names_and_paths[model_dir_name][0][0]
elif model_type == "unclip":
base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
elif model_type == "clip" or model_type == "text_encoders":
if folder_paths.folder_names_and_paths.get("text_encoders"):
base_model = folder_paths.folder_names_and_paths["text_encoders"][0][0]
else:
if show_log:
logging.info("[ComfyUI-Manager] Your ComfyUI is outdated version.")
base_model = folder_paths.folder_names_and_paths["clip"][0][0] # outdated version
elif model_type == "VAE":
base_model = folder_paths.folder_names_and_paths["vae"][0][0]
elif model_type == "lora":
base_model = folder_paths.folder_names_and_paths["loras"][0][0]
elif model_type == "T2I-Adapter":
base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
elif model_type == "T2I-Style":
base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
elif model_type == "controlnet":
base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
elif model_type == "clip_vision":
base_model = folder_paths.folder_names_and_paths["clip_vision"][0][0]
elif model_type == "gligen":
base_model = folder_paths.folder_names_and_paths["gligen"][0][0]
elif model_type == "upscale":
base_model = folder_paths.folder_names_and_paths["upscale_models"][0][0]
elif model_type == "embeddings":
base_model = folder_paths.folder_names_and_paths["embeddings"][0][0]
elif model_type == "unet" or model_type == "diffusion_model":
if folder_paths.folder_names_and_paths.get("diffusion_models"):
base_model = folder_paths.folder_names_and_paths["diffusion_models"][0][1]
else:
if show_log:
logging.info("[ComfyUI-Manager] Your ComfyUI is outdated version.")
base_model = folder_paths.folder_names_and_paths["unet"][0][0] # outdated version
else: else:
base_model = os.path.join(models_base, "etc") base_model = os.path.join(models_base, "etc")
@@ -322,7 +315,10 @@ def get_model_path(data, show_log=False):
if base_model is None: if base_model is None:
return None return None
else: else:
return os.path.join(base_model, data['filename']) if data['filename'] == '<huggingface>':
return os.path.join(base_model, os.path.basename(data['url']))
else:
return os.path.join(base_model, data['filename'])
def check_state_of_git_node_pack(node_packs, do_fetch=False, do_update_check=True, do_update=False): def check_state_of_git_node_pack(node_packs, do_fetch=False, do_update_check=True, do_update=False):
@@ -381,6 +377,266 @@ def nickname_filter(json_obj):
return json_obj return json_obj
task_queue = queue.Queue()
nodepack_result = {}
model_result = {}
tasks_in_progress = set()
task_worker_lock = threading.Lock()
async def task_worker():
global task_queue
global nodepack_result
global model_result
global tasks_in_progress
async def do_install(item) -> str:
ui_id, node_spec_str, channel, mode, skip_post_install = item
try:
node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
if node_spec is None:
logging.error(f"Cannot resolve install target: '{node_spec_str}'")
return f"Cannot resolve install target: '{node_spec_str}'"
node_name, version_spec, is_specified = node_spec
res = await core.unified_manager.install_by_id(node_name, version_spec, channel, mode, return_postinstall=skip_post_install)
# discard post install if skip_post_install mode
if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
return res.msg
elif not res.result:
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
return res.msg
return 'success'
except Exception:
traceback.print_exc()
return f"Installation failed:\n{node_spec_str}"
async def do_update(item):
ui_id, node_name, node_ver = item
try:
res = core.unified_manager.unified_update(node_name, node_ver)
if res.ver == 'unknown':
url = core.unified_manager.unknown_active_nodes[node_name][0]
title = os.path.basename(url)
else:
url = core.unified_manager.cnr_map[node_name].get('repository')
title = core.unified_manager.cnr_map[node_name]['name']
manager_util.clear_pip_cache()
if url is not None:
base_res = {'url': url, 'title': title}
else:
base_res = {'title': title}
if res.result:
if res.action == 'skip':
base_res['msg'] = 'skip'
return base_res
else:
base_res['msg'] = 'success'
return base_res
base_res['msg'] = f"An error occurred while updating '{node_name}'."
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
return base_res
except Exception:
traceback.print_exc()
return {'msg':f"An error occurred while updating '{node_name}'."}
async def do_update_comfyui() -> str:
try:
repo_path = os.path.dirname(folder_paths.__file__)
res = core.update_path(repo_path)
if res == "fail":
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
return "The installed ComfyUI does not have a Git repository."
elif res == "updated":
logging.info("ComfyUI is updated.")
return "success"
else: # skipped
logging.info("ComfyUI is up-to-date.")
return "skip"
except Exception:
traceback.print_exc()
return "An error occurred while updating 'comfyui'."
async def do_fix(item) -> str:
ui_id, node_name, node_ver = item
try:
res = core.unified_manager.unified_fix(node_name, node_ver)
if res.result:
return 'success'
else:
logging.error(res.msg)
logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
except Exception:
traceback.print_exc()
return f"An error occurred while fixing '{node_name}@{node_ver}'."
async def do_uninstall(item) -> str:
ui_id, node_name, is_unknown = item
try:
res = core.unified_manager.unified_uninstall(node_name, is_unknown)
if res.result:
return 'success'
logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
except Exception:
traceback.print_exc()
return f"An error occurred while uninstalling '{node_name}'."
async def do_disable(item) -> str:
ui_id, node_name, is_unknown = item
try:
res = core.unified_manager.unified_disable(node_name, is_unknown)
if res:
return 'success'
except Exception:
traceback.print_exc()
return f"Failed to disable: '{node_name}'"
async def do_install_model(item) -> str:
ui_id, json_data = item
model_path = get_model_path(json_data)
model_url = json_data['url']
res = False
try:
if model_path is not None:
logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
if json_data['filename'] == '<huggingface>':
if os.path.exists(os.path.join(model_path, os.path.dirname(json_data['url']))):
logging.error(f"[ComfyUI-Manager] the model path already exists: {model_path}")
return f"The model path already exists: {model_path}"
logging.info(f"[ComfyUI-Manager] Downloading '{model_url}' into '{model_path}'")
manager_downloader.download_repo_in_bytes(repo_id=model_url, local_dir=model_path)
return 'success'
elif not core.get_config()['model_download_by_agent'] and (
model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
model_dir = get_model_dir(json_data, True)
download_url(model_url, model_dir, filename=json_data['filename'])
if model_path.endswith('.zip'):
res = core.unzip(model_path)
else:
res = True
if res:
return 'success'
else:
res = download_url_with_agent(model_url, model_path)
if res and model_path.endswith('.zip'):
res = core.unzip(model_path)
else:
logging.error(f"[ComfyUI-Manager] Model installation error: invalid model type - {json_data['type']}")
if res:
return 'success'
except Exception as e:
logging.error(f"[ComfyUI-Manager] ERROR: {e}", file=sys.stderr)
return f"Model installation error: {model_url}"
stats = {}
while True:
done_count = len(nodepack_result) + len(model_result)
total_count = done_count + task_queue.qsize()
if task_queue.empty():
logging.info(f"\n[ComfyUI-Manager] Queued works are completed.\n{stats}")
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
PromptServer.instance.send_sync("cm-queue-status",
{'status': 'done',
'nodepack_result': nodepack_result, 'model_result': model_result,
'total_count': total_count, 'done_count': done_count})
nodepack_result = {}
task_queue = queue.Queue()
return # terminate worker thread
with task_worker_lock:
kind, item = task_queue.get()
tasks_in_progress.add((kind, item[0]))
try:
if kind == 'install':
msg = await do_install(item)
elif kind == 'install-model':
msg = await do_install_model(item)
elif kind == 'update':
msg = await do_update(item)
elif kind == 'update-main':
msg = await do_update(item)
elif kind == 'update-comfyui':
msg = await do_update_comfyui()
elif kind == 'fix':
msg = await do_fix(item)
elif kind == 'uninstall':
msg = await do_uninstall(item)
elif kind == 'disable':
msg = await do_disable(item)
else:
msg = "Unexpected kind: " + kind
except Exception:
traceback.print_exc()
msg = f"Exception: {(kind, item)}"
with task_worker_lock:
tasks_in_progress.remove((kind, item[0]))
ui_id = item[0]
if kind == 'install-model':
model_result[ui_id] = msg
ui_target = "model_manager"
elif kind == 'update-main':
nodepack_result[ui_id] = msg
ui_target = "main"
elif kind == 'update-comfyui':
nodepack_result['comfyui'] = msg
ui_target = "main"
elif kind == 'update':
nodepack_result[ui_id] = msg['msg']
ui_target = "nodepack_manager"
else:
nodepack_result[ui_id] = msg
ui_target = "nodepack_manager"
stats[kind] = stats.get(kind, 0) + 1
PromptServer.instance.send_sync("cm-queue-status",
{'status': 'in_progress', 'target': item[0], 'ui_target': ui_target,
'total_count': total_count, 'done_count': done_count})
@routes.get("/customnode/getmappings") @routes.get("/customnode/getmappings")
async def fetch_customnode_mappings(request): async def fetch_customnode_mappings(request):
""" """
@@ -444,49 +700,46 @@ async def fetch_updates(request):
return web.Response(status=400) return web.Response(status=400)
@routes.get("/customnode/update_all") @routes.get("/manager/queue/update_all")
async def update_all(request): async def update_all(request):
if not is_allowed_security_level('middle'): if not is_allowed_security_level('middle'):
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
return web.Response(status=403) return web.Response(status=403)
try: with task_worker_lock:
await core.save_snapshot_with_postfix('autosave') is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
if is_processing:
return web.Response(status=401)
await core.save_snapshot_with_postfix('autosave')
if request.rel_url.query["mode"] == "local": if request.rel_url.query["mode"] == "local":
channel = 'local' channel = 'local'
else: else:
channel = core.get_config()['channel_url'] channel = core.get_config()['channel_url']
await core.unified_manager.reload(request.rel_url.query["mode"]) await core.unified_manager.reload(request.rel_url.query["mode"])
await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"]) await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
updated_cnr = [] for k, v in core.unified_manager.active_nodes.items():
for k, v in core.unified_manager.active_nodes.items(): if k == 'comfyui-manager':
if v[0] != 'nightly': # skip updating comfyui-manager if desktop version
res = core.unified_manager.unified_update(k, v[0]) if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
if res.action == 'switch-cnr' and res: continue
updated_cnr.append(k)
res = core.unified_manager.fetch_or_pull_git_repo(is_pull=True) update_item = k, k, v[0]
task_queue.put(("update-main", update_item))
res['updated'] += updated_cnr for k, v in core.unified_manager.unknown_active_nodes.items():
if k == 'comfyui-manager':
# skip updating comfyui-manager if desktop version
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
continue
for x in res['failed']: update_item = k, k, 'unknown'
logging.error(f"PULL FAILED: {x}") task_queue.put(("update-main", update_item))
if len(res['updated']) == 0 and len(res['failed']) == 0: return web.Response(status=200)
status = 200
else:
status = 201
logging.info("\nDone.")
return web.json_response(res, status=status, content_type='application/json')
except:
traceback.print_exc()
return web.Response(status=400)
finally:
manager_util.clear_pip_cache()
def convert_markdown_to_html(input_text): def convert_markdown_to_html(input_text):
@@ -605,24 +858,59 @@ async def fetch_customnode_alternatives(request):
def check_model_installed(json_obj): def check_model_installed(json_obj):
def process_model(item): def is_exists(model_dir_name, filename, url):
model_path = get_model_path(item, False) if filename == '<huggingface>':
item['installed'] = 'None' filename = os.path.basename(url)
if model_path is not None: dirs = folder_paths.get_folder_paths(model_dir_name)
if model_path.endswith('.zip'):
if os.path.exists(model_path[:-4]): for x in dirs:
item['installed'] = 'True' if os.path.exists(os.path.join(x, filename)):
else: return True
item['installed'] = 'False'
elif os.path.exists(model_path): return False
model_dir_names = ['checkpoints', 'loras', 'vae', 'text_encoders', 'diffusion_models', 'clip_vision', 'embeddings',
'diffusers', 'vae_approx', 'controlnet', 'gligen', 'upscale_models', 'hypernetworks',
'photomaker', 'classifiers']
total_models_files = set()
for x in model_dir_names:
for y in folder_paths.get_filename_list(x):
total_models_files.add(y)
def process_model_phase(item):
if 'diffusion' not in item['filename'] and 'pytorch' not in item['filename'] and 'model' not in item['filename']:
# non-general name case
if item['filename'] in total_models_files:
item['installed'] = 'True' item['installed'] = 'True'
return
if item['save_path'] == 'default':
model_dir_name = model_dir_name_map.get(item['type'].lower())
if model_dir_name is not None:
item['installed'] = str(is_exists(model_dir_name, item['filename'], item['url']))
else: else:
item['installed'] = 'False' item['installed'] = 'False'
else:
model_dir_name = item['save_path'].split('/')[0]
if model_dir_name in folder_paths.folder_names_and_paths:
if is_exists(model_dir_name, item['filename'], item['url']):
item['installed'] = 'True'
if 'installed' not in item:
if item['filename'] == '<huggingface>':
filename = os.path.basename(item['url'])
else:
filename = item['filename']
fullpath = os.path.join(folder_paths.models_dir, item['save_path'], filename)
item['installed'] = 'True' if os.path.exists(fullpath) else 'False'
with concurrent.futures.ThreadPoolExecutor(8) as executor: with concurrent.futures.ThreadPoolExecutor(8) as executor:
for item in json_obj['models']: for item in json_obj['models']:
executor.submit(process_model, item) executor.submit(process_model_phase, item)
@routes.get("/externalmodel/getlist") @routes.get("/externalmodel/getlist")
@@ -852,13 +1140,35 @@ async def import_fail_info(request):
return web.Response(status=400) return web.Response(status=400)
@routes.post("/customnode/reinstall") @routes.post("/manager/queue/reinstall")
async def reinstall_custom_node(request): async def reinstall_custom_node(request):
await uninstall_custom_node(request) await uninstall_custom_node(request)
await install_custom_node(request) await install_custom_node(request)
@routes.post("/customnode/install") @routes.get("/manager/queue/reset")
async def reset_queue(request):
global task_queue
task_queue = queue.Queue()
return web.Response(status=200)
@routes.get("/manager/queue/status")
async def queue_count(request):
global task_queue
with task_worker_lock:
done_count = len(nodepack_result) + len(model_result)
in_progress_count = len(tasks_in_progress)
total_count = done_count + in_progress_count + task_queue.qsize()
is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
return web.json_response({
'total_count': total_count, 'done_count': done_count, 'in_progress_count': in_progress_count,
'is_processing': is_processing})
@routes.post("/manager/queue/install")
async def install_custom_node(request): async def install_custom_node(request):
if not is_allowed_security_level('middle'): if not is_allowed_security_level('middle'):
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -901,26 +1211,33 @@ async def install_custom_node(request):
logging.error(SECURITY_MESSAGE_GENERAL) logging.error(SECURITY_MESSAGE_GENERAL)
return web.Response(status=404, text="A security error has occurred. Please check the terminal logs") return web.Response(status=404, text="A security error has occurred. Please check the terminal logs")
node_spec = core.unified_manager.resolve_node_spec(node_spec_str) install_item = json_data.get('ui_id'), node_spec_str, json_data['channel'], json_data['mode'], skip_post_install
task_queue.put(("install", install_item))
if node_spec is None: return web.Response(status=200)
return web.Response(status=400, text=f"Cannot resolve install target: '{node_spec_str}'")
node_name, version_spec, is_specified = node_spec
res = await core.unified_manager.install_by_id(node_name, version_spec, json_data['channel'], json_data['mode'], return_postinstall=skip_post_install)
# discard post install if skip_post_install mode
if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
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.")
@routes.post("/customnode/fix") task_worker_thread:threading.Thread = None
@routes.get("/manager/queue/start")
async def queue_start(request):
global nodepack_result
global model_result
global task_worker_thread
if task_worker_thread is not None and task_worker_thread.is_alive():
return web.Response(status=201) # already in-progress
nodepack_result = {}
model_result = {}
task_worker_thread = threading.Thread(target=lambda: asyncio.run(task_worker()))
task_worker_thread.start()
return web.Response(status=200)
@routes.post("/manager/queue/fix")
async def fix_custom_node(request): async def fix_custom_node(request):
if not is_allowed_security_level('middle'): if not is_allowed_security_level('middle'):
logging.error(SECURITY_MESSAGE_GENERAL) logging.error(SECURITY_MESSAGE_GENERAL)
@@ -936,16 +1253,10 @@ async def fix_custom_node(request):
# unknown # unknown
node_name = os.path.basename(json_data['files'][0]) node_name = os.path.basename(json_data['files'][0])
res = core.unified_manager.unified_fix(node_name, node_ver) update_item = json_data.get('ui_id'), node_name, json_data['version']
task_queue.put(("fix", update_item))
if res.result: return web.Response(status=200)
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
return web.json_response({}, content_type='application/json')
else:
logging.error(res.msg)
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}'.")
@routes.post("/customnode/install/git_url") @routes.post("/customnode/install/git_url")
@@ -980,7 +1291,7 @@ async def install_custom_node_pip(request):
return web.Response(status=200) return web.Response(status=200)
@routes.post("/customnode/uninstall") @routes.post("/manager/queue/uninstall")
async def uninstall_custom_node(request): async def uninstall_custom_node(request):
if not is_allowed_security_level('middle'): if not is_allowed_security_level('middle'):
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -997,17 +1308,13 @@ async def uninstall_custom_node(request):
is_unknown = True is_unknown = True
node_name = os.path.basename(json_data['files'][0]) node_name = os.path.basename(json_data['files'][0])
res = core.unified_manager.unified_uninstall(node_name, is_unknown) uninstall_item = json_data.get('ui_id'), node_name, is_unknown
task_queue.put(("uninstall", uninstall_item))
if res.result: return web.Response(status=200)
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
return web.json_response({}, content_type='application/json')
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}'.")
@routes.post("/customnode/update") @routes.post("/manager/queue/update")
async def update_custom_node(request): async def update_custom_node(request):
if not is_allowed_security_level('middle'): if not is_allowed_security_level('middle'):
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -1022,36 +1329,16 @@ async def update_custom_node(request):
# unknown # unknown
node_name = os.path.basename(json_data['files'][0]) node_name = os.path.basename(json_data['files'][0])
res = core.unified_manager.unified_update(node_name, json_data['version']) update_item = json_data.get('ui_id'), node_name, json_data['version']
task_queue.put(("update", update_item))
manager_util.clear_pip_cache() return web.Response(status=200)
if res.result:
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
return web.json_response({}, content_type='application/json')
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}'.")
@routes.get("/comfyui_manager/update_comfyui") @routes.get("/manager/queue/update_comfyui")
async def update_comfyui(request): async def update_comfyui(request):
logging.info("Update ComfyUI") task_queue.put(("update-comfyui", ('comfyui',)))
return web.Response(status=200)
try:
repo_path = os.path.dirname(folder_paths.__file__)
res = core.update_path(repo_path)
if res == "fail":
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
return web.Response(status=400)
elif res == "updated":
return web.Response(status=201)
else: # skipped
return web.Response(status=200)
except Exception as e:
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
return web.Response(status=400)
@routes.get("/comfyui_manager/comfyui_versions") @routes.get("/comfyui_manager/comfyui_versions")
@@ -1078,7 +1365,7 @@ async def comfyui_switch_version(request):
return web.Response(status=400) return web.Response(status=400)
@routes.post("/customnode/disable") @routes.post("/manager/queue/disable")
async def disable_node(request): async def disable_node(request):
json_data = await request.json() json_data = await request.json()
@@ -1091,12 +1378,10 @@ async def disable_node(request):
is_unknown = True is_unknown = True
node_name = os.path.basename(json_data['files'][0]) node_name = os.path.basename(json_data['files'][0])
res = core.unified_manager.unified_disable(node_name, is_unknown) update_item = json_data.get('ui_id'), node_name, is_unknown
task_queue.put(("disable", update_item))
if res: return web.Response(status=200)
return web.json_response({}, content_type='application/json')
return web.Response(status=400, text="Failed to disable")
@routes.get("/manager/migrate_unmanaged_nodes") @routes.get("/manager/migrate_unmanaged_nodes")
@@ -1112,18 +1397,16 @@ async def need_to_migrate(request):
return web.Response(text=str(core.need_to_migrate), status=200) return web.Response(text=str(core.need_to_migrate), status=200)
@routes.post("/model/install") @routes.post("/manager/queue/install_model")
async def install_model(request): async def install_model(request):
json_data = await request.json() json_data = await request.json()
model_path = get_model_path(json_data)
if not is_allowed_security_level('middle'): if not is_allowed_security_level('middle'):
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW) logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
return web.Response(status=403) return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
if not json_data['filename'].endswith('.safetensors') and not is_allowed_security_level('high'): if not json_data['filename'].endswith('.safetensors') and not is_allowed_security_level('high'):
models_json = await core.get_data_by_mode('cache', 'model-list.json') models_json = await core.get_data_by_mode('cache', 'model-list.json', 'default')
is_belongs_to_whitelist = False is_belongs_to_whitelist = False
for x in models_json['models']: for x in models_json['models']:
@@ -1132,40 +1415,13 @@ async def install_model(request):
break break
if not is_belongs_to_whitelist: if not is_belongs_to_whitelist:
logging.error(SECURITY_MESSAGE_NORMAL_MINUS) logging.error(SECURITY_MESSAGE_NORMAL_MINUS_MODEL)
return web.Response(status=403) return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
res = False install_item = json_data.get('ui_id'), json_data
task_queue.put(("install-model", install_item))
try: return web.Response(status=200)
if model_path is not None:
model_url = json_data['url']
logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
if not core.get_config()['model_download_by_agent'] and (
model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
model_dir = get_model_dir(json_data, True)
download_url(model_url, model_dir, filename=json_data['filename'])
if model_path.endswith('.zip'):
res = core.unzip(model_path)
else:
res = True
if res:
return web.json_response({}, content_type='application/json')
else:
res = download_url_with_agent(model_url, model_path)
if res and model_path.endswith('.zip'):
res = core.unzip(model_path)
else:
logging.error(f"Model installation error: invalid model type - {json_data['type']}")
if res:
return web.json_response({}, content_type='application/json')
except Exception as e:
logging.error(f"[ERROR] {e}", file=sys.stderr)
return web.Response(status=400)
@routes.get("/manager/preview_method") @routes.get("/manager/preview_method")
@@ -1179,17 +1435,6 @@ async def preview_method(request):
return web.Response(status=200) return web.Response(status=200)
@routes.get("/manager/default_ui")
async def default_ui_mode(request):
if "value" in request.rel_url.query:
set_default_ui_mode(request.rel_url.query['value'])
core.write_config()
else:
return web.Response(text=core.get_config()['default_ui'], status=200)
return web.Response(status=200)
@routes.get("/manager/component/policy") @routes.get("/manager/component/policy")
async def component_policy(request): async def component_policy(request):
if "value" in request.rel_url.query: if "value" in request.rel_url.query:
@@ -1394,12 +1639,15 @@ def confirm_try_install(sender, custom_node_url, msg):
cm_global.register_api('cm.try-install-custom-node', confirm_try_install) cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
import asyncio
async def default_cache_update(): async def default_cache_update():
channel_url = core.get_config()['channel_url']
async def get_cache(filename): async def get_cache(filename):
uri = f"{core.DEFAULT_CHANNEL}/{filename}" if core.get_config()['default_cache_as_channel_url']:
uri = f"{channel_url}/{filename}"
else:
uri = f"{core.DEFAULT_CHANNEL}/{filename}"
cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
cache_uri = os.path.join(manager_util.cache_dir, cache_uri) cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
@@ -1410,17 +1658,23 @@ async def default_cache_update():
json.dump(json_obj, file, indent=4, sort_keys=True) json.dump(json_obj, file, indent=4, sort_keys=True)
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}") logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
a = get_cache("custom-node-list.json") if core.get_config()['network_mode'] != 'offline':
b = get_cache("extension-node-map.json") a = get_cache("custom-node-list.json")
c = get_cache("model-list.json") b = get_cache("extension-node-map.json")
d = get_cache("alter-list.json") c = get_cache("model-list.json")
e = get_cache("github-stats.json") d = get_cache("alter-list.json")
e = get_cache("github-stats.json")
await asyncio.gather(a, b, c, d, e) await asyncio.gather(a, b, c, d, e)
# load at least once if core.get_config()['network_mode'] == 'private':
await core.unified_manager.reload('remote', dont_wait=False) logging.info("[ComfyUI-Manager] The private comfyregistry is not yet supported in `network_mode=private`.")
await core.unified_manager.get_custom_nodes('default', 'remote') else:
# load at least once
await core.unified_manager.reload('remote', dont_wait=False)
await core.unified_manager.get_custom_nodes(channel_url, 'remote')
logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
# 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']:

View File

@@ -12,6 +12,7 @@ import subprocess
import sys import sys
import re import re
import logging import logging
import chardet
cache_lock = threading.Lock() cache_lock = threading.Lock()
@@ -19,6 +20,14 @@ cache_lock = threading.Lock()
comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also updated together in **manager_core.update_user_directory**. cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also updated together in **manager_core.update_user_directory**.
use_uv = False
def make_pip_cmd(cmd):
if use_uv:
return [sys.executable, '-m', 'uv', 'pip'] + cmd
else:
return [sys.executable, '-m', 'pip'] + cmd
# DON'T USE StrictVersion - cannot handle pre_release version # DON'T USE StrictVersion - cannot handle pre_release version
# try: # try:
@@ -122,7 +131,12 @@ async def get_data(uri, silent=False):
with open(uri, "r", encoding="utf-8") as f: with open(uri, "r", encoding="utf-8") as f:
json_text = f.read() json_text = f.read()
json_obj = json.loads(json_text) try:
json_obj = json.loads(json_text)
except Exception as e:
logging.error(f"[ComfyUI-Manager] An error occurred while fetching '{uri}': {e}")
return {}
if not silent: if not silent:
print(" [DONE]") print(" [DONE]")
@@ -209,7 +223,7 @@ def get_installed_packages(renew=False):
if renew or pip_map is None: if renew or pip_map is None:
try: try:
result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True) result = subprocess.check_output(make_pip_cmd(['list']), universal_newlines=True)
pip_map = {} pip_map = {}
for line in result.split('\n'): for line in result.split('\n'):
@@ -232,21 +246,22 @@ def clear_pip_cache():
pip_map = None pip_map = None
torch_torchvision_version_map = { torch_torchvision_torchaudio_version_map = {
'2.5.1': '0.20.1', '2.6.0': ('0.21.0', '2.6.0'),
'2.5.0': '0.20.0', '2.5.1': ('0.20.0', '2.5.0'),
'2.4.1': '0.19.1', '2.5.0': ('0.20.0', '2.5.0'),
'2.4.0': '0.19.0', '2.4.1': ('0.19.1', '2.4.1'),
'2.3.1': '0.18.1', '2.4.0': ('0.19.0', '2.4.0'),
'2.3.0': '0.18.0', '2.3.1': ('0.18.1', '2.3.1'),
'2.2.2': '0.17.2', '2.3.0': ('0.18.0', '2.3.0'),
'2.2.1': '0.17.1', '2.2.2': ('0.17.2', '2.2.2'),
'2.2.0': '0.17.0', '2.2.1': ('0.17.1', '2.2.1'),
'2.1.2': '0.16.2', '2.2.0': ('0.17.0', '2.2.0'),
'2.1.1': '0.16.1', '2.1.2': ('0.16.2', '2.1.2'),
'2.1.0': '0.16.0', '2.1.1': ('0.16.1', '2.1.1'),
'2.0.1': '0.15.2', '2.1.0': ('0.16.0', '2.1.0'),
'2.0.0': '0.15.1', '2.0.1': ('0.15.2', '2.0.1'),
'2.0.0': ('0.15.1', '2.0.0'),
} }
@@ -259,24 +274,23 @@ class PIPFixer:
if len(spec) > 0: if len(spec) > 0:
platform = spec[1] platform = spec[1]
else: else:
cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio'] cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
subprocess.check_output(cmd, universal_newlines=True) subprocess.check_output(cmd, universal_newlines=True)
logging.error(cmd) logging.error(cmd)
return return
torch_ver = StrictVersion(spec[0]) torch_ver = StrictVersion(spec[0])
torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}" torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
torchvision_ver = torch_torchvision_version_map.get(torch_ver) torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
if torchvision_ver is None: if torch_torchvision_torchaudio_ver is None:
cmd = [sys.executable, '-m', 'pip', 'install', '--pre', cmd = make_pip_cmd(['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}"]
logging.info("[ComfyUI-Manager] restore PyTorch to nightly version") logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
else: else:
cmd = [sys.executable, '-m', 'pip', 'install', torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_ver}", cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
'--index-url', f"https://download.pytorch.org/whl/{platform}"] '--index-url', f"https://download.pytorch.org/whl/{platform}"])
logging.info(f"[ComfyUI-Manager] 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)
@@ -287,7 +301,7 @@ class PIPFixer:
# remove `comfy` python package # remove `comfy` python package
try: try:
if 'comfy' in new_pip_versions: if 'comfy' in new_pip_versions:
cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy'] cmd = make_pip_cmd(['uninstall', 'comfy'])
subprocess.check_output(cmd, universal_newlines=True) subprocess.check_output(cmd, universal_newlines=True)
logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.") 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.")
@@ -333,7 +347,7 @@ class PIPFixer:
if len(targets) > 0: if len(targets) > 0:
for x in targets: for x in targets:
cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"] cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
subprocess.check_output(cmd, universal_newlines=True) subprocess.check_output(cmd, universal_newlines=True)
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}") logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
@@ -346,7 +360,8 @@ class PIPFixer:
np = new_pip_versions.get('numpy') np = new_pip_versions.get('numpy')
if np is not None: if np is not None:
if StrictVersion(np) >= StrictVersion('2'): if StrictVersion(np) >= StrictVersion('2'):
subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True) cmd = make_pip_cmd(['install', "numpy<2"])
subprocess.check_output(cmd , universal_newlines=True)
except Exception as e: except Exception as e:
logging.error("[ComfyUI-Manager] Failed to restore numpy") logging.error("[ComfyUI-Manager] Failed to restore numpy")
logging.error(e) logging.error(e)
@@ -359,3 +374,22 @@ def sanitize(data):
def sanitize_filename(input_string): def sanitize_filename(input_string):
result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string) result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
return result_string return result_string
def robust_readlines(fullpath):
try:
with open(fullpath, "r") as f:
return f.readlines()
except:
encoding = None
with open(fullpath, "rb") as f:
raw_data = f.read()
result = chardet.detect(raw_data)
encoding = result['encoding']
if encoding is not None:
with open(fullpath, "r", encoding=encoding) as f:
return f.readlines()
print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
return []

View File

@@ -13,11 +13,12 @@ import {
import { OpenArtShareDialog } from "./comfyui-share-openart.js"; import { OpenArtShareDialog } from "./comfyui-share-openart.js";
import { import {
free_models, install_pip, install_via_git_url, manager_instance, free_models, install_pip, install_via_git_url, manager_instance,
rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.js"; rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt,
infoToast, showTerminal, setNeedRestart
} from "./common.js";
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js"; import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
import { CustomNodesManager } from "./custom-nodes-manager.js"; import { CustomNodesManager } from "./custom-nodes-manager.js";
import { ModelManager } from "./model-manager.js"; import { ModelManager } from "./model-manager.js";
import { set_double_click_policy } from "./node_fixer.js";
import { SnapshotManager } from "./snapshot.js"; import { SnapshotManager } from "./snapshot.js";
var docStyle = document.createElement('style'); var docStyle = document.createElement('style');
@@ -41,7 +42,7 @@ docStyle.innerHTML = `
#cm-manager-dialog { #cm-manager-dialog {
width: 1000px; width: 1000px;
height: 520px; height: 450px;
box-sizing: content-box; box-sizing: content-box;
z-index: 1000; z-index: 1000;
overflow-y: auto; overflow-y: auto;
@@ -138,7 +139,7 @@ docStyle.innerHTML = `
.cm-notice-board { .cm-notice-board {
width: 290px; width: 290px;
height: 270px; height: 210px;
overflow: auto; overflow: auto;
color: var(--input-text); color: var(--input-text);
border: 1px solid var(--descrip-text); border: 1px solid var(--descrip-text);
@@ -226,7 +227,11 @@ var update_comfyui_button = null;
var switch_comfyui_button = null; var switch_comfyui_button = null;
var fetch_updates_button = null; var fetch_updates_button = null;
var update_all_button = null; var update_all_button = null;
var restart_stop_button = null;
let share_option = 'all'; let share_option = 'all';
var is_updating_all = false;
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
const style = ` const style = `
@@ -425,102 +430,54 @@ async function init_notice(notice) {
await init_share_option(); await init_share_option();
async function fetchNicknames() {
const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
const mappings = await response1.json();
let result = {}; async function set_inprogress_mode() {
let nickname_patterns = []; update_comfyui_button.disabled = true;
update_comfyui_button.style.backgroundColor = "gray";
for (let i in mappings) { update_all_button.disabled = true;
let item = mappings[i]; update_all_button.style.backgroundColor = "gray";
var nickname;
if (item[1].nickname) {
nickname = item[1].nickname;
}
else if (item[1].title) {
nickname = item[1].title;
}
else {
nickname = item[1].title_aux;
}
for (let j in item[0]) { switch_comfyui_button.disabled = true;
result[item[0][j]] = nickname; switch_comfyui_button.style.backgroundColor = "gray";
}
if(item[1].nodename_pattern) { restart_stop_button.innerText = 'Stop';
nickname_patterns.push([item[1].nodename_pattern, nickname]);
}
}
return [result, nickname_patterns];
} }
const [nicknames, nickname_patterns] = await fetchNicknames();
function getNickname(node, nodename) { async function reset_action_buttons() {
if(node.nickname) { const isElectron = 'electronAPI' in window;
return node.nickname;
if(isElectron) {
update_all_button.innerText = "Update All Custom Nodes";
} }
else { else {
if (nicknames[nodename]) { update_all_button.innerText = "Update All";
node.nickname = nicknames[nodename];
}
else if(node.getInnerNodes) {
let pure_name = getPureName(node);
let groupNode = app.graph.extra?.groupNodes?.[pure_name];
if(groupNode) {
let packname = groupNode.packname;
node.nickname = packname;
}
return node.nickname;
}
else {
for(let i in nickname_patterns) {
let item = nickname_patterns[i];
if(nodename.match(item[0])) {
node.nickname = item[1];
}
}
}
return node.nickname;
} }
update_comfyui_button.innerText = "Update ComfyUI";
switch_comfyui_button.innerText = "Switch ComfyUI";
restart_stop_button.innerText = 'Restart';
update_comfyui_button.disabled = false;
update_all_button.disabled = false;
switch_comfyui_button.disabled = false;
update_comfyui_button.style.backgroundColor = "";
update_all_button.style.backgroundColor = "";
switch_comfyui_button.style.backgroundColor = "";
} }
async function updateComfyUI() { async function updateComfyUI() {
let prev_text = update_comfyui_button.innerText; let prev_text = update_comfyui_button.innerText;
update_comfyui_button.innerText = "Updating ComfyUI..."; update_comfyui_button.innerText = "Updating ComfyUI...";
update_comfyui_button.disabled = true;
update_comfyui_button.style.backgroundColor = "gray";
try { set_inprogress_mode();
const response = await api.fetchApi('/comfyui_manager/update_comfyui');
if (response.status == 400) { const response = await api.fetchApi('/manager/queue/update_comfyui');
show_message('Failed to update ComfyUI.');
return false;
}
if (response.status == 201) { showTerminal();
show_message('ComfyUI has been successfully updated.'); await api.fetchApi('/manager/queue/start');
}
else {
show_message('ComfyUI is already up to date with the latest version.');
}
return true;
}
catch (exception) {
show_message(`Failed to update ComfyUI / ${exception}`);
return false;
}
finally {
update_comfyui_button.disabled = false;
update_comfyui_button.innerText = prev_text;
update_comfyui_button.style.backgroundColor = "";
}
} }
function showVersionSelectorDialog(versions, current, onSelect) { function showVersionSelectorDialog(versions, current, onSelect) {
@@ -648,26 +605,32 @@ function showVersionSelectorDialog(versions, current, onSelect) {
} }
async function switchComfyUI() { async function switchComfyUI() {
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" }); let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
if(res.status == 200) { if(res.status == 200) {
let obj = await res.json(); let obj = await res.json();
let versions = []; let versions = [];
let default_version; let default_version;
for(let v of obj.versions) { for(let v of obj.versions) {
default_version = v; default_version = v;
versions.push(v); versions.push(v);
} }
showVersionSelectorDialog(versions, obj.current, (selected_version) => { showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" }); let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
}); if (response.status == 200) {
} infoToast(`ComfyUI version is switched to ${selected_version}`);
else { }
show_message('Failed to fetch ComfyUI versions.'); else {
} customAlert('Failed to switch ComfyUI version.');
}
});
}
else {
customAlert('Failed to fetch ComfyUI versions.');
}
} }
@@ -721,70 +684,135 @@ async function fetchUpdates(update_check_checkbox) {
} }
} }
async function updateAll(update_check_checkbox, manager_dialog) { async function onQueueStatus(event) {
let prev_text = update_all_button.innerText; const isElectron = 'electronAPI' in window;
update_all_button.innerText = "Updating all...(ComfyUI)";
update_all_button.disabled = true;
update_all_button.style.backgroundColor = "gray";
try { if(event.detail.status == 'in_progress') {
var mode = manager_instance.datasrc_combo.value; set_inprogress_mode();
update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
}
else if(event.detail.status == 'done') {
reset_action_buttons();
update_all_button.innerText = "Updating all..."; if(!is_updating_all) {
const response1 = await api.fetchApi('/comfyui_manager/update_comfyui'); return;
const response2 = await api.fetchApi(`/customnode/update_all?mode=${mode}`);
if (response2.status == 403) {
show_message('This action is not allowed with this security level configuration.');
return false;
} }
if (response1.status == 400 || response2.status == 400) { is_updating_all = false;
show_message('Failed to update ComfyUI or several extensions.<BR><BR>See terminal log.<BR>');
return false; let success_list = [];
let failed_list = [];
let comfyui_state = null;
for(let k in event.detail.nodepack_result){
let v = event.detail.nodepack_result[k];
if(k == 'comfyui') {
comfyui_state = v;
continue;
}
if(v.msg == 'success') {
success_list.push(k);
}
else if(v.msg != 'skip')
failed_list.push(k);
} }
if(response1.status == 201 || response2.status == 201) { let msg = "";
const update_info = await response2.json();
if(success_list.length == 0 && comfyui_state != 'success') {
let failed_list = ""; if(failed_list.length == 0) {
if(update_info.failed.length > 0) { msg += "All custom nodes are already up to date.";
failed_list = "<BR>FAILED: "+update_info.failed.join(", ");
} }
let updated_list = "";
if(update_info.updated.length > 0) {
updated_list = "<BR>UPDATED: "+update_info.updated.join(", ");
}
show_message(
"ComfyUI and all extensions have been updated to the latest version.<BR>To apply the updated custom node, please <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI. And refresh browser.<BR>"
+failed_list
+updated_list
);
const rebootButton = document.getElementById('cm-reboot-button5');
rebootButton.addEventListener("click",
function() {
if(rebootAPI()) {
manager_dialog.close();
}
});
} }
else { else {
show_message('ComfyUI and all extensions are already up-to-date with the latest versions.'); msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
if(comfyui_state == 'success') {
msg += "ComfyUI is updated.<BR><BR>";
}
else if(comfyui_state == 'skip') {
msg += "ComfyUI is already up-to-date.<BR><BR>"
}
else if(comfyui_state != null) {
msg += "Failed to update ComfyUI.<BR><BR>"
}
if(success_list.length > 0) {
msg += "The following custom nodes have been updated:<ul>";
for(let x in success_list) {
let k = success_list[x];
let url = event.detail.nodepack_result[k].url;
let title = event.detail.nodepack_result[k].title;
if(url) {
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
}
else {
msg += `<li>${k}</li>`;
}
}
msg += "</ul>";
}
setNeedRestart(true);
}
if(failed_list.length > 0) {
msg += '<br>The update for the following custom nodes has failed:<ul>';
for(let x in failed_list) {
let k = failed_list[x];
let url = event.detail.nodepack_result[k].url;
let title = event.detail.nodepack_result[k].title;
if(url) {
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
}
else {
msg += `<li>${k}</li>`;
}
}
msg += '</ul>'
} }
return true; show_message(msg);
const rebootButton = document.getElementById('cm-reboot-button5');
rebootButton?.addEventListener("click",
function() {
if(rebootAPI()) {
manager_dialog.close();
}
});
} }
catch (exception) { }
show_message(`Failed to update ComfyUI or several extensions / ${exception}`);
return false; api.addEventListener("cm-queue-status", onQueueStatus);
async function updateAll(update_comfyui, manager_dialog) {
let prev_text = update_all_button.innerText;
update_all_button.innerText = "Updating...";
set_inprogress_mode();
var mode = manager_instance.datasrc_combo.value;
showTerminal();
if(update_comfyui) {
update_all_button.innerText = "Updating ComfyUI...";
await api.fetchApi('/manager/queue/update_comfyui');
} }
finally {
update_all_button.disabled = false; const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
update_all_button.innerText = prev_text;
update_all_button.style.backgroundColor = ""; if (response.status == 401) {
customAlert('Another task is already in progress. Please stop the ongoing task first.');
}
else if(response.status == 200) {
is_updating_all = true;
await api.fetchApi('/manager/queue/start');
} }
} }
@@ -808,15 +836,29 @@ const isOutputNode = (node) => {
return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type); return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
} }
function restartOrStop() {
if(restart_stop_button.innerText == 'Restart'){
rebootAPI();
}
else {
api.fetchApi('/manager/queue/reset');
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
}
}
// ----------- // -----------
class ManagerMenuDialog extends ComfyDialog { class ManagerMenuDialog extends ComfyDialog {
createControlsMid() { createControlsMid() {
let self = this; let self = this;
const isElectron = 'electronAPI' in window;
update_comfyui_button = update_comfyui_button =
$el("button.cm-button", { $el("button.cm-button", {
type: "button", type: "button",
textContent: "Update ComfyUI", textContent: "Update ComfyUI",
style: {
display: isElectron ? 'none' : 'block'
},
onclick: onclick:
() => updateComfyUI() () => updateComfyUI()
}); });
@@ -825,6 +867,9 @@ class ManagerMenuDialog extends ComfyDialog {
$el("button.cm-button", { $el("button.cm-button", {
type: "button", type: "button",
textContent: "Switch ComfyUI", textContent: "Switch ComfyUI",
style: {
display: isElectron ? 'none' : 'block'
},
onclick: onclick:
() => switchComfyUI() () => switchComfyUI()
}); });
@@ -837,14 +882,32 @@ class ManagerMenuDialog extends ComfyDialog {
() => fetchUpdates(this.update_check_checkbox) () => fetchUpdates(this.update_check_checkbox)
}); });
update_all_button = restart_stop_button =
$el("button.cm-button", { $el("button.cm-button-red", {
type: "button", type: "button",
textContent: "Update All", textContent: "Restart",
onclick: onclick: () => restartOrStop()
() => updateAll(this.update_check_checkbox, self)
}); });
if(isElectron) {
update_all_button =
$el("button.cm-button", {
type: "button",
textContent: "Update All Custom Nodes",
onclick:
() => updateAll(false, self)
});
}
else {
update_all_button =
$el("button.cm-button", {
type: "button",
textContent: "Update All",
onclick:
() => updateAll(true, self)
});
}
const res = const res =
[ [
$el("button.cm-button", { $el("button.cm-button", {
@@ -903,24 +966,7 @@ class ManagerMenuDialog extends ComfyDialog {
fetch_updates_button, fetch_updates_button,
$el("br", {}, []), $el("br", {}, []),
$el("button.cm-button", { restart_stop_button,
type: "button",
textContent: "Alternatives of A1111",
onclick:
() => {
if(!CustomNodesManager.instance) {
CustomNodesManager.instance = new CustomNodesManager(app, self);
}
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.ALTERNATIVES);
}
}),
$el("br", {}, []),
$el("button.cm-button-red", {
type: "button",
textContent: "Restart",
onclick: () => rebootAPI()
}),
]; ];
let migration_btn = let migration_btn =
@@ -1009,21 +1055,6 @@ class ManagerMenuDialog extends ComfyDialog {
} }
}); });
// default ui state
let default_ui_combo = document.createElement("select");
default_ui_combo.setAttribute("title", "Set the default state to be displayed in the main menu when the browser starts.");
default_ui_combo.className = "cm-menu-combo";
default_ui_combo.appendChild($el('option', { value: 'none', text: 'Default UI: None' }, []));
default_ui_combo.appendChild($el('option', { value: 'history', text: 'Default UI: History' }, []));
default_ui_combo.appendChild($el('option', { value: 'queue', text: 'Default UI: Queue' }, []));
api.fetchApi('/manager/default_ui')
.then(response => response.text())
.then(data => { default_ui_combo.value = data; });
default_ui_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/default_ui?value=${event.target.value}`);
});
// share // share
let share_combo = document.createElement("select"); let share_combo = document.createElement("select");
@@ -1086,7 +1117,6 @@ class ManagerMenuDialog extends ComfyDialog {
this.datasrc_combo, this.datasrc_combo,
channel_combo, channel_combo,
preview_combo, preview_combo,
default_ui_combo,
share_combo, share_combo,
component_policy_combo, component_policy_combo,
$el("br", {}, []), $el("br", {}, []),
@@ -1269,10 +1299,22 @@ class ManagerMenuDialog extends ComfyDialog {
this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]); this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
} }
get isVisible() {
return this.element?.style?.display !== "none";
}
show() { show() {
this.element.style.display = "block"; this.element.style.display = "block";
} }
toggleVisibility() {
if (this.isVisible) {
this.close();
} else {
this.show();
}
}
handleWorkflowGalleryButtonClick(e) { handleWorkflowGalleryButtonClick(e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@@ -1390,6 +1432,41 @@ app.registerExtension({
} }
], ],
commands: [
{
id: "Comfy.Manager.Menu.ToggleVisibility",
label: "Toggle Manager Menu Visibility",
icon: "mdi mdi-puzzle",
function: () => {
if (!manager_instance) {
setManagerInstance(new ManagerMenuDialog());
manager_instance.show();
} else {
manager_instance.toggleVisibility();
}
},
},
{
id: "Comfy.Manager.CustomNodesManager.ToggleVisibility",
label: "Toggle Custom Nodes Manager Visibility",
icon: "pi pi-server",
function: () => {
if (CustomNodesManager.instance?.isVisible) {
CustomNodesManager.instance.close();
return;
}
if (!manager_instance) {
setManagerInstance(new ManagerMenuDialog());
}
if (!CustomNodesManager.instance) {
CustomNodesManager.instance = new CustomNodesManager(app, self);
}
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.NORMAL);
},
}
],
init() { init() {
$el("style", { $el("style", {
textContent: style, textContent: style,
@@ -1584,27 +1661,3 @@ app.registerExtension({
} }
}, },
}); });
async function set_default_ui()
{
let res = await api.fetchApi('/manager/default_ui');
if(res.status == 200) {
let mode = await res.text();
switch(mode) {
case 'history':
app.ui.queue.hide();
app.ui.history.show();
break;
case 'queue':
app.ui.queue.show();
app.ui.history.hide();
break;
default:
// do nothing
break;
}
}
}
set_default_ui();

View File

@@ -130,6 +130,20 @@ export function customAlert(message) {
} }
} }
export function infoToast(summary, message) {
try {
app.extensionManager.toast.add({
severity: 'info',
summary: summary,
detail: message,
life: 3000
})
}
catch {
// do nothing
}
}
export async function customPrompt(title, message) { export async function customPrompt(title, message) {
try { try {
@@ -399,10 +413,93 @@ export const icons = {
} }
export function sanitizeHTML(str) { export function sanitizeHTML(str) {
return str return str
.replace(/&/g, "&amp;") .replace(/&/g, "&amp;")
.replace(/</g, "&lt;") .replace(/</g, "&lt;")
.replace(/>/g, "&gt;") .replace(/>/g, "&gt;")
.replace(/"/g, "&quot;") .replace(/"/g, "&quot;")
.replace(/'/g, "&#039;"); .replace(/'/g, "&#039;");
} }
export function showTerminal() {
try {
const panel = app.extensionManager.bottomPanel;
const isTerminalVisible = panel.bottomPanelVisible && panel.activeBottomPanelTab.id === 'logs-terminal';
if (!isTerminalVisible)
panel.toggleBottomPanelTab('logs-terminal');
}
catch(exception) {
// do nothing
}
}
let need_restart = false;
export function setNeedRestart(value) {
need_restart = value;
}
async function onReconnected(event) {
if(need_restart) {
setNeedRestart(false);
const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
if (!confirmed) {
return;
}
window.location.reload(true);
}
}
api.addEventListener('reconnected', onReconnected);
const storeId = "comfyui-manager-grid";
let timeId;
export function storeColumnWidth(gridId, columnItem) {
clearTimeout(timeId);
timeId = setTimeout(() => {
let data = {};
const dataStr = localStorage.getItem(storeId);
if (dataStr) {
try {
data = JSON.parse(dataStr);
} catch (e) {}
}
if (!data[gridId]) {
data[gridId] = {};
}
data[gridId][columnItem.id] = columnItem.width;
localStorage.setItem(storeId, JSON.stringify(data));
}, 200)
}
export function restoreColumnWidth(gridId, columns) {
const dataStr = localStorage.getItem(storeId);
if (!dataStr) {
return;
}
let data;
try {
data = JSON.parse(dataStr);
} catch (e) {}
if(!data) {
return;
}
const widthMap = data[gridId];
if (!widthMap) {
return;
}
columns.forEach(columnItem => {
const w = widthMap[columnItem.id];
if (w) {
columnItem.width = w;
}
});
}

View File

@@ -4,12 +4,16 @@ 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, sanitizeHTML fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
sanitizeHTML, infoToast, showTerminal, setNeedRestart,
storeColumnWidth, restoreColumnWidth
} from "./common.js"; } from "./common.js";
// https://cenfun.github.io/turbogrid/api.html // https://cenfun.github.io/turbogrid/api.html
import TG from "./turbogrid.esm.js"; import TG from "./turbogrid.esm.js";
const gridId = "node";
const pageCss = ` const pageCss = `
.cn-manager { .cn-manager {
--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; --grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
@@ -55,6 +59,12 @@ const pageCss = `
color: white; color: white;
} }
.cn-manager .cn-manager-stop {
display: none;
background-color: #500000;
color: white;
}
.cn-manager .cn-manager-back { .cn-manager .cn-manager-back {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -344,13 +354,14 @@ const pageHtml = `
<div class="cn-manager-selection"></div> <div class="cn-manager-selection"></div>
<div class="cn-manager-message"></div> <div class="cn-manager-message"></div>
<div class="cn-manager-footer"> <div class="cn-manager-footer">
<button class="cn-manager-back"> <button class="cn-manager-back">
<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/> <path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg> </svg>
Back Back
</button> </button>
<button class="cn-manager-restart">Restart</button> <button class="cn-manager-restart">Restart</button>
<button class="cn-manager-stop">Stop</button>
<div class="cn-flex-auto"></div> <div class="cn-flex-auto"></div>
<button class="cn-manager-check-update">Check Update</button> <button class="cn-manager-check-update">Check Update</button>
<button class="cn-manager-check-missing">Check Missing</button> <button class="cn-manager-check-missing">Check Missing</button>
@@ -391,6 +402,8 @@ export class CustomNodesManager {
this.restartMap = {}; this.restartMap = {};
this.init(); this.init();
api.addEventListener("cm-queue-status", this.onQueueStatus);
} }
init() { init() {
@@ -753,10 +766,16 @@ export class CustomNodesManager {
".cn-manager-restart": { ".cn-manager-restart": {
click: () => { click: () => {
if(rebootAPI()) { this.close();
this.close(); this.manager_dialog.close();
this.manager_dialog.close(); rebootAPI();
} }
},
".cn-manager-stop": {
click: () => {
api.fetchApi('/manager/queue/reset');
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
} }
}, },
@@ -816,6 +835,10 @@ export class CustomNodesManager {
this.renderSelected(); this.renderSelected();
}); });
grid.bind("onColumnWidthChanged", (e, columnItem) => {
storeColumnWidth(gridId, columnItem)
});
grid.bind('onClick', (e, d) => { grid.bind('onClick', (e, d) => {
const btn = this.getButton(d.e.target); const btn = this.getButton(d.e.target);
if (btn) { if (btn) {
@@ -1143,6 +1166,8 @@ export class CustomNodesManager {
return 0; return 0;
}); });
restoreColumnWidth(gridId, columns);
this.grid.setData({ this.grid.setData({
options: options, options: options,
rows: rows_values, rows: rows_values,
@@ -1204,7 +1229,7 @@ export class CustomNodesManager {
} }
focusInstall(item, mode) { focusInstall(item, mode) {
const cellNode = this.grid.getCellNode(item, "installed"); const cellNode = this.grid.getCellNode(item, "action");
if (cellNode) { if (cellNode) {
const cellBtn = cellNode.querySelector(`button[mode="${mode}"]`); const cellBtn = cellNode.querySelector(`button[mode="${mode}"]`);
if (cellBtn) { if (cellBtn) {
@@ -1269,6 +1294,13 @@ export class CustomNodesManager {
} }
async installNodes(list, btn, title, selected_version) { async installNodes(list, btn, title, selected_version) {
let stats = await api.fetchApi('/manager/queue/status');
stats = await stats.json();
if(stats.is_processing) {
customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
return;
}
const { target, label, mode} = btn; const { target, label, mode} = btn;
if(mode === "uninstall") { if(mode === "uninstall") {
@@ -1294,8 +1326,15 @@ export class CustomNodesManager {
let needRestart = false; let needRestart = false;
let errorMsg = ""; let errorMsg = "";
await api.fetchApi('/manager/queue/reset');
let target_items = [];
for (const hash of list) { for (const hash of list) {
const item = this.grid.getRowItemBy("hash", hash); const item = this.grid.getRowItemBy("hash", hash);
target_items.push(item);
if (!item) { if (!item) {
errorMsg = `Not found custom node: ${hash}`; errorMsg = `Not found custom node: ${hash}`;
break; break;
@@ -1315,6 +1354,7 @@ export class CustomNodesManager {
data.selected_version = selected_version; data.selected_version = selected_version;
data.channel = this.channel; data.channel = this.channel;
data.mode = this.mode; data.mode = this.mode;
data.ui_id = hash;
let install_mode = mode; let install_mode = mode;
if(mode == 'switch') { if(mode == 'switch') {
@@ -1332,50 +1372,105 @@ export class CustomNodesManager {
api_mode = 'reinstall'; api_mode = 'reinstall';
} }
const res = await api.fetchApi(`/customnode/${api_mode}`, { const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
method: 'POST', method: 'POST',
body: JSON.stringify(data) body: JSON.stringify(data)
}); });
if (res.status != 200) { if (res.status != 200) {
errorMsg = `'${item.title}': `;
errorMsg = `${item.title} ${mode} failed: `;
if(res.status == 403) { if(res.status == 403) {
errorMsg += `This action is not allowed with this security level configuration.`; errorMsg += `This action is not allowed with this security level configuration.\n`;
} 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.\n`;
} else { } else {
errorMsg += await res.text(); errorMsg += await res.text() + '\n';
} }
break; break;
} }
needRestart = true;
this.grid.setRowSelected(item, false);
item.restart = true;
this.restartMap[item.hash] = true;
this.grid.updateCell(item, "action");
//console.log(res.data);
} }
this.install_context = {btn: btn, targets: target_items};
if(errorMsg) {
this.showError(errorMsg);
show_message("[Installation Errors]\n"+errorMsg);
// reset
for(let k in target_items) {
const item = target_items[k];
this.grid.updateCell(item, "action");
}
}
else {
await api.fetchApi('/manager/queue/start');
this.showStop();
showTerminal();
}
}
async onQueueStatus(event) {
let self = CustomNodesManager.instance;
if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
const hash = event.detail.target;
const item = self.grid.getRowItemBy("hash", hash);
item.restart = true;
self.restartMap[item.hash] = true;
self.grid.updateCell(item, "action");
self.grid.setRowSelected(item, false);
}
else if(event.detail.status == 'done') {
self.hideStop();
self.onQueueCompleted(event.detail);
}
}
async onQueueCompleted(info) {
let result = info.nodepack_result;
if(result.length == 0) {
return;
}
let self = CustomNodesManager.instance;
if(!self.install_context) {
return;
}
const { target, label, mode } = self.install_context.btn;
target.classList.remove("cn-btn-loading"); target.classList.remove("cn-btn-loading");
let errorMsg = "";
for(let hash in result){
let v = result[hash];
if(v != 'success' && v != 'skip')
errorMsg += v+'\n';
}
for(let k in self.install_context.targets) {
let item = self.install_context.targets[k];
self.grid.updateCell(item, "action");
}
if (errorMsg) { if (errorMsg) {
this.showError(errorMsg); self.showError(errorMsg);
show_message("Installation Error:\n"+errorMsg); show_message("Installation Error:\n"+errorMsg);
} else { } else {
this.showStatus(`${label} ${list.length} custom node(s) successfully`); self.showStatus(`${label} ${result.length} custom node(s) successfully`);
} }
if (needRestart) { self.showRestart();
this.showRestart(); self.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red");
this.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red")
}
infoToast(`[ComfyUI-Manager] All node pack tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
self.install_context = undefined;
} }
// =========================================================================================== // ===========================================================================================
@@ -1570,6 +1665,8 @@ export class CustomNodesManager {
} }
async loadData(show_mode = ShowMode.NORMAL) { async loadData(show_mode = ShowMode.NORMAL) {
const isElectron = 'electronAPI' in window;
this.show_mode = show_mode; this.show_mode = show_mode;
console.log("Show mode:", show_mode); console.log("Show mode:", show_mode);
@@ -1589,6 +1686,11 @@ export class CustomNodesManager {
} }
const { channel, node_packs } = res.data; const { channel, node_packs } = res.data;
if(isElectron) {
delete node_packs['comfyui-manager'];
}
this.channel = channel; this.channel = channel;
this.mode = mode; this.mode = mode;
this.custom_nodes = node_packs; this.custom_nodes = node_packs;
@@ -1756,9 +1858,9 @@ export class CustomNodesManager {
} }
setDisabled(disabled) { setDisabled(disabled) {
const $close = this.element.querySelector(".cn-manager-close"); const $close = this.element.querySelector(".cn-manager-close");
const $restart = this.element.querySelector(".cn-manager-restart"); const $restart = this.element.querySelector(".cn-manager-restart");
const $stop = this.element.querySelector(".cn-manager-stop");
const list = [ const list = [
".cn-manager-header input", ".cn-manager-header input",
@@ -1770,7 +1872,7 @@ export class CustomNodesManager {
}) })
.flat() .flat()
.filter(it => { .filter(it => {
return it !== $close && it !== $restart; return it !== $close && it !== $restart && it !== $stop;
}); });
list.forEach($elem => { list.forEach($elem => {
@@ -1789,6 +1891,15 @@ export class CustomNodesManager {
showRestart() { showRestart() {
this.element.querySelector(".cn-manager-restart").style.display = "block"; this.element.querySelector(".cn-manager-restart").style.display = "block";
setNeedRestart(true);
}
showStop() {
this.element.querySelector(".cn-manager-stop").style.display = "block";
}
hideStop() {
this.element.querySelector(".cn-manager-stop").style.display = "none";
} }
setFilter(filterValue) { setFilter(filterValue) {
@@ -1818,4 +1929,8 @@ export class CustomNodesManager {
close() { close() {
this.element.style.display = "none"; this.element.style.display = "none";
} }
get isVisible() {
return this.element?.style?.display !== "none";
}
} }

View File

@@ -1,12 +1,17 @@
import { app } from "../../scripts/app.js";
import { $el } from "../../scripts/ui.js"; import { $el } from "../../scripts/ui.js";
import { import {
manager_instance, rebootAPI, manager_instance, rebootAPI,
fetchData, md5, icons fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
storeColumnWidth, restoreColumnWidth
} from "./common.js"; } from "./common.js";
import { api } from "../../scripts/api.js";
// https://cenfun.github.io/turbogrid/api.html // https://cenfun.github.io/turbogrid/api.html
import TG from "./turbogrid.esm.js"; import TG from "./turbogrid.esm.js";
const gridId = "model";
const pageCss = ` const pageCss = `
.cmm-manager { .cmm-manager {
--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; --grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
@@ -46,6 +51,18 @@ const pageCss = `
background-color: var(--comfy-input-bg); background-color: var(--comfy-input-bg);
} }
.cmm-manager .cmm-manager-refresh {
display: none;
background-color: #000080;
color: white;
}
.cmm-manager .cmm-manager-stop {
display: none;
background-color: #500000;
color: white;
}
.cmm-manager-header { .cmm-manager-header {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@@ -235,7 +252,14 @@ const pageHtml = `
<div class="cmm-manager-selection"></div> <div class="cmm-manager-selection"></div>
<div class="cmm-manager-message"></div> <div class="cmm-manager-message"></div>
<div class="cmm-manager-footer"> <div class="cmm-manager-footer">
<button class="cmm-manager-back">Back</button> <button class="cmm-manager-back">
<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Back
</button>
<button class="cmm-manager-refresh">Refresh</button>
<button class="cmm-manager-stop">Stop</button>
<div class="cmm-flex-auto"></div> <div class="cmm-flex-auto"></div>
</div> </div>
`; `;
@@ -254,6 +278,8 @@ export class ModelManager {
this.keywords = ''; this.keywords = '';
this.init(); this.init();
api.addEventListener("cm-queue-status", this.onQueueStatus);
} }
init() { init() {
@@ -365,12 +391,25 @@ export class ModelManager {
} }
}, },
".cmm-manager-refresh": {
click: () => {
app.refreshComboInNodes();
}
},
".cmm-manager-stop": {
click: () => {
api.fetchApi('/manager/queue/reset');
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
}
},
".cmm-manager-back": { ".cmm-manager-back": {
click: (e) => { click: (e) => {
this.close() this.close()
manager_instance.show(); manager_instance.show();
} }
}, }
}; };
Object.keys(eventsMap).forEach(selector => { Object.keys(eventsMap).forEach(selector => {
const target = this.element.querySelector(selector); const target = this.element.querySelector(selector);
@@ -402,6 +441,10 @@ export class ModelManager {
this.renderSelected(); this.renderSelected();
}); });
grid.bind("onColumnWidthChanged", (e, columnItem) => {
storeColumnWidth(gridId, columnItem)
});
grid.bind('onClick', (e, d) => { grid.bind('onClick', (e, d) => {
const { rowItem } = d; const { rowItem } = d;
const target = d.e.target; const target = d.e.target;
@@ -553,6 +596,8 @@ export class ModelManager {
width: 200 width: 200
}]; }];
restoreColumnWidth(gridId, columns);
this.grid.setData({ this.grid.setData({
options, options,
rows, rows,
@@ -595,17 +640,27 @@ export class ModelManager {
} }
async installModels(list, btn) { async installModels(list, btn) {
let stats = await api.fetchApi('/manager/queue/status');
stats = await stats.json();
if(stats.is_processing) {
customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
return;
}
btn.classList.add("cmm-btn-loading"); btn.classList.add("cmm-btn-loading");
this.showLoading();
this.showError(""); this.showError("");
let needRestart = false; let needRefresh = false;
let errorMsg = ""; let errorMsg = "";
await api.fetchApi('/manager/queue/reset');
let target_items = [];
for (const item of list) { for (const item of list) {
this.grid.scrollRowIntoView(item); this.grid.scrollRowIntoView(item);
target_items.push(item);
if (!this.focusInstall(item)) { if (!this.focusInstall(item)) {
this.grid.onNextUpdated(() => { this.grid.onNextUpdated(() => {
@@ -616,48 +671,112 @@ export class ModelManager {
this.showStatus(`Install ${item.name} ...`); this.showStatus(`Install ${item.name} ...`);
const data = item.originalData; const data = item.originalData;
const res = await fetchData('/model/install', { data.ui_id = item.hash;
const res = await api.fetchApi(`/manager/queue/install_model`, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(data) body: JSON.stringify(data)
}); });
if (res.status != 200) {
errorMsg = `'${item.name}': `;
if (res.error) { if(res.status == 403) {
errorMsg = `Install failed: ${item.name} ${res.error.message}`; errorMsg += `This action is not allowed with this security level configuration.\n`;
break;; } else {
errorMsg += await res.text() + '\n';
}
break;
} }
}
needRestart = true; this.install_context = {btn: btn, targets: target_items};
this.grid.setRowSelected(item, false); if(errorMsg) {
this.showError(errorMsg);
show_message("[Installation Errors]\n"+errorMsg);
// reset
for(let k in target_items) {
const item = target_items[k];
this.grid.updateCell(item, "installed");
}
}
else {
await api.fetchApi('/manager/queue/start');
this.showStop();
showTerminal();
}
}
async onQueueStatus(event) {
let self = ModelManager.instance;
if(event.detail.status == 'in_progress' && event.detail.ui_target == 'model_manager') {
const hash = event.detail.target;
const item = self.grid.getRowItemBy("hash", hash);
item.refresh = true; item.refresh = true;
self.grid.setRowSelected(item, false);
item.selectable = false; item.selectable = false;
this.grid.updateCell(item, "installed"); // self.grid.updateCell(item, "tg-column-select");
this.grid.updateCell(item, "tg-column-select"); self.grid.updateRow(item);
}
else if(event.detail.status == 'done') {
self.hideStop();
self.onQueueCompleted(event.detail);
}
}
this.showStatus(`Install ${item.name} successfully`); async onQueueCompleted(info) {
let result = info.model_result;
if(result.length == 0) {
return;
} }
this.hideLoading(); let self = ModelManager.instance;
if(!self.install_context) {
return;
}
let btn = self.install_context.btn;
self.hideLoading();
btn.classList.remove("cmm-btn-loading"); btn.classList.remove("cmm-btn-loading");
let errorMsg = "";
for(let hash in result){
let v = result[hash];
if(v != 'success')
errorMsg += v + '\n';
}
for(let k in self.install_context.targets) {
let item = self.install_context.targets[k];
self.grid.updateCell(item, "installed");
}
if (errorMsg) { if (errorMsg) {
this.showError(errorMsg); self.showError(errorMsg);
show_message("Installation Error:\n"+errorMsg);
} else { } else {
this.showStatus(`Install ${list.length} models successfully`); self.showStatus(`Install ${result.length} models successfully`);
} }
if (needRestart) { self.showRefresh();
this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "red") self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red")
}
infoToast('Tasks done', `[ComfyUI-Manager] All model downloading tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
self.install_context = undefined;
} }
getModelList(models) { getModelList(models) {
const typeMap = new Map(); const typeMap = new Map();
const baseMap = new Map(); const baseMap = new Map();
@@ -826,7 +945,7 @@ export class ModelManager {
} }
showLoading() { showLoading() {
this.setDisabled(true); // this.setDisabled(true);
if (this.grid) { if (this.grid) {
this.grid.showLoading(); this.grid.showLoading();
this.grid.showMask({ this.grid.showMask({
@@ -836,7 +955,7 @@ export class ModelManager {
} }
hideLoading() { hideLoading() {
this.setDisabled(false); // this.setDisabled(false);
if (this.grid) { if (this.grid) {
this.grid.hideLoading(); this.grid.hideLoading();
this.grid.hideMask(); this.grid.hideMask();
@@ -844,8 +963,9 @@ export class ModelManager {
} }
setDisabled(disabled) { setDisabled(disabled) {
const $close = this.element.querySelector(".cmm-manager-close"); const $close = this.element.querySelector(".cmm-manager-close");
const $refresh = this.element.querySelector(".cmm-manager-refresh");
const $stop = this.element.querySelector(".cmm-manager-stop");
const list = [ const list = [
".cmm-manager-header input", ".cmm-manager-header input",
@@ -857,7 +977,7 @@ export class ModelManager {
}) })
.flat() .flat()
.filter(it => { .filter(it => {
return it !== $close; return it !== $close && it !== $refresh && it !== $stop;
}); });
list.forEach($elem => { list.forEach($elem => {
@@ -874,6 +994,18 @@ export class ModelManager {
} }
showRefresh() {
this.element.querySelector(".cmm-manager-refresh").style.display = "block";
}
showStop() {
this.element.querySelector(".cmm-manager-stop").style.display = "block";
}
hideStop() {
this.element.querySelector(".cmm-manager-stop").style.display = "none";
}
setKeywords(keywords = "") { setKeywords(keywords = "") {
this.keywords = keywords; this.keywords = keywords;
this.element.querySelector(".cmm-manager-keywords").value = keywords; this.element.querySelector(".cmm-manager-keywords").value = keywords;

View File

@@ -1,16 +1,6 @@
import { app } from "../../scripts/app.js"; import { app } from "../../scripts/app.js";
import { api } from "../../scripts/api.js"; import { api } from "../../scripts/api.js";
let double_click_policy = "copy-all";
api.fetchApi('/manager/dbl_click/policy')
.then(response => response.text())
.then(data => set_double_click_policy(data));
export function set_double_click_policy(mode) {
double_click_policy = mode;
}
function addMenuHandler(nodeType, cb) { function addMenuHandler(nodeType, cb) {
const getOpts = nodeType.prototype.getExtraMenuOptions; const getOpts = nodeType.prototype.getExtraMenuOptions;
nodeType.prototype.getExtraMenuOptions = function () { nodeType.prototype.getExtraMenuOptions = function () {
@@ -153,62 +143,6 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
app.registerExtension({ app.registerExtension({
name: "Comfy.Manager.NodeFixer", name: "Comfy.Manager.NodeFixer",
async nodeCreated(node, app) {
let orig_dblClick = node.onDblClick;
node.onDblClick = function (e, pos, self) {
orig_dblClick?.apply?.(this, arguments);
if((!node.inputs && !node.outputs) || pos[1] > 0)
return;
switch(double_click_policy) {
case "copy-all":
case "copy-full":
case "copy-input":
{
if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
return;
let src_node = lookup_nearest_nodes(node);
if(src_node)
{
let both_connection = double_click_policy != "copy-input";
let copy_shape = double_click_policy == "copy-full";
node_info_copy(src_node, node, both_connection, copy_shape);
}
}
break;
case "possible-input":
{
let nearest_inputs = lookup_nearest_inputs(node);
if(nearest_inputs)
connect_inputs(nearest_inputs, node);
}
break;
case "dual":
{
if(pos[0] < node.size[0]/2) {
// left: possible-input
let nearest_inputs = lookup_nearest_inputs(node);
if(nearest_inputs)
connect_inputs(nearest_inputs, node);
}
else {
// right: copy-all
if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
return;
let src_node = lookup_nearest_nodes(node);
if(src_node)
node_info_copy(src_node, node, true);
}
}
break;
}
}
},
beforeRegisterNodeDef(nodeType, nodeData, app) { beforeRegisterNodeDef(nodeType, nodeData, app) {
addMenuHandler(nodeType, function (_, options) { addMenuHandler(nodeType, function (_, options) {
options.push({ options.push({

View File

@@ -209,28 +209,6 @@
"url": "https://huggingface.co/stabilityai/stable-diffusion-x4-upscaler/resolve/main/x4-upscaler-ema.safetensors", "url": "https://huggingface.co/stabilityai/stable-diffusion-x4-upscaler/resolve/main/x4-upscaler-ema.safetensors",
"size": "3.53GB" "size": "3.53GB"
}, },
{
"name": "Inswapper-fp16 (face swap)",
"type": "insightface",
"base": "inswapper",
"save_path": "insightface",
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
"reference": "https://github.com/facefusion/facefusion-assets",
"filename": "inswapper_128_fp16.onnx",
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
"size": "277.7MB"
},
{
"name": "Inswapper (face swap)",
"type": "insightface",
"base": "inswapper",
"save_path": "insightface",
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
"reference": "https://github.com/facefusion/facefusion-assets",
"filename": "inswapper_128.onnx",
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
"size": "555.3MB"
},
{ {
"name": "Deepbump", "name": "Deepbump",
"type": "deepbump", "type": "deepbump",
@@ -310,7 +288,7 @@
}, },
{ {
"name": "negative_hand Negative Embedding", "name": "negative_hand Negative Embedding",
"type": "embeddings", "type": "embedding",
"base": "SD1.5", "base": "SD1.5",
"save_path": "embeddings/SD1.5", "save_path": "embeddings/SD1.5",
"description": "If you use this embedding with negatives, you can solve the issue of damaging your hands.", "description": "If you use this embedding with negatives, you can solve the issue of damaging your hands.",
@@ -321,7 +299,7 @@
}, },
{ {
"name": "bad_prompt Negative Embedding", "name": "bad_prompt Negative Embedding",
"type": "embeddings", "type": "embedding",
"base": "SD1.5", "base": "SD1.5",
"save_path": "embeddings/SD1.5", "save_path": "embeddings/SD1.5",
"description": "The idea behind this embedding was to somehow train the negative prompt as an embedding, thus unifying the basis of the negative prompt into one word or embedding.", "description": "The idea behind this embedding was to somehow train the negative prompt as an embedding, thus unifying the basis of the negative prompt into one word or embedding.",
@@ -332,7 +310,7 @@
}, },
{ {
"name": "Deep Negative V1.75", "name": "Deep Negative V1.75",
"type": "embeddings", "type": "embedding",
"base": "SD1.5", "base": "SD1.5",
"save_path": "embeddings/SD1.5", "save_path": "embeddings/SD1.5",
"description": "These embedding learn what disgusting compositions and color patterns are, including faulty human anatomy, offensive color schemes, upside-down spatial structures, and more. Placing it in the negative can go a long way to avoiding these things.", "description": "These embedding learn what disgusting compositions and color patterns are, including faulty human anatomy, offensive color schemes, upside-down spatial structures, and more. Placing it in the negative can go a long way to avoiding these things.",
@@ -343,7 +321,7 @@
}, },
{ {
"name": "EasyNegative", "name": "EasyNegative",
"type": "embeddings", "type": "embedding",
"base": "SD1.5", "base": "SD1.5",
"save_path": "embeddings/SD1.5", "save_path": "embeddings/SD1.5",
"description": "This embedding should be used in your NEGATIVE prompt. Adjust the strength as desired (seems to scale well without any distortions), the strength required may vary based on positive and negative prompts.", "description": "This embedding should be used in your NEGATIVE prompt. Adjust the strength as desired (seems to scale well without any distortions), the strength required may vary based on positive and negative prompts.",
@@ -488,7 +466,7 @@
"name": "stabilityai/Stable Cascade: text_encoder (CLIP)", "name": "stabilityai/Stable Cascade: text_encoder (CLIP)",
"type": "clip", "type": "clip",
"base": "Stable Cascade", "base": "Stable Cascade",
"save_path": "clip/Stable-Cascade", "save_path": "text_encoders/Stable-Cascade",
"description": "Stable Cascade: text_encoder", "description": "Stable Cascade: text_encoder",
"reference": "https://huggingface.co/stabilityai/stable-cascade", "reference": "https://huggingface.co/stabilityai/stable-cascade",
"filename": "model.safetensors", "filename": "model.safetensors",
@@ -937,7 +915,7 @@
"name": "google-t5/t5-base", "name": "google-t5/t5-base",
"type": "clip", "type": "clip",
"base": "t5-base", "base": "t5-base",
"save_path": "clip/t5-base", "save_path": "text_encoders/t5-base",
"description": "T5 Base: Text-To-Text Transfer Transformer. This model can be loaded via CLIPLoader for Stable Audio workflow.", "description": "T5 Base: Text-To-Text Transfer Transformer. This model can be loaded via CLIPLoader for Stable Audio workflow.",
"reference": "https://huggingface.co/google-t5/t5-base", "reference": "https://huggingface.co/google-t5/t5-base",
"filename": "model.safetensors", "filename": "model.safetensors",
@@ -948,7 +926,7 @@
"name": "google-t5/t5-v1_1-xxl_encoderonly-fp16", "name": "google-t5/t5-v1_1-xxl_encoderonly-fp16",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1", "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
"reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly", "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
"filename": "google_t5-v1_1-xxl_encoderonly-fp16.safetensors", "filename": "google_t5-v1_1-xxl_encoderonly-fp16.safetensors",
@@ -959,7 +937,7 @@
"name": "google-t5/t5-v1_1-xxl_encoderonly-fp8_e4m3fn", "name": "google-t5/t5-v1_1-xxl_encoderonly-fp8_e4m3fn",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1", "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
"reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly", "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
"filename": "google_t5-v1_1-xxl_encoderonly-fp8_e4m3fn.safetensors", "filename": "google_t5-v1_1-xxl_encoderonly-fp8_e4m3fn.safetensors",
@@ -972,7 +950,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q3_K_L.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q3_K_L.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q3_K_L quantized)", "description": "t5xxl Text Encoder GGUF model. (Q3_K_L quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q3_K_L.gguf", "filename": "t5-v1_1-xxl-encoder-Q3_K_L.gguf",
@@ -983,7 +961,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q3_K_M.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q3_K_M.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q3_K_M quantized)", "description": "t5xxl Text Encoder GGUF model. (Q3_K_M quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q3_K_M.gguf", "filename": "t5-v1_1-xxl-encoder-Q3_K_M.gguf",
@@ -994,7 +972,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q3_K_S.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q3_K_S.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q3_K_S quantized)", "description": "t5xxl Text Encoder GGUF model. (Q3_K_S quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q3_K_S.gguf", "filename": "t5-v1_1-xxl-encoder-Q3_K_S.gguf",
@@ -1005,7 +983,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q4_K_M.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q4_K_M.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q4_K_M quantized)", "description": "t5xxl Text Encoder GGUF model. (Q4_K_M quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q4_K_M.gguf", "filename": "t5-v1_1-xxl-encoder-Q4_K_M.gguf",
@@ -1016,7 +994,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q4_K_S.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q4_K_S.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q4_K_S quantized)", "description": "t5xxl Text Encoder GGUF model. (Q4_K_S quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q4_K_S.gguf", "filename": "t5-v1_1-xxl-encoder-Q4_K_S.gguf",
@@ -1027,7 +1005,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q5_K_M.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q5_K_M.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q5_K_M quantized)", "description": "t5xxl Text Encoder GGUF model. (Q5_K_M quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q5_K_M.gguf", "filename": "t5-v1_1-xxl-encoder-Q5_K_M.gguf",
@@ -1038,7 +1016,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q5_K_S.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q5_K_S.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q5_K_S quantized)", "description": "t5xxl Text Encoder GGUF model. (Q5_K_S quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q5_K_S.gguf", "filename": "t5-v1_1-xxl-encoder-Q5_K_S.gguf",
@@ -1049,7 +1027,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q6_K.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q6_K.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q6_K quantized)", "description": "t5xxl Text Encoder GGUF model. (Q6_K quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q6_K.gguf", "filename": "t5-v1_1-xxl-encoder-Q6_K.gguf",
@@ -1060,7 +1038,7 @@
"name": "city96/t5-v1_1-xxl-encoder-Q8_0.gguf", "name": "city96/t5-v1_1-xxl-encoder-Q8_0.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (Q8_0 quantized)", "description": "t5xxl Text Encoder GGUF model. (Q8_0 quantized)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-Q8_0.gguf", "filename": "t5-v1_1-xxl-encoder-Q8_0.gguf",
@@ -1071,7 +1049,7 @@
"name": "city96/t5-v1_1-xxl-encoder-f16.gguf", "name": "city96/t5-v1_1-xxl-encoder-f16.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (float 16)", "description": "t5xxl Text Encoder GGUF model. (float 16)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-f16.gguf", "filename": "t5-v1_1-xxl-encoder-f16.gguf",
@@ -1082,7 +1060,7 @@
"name": "city96/t5-v1_1-xxl-encoder-f32.gguf", "name": "city96/t5-v1_1-xxl-encoder-f32.gguf",
"type": "clip", "type": "clip",
"base": "t5", "base": "t5",
"save_path": "clip/t5", "save_path": "text_encoders/t5",
"description": "t5xxl Text Encoder GGUF model. (float 32)", "description": "t5xxl Text Encoder GGUF model. (float 32)",
"reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf", "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
"filename": "t5-v1_1-xxl-encoder-f32.gguf", "filename": "t5-v1_1-xxl-encoder-f32.gguf",
@@ -1721,17 +1699,6 @@
"url": "https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors", "url": "https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors",
"size": "774.5MB" "size": "774.5MB"
}, },
{
"name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
"type": "controlnet",
"base": "SDXL",
"save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
"description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
"reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
"filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
"url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
"size": "46.2MB"
},
{ {
"name": "SDXL-controlnet: OpenPose (v2)", "name": "SDXL-controlnet: OpenPose (v2)",
"type": "controlnet", "type": "controlnet",
@@ -2814,39 +2781,6 @@
{
"name": "pfg-novel-n10.pt",
"type": "PFG",
"base": "SD1.5",
"save_path": "custom_nodes/pfg-ComfyUI/models",
"description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
"reference": "https://huggingface.co/furusu/PFG",
"filename": "pfg-novel-n10.pt",
"url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
"size": "23.6MB"
},
{
"name": "pfg-wd14-n10.pt",
"type": "PFG",
"base": "SD1.5",
"save_path": "custom_nodes/pfg-ComfyUI/models",
"description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
"reference": "https://huggingface.co/furusu/PFG",
"filename": "pfg-wd14-n10.pt",
"url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
"size": "31.5MB"
},
{
"name": "pfg-wd15beta2-n10.pt",
"type": "PFG",
"base": "SD1.5",
"save_path": "custom_nodes/pfg-ComfyUI/models",
"description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
"reference": "https://huggingface.co/furusu/PFG",
"filename": "pfg-wd15beta2-n10.pt",
"url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
"size": "31.5MB"
},
{ {
"name": "GFPGANv1.4.pth", "name": "GFPGANv1.4.pth",
"type": "GFPGAN", "type": "GFPGAN",
@@ -3012,50 +2946,6 @@
"url": "https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors", "url": "https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors",
"size": "2.50GB" "size": "2.50GB"
}, },
{
"name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
"type": "efficient_sam",
"base": "efficient_sam",
"save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
"description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
"reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
"filename": "efficient_sam_s_cpu.jit",
"url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
"size": "106.0MB"
},
{
"name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
"type": "efficient_sam",
"base": "efficient_sam",
"save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
"description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
"reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
"filename": "efficient_sam_s_gpu.jit",
"url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
"size": "106.0MB"
},
{
"name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
"type": "Shape Predictor",
"base": "DLIB",
"save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
"description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
"reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
"filename": "shape_predictor_68_face_landmarks.dat",
"url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
"size": "99.7MB"
},
{
"name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
"type": "Face Recognition",
"base": "DLIB",
"save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
"description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
"reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
"filename": "dlib_face_recognition_resnet_model_v1.dat",
"url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
"size": "22.5MB"
},
{ {
"name": "InstanceDiffusion/fusers", "name": "InstanceDiffusion/fusers",
"type": "InstanceDiffusion", "type": "InstanceDiffusion",
@@ -3430,50 +3320,6 @@
"url": "https://huggingface.co/lllyasviel/ic-light/resolve/main/iclight_sd15_fcon.safetensors", "url": "https://huggingface.co/lllyasviel/ic-light/resolve/main/iclight_sd15_fcon.safetensors",
"size": "1.72GB" "size": "1.72GB"
}, },
{
"name": "ID-Animator/animator.ckpt",
"type": "ID-Animator",
"base": "SD1.5",
"save_path": "custom_nodes/ComfyUI_ID_Animator/models",
"description": "ID-Animator checkpoint",
"reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
"filename": "animator.ckpt",
"url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
"size": "247.3MB"
},
{
"name": "ID-Animator/mm_sd_v15_v2.ckpt",
"type": "ID-Animator",
"base": "SD1.5",
"save_path": "custom_nodes/ComfyUI_ID_Animator/models/animatediff_models",
"description": "AnimateDiff checkpoint for ID-Animator",
"reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
"filename": "mm_sd_v15_v2.ckpt",
"url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
"size": "1.82GB"
},
{
"name": "ID-Animator/image_encoder",
"type": "ID-Animator",
"base": "SD1.5",
"save_path": "custom_nodes/ComfyUI_ID_Animator/models/image_encoder",
"description": "CLIP Image encoder for ID-Animator",
"reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
"filename": "model.safetensors",
"url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
"size": "2.53GB"
},
{
"name": "TencentARC/CustomNet",
"type": "CustomNet",
"base": "CustomNet",
"save_path": "custom_nodes/ComfyUI_CustomNet/pretrain",
"description": "CustomNet pretrained model for ComfyUI_CustomNet",
"reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
"filename": "customnet_v1.pt",
"url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
"size": "5.71GB"
},
{ {
"name": "TTPlanet/TTPLanet_SDXL_Controlnet_Tile_Realistic v2 (fp16)", "name": "TTPlanet/TTPLanet_SDXL_Controlnet_Tile_Realistic v2 (fp16)",
"type": "controlnet", "type": "controlnet",
@@ -3562,17 +3408,6 @@
"url": "https://huggingface.co/ViperYX/RGT/resolve/main/RGT_S/RGT_S_x4.pth", "url": "https://huggingface.co/ViperYX/RGT/resolve/main/RGT_S/RGT_S_x4.pth",
"size": "136.0MB" "size": "136.0MB"
}, },
{
"name": "Doubiiu/ToonCrafter model checkpoint",
"type": "checkpoint",
"base": "ToonCrafter",
"save_path": "custom_nodes/ComfyUI-ToonCrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
"description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
"reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
"filename": "model.ckpt",
"url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
"size": "10.5GB"
},
{ {
"name": "InstantX/FLUX.1-dev Controlnet (Union)", "name": "InstantX/FLUX.1-dev Controlnet (Union)",
@@ -4465,23 +4300,11 @@
"size": "12.7GB" "size": "12.7GB"
}, },
{
"name": "BAAI/SegGPT",
"type": "SegGPT",
"base": "SegGPT",
"save_path": "custom_nodes/comfyui-SegGPT",
"description": "SegGPT",
"reference": "https://huggingface.co/BAAI/SegGPT",
"filename": "seggpt_vit_large.pth",
"url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
"size": "1.48GB"
},
{ {
"name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]", "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
"type": "clip", "type": "clip",
"base": "clip", "base": "clip",
"save_path": "clip/long_clip", "save_path": "text_encoders/long_clip",
"description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)", "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
"reference": "https://huggingface.co/zer0int", "reference": "https://huggingface.co/zer0int",
"filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors", "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -4492,7 +4315,7 @@
"name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]", "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
"type": "clip", "type": "clip",
"base": "clip", "base": "clip",
"save_path": "clip/long_clip", "save_path": "text_encoders/long_clip",
"description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)", "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
"reference": "https://huggingface.co/zer0int", "reference": "https://huggingface.co/zer0int",
"filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors", "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -4793,6 +4616,75 @@
"filename": "ip_adapter.safetensors", "filename": "ip_adapter.safetensors",
"url": "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors", "url": "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors",
"size": "982MB" "size": "982MB"
},
{
"name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
"type": "efficient_sam",
"base": "efficient_sam",
"save_path": "yolo_world",
"description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
"reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
"filename": "efficient_sam_s_cpu.jit",
"url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
"size": "106.0MB"
},
{
"name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
"type": "efficient_sam",
"base": "efficient_sam",
"save_path": "yolo_world",
"description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
"reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
"filename": "efficient_sam_s_gpu.jit",
"url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
"size": "106.0MB"
},
{
"name": "TencentARC/CustomNet V1",
"type": "CustomNet",
"base": "CustomNet",
"save_path": "checkpoints/customnet",
"description": "CustomNet pretrained model for ComfyUI_CustomNet",
"reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
"filename": "customnet_v1.pt",
"url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
"size": "5.71GB"
},
{
"name": "TencentARC/CustomNet Inpaint V1",
"type": "CustomNet",
"base": "CustomNet",
"save_path": "checkpoints/customnet",
"description": "CustomNet Inpaint pretrained model for ComfyUI_CustomNet",
"reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
"filename": "customnet_inpaint_v1.pt",
"url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_inpaint_v1.pt",
"size": "5.71GB"
},
{
"name": "deepseek-ai/Janus-Pro-1B",
"type": "Janus-Pro",
"base": "Janus-Pro",
"save_path": "Janus-Pro",
"description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
"filename": "<huggingface>",
"url": "deepseek-ai/Janus-Pro-1B",
"size": "7.8GB"
},
{
"name": "deepseek-ai/Janus-Pro-7B",
"type": "Janus-Pro",
"base": "Janus-Pro",
"save_path": "Janus-Pro",
"description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
"filename": "<huggingface>",
"url": "deepseek-ai/Janus-Pro-7B",
"size": "14.85GB"
} }
] ]
} }

View File

@@ -11,6 +11,339 @@
{
"author": "D1-3105",
"title": "ComfyUI-VideoStream",
"reference": "https://github.com/D1-3105/ComfyUI-VideoStream",
"files": [
"https://github.com/D1-3105/ComfyUI-VideoStream"
],
"install_type": "git-clone",
"description": "NODES: FloWWeaverExportSingleFrameGRPC"
},
{
"author": "gmorks",
"title": "ComfyUI Animagine prompt [WIP]",
"reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
"files": [
"https://github.com/gmorks/ComfyUI-Animagine-Prompt"
],
"install_type": "git-clone",
"description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model\nNOTE: The files in the repo are not organized."
},
{
"author": "wirytiox",
"title": "ComfyUI-Qwen [CONFLICT]",
"reference": "https://github.com/mr-krak3n/ComfyUI-Qwen",
"files": [
"https://github.com/mr-krak3n/ComfyUI-Qwen"
],
"install_type": "git-clone",
"description": "This repository contains custom nodes for ComfyUI, designed to facilitate working with language models such as Qwen2.5 and DeepSeek. [w/This node pack is causing a name conflict with https://github.com/ZHO-ZHO-ZHO/ComfyUI-Qwen]"
},
{
"author": "hiusdev",
"title": "ComfyUI_Lah_Toffee",
"reference": "https://github.com/hiusdev/ComfyUI_Lah_Toffee",
"files": [
"https://github.com/hiusdev/ComfyUI_Lah_Toffee"
],
"install_type": "git-clone",
"description": "NODES: Lah LoadVideoRandom"
},
{
"author": "hdfhssg",
"title": "ComfyUI_pxtool [WIP]",
"reference": "https://github.com/hdfhssg/ComfyUI_pxtool",
"files": [
"https://github.com/hdfhssg/ComfyUI_pxtool"
],
"install_type": "git-clone",
"description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
},
{
"author": "dasilva333",
"title": "ComfyUI_MarkdownImage [WIP]",
"reference": "https://github.com/dasilva333/ComfyUI_MarkdownImage",
"files": [
"https://github.com/dasilva333/ComfyUI_MarkdownImage"
],
"install_type": "git-clone",
"description": "Create an image using html and markdown in ComfyUI\nNOTE: The files in the repo are not organized."
},
{
"author": "franky519",
"title": "comfyui-redux-style",
"reference": "https://github.com/franky519/comfyui-redux-style",
"files": [
"https://github.com/franky519/comfyui-redux-style"
],
"install_type": "git-clone",
"description": "NODES: Style Model Grid, Style Model Apply, Style Model Advanced"
},
{
"author": "rishipandey125",
"title": "ComfyUI-FramePacking [WIP]",
"reference": "https://github.com/rishipandey125/ComfyUI-FramePacking",
"files": [
"https://github.com/rishipandey125/ComfyUI-FramePacking"
],
"install_type": "git-clone",
"description": "NODES: Add Grid Boundaries, Pack Frames, Unpack Frames, Resize Frame"
},
{
"author": "Northerner1",
"title": "ComfyUI_North_Noise [WIP]",
"reference": "https://github.com/Northerner1/ComfyUI_North_Noise",
"files": [
"https://github.com/Northerner1/ComfyUI_North_Noise"
],
"install_type": "git-clone",
"description": "NODES: Unsampler"
},
{
"author": "kimara-ai",
"title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
"reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
"files": [
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
],
"install_type": "git-clone",
"description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
},
{
"author": "tc8M4lF3s88",
"title": "comfy-tif-support",
"reference": "https://github.com/M4lF3s/comfy-tif-support",
"files": [
"https://github.com/M4lF3s/comfy-tif-support"
],
"install_type": "git-clone",
"description": "NODES: Load TIFF"
},
{
"author": "greengerong",
"title": "ComfyUI-Lumina-Video [WIP]",
"reference": "https://github.com/greengerong/ComfyUI-Lumina-Video",
"files": [
"https://github.com/greengerong/ComfyUI-Lumina-Video"
],
"install_type": "git-clone",
"description": "This is a video generation plugin implementation for ComfyUI based on the Lumina Video model."
},
{
"author": "tc888",
"title": "ComfyUI_Save_Flux_Image",
"reference": "https://github.com/tc888/ComfyUI_Save_Flux_Image",
"files": [
"https://github.com/tc888/ComfyUI_Save_Flux_Image"
],
"install_type": "git-clone",
"description": "Customized version of comfyui-image-save tailored for saving Flux images"
},
{
"author": "var1ableX",
"title": "ComfyUI_Accessories",
"reference": "https://github.com/var1ableX/ComfyUI_Accessories",
"files": [
"https://github.com/var1ableX/ComfyUI_Accessories"
],
"install_type": "git-clone",
"description": "NODES: Get Mask Dimensions, Get Random Dimensions, Is Mask Empty/Image, Any Cast, Make List From Text"
},
{
"author": "xinyiSS",
"title": "CombineMasksNode",
"reference": "https://github.com/xinyiSS/CombineMasksNode",
"files": [
"https://github.com/xinyiSS/CombineMasksNode"
],
"install_type": "git-clone",
"description": "NODES: Combine Masks Node"
},
{
"author": "osuiso-depot",
"title": "comfyui-keshigom_custom",
"reference": "https://github.com/osuiso-depot/comfyui-keshigom_custom",
"files": [
"https://github.com/osuiso-depot/comfyui-keshigom_custom"
],
"install_type": "git-clone",
"description": "NODES: RegexpChopper, FLIP-W/H Selector, FLIP-W/H SelectorConst, TextFind, ckpt_Loader_Simple, True-or-False, myStringNode"
},
{
"author": "LucipherDev",
"title": "ComfyUI-Sentinel [WIP]",
"reference": "https://github.com/LucipherDev/ComfyUI-Sentinel",
"files": [
"https://github.com/LucipherDev/ComfyUI-Sentinel"
],
"install_type": "git-clone",
"description": "ComfyUI Extension for Advanced Security. Implements login, multi-user registration, IP filtering, and user-specific input/output directories.[w/WARN:While ComfyUI Sentinel enhances security for ComfyUI, it does not guarantee absolute protection. Security is about risk mitigation, not elimination. Users are responsible for implementing their own security measures.]"
},
{
"author": "threadedblue",
"title": "MLXnodes [WIP]",
"reference": "https://github.com/threadedblue/MLXnodes",
"files": [
"https://github.com/threadedblue/MLXnodes"
],
"install_type": "git-clone",
"description": "A port of MLX Examples to ComfyUI custom_nodes. These are intended to run on a macOS M1.\nNOTE: The files in the repo are not organized."
},
{
"author": "jschoormans",
"title": "Comfy-InterestingPixels [WIP]",
"reference": "https://github.com/jschoormans/Comfy-InterestingPixels",
"files": [
"https://github.com/jschoormans/Comfy-InterestingPixels"
],
"install_type": "git-clone",
"description": "NODES: Shareable Image Slider, Random Palette\nNOTE: The files in the repo are not organized."
},
{
"author": "jschoormans",
"title": "ComfyUI-TexturePacker [WIP]",
"reference": "https://github.com/kijai/ComfyUI-TexturePacker",
"files": [
"https://github.com/jschoormans/Comfy-InterestingPixels"
],
"install_type": "git-clone",
"description": "ComfyUI node to use PyTexturePacker\nNOTE: The files in the repo are not organized."
},
{
"author": "lum3on",
"title": "comfyui_LLM_Polymath [WIP]",
"reference": "https://github.com/lum3on/comfyui_LLM_Polymath",
"files": [
"https://github.com/lum3on/comfyui_LLM_Polymath"
],
"install_type": "git-clone",
"description": "An advanced chat node, that integrates large language models to automate data processes and enhance prompt responses through real-time web search and image handling. It supports both OpenAI's GPT-like models and a local Ollama API. Custom node finder and smart assistant tools provide tailored workflow recommendations for efficient integration. Additionally, the node dynamically augments prompts and offers flexible output compression options.\nNOTE: The files in the repo are not organized."
},
{
"author": "MickeyJ",
"title": "ComfyUI_mickster_nodes [WIP]",
"reference": "https://github.com/MickeyJ/ComfyUI_mickster_nodes",
"files": [
"https://github.com/MickeyJ/ComfyUI_mickster_nodes"
],
"install_type": "git-clone",
"description": "A collection of custom nodes for ComfyUI, focusing on image handling and LoRA training."
},
{
"author": "thedivergentai",
"title": "Divergent Nodes [WIP]",
"reference": "https://github.com/thedivergentai/divergent_nodes",
"files": [
"https://github.com/thedivergentai/divergent_nodes"
],
"install_type": "git-clone",
"description": "A ComfyUI custom node for counting CLIP tokens in text input."
},
{
"author": "gold24park",
"title": "loki-comfyui-node",
"reference": "https://github.com/gold24park/loki-comfyui-node",
"files": [
"https://github.com/gold24park/loki-comfyui-node"
],
"install_type": "git-clone",
"description": "NODES: Get Image Luminance, Get Dominant Color, Overlay Text"
},
{
"author": "hayden-fr",
"title": "ComfyUI-Image-Browsing [USAFE]",
"id": "image-browsing",
"reference": "https://github.com/hayden-fr/ComfyUI-Image-Browsing",
"files": [
"https://github.com/hayden-fr/ComfyUI-Image-Browsing"
],
"install_type": "git-clone",
"description": "Image Browsing: browsing, download and delete."
},
{
"author": "molbal",
"title": "comfy-url-fetcher [WIP]",
"reference": "https://github.com/molbal/comfy-url-fetcher",
"files": [
"https://github.com/molbal/comfy-url-fetcher"
],
"install_type": "git-clone",
"description": "Fetches URLs"
},
{
"author": "myAiLemon",
"title": "MagicAutomaticPicture [WIP]",
"reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
"files": [
"https://github.com/myAiLemon/MagicAutomaticPicture"
],
"install_type": "git-clone",
"description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
},
{
"author": "neverbiasu",
"title": "ComfyUI_Output_as_Input",
"reference": "https://github.com/a-und-b/ComfyUI_Output_as_Input",
"files": [
"https://github.com/a-und-b/ComfyUI_Output_as_Input"
],
"install_type": "git-clone",
"description": "This is a simple custom ComfyUI node that allows you to easily use recent output images as input in your workflows. It does not allow image uploads on purpose and does not require any additional dependencies.\nNOTE: The files in the repo are not organized."
},
{
"author": "neverbiasu",
"title": "ComfyUI-DeepSeek",
"reference": "https://github.com/neverbiasu/ComfyUI-DeepSeek",
"files": [
"https://github.com/neverbiasu/ComfyUI-DeepSeek"
],
"install_type": "git-clone",
"description": "NODES: DeepSeek Caller"
},
{
"author": "Krish-701",
"title": "RK_Comfyui",
"reference": "https://github.com/Krish-701/RK_Comfyui",
"files": [
"https://github.com/Krish-701/RK_Comfyui"
],
"install_type": "git-clone",
"description": "NODES: RK Excel File State Looper, RK Accumulate Text, RK Advanced Script Finder, RK CSV File State Looper, RK Read Excel Row, RK Sequential Image Viewer, RK Concatenate Text, RK Write Text, RK Save Image, RK Seed Loop"
},
{
"author": "mikebilly",
"title": "transparent-background-comfyui",
"reference": "https://github.com/mikebilly/Transparent-background-comfyUI",
"files": [
"https://github.com/mikebilly/Transparent-background-comfyUI"
],
"install_type": "git-clone",
"description": "NODES: Transparentbackground RemBg"
},
{
"author": "UD1sto",
"title": "plugin-utils-nodes",
"reference": "https://github.com/UD1sto/plugin-utils-nodes",
"files": [
"https://github.com/UD1sto/plugin-utils-nodes"
],
"install_type": "git-clone",
"description": "NODES: Compare Images (SimHash), Image Selector, Temporal Consistency, Update Image Reference, Frame Blend."
},
{
"author": "Kayarte",
"title": "Time Series Nodes for ComfyUI [Experimental]",
"reference": "https://github.com/Kayarte/Time-Series-Nodes-for-ComfyUI",
"files": [
"https://github.com/Kayarte/Time-Series-Nodes-for-ComfyUI"
],
"install_type": "git-clone",
"description": "Basic nodes for time series analysis in ComfyUI. Currently in early development."
},
{ {
"author": "HuangYuChuh", "author": "HuangYuChuh",
"title": "ComfyUI-DeepSeek_Toolkit [WIP]", "title": "ComfyUI-DeepSeek_Toolkit [WIP]",
@@ -89,7 +422,7 @@
"https://github.com/7BEII/Comfyui_PDuse" "https://github.com/7BEII/Comfyui_PDuse"
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "NODES:PD_groupfontsize unnify, PD_grownumber-JSON, PD_add or delete words, PD_Image Crop Location, PD_Image centerCrop, PD_GetImageSize\nNOTE: The files in the repo are not organized." "description": "NODES: PD_json_group_fontsize, PD_Incremental_JSON, PD_removeword, PD_Image Crop Location, PD_ImageConcanate, PD_FileName_refixer\nNOTE: The files in the repo are not organized."
}, },
{ {
"author": "RLW-Chars", "author": "RLW-Chars",
@@ -149,7 +482,7 @@
"https://github.com/yanhuifair/comfyui-deepseek" "https://github.com/yanhuifair/comfyui-deepseek"
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "Implement deepseek API call [a/https://api-docs.deepseek.com/](Implement deepseek API call https://api-docs.deepseek.com/)\nNOTE: The files in the repo are not organized." "description": "nodes for deepseek api\nNOTE: The files in the repo are not organized."
}, },
{ {
"author": "807502278", "author": "807502278",
@@ -171,16 +504,6 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "NODES: Face Crop, [w/A pack of custom nodes used in my projects. Not intended to be used by other persons as the usage is not documented. But if something interests you in this repository, go for it !]" "description": "NODES: Face Crop, [w/A pack of custom nodes used in my projects. Not intended to be used by other persons as the usage is not documented. But if something interests you in this repository, go for it !]"
}, },
{
"author": "zmwv823",
"title": "ComfyUI-VideoDiffusion",
"reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
"files": [
"https://github.com/zmwv823/ComfyUI-VideoDiffusion"
],
"install_type": "git-clone",
"description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
},
{ {
"author": "KihongK", "author": "KihongK",
"title": "ComfyUI-RoysNodes [WIP]", "title": "ComfyUI-RoysNodes [WIP]",
@@ -291,16 +614,6 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "Tools for creating voxel based videos" "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", "author": "PATATAJEC",
"title": "Patatajec-Nodes [WIP]", "title": "Patatajec-Nodes [WIP]",
@@ -529,7 +842,7 @@
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit" "https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit"
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "for now: just custom node(s) to fetch tags from a given danbooru (soon e621 too) post link\ncurrently only supports danbooru-style urls + api response formats\nthis repo is a rewrite of: [a/https://github.com/yffyhk/comfyui_auto_danbooru](https://github.com/yffyhk/comfyui_auto_danbooru)" "description": "WIP. Nodes: Fetch e621/danbooru image and/or tags etc from a given URL; Get the Wiki entry for a tag through a button press."
}, },
{ {
"author": "Grey3016", "author": "Grey3016",
@@ -791,7 +1104,7 @@
"https://github.com/jonnydolake/ComfyUI-AIR-Nodes" "https://github.com/jonnydolake/ComfyUI-AIR-Nodes"
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "NODES: String List To Prompt Schedule, Force Minimum Batch Size, Target Location (Crop), Target Location (Paste)" "description": "NODES: String List To Prompt Schedule, Force Minimum Batch Size, Target Location (Crop), Target Location (Paste), Image Composite Chained, Match Image Count To Mask Count, Random Character Prompts, Parallax Test, Easy Parallax, Parallax GPU Test"
}, },
{ {
"author": "watarika", "author": "watarika",
@@ -1328,16 +1641,6 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "NODES:Mask Size Calculator (MagicAI), Universal Mask Converter (MagicAI), Python Execution (MagicAI), Extract JSON From Text Node(MagicAI)\n[w/This extension allows the execution of arbitrary Python code from a workflow.]" "description": "NODES:Mask Size Calculator (MagicAI), Universal Mask Converter (MagicAI), Python Execution (MagicAI), Extract JSON From Text Node(MagicAI)\n[w/This extension allows the execution of arbitrary Python code from a workflow.]"
}, },
{
"author": "T8star1984",
"title": "comfyui-purgevram",
"reference": "https://github.com/T8star1984/comfyui-purgevram",
"files": [
"https://github.com/T8star1984/comfyui-purgevram"
],
"install_type": "git-clone",
"description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
},
{ {
"author": "Laser-one", "author": "Laser-one",
"title": "ComfyUI-align-pose", "title": "ComfyUI-align-pose",
@@ -1546,7 +1849,7 @@
"https://github.com/rouxianmantou/comfyui-rxmt-nodes" "https://github.com/rouxianmantou/comfyui-rxmt-nodes"
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "NODES:Check Value Type" "description": "NODES:Check Value Type, Why Prompt Text"
}, },
{ {
"author": "SirVeggie", "author": "SirVeggie",
@@ -1930,16 +2233,6 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "ComfyUI-OpenAINode is a user-friendly node that serves as an interface to the OpenAI Models.[w/Repo name conflict with Electrofried/ComfyUI-OpenAINode]" "description": "ComfyUI-OpenAINode is a user-friendly node that serves as an interface to the OpenAI Models.[w/Repo name conflict with Electrofried/ComfyUI-OpenAINode]"
}, },
{
"author": "hgabha",
"title": "WWAA-CustomNodes",
"reference": "https://github.com/hgabha/WWAA-CustomNodes",
"files": [
"https://github.com/hgabha/WWAA-CustomNodes"
],
"install_type": "git-clone",
"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",
"title": "ComfyUI-igTools", "title": "ComfyUI-igTools",

View File

@@ -164,13 +164,12 @@
], ],
"https://github.com/7BEII/Comfyui_PDuse": [ "https://github.com/7BEII/Comfyui_PDuse": [
[ [
"BatchChangeNodeColor",
"BatchJsonIncremental", "BatchJsonIncremental",
"PD_GetImageSize", "FileName_refixer",
"PD_ImageConcanate",
"PD_Image_Crop_Location", "PD_Image_Crop_Location",
"PD_Image_centerCrop",
"PD_RemoveColorWords", "PD_RemoveColorWords",
"PD_node" "json_group_fontsize"
], ],
{ {
"title_aux": "comfyui-promptbymood [WIP]" "title_aux": "comfyui-promptbymood [WIP]"
@@ -179,8 +178,19 @@
"https://github.com/807502278/ComfyUI_TensorRT_Merge": [ "https://github.com/807502278/ComfyUI_TensorRT_Merge": [
[ [
"BiRefNet2_tensort", "BiRefNet2_tensort",
"building_tensorrt_engine", "BiRefNet_TRT",
"load_BiRefNet2_General" "Building_TRT",
"Custom_Building_TRT",
"DepthAnything_Tensorrt",
"Dwpose_Tensorrt",
"FaceRestoreTensorrt",
"RifeTensorrt",
"UpscalerTensorrt",
"YoloNasPoseTensorrt",
"load_BiRefNet2_tensort",
"load_BiRefNet_TRT",
"load_DepthAnything_Tensorrt",
"load_Dwpos_Tensorrt"
], ],
{ {
"title_aux": "ComfyUI_TensorRT_Merge [WIP]" "title_aux": "ComfyUI_TensorRT_Merge [WIP]"
@@ -620,6 +630,7 @@
"DevToolsErrorRaiseNodeWithMessage", "DevToolsErrorRaiseNodeWithMessage",
"DevToolsExperimentalNode", "DevToolsExperimentalNode",
"DevToolsLongComboDropdown", "DevToolsLongComboDropdown",
"DevToolsNodeWithBooleanInput",
"DevToolsNodeWithForceInput", "DevToolsNodeWithForceInput",
"DevToolsNodeWithOnlyOptionalInput", "DevToolsNodeWithOnlyOptionalInput",
"DevToolsNodeWithOptionalInput", "DevToolsNodeWithOptionalInput",
@@ -628,6 +639,11 @@
"DevToolsNodeWithStringInput", "DevToolsNodeWithStringInput",
"DevToolsNodeWithUnionInput", "DevToolsNodeWithUnionInput",
"DevToolsObjectPatchNode", "DevToolsObjectPatchNode",
"DevToolsRemoteWidgetNode",
"DevToolsRemoteWidgetNodeWithControlAfterRefresh",
"DevToolsRemoteWidgetNodeWithParams",
"DevToolsRemoteWidgetNodeWithRefresh",
"DevToolsRemoteWidgetNodeWithRefreshButton",
"DevToolsSimpleSlider" "DevToolsSimpleSlider"
], ],
{ {
@@ -642,6 +658,14 @@
"title_aux": "ComfyUI OpenAI Nodes" "title_aux": "ComfyUI OpenAI Nodes"
} }
], ],
"https://github.com/D1-3105/ComfyUI-VideoStream": [
[
"FloWWeaverExportSingleFrameGRPC"
],
{
"title_aux": "ComfyUI-VideoStream"
}
],
"https://github.com/DataCTE/ComfyUI-DataVoid-nodes": [ "https://github.com/DataCTE/ComfyUI-DataVoid-nodes": [
[ [
"IPAAdapterFaceIDBatch", "IPAAdapterFaceIDBatch",
@@ -923,7 +947,12 @@
[ [
"DeepSeekImageGeneration", "DeepSeekImageGeneration",
"DeepSeekImageUnderstanding", "DeepSeekImageUnderstanding",
"DeepSeekModelLoader" "DeepSeekModelLoader",
"GoogleDriveUpload",
"ImagePreprocessor",
"LLM_Loader",
"OpenAICompatibleLoader",
"VideoFileUploader"
], ],
{ {
"title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]" "title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]"
@@ -931,7 +960,9 @@
], ],
"https://github.com/IfnotFr/ComfyUI-Ifnot-Pack": [ "https://github.com/IfnotFr/ComfyUI-Ifnot-Pack": [
[ [
"Face Crop" "Face Crop",
"Face Crop Mouth",
"Get Beard Mask"
], ],
{ {
"title_aux": "ComfyUI-Ifnot-Pack" "title_aux": "ComfyUI-Ifnot-Pack"
@@ -980,6 +1011,7 @@
"CombineVideos", "CombineVideos",
"ImAppendFreeChatAction", "ImAppendFreeChatAction",
"ImAppendImageActionNode", "ImAppendImageActionNode",
"ImAppendNodeHub",
"ImAppendQuickbackNode", "ImAppendQuickbackNode",
"ImAppendQuickbackVideoNode", "ImAppendQuickbackVideoNode",
"ImAppendVideoNode", "ImAppendVideoNode",
@@ -989,6 +1021,7 @@
"ImNodeTitleOverride", "ImNodeTitleOverride",
"ImSetActionKeywordMapping", "ImSetActionKeywordMapping",
"MergeNode", "MergeNode",
"MuteNode",
"NewNode", "NewNode",
"Node2String", "Node2String",
"OllamaChat", "OllamaChat",
@@ -1001,6 +1034,7 @@
"TurnOnOffNodeOnEnter", "TurnOnOffNodeOnEnter",
"batchNodes", "batchNodes",
"grepNodeByText", "grepNodeByText",
"imageList",
"mergeEntityAndPointer", "mergeEntityAndPointer",
"redirectToNode" "redirectToNode"
], ],
@@ -1047,6 +1081,16 @@
"title_aux": "ComfyUI-PNG2SVG2PNG" "title_aux": "ComfyUI-PNG2SVG2PNG"
} }
], ],
"https://github.com/Kayarte/Time-Series-Nodes-for-ComfyUI": [
[
"DomainTimeSeriesPrep",
"TimeSeriesLoader",
"TimeSeriesPredictor"
],
{
"title_aux": "Time Series Nodes for ComfyUI [Experimental]"
}
],
"https://github.com/KihongK/comfyui-roysnodes": [ "https://github.com/KihongK/comfyui-roysnodes": [
[ [
"CLIPMultiTextEncode", "CLIPMultiTextEncode",
@@ -1081,6 +1125,27 @@
"title_aux": "ComfyUI Production Nodes Pack [WIP]" "title_aux": "ComfyUI Production Nodes Pack [WIP]"
} }
], ],
"https://github.com/Krish-701/RK_Comfyui": [
[
"RK_Accumulate_Text_Multiline",
"RK_Accumulate_Text_Multiline_Numbered",
"RK_Advanced_Script_Finder",
"RK_CSV_File_State_Looper_v01",
"RK_CSV_File_State_Looper_v02",
"RK_Calc",
"RK_Concatenate_Text",
"RK_Excel_File_State_Looper",
"RK_ImageViewer",
"RK_Read_Excel_Row",
"RK_Write_Text",
"RK_seed",
"rk_save_image",
"rk_save_image_v01"
],
{
"title_aux": "RK_Comfyui"
}
],
"https://github.com/LZpenguin/ComfyUI-Text": [ "https://github.com/LZpenguin/ComfyUI-Text": [
[ [
"Add_text_by_mask" "Add_text_by_mask"
@@ -1205,6 +1270,15 @@
"title_aux": "ComfyUI Nodes for Inference.Core" "title_aux": "ComfyUI Nodes for Inference.Core"
} }
], ],
"https://github.com/M4lF3s/comfy-tif-support": [
[
"Load TIFF",
"Save TIFF"
],
{
"title_aux": "comfy-tif-support"
}
],
"https://github.com/Matrix-King-Studio/ComfyUI-MoviePy": [ "https://github.com/Matrix-King-Studio/ComfyUI-MoviePy": [
[ [
"AudioDurationNode", "AudioDurationNode",
@@ -1227,6 +1301,15 @@
"title_aux": "ComfyUI-MS_Tools [WIP]" "title_aux": "ComfyUI-MS_Tools [WIP]"
} }
], ],
"https://github.com/MickeyJ/ComfyUI_mickster_nodes": [
[
"Image Size Scaled",
"ImageSwitchSelect"
],
{
"title_aux": "ComfyUI_mickster_nodes [WIP]"
}
],
"https://github.com/MrAdamBlack/CheckProgress": [ "https://github.com/MrAdamBlack/CheckProgress": [
[ [
"CHECK_PROGRESS" "CHECK_PROGRESS"
@@ -1243,12 +1326,12 @@
"title_aux": "ComfyUI-APG_ImYourCFGNow" "title_aux": "ComfyUI-APG_ImYourCFGNow"
} }
], ],
"https://github.com/Njbx/ComfyUI-blockswap": [ "https://github.com/Northerner1/ComfyUI_North_Noise": [
[ [
"BlockSwap" "North_Unsampler"
], ],
{ {
"title_aux": "ComfyUI-blockswap" "title_aux": "ComfyUI_North_Noise [WIP]"
} }
], ],
"https://github.com/PATATAJEC/Patatajec-Nodes": [ "https://github.com/PATATAJEC/Patatajec-Nodes": [
@@ -1353,7 +1436,9 @@
"https://github.com/RobeSantoro/ComfyUI-RobeNodes": [ "https://github.com/RobeSantoro/ComfyUI-RobeNodes": [
[ [
"List Image Path \ud83d\udc24", "List Image Path \ud83d\udc24",
"List Video Path \ud83d\udc24" "List Model Path \ud83d\udc24",
"List Video Path \ud83d\udc24",
"Peaks Weights Generator \ud83d\udc24"
], ],
{ {
"title_aux": "Comfy UI Robe Nodes [UNSAFE]" "title_aux": "Comfy UI Robe Nodes [UNSAFE]"
@@ -1405,6 +1490,7 @@
], ],
"https://github.com/SeedV/ComfyUI-SeedV-Nodes": [ "https://github.com/SeedV/ComfyUI-SeedV-Nodes": [
[ [
"ALL_Model_UnLoader(SEEDV)",
"AdvancedScript", "AdvancedScript",
"CheckpointLoaderSimpleShared //SeedV", "CheckpointLoaderSimpleShared //SeedV",
"ControlNetLoaderAdvancedShared", "ControlNetLoaderAdvancedShared",
@@ -1434,6 +1520,7 @@
"https://github.com/Shinsplat/ComfyUI-Shinsplat": [ "https://github.com/Shinsplat/ComfyUI-Shinsplat": [
[ [
"Clip Text Encode (Shinsplat)", "Clip Text Encode (Shinsplat)",
"Clip Text Encode ALT (Shinsplat)",
"Clip Text Encode SD3 (Shinsplat)", "Clip Text Encode SD3 (Shinsplat)",
"Clip Text Encode SDXL (Shinsplat)", "Clip Text Encode SDXL (Shinsplat)",
"Clip Text Encode T5 (Shinsplat)", "Clip Text Encode T5 (Shinsplat)",
@@ -1451,6 +1538,7 @@
"Test Node (Shinsplat)", "Test Node (Shinsplat)",
"Text To Tokens (Shinsplat)", "Text To Tokens (Shinsplat)",
"Text To Tokens SD3 (Shinsplat)", "Text To Tokens SD3 (Shinsplat)",
"Upscale WEBP (Shinsplat)",
"Variables (Shinsplat)" "Variables (Shinsplat)"
], ],
{ {
@@ -1466,7 +1554,8 @@
"FreeMemoryCLIP", "FreeMemoryCLIP",
"FreeMemoryImage", "FreeMemoryImage",
"FreeMemoryLatent", "FreeMemoryLatent",
"FreeMemoryModel" "FreeMemoryModel",
"FreeMemoryString"
], ],
{ {
"title_aux": "ComfyUI-FreeMemory" "title_aux": "ComfyUI-FreeMemory"
@@ -1567,14 +1656,6 @@
"title_aux": "Comfyui_leffa" "title_aux": "Comfyui_leffa"
} }
], ],
"https://github.com/T8star1984/comfyui-purgevram": [
[
"PurgeVRAM"
],
{
"title_aux": "comfyui-purgevram"
}
],
"https://github.com/TSFSean/ComfyUI-TSFNodes": [ "https://github.com/TSFSean/ComfyUI-TSFNodes": [
[ [
"GyroOSC" "GyroOSC"
@@ -1591,6 +1672,29 @@
"title_aux": "ComfyUI Instructor Ollama" "title_aux": "ComfyUI Instructor Ollama"
} }
], ],
"https://github.com/UD1sto/plugin-utils-nodes": [
[
"FrameBlend",
"ImageReferenceUpdate",
"ImageSelector",
"KeypointComparator",
"KeypointComparatorNode",
"KeypointsInput",
"KeypointsInputNode",
"KeypointsToPose",
"KeypointsToPoseNode",
"PoseDatabase",
"PoseDatabaseVisualizer",
"PoseDifference",
"PoseEstimator",
"PoseEstimatorNode",
"SimHashCompare",
"TemporalConsistency"
],
{
"title_aux": "plugin-utils-nodes"
}
],
"https://github.com/Video3DGenResearch/comfyui-batch-input-node": [ "https://github.com/Video3DGenResearch/comfyui-batch-input-node": [
[ [
"BatchImageAndPrompt", "BatchImageAndPrompt",
@@ -1715,6 +1819,14 @@
"title_aux": "ComfyUI-Blenderesque-Nodes [WIP]" "title_aux": "ComfyUI-Blenderesque-Nodes [WIP]"
} }
], ],
"https://github.com/a-und-b/ComfyUI_Output_as_Input": [
[
"OutputAsInput"
],
{
"title_aux": "ComfyUI_Output_as_Input"
}
],
"https://github.com/aiden1020/ComfyUI_Artcoder": [ "https://github.com/aiden1020/ComfyUI_Artcoder": [
[ [
"ArtCoder" "ArtCoder"
@@ -2362,9 +2474,12 @@
"Mahiro", "Mahiro",
"MaskComposite", "MaskComposite",
"MaskToImage", "MaskToImage",
"ModelComputeDtype",
"ModelMergeAdd", "ModelMergeAdd",
"ModelMergeAuraflow", "ModelMergeAuraflow",
"ModelMergeBlocks", "ModelMergeBlocks",
"ModelMergeCosmos14B",
"ModelMergeCosmos7B",
"ModelMergeFlux1", "ModelMergeFlux1",
"ModelMergeLTXV", "ModelMergeLTXV",
"ModelMergeMochiPreview", "ModelMergeMochiPreview",
@@ -2394,6 +2509,7 @@
"PolyexponentialScheduler", "PolyexponentialScheduler",
"PorterDuffImageComposite", "PorterDuffImageComposite",
"Preview3D", "Preview3D",
"Preview3DAnimation",
"PreviewAudio", "PreviewAudio",
"PreviewImage", "PreviewImage",
"RandomNoise", "RandomNoise",
@@ -2566,6 +2682,15 @@
"title_aux": "VoidCustomNodes" "title_aux": "VoidCustomNodes"
} }
], ],
"https://github.com/dasilva333/ComfyUI_MarkdownImage": [
[
"CreateDialogImage",
"CreateMarkdownImage"
],
{
"title_aux": "ComfyUI_MarkdownImage [WIP]"
}
],
"https://github.com/denislov/Comfyui_AutoSurvey": [ "https://github.com/denislov/Comfyui_AutoSurvey": [
[ [
"AddDoc2Knowledge", "AddDoc2Knowledge",
@@ -2803,6 +2928,17 @@
"title_aux": "comfyui-cem-tools" "title_aux": "comfyui-cem-tools"
} }
], ],
"https://github.com/franky519/comfyui-redux-style": [
[
"StyleModelAdvanced",
"StyleModelApplySimple",
"StyleModelConditioner",
"StyleModelGridVisualizer"
],
{
"title_aux": "comfyui-redux-style"
}
],
"https://github.com/fritzprix/ComfyUI-LLM-Utils": [ "https://github.com/fritzprix/ComfyUI-LLM-Utils": [
[ [
"WeightedDict", "WeightedDict",
@@ -2848,6 +2984,14 @@
"title_aux": "comfyui_median_filter" "title_aux": "comfyui_median_filter"
} }
], ],
"https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
[
"AnimaginePrompt"
],
{
"title_aux": "ComfyUI Animagine prompt [WIP]"
}
],
"https://github.com/go-package-lab/ComfyUI-Tools-Video-Combine": [ "https://github.com/go-package-lab/ComfyUI-Tools-Video-Combine": [
[ [
"Tools:CopyFile", "Tools:CopyFile",
@@ -2862,6 +3006,28 @@
"title_aux": "ComfyUI-Tools-Video-Combine [WIP]" "title_aux": "ComfyUI-Tools-Video-Combine [WIP]"
} }
], ],
"https://github.com/gold24park/loki-comfyui-node": [
[
"Base64ToImage",
"DominantColor",
"ImageLuminance",
"ImageToBase64",
"OverlayText"
],
{
"title_aux": "loki-comfyui-node"
}
],
"https://github.com/greengerong/ComfyUI-Lumina-Video": [
[
"LuminaVideoModelLoader",
"LuminaVideoSampler",
"LuminaVideoVAEDecode"
],
{
"title_aux": "ComfyUI-Lumina-Video [WIP]"
}
],
"https://github.com/grimli333/ComfyUI_Grim": [ "https://github.com/grimli333/ComfyUI_Grim": [
[ [
"GenerateFileName", "GenerateFileName",
@@ -2944,15 +3110,28 @@
"title_aux": "ComfyUI AceNodes [UNSAFE]" "title_aux": "ComfyUI AceNodes [UNSAFE]"
} }
], ],
"https://github.com/hgabha/WWAA-CustomNodes": [ "https://github.com/hdfhssg/ComfyUI_pxtool": [
[ [
"WWAA-BuildString", "CivitaiHelper",
"WWAA-LineCount", "DanbooruCharacterTag",
"WWAA_DitherNode", "E621CharacterTag",
"WWAA_ImageLoader" "NegativeTag",
"PX_Seed",
"QualityTag",
"RandomArtists",
"RandomArtistsAdvanced",
"RandomTag"
], ],
{ {
"title_aux": "WWAA-CustomNodes" "title_aux": "ComfyUI_pxtool [WIP]"
}
],
"https://github.com/hiusdev/ComfyUI_Lah_Toffee": [
[
"LoadVideoRandom"
],
{
"title_aux": "ComfyUI_Lah_Toffee"
} }
], ],
"https://github.com/horidream/ComfyUI-Horidream": [ "https://github.com/horidream/ComfyUI-Horidream": [
@@ -3273,11 +3452,16 @@
[ [
"ForceMinimumBatchSize", "ForceMinimumBatchSize",
"ImageCompositeChained", "ImageCompositeChained",
"LineDetection",
"MangaPanelSegmentationNode",
"Mask_Fill_Region",
"MatchImageCountToMaskCount", "MatchImageCountToMaskCount",
"ParallaxTest", "ParallaxTest",
"RandomCharacterPrompts", "RandomCharacterPrompts",
"TargetLocationCrop", "TargetLocationCrop",
"TargetLocationPaste", "TargetLocationPaste",
"Yolov8Detection",
"easy_parallax",
"string_list_to_prompt_schedule" "string_list_to_prompt_schedule"
], ],
{ {
@@ -3292,6 +3476,15 @@
"title_aux": "ComfyUI_HelpfulNodes" "title_aux": "ComfyUI_HelpfulNodes"
} }
], ],
"https://github.com/jschoormans/Comfy-InterestingPixels": [
[
"Random Palette",
"Shareable Image Slider"
],
{
"title_aux": "ComfyUI-TexturePacker [WIP]"
}
],
"https://github.com/jtscmw01/ComfyUI-DiffBIR": [ "https://github.com/jtscmw01/ComfyUI-DiffBIR": [
[ [
"DiffBIR_sample", "DiffBIR_sample",
@@ -3434,6 +3627,7 @@
"Hy3DDelightImage", "Hy3DDelightImage",
"Hy3DDiffusersSchedulerConfig", "Hy3DDiffusersSchedulerConfig",
"Hy3DExportMesh", "Hy3DExportMesh",
"Hy3DFastSimplifyMesh",
"Hy3DGenerateMesh", "Hy3DGenerateMesh",
"Hy3DGetMeshPBRTextures", "Hy3DGetMeshPBRTextures",
"Hy3DIMRemesh", "Hy3DIMRemesh",
@@ -3442,6 +3636,7 @@
"Hy3DMeshUVWrap", "Hy3DMeshUVWrap",
"Hy3DMeshVerticeInpaintTexture", "Hy3DMeshVerticeInpaintTexture",
"Hy3DModelLoader", "Hy3DModelLoader",
"Hy3DNvdiffrastRenderer",
"Hy3DPostprocessMesh", "Hy3DPostprocessMesh",
"Hy3DRenderMultiView", "Hy3DRenderMultiView",
"Hy3DRenderMultiViewDepth", "Hy3DRenderMultiViewDepth",
@@ -3450,6 +3645,7 @@
"Hy3DSetMeshPBRAttributes", "Hy3DSetMeshPBRAttributes",
"Hy3DSetMeshPBRTextures", "Hy3DSetMeshPBRTextures",
"Hy3DTorchCompileSettings", "Hy3DTorchCompileSettings",
"Hy3DUploadMesh",
"Hy3DVAEDecode" "Hy3DVAEDecode"
], ],
{ {
@@ -3533,7 +3729,8 @@
[ [
"GetWarpedNoiseFromVideo", "GetWarpedNoiseFromVideo",
"GetWarpedNoiseFromVideoAnimateDiff", "GetWarpedNoiseFromVideoAnimateDiff",
"GetWarpedNoiseFromVideoCogVideoX" "GetWarpedNoiseFromVideoCogVideoX",
"GetWarpedNoiseFromVideoHunyuan"
], ],
{ {
"title_aux": "ComfyUI-VideoNoiseWarp [WIP]" "title_aux": "ComfyUI-VideoNoiseWarp [WIP]"
@@ -3548,6 +3745,14 @@
"title_aux": "Advanced Watermarking Tools [WIP]" "title_aux": "Advanced Watermarking Tools [WIP]"
} }
], ],
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL": [
[
"KimaraAIImageFromURL"
],
{
"title_aux": "ComfyUI-Kimara-AI-Image-From-URL [WIP]"
}
],
"https://github.com/kk8bit/KayTool": [ "https://github.com/kk8bit/KayTool": [
[ [
"Abc_Math", "Abc_Math",
@@ -3850,6 +4055,16 @@
"title_aux": "SK-Nodes" "title_aux": "SK-Nodes"
} }
], ],
"https://github.com/lum3on/comfyui_LLM_Polymath": [
[
"polymath_SaveAbsolute",
"polymath_chat",
"polymath_scraper"
],
{
"title_aux": "comfyui_LLM_Polymath [WIP]"
}
],
"https://github.com/majorsauce/comfyui_indieTools": [ "https://github.com/majorsauce/comfyui_indieTools": [
[ [
"IndCutByMask", "IndCutByMask",
@@ -3933,7 +4148,6 @@
], ],
"https://github.com/mfg637/ComfyUI-ScheduledGuider-Ext": [ "https://github.com/mfg637/ComfyUI-ScheduledGuider-Ext": [
[ [
"Add zSNR Sigma max",
"ConcatSigmas", "ConcatSigmas",
"CosineScheduler", "CosineScheduler",
"GaussianScheduler", "GaussianScheduler",
@@ -3941,12 +4155,21 @@
"LogNormal Scheduler", "LogNormal Scheduler",
"OffsetSigmas", "OffsetSigmas",
"PerpNegScheduledCFGGuider", "PerpNegScheduledCFGGuider",
"ScheduledCFGGuider" "ScheduledCFGGuider",
"SplitSigmasByValue"
], ],
{ {
"title_aux": "ComfyUI-ScheduledGuider-Ext" "title_aux": "ComfyUI-ScheduledGuider-Ext"
} }
], ],
"https://github.com/mikebilly/Transparent-background-comfyUI": [
[
"Transparentbackground RemBg"
],
{
"title_aux": "transparent-background-comfyui"
}
],
"https://github.com/mikeymcfish/FishTools": [ "https://github.com/mikeymcfish/FishTools": [
[ [
"AnaglyphCreator", "AnaglyphCreator",
@@ -4018,6 +4241,14 @@
"title_aux": "ComfyUI-FramerComfy [WIP]" "title_aux": "ComfyUI-FramerComfy [WIP]"
} }
], ],
"https://github.com/molbal/comfy-url-fetcher": [
[
"URL Fetcher"
],
{
"title_aux": "comfy-url-fetcher [WIP]"
}
],
"https://github.com/monate0615/ComfyUI-Affine-Transform": [ "https://github.com/monate0615/ComfyUI-Affine-Transform": [
[ [
"AffineTransform" "AffineTransform"
@@ -4035,6 +4266,16 @@
"title_aux": "ComfyUI-Simple-Image-Tools [WIP]" "title_aux": "ComfyUI-Simple-Image-Tools [WIP]"
} }
], ],
"https://github.com/mr-krak3n/ComfyUI-Qwen": [
[
"DeepSeekResponseParser",
"QwenLoader",
"QwenSampler"
],
{
"title_aux": "ComfyUI-Qwen [CONFLICT]"
}
],
"https://github.com/mut-ex/comfyui-gligengui-node": [ "https://github.com/mut-ex/comfyui-gligengui-node": [
[ [
"GLIGEN_GUI" "GLIGEN_GUI"
@@ -4051,15 +4292,29 @@
"title_aux": "ComfyUI-Claude-I2T" "title_aux": "ComfyUI-Claude-I2T"
} }
], ],
"https://github.com/myAiLemon/MagicAutomaticPicture": [
[
"EditableStringNode",
"IntegratedCLIPTextEncodeWithExtract",
"MagicLatent",
"ProcessAndSave",
"StringConcat"
],
{
"title_aux": "MagicAutomaticPicture [WIP]"
}
],
"https://github.com/naderzare/comfyui-inodes": [ "https://github.com/naderzare/comfyui-inodes": [
[ [
"IAzureAiApi", "IAzureAiApi",
"ICutStrings", "ICutStrings",
"IFinalizeProject",
"IIfElse", "IIfElse",
"ILLMExecute", "ILLMExecute",
"ILLMExecute2", "ILLMExecute2",
"ILoadAzureAiApi", "ILoadAzureAiApi",
"ILoadOllamaApi", "ILoadOllamaApi",
"IMergeImages",
"IMultilineSplitToStrings", "IMultilineSplitToStrings",
"IPassImage", "IPassImage",
"IPostProcessLLMResponse", "IPostProcessLLMResponse",
@@ -4071,6 +4326,7 @@
"IStringsToFile", "IStringsToFile",
"IStringsToString", "IStringsToString",
"ITimesToStrings", "ITimesToStrings",
"IUploadToGoogleDrive",
"IZipImages" "IZipImages"
], ],
{ {
@@ -4113,6 +4369,14 @@
"title_aux": "ComfyUI-ControlNeXt [WIP]" "title_aux": "ComfyUI-ControlNeXt [WIP]"
} }
], ],
"https://github.com/neverbiasu/ComfyUI-DeepSeek": [
[
"DeepSeekCaller"
],
{
"title_aux": "ComfyUI-DeepSeek"
}
],
"https://github.com/neverbiasu/ComfyUI-StereoCrafter": [ "https://github.com/neverbiasu/ComfyUI-StereoCrafter": [
[ [
"DepthSplattingModelLoader", "DepthSplattingModelLoader",
@@ -4181,7 +4445,9 @@
], ],
"https://github.com/nomcycle/ComfyUI_Cluster": [ "https://github.com/nomcycle/ComfyUI_Cluster": [
[ [
"FenceClusteredWorkflow" "ClusterFanInImages",
"ClusterFanInLatents",
"ClusterInstanceIndex"
], ],
{ {
"title_aux": "ComfyUI_Cluster [WIP]" "title_aux": "ComfyUI_Cluster [WIP]"
@@ -4200,6 +4466,23 @@
"title_aux": "ComfyUI-oshtz-nodes [WIP]" "title_aux": "ComfyUI-oshtz-nodes [WIP]"
} }
], ],
"https://github.com/osuiso-depot/comfyui-keshigom_custom": [
[
"KANI_Checkpoint_Loader_From_String",
"KANI_MathExpression",
"KANI_Multiplexer",
"KANI_ShowAnything",
"KANI_TextFind",
"KANI_TrueorFalse",
"RegExTextChopper",
"ResolutionSelector",
"ResolutionSelectorConst",
"StringNodeClass"
],
{
"title_aux": "comfyui-keshigom_custom"
}
],
"https://github.com/oyvindg/ComfyUI-TrollSuite": [ "https://github.com/oyvindg/ComfyUI-TrollSuite": [
[ [
"BinaryImageMask", "BinaryImageMask",
@@ -4234,6 +4517,7 @@
"ConditioningZeroOutCombine", "ConditioningZeroOutCombine",
"ConvertTimestepToSigma", "ConvertTimestepToSigma",
"DynSamplerSelect", "DynSamplerSelect",
"DynamicThresholdingPost",
"DynamicThresholdingSimplePost", "DynamicThresholdingSimplePost",
"EmptyLatentImageAR", "EmptyLatentImageAR",
"FreeU2PPM", "FreeU2PPM",
@@ -4241,6 +4525,7 @@
"LatentOperationTonemapLuminance", "LatentOperationTonemapLuminance",
"LatentToMaskBB", "LatentToMaskBB",
"LatentToWidthHeight", "LatentToWidthHeight",
"MaskCompositePPM",
"PPMSamplerSelect", "PPMSamplerSelect",
"RescaleCFGPost" "RescaleCFGPost"
], ],
@@ -4382,6 +4667,17 @@
"title_aux": "ComfyUI-ODE" "title_aux": "ComfyUI-ODE"
} }
], ],
"https://github.com/rishipandey125/ComfyUI-FramePacking": [
[
"Add Grid Boundaries",
"Pack Frames",
"Resize Frame",
"Unpack Frames"
],
{
"title_aux": "ComfyUI-FramePacking [WIP]"
}
],
"https://github.com/risunobushi/ComfyUI_FocusMask": [ "https://github.com/risunobushi/ComfyUI_FocusMask": [
[ [
"FocusMaskExtractor", "FocusMaskExtractor",
@@ -4401,7 +4697,8 @@
], ],
"https://github.com/rouxianmantou/comfyui-rxmt-nodes": [ "https://github.com/rouxianmantou/comfyui-rxmt-nodes": [
[ [
"CheckValueTypeNode" "CheckValueTypeNode",
"WhyPromptTextNode"
], ],
{ {
"title_aux": "comfyui-rxmt-nodes" "title_aux": "comfyui-rxmt-nodes"
@@ -4673,6 +4970,22 @@
"title_aux": "ComfyUI-Rpg-Architect [WIP]" "title_aux": "ComfyUI-Rpg-Architect [WIP]"
} }
], ],
"https://github.com/tc888/ComfyUI_Save_Flux_Image": [
[
"Cfg Literal",
"Int Literal",
"Sampler Select",
"Save Flux Image with Metadata",
"Scheduler Select",
"Seed Gen",
"String Literal",
"Unet Select",
"Width/Height Literal"
],
{
"title_aux": "ComfyUI_Save_Flux_Image"
}
],
"https://github.com/techzuhaib/ComfyUI-CacheImageNode": [ "https://github.com/techzuhaib/ComfyUI-CacheImageNode": [
[ [
"CacheImageNode" "CacheImageNode"
@@ -4690,6 +5003,24 @@
"title_aux": "_topfun_s_nodes" "title_aux": "_topfun_s_nodes"
} }
], ],
"https://github.com/thedivergentai/divergent_nodes": [
[
"CLIPTokenCounter",
"DolphinVisionNode"
],
{
"title_aux": "Divergent Nodes [WIP]"
}
],
"https://github.com/threadedblue/MLXnodes": [
[
"MLXImg2Img",
"MLXText2Image"
],
{
"title_aux": "MLXnodes [WIP]"
}
],
"https://github.com/tjorbogarden/my-useful-comfyui-custom-nodes": [ "https://github.com/tjorbogarden/my-useful-comfyui-custom-nodes": [
[ [
"ImageSizer", "ImageSizer",
@@ -4794,6 +5125,19 @@
"title_aux": "ComfyUI-My-Handy-Nodes" "title_aux": "ComfyUI-My-Handy-Nodes"
} }
], ],
"https://github.com/var1ableX/ComfyUI_Accessories": [
[
"ACC_AnyCast",
"AccMakeListNode",
"GetMaskDimensions",
"GetRandomDimensions",
"isImageEmpty",
"isMaskEmpty"
],
{
"title_aux": "ComfyUI_Accessories"
}
],
"https://github.com/walterFeng/ComfyUI-Image-Utils": [ "https://github.com/walterFeng/ComfyUI-Image-Utils": [
[ [
"Calculate Image Brightness", "Calculate Image Brightness",
@@ -4895,22 +5239,32 @@
"title_aux": "ComfyUI-XYNodes" "title_aux": "ComfyUI-XYNodes"
} }
], ],
"https://github.com/xinyiSS/CombineMasksNode": [
[
"CombineMasksNode"
],
{
"title_aux": "CombineMasksNode"
}
],
"https://github.com/yanhuifair/ComfyUI-FairLab": [ "https://github.com/yanhuifair/ComfyUI-FairLab": [
[ [
"CLIPTranslatedNode", "CLIPTranslatedNode",
"DownloadImageNode", "DownloadImageNode",
"FixUTF8StringNode", "FixUTF8StringNode",
"ImageResizeNode", "ImageResizeNode",
"ImagesToVideoNode", "ImageToVideoNode",
"LoadImageFromFolderNode", "LoadImageFromDirectoryNode",
"SaveImageToFolderNode", "LoadImageFromURLNode",
"SaveImagesToFolderNode", "PrintAnyNode",
"SaveStringToFolderNode", "PrintImageNode",
"SaveImageToDirectoryNode",
"SaveStringToDirectoryNode",
"SequenceStringListNode", "SequenceStringListNode",
"StringCombineNode", "StringCombineNode",
"StringFieldNode", "StringFieldNode",
"TranslateStringNode", "TranslateStringNode",
"VideoToImagesNode" "VideoToImageNode"
], ],
{ {
"title_aux": "ComfyUI-FairLab" "title_aux": "ComfyUI-FairLab"
@@ -4975,22 +5329,10 @@
"title_aux": "Comfyui_image2prompt" "title_aux": "Comfyui_image2prompt"
} }
], ],
"https://github.com/zmwv823/ComfyUI-VideoDiffusion": [
[
"UL_LatentSyncLoader",
"UL_LatentSyncProcess",
"UL_LatentSyncSampler",
"UL_SonicLoader",
"UL_SonicProcess",
"UL_SonicSampler"
],
{
"title_aux": "ComfyUI-VideoDiffusion"
}
],
"https://github.com/zyd232/ComfyUI-zyd232-Nodes": [ "https://github.com/zyd232/ComfyUI-zyd232-Nodes": [
[ [
"zyd232 ImagesPixelsCompare" "zyd232 ImagesPixelsCompare",
"zyd232_SavePreviewImages"
], ],
{ {
"title_aux": "ComfyUI-zyd232-Nodes" "title_aux": "ComfyUI-zyd232-Nodes"

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,15 @@
{ {
"custom_nodes": [ "custom_nodes": [
{
"author": "PramaLLC",
"title": "ComfyUI BEN - Background Erase Network",
"reference": "https://github.com/PramaLLC/BEN2_ComfyUI",
"files": [
"https://github.com/PramaLLC/BEN2_ComfyUI"
],
"install_type": "git-clone",
"description": "Remove backgrounds from images with [a/BEN2](https://huggingface.co/PramaLLC/BEN2) in ComfyUI\nOriginal repo: [a/https://github.com/DoctorDiffusion/ComfyUI-BEN](https://github.com/DoctorDiffusion/ComfyUI-BEN)"
},
{ {
"author": "BlenderNeko", "author": "BlenderNeko",
"title": "ltdrdata/ComfyUI_TiledKSampler", "title": "ltdrdata/ComfyUI_TiledKSampler",

View File

@@ -10,7 +10,99 @@
}, },
{
"author": "apesplat",
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
"id": "ezxy",
"reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
"files": [
"https://github.com/GMapeSplat/ComfyUI_ezXY"
],
"install_type": "git-clone",
"description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
},
{
"author": "mie",
"title": "ComfyUI_JanusProCaption [REMOVED]",
"reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
"files": [
"https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
],
"install_type": "git-clone",
"description": "Describe image or create caption files using Janus Pro Model"
},
{
"author": "Njbx",
"title": "ComfyUI-blockswap [REMOVED]",
"reference": "https://github.com/Njbx/ComfyUI-blockswap",
"files": [
"https://github.com/Njbx/ComfyUI-blockswap"
],
"install_type": "git-clone",
"description": "NODES: Block Swap"
},
{
"author": "T8star1984",
"title": "comfyui-purgevram [REMOVED]",
"reference": "https://github.com/T8star1984/comfyui-purgevram",
"files": [
"https://github.com/T8star1984/comfyui-purgevram"
],
"install_type": "git-clone",
"description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
},
{
"author": "zmwv823",
"title": "ComfyUI-VideoDiffusion [REMOVED]",
"reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
"files": [
"https://github.com/zmwv823/ComfyUI-VideoDiffusion"
],
"install_type": "git-clone",
"description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
},
{
"author": "NyaamZ",
"title": "Get Booru Tag ExtendeD [REMOVED]",
"reference": "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED",
"files": [
"https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED"
],
"description": "Get tag from Booru site.",
"install_type": "git-clone"
},
{
"author": "lingha",
"title": "comfyui_kj [REMOVED]",
"id": "comfyui_kj",
"reference": "https://github.com/XieChengYuan/comfyui_kj",
"files": [
"https://github.com/XieChengYuan/comfyui_kj"
],
"install_type": "git-clone",
"description": "comfyui_kj, A tool that can package workflows into projects and publish them to a WeChat Mini Program named Kaji, allowing charges to be collected from users."
},
{
"author": "myAiLemon",
"title": "MagicGetPromptAutomatically",
"reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
"files": [
"https://github.com/myAiLemon/MagicGetPromptAutomatically"
],
"install_type": "git-clone",
"description": "A plug-in that can automatically generate pictures and save txt files in comfyui"
},
{
"author": "ryanontheinside",
"title": "ComfyUI_ScavengerHunt [REMOVED]",
"reference": "https://github.com/ryanontheinside/ComfyUI_ScavengerHunt",
"files": [
"https://github.com/ryanontheinside/ComfyUI_ScavengerHunt"
],
"install_type": "git-clone",
"description": "NODES: Compare Image Similarity (ResNet), Compare Image Similarity (CLIP), Compare Image Types\nNOTE: The files in the repo are not organized."
},
{ {
"author": "vpakarinen", "author": "vpakarinen",
"title": "ComfyUI-GenerationTimer [REMOVED]", "title": "ComfyUI-GenerationTimer [REMOVED]",

View File

@@ -1,3 +1,148 @@
{ {
"models": [] "models": [
{
"name": "Inswapper-fp16 (face swap) [REMOVED]",
"type": "insightface",
"base": "inswapper",
"save_path": "insightface",
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
"reference": "https://github.com/facefusion/facefusion-assets",
"filename": "inswapper_128_fp16.onnx",
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
"size": "277.7MB"
},
{
"name": "Inswapper (face swap) [REMOVED]",
"type": "insightface",
"base": "inswapper",
"save_path": "insightface",
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
"reference": "https://github.com/facefusion/facefusion-assets",
"filename": "inswapper_128.onnx",
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
"size": "555.3MB"
},
{
"name": "pfg-novel-n10.pt",
"type": "PFG",
"base": "SD1.5",
"save_path": "custom_nodes/pfg-ComfyUI/models",
"description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
"reference": "https://huggingface.co/furusu/PFG",
"filename": "pfg-novel-n10.pt",
"url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
"size": "23.6MB"
},
{
"name": "pfg-wd14-n10.pt",
"type": "PFG",
"base": "SD1.5",
"save_path": "custom_nodes/pfg-ComfyUI/models",
"description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
"reference": "https://huggingface.co/furusu/PFG",
"filename": "pfg-wd14-n10.pt",
"url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
"size": "31.5MB"
},
{
"name": "pfg-wd15beta2-n10.pt",
"type": "PFG",
"base": "SD1.5",
"save_path": "custom_nodes/pfg-ComfyUI/models",
"description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
"reference": "https://huggingface.co/furusu/PFG",
"filename": "pfg-wd15beta2-n10.pt",
"url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
"size": "31.5MB"
},
{
"name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
"type": "Shape Predictor",
"base": "DLIB",
"save_path": "custom_nodes/comfyui_faceanalysis/dlib",
"description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
"reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
"filename": "shape_predictor_68_face_landmarks.dat",
"url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
"size": "99.7MB"
},
{
"name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
"type": "Face Recognition",
"base": "DLIB",
"save_path": "custom_nodes/comfyui_faceanalysis/dlib",
"description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
"reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
"filename": "dlib_face_recognition_resnet_model_v1.dat",
"url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
"size": "22.5MB"
},
{
"name": "ID-Animator/animator.ckpt",
"type": "ID-Animator",
"base": "SD1.5",
"save_path": "custom_nodes/comfyui_id_animator/models",
"description": "ID-Animator checkpoint",
"reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
"filename": "animator.ckpt",
"url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
"size": "247.3MB"
},
{
"name": "ID-Animator/mm_sd_v15_v2.ckpt",
"type": "ID-Animator",
"base": "SD1.5",
"save_path": "custom_nodes/comfyui_id_animator/models/animatediff_models",
"description": "AnimateDiff checkpoint for ID-Animator",
"reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
"filename": "mm_sd_v15_v2.ckpt",
"url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
"size": "1.82GB"
},
{
"name": "ID-Animator/image_encoder",
"type": "ID-Animator",
"base": "SD1.5",
"save_path": "custom_nodes/comfyui_id_animator/models/image_encoder",
"description": "CLIP Image encoder for ID-Animator",
"reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
"filename": "model.safetensors",
"url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
"size": "2.53GB"
},
{
"name": "Doubiiu/ToonCrafter model checkpoint",
"type": "checkpoint",
"base": "ToonCrafter",
"save_path": "custom_nodes/comfyui-tooncrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
"description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
"reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
"filename": "model.ckpt",
"url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
"size": "10.5GB"
},
{
"name": "BAAI/SegGPT",
"type": "SegGPT",
"base": "SegGPT",
"save_path": "custom_nodes/comfyui-seggpt",
"description": "SegGPT",
"reference": "https://huggingface.co/BAAI/SegGPT",
"filename": "seggpt_vit_large.pth",
"url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
"size": "1.48GB"
},
{
"name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
"type": "controlnet",
"base": "SDXL",
"save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
"description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
"reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
"filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
"url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
"size": "46.2MB"
}
]
} }

View File

File diff suppressed because it is too large Load Diff

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,28 @@
{ {
"models": [ "models": [
{
"name": "deepseek-ai/Janus-Pro-1B",
"type": "Janus-Pro",
"base": "Janus-Pro",
"save_path": "Janus-Pro",
"description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
"filename": "<huggingface>",
"url": "deepseek-ai/Janus-Pro-1B",
"size": "7.8GB"
},
{
"name": "deepseek-ai/Janus-Pro-7B",
"type": "Janus-Pro",
"base": "Janus-Pro",
"save_path": "Janus-Pro",
"description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
"filename": "<huggingface>",
"url": "deepseek-ai/Janus-Pro-7B",
"size": "14.85GB"
},
{ {
"name": "Leoxing/pia.ckpt", "name": "Leoxing/pia.ckpt",
"type": "animatediff-pia", "type": "animatediff-pia",
@@ -575,7 +598,7 @@
"name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]", "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
"type": "clip", "type": "clip",
"base": "clip", "base": "clip",
"save_path": "clip/long_clip", "save_path": "text_encoders/long_clip",
"description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)", "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
"reference": "https://huggingface.co/zer0int", "reference": "https://huggingface.co/zer0int",
"filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors", "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -586,7 +609,7 @@
"name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]", "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
"type": "clip", "type": "clip",
"base": "clip", "base": "clip",
"save_path": "clip/long_clip", "save_path": "text_encoders/long_clip",
"description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)", "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
"reference": "https://huggingface.co/zer0int", "reference": "https://huggingface.co/zer0int",
"filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors", "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -629,18 +652,6 @@
"size": "1.39GB" "size": "1.39GB"
}, },
{
"name": "BAAI/SegGPT",
"type": "SegGPT",
"base": "SegGPT",
"save_path": "custom_nodes/comfyui-SegGPT",
"description": "SegGPT",
"reference": "https://huggingface.co/BAAI/SegGPT",
"filename": "seggpt_vit_large.pth",
"url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
"size": "1.48GB"
},
{ {
"name": "DMD2 LoRA (4steps)", "name": "DMD2 LoRA (4steps)",
"type": "lora", "type": "lora",

View File

@@ -291,6 +291,16 @@
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off" "description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
},
{
"author": "xhiroga",
"title": "ComfyUI-TypeScript-CustomNode",
"reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
"files": [
"https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
],
"install_type": "git-clone",
"description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
} }
] ]
} }

View File

@@ -20,13 +20,14 @@ import cm_global
import manager_downloader import manager_downloader
import folder_paths import folder_paths
try: import datetime
if hasattr(datetime, 'datetime'):
from datetime import datetime from datetime import datetime
def current_timestamp(): def current_timestamp():
return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3] return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
except: else:
# NOTE: Occurs in some Mac environments.
import time import time
import datetime
logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n datetime module is invalid: '{datetime.__file__}'") logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n datetime module is invalid: '{datetime.__file__}'")
def current_timestamp(): def current_timestamp():
return str(time.time()).split('.')[0] return str(time.time()).split('.')[0]
@@ -57,22 +58,6 @@ def is_import_failed_extension(name):
return name in import_failed_extensions return name in import_failed_extensions
def check_file_logging():
global enable_file_logging
try:
import configparser
config = configparser.ConfigParser()
config.read(manager_config_path)
default_conf = config['default']
if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
enable_file_logging = False
except Exception:
pass
check_file_logging()
comfy_path = os.environ.get('COMFYUI_PATH') comfy_path = os.environ.get('COMFYUI_PATH')
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH') comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
@@ -103,6 +88,32 @@ manager_config_path = os.path.join(manager_files_path, 'config.ini')
cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py") cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
default_conf = {}
def read_config():
global default_conf
try:
import configparser
config = configparser.ConfigParser()
config.read(manager_config_path)
default_conf = config['default']
except Exception:
pass
def read_uv_mode():
if 'use_uv' in default_conf:
manager_util.use_uv = default_conf['use_uv'].lower() == 'true'
def check_file_logging():
global enable_file_logging
if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
enable_file_logging = False
read_config()
read_uv_mode()
check_file_logging()
cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'} cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
if os.path.exists(manager_pip_overrides_path): if os.path.exists(manager_pip_overrides_path):
with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file: with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
@@ -410,28 +421,33 @@ except Exception as e:
print(f"[ComfyUI-Manager] Logging failed: {e}") print(f"[ComfyUI-Manager] Logging failed: {e}")
try: def ensure_dependencies():
import git # noqa: F401
import toml # noqa: F401
except ModuleNotFoundError:
my_path = os.path.dirname(__file__)
requirements_path = os.path.join(my_path, "requirements.txt")
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
try: try:
result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path]) import git # noqa: F401
except subprocess.CalledProcessError: import toml # noqa: F401
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.") import rich # noqa: F401
try: import chardet # noqa: F401
result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path]) except ModuleNotFoundError:
except subprocess.CalledProcessError: my_path = os.path.dirname(__file__)
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)") requirements_path = os.path.join(my_path, "requirements.txt")
try: print("## ComfyUI-Manager: installing dependencies. (GitPython)")
print("## ComfyUI-Manager: installing dependencies done.") try:
except: result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages except subprocess.CalledProcessError:
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: Attempting to reinstall dependencies using an alternative method.")
try:
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
except subprocess.CalledProcessError:
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
try:
print("## ComfyUI-Manager: installing dependencies done.")
except:
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
ensure_dependencies()
print("** ComfyUI startup time:", current_timestamp()) print("** ComfyUI startup time:", current_timestamp())
@@ -452,11 +468,6 @@ else:
def read_downgrade_blacklist(): def read_downgrade_blacklist():
try: try:
import configparser
config = configparser.ConfigParser()
config.read(manager_config_path)
default_conf = config['default']
if 'downgrade_blacklist' in default_conf: if 'downgrade_blacklist' in default_conf:
items = default_conf['downgrade_blacklist'].split(',') items = default_conf['downgrade_blacklist'].split(',')
items = [x.strip() for x in items if x != ''] items = [x.strip() for x in items if x != '']
@@ -471,19 +482,13 @@ read_downgrade_blacklist()
def check_bypass_ssl(): def check_bypass_ssl():
try: try:
import configparser
import ssl import ssl
config = configparser.ConfigParser()
config.read(manager_config_path)
default_conf = config['default']
if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true': if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})") print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})")
ssl._create_default_https_context = ssl._create_unverified_context # SSL certificate error fix. ssl._create_default_https_context = ssl._create_unverified_context # SSL certificate error fix.
except Exception: except Exception:
pass pass
check_bypass_ssl() check_bypass_ssl()
@@ -597,17 +602,18 @@ def execute_lazy_install_script(repo_path, executable):
if os.path.exists(requirements_path): if os.path.exists(requirements_path):
print(f"Install: pip packages for '{repo_path}'") print(f"Install: pip packages for '{repo_path}'")
with open(requirements_path, "r") as requirements_file:
for line in requirements_file:
package_name = remap_pip_package(line.strip())
if package_name and not is_installed(package_name):
if '--index-url' in package_name:
s = package_name.split('--index-url')
install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
else:
install_cmd = [sys.executable, "-m", "pip", "install", package_name]
process_wrap(install_cmd, repo_path) lines = manager_util.robust_readlines(requirements_path)
for line in lines:
package_name = remap_pip_package(line.strip())
if package_name and not is_installed(package_name):
if '--index-url' in package_name:
s = package_name.split('--index-url')
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
else:
install_cmd = manager_util.make_pip_cmd(["install", package_name])
process_wrap(install_cmd, repo_path)
if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install: if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
processed_install.add(f'{repo_path}/install.py') processed_install.add(f'{repo_path}/install.py')
@@ -678,6 +684,7 @@ def execute_migration(moves):
shutil.move(x[0], x[1]) shutil.move(x[0], x[1])
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'") print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
script_executed = False
# Check if script_list_path exists # Check if script_list_path exists
if os.path.exists(script_list_path): if os.path.exists(script_list_path):
@@ -732,6 +739,7 @@ if os.path.exists(script_list_path):
# Remove the script_list_path file # Remove the script_list_path file
if os.path.exists(script_list_path): if os.path.exists(script_list_path):
script_executed = True
os.remove(script_list_path) os.remove(script_list_path)
print("\n[ComfyUI-Manager] Startup script completed.") print("\n[ComfyUI-Manager] Startup script completed.")
@@ -743,6 +751,29 @@ del processed_install
del pip_fixer del pip_fixer
manager_util.clear_pip_cache() manager_util.clear_pip_cache()
if script_executed:
# Restart
print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
if '__COMFY_CLI_SESSION__' in os.environ:
with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
pass
print("--------------------------------------------------------------------------\n")
exit(0)
else:
sys_argv = sys.argv.copy()
if sys.platform.startswith('win32'):
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
else:
cmds = [sys.executable] + sys_argv
print(f"Command: {cmds}", flush=True)
print("--------------------------------------------------------------------------\n")
os.execv(sys.executable, cmds)
def check_windows_event_loop_policy(): def check_windows_event_loop_policy():
try: try:

View File

@@ -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.10" version = "3.22"
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"]

View File

@@ -6,4 +6,6 @@ huggingface-hub>0.20
typer typer
rich rich
typing-extensions typing-extensions
toml toml
uv
chardet