Compare commits

...

97 Commits
3.24 ... 3.31.2

Author SHA1 Message Date
Dr.Lt.Data
39eaa76b8a fixed: remove migration code completely
https://github.com/ltdrdata/ComfyUI-Manager/issues/1659
2025-03-14 18:24:30 +09:00
Dr.Lt.Data
e5396713ce fixed: gitclone_install - add mode 2025-03-14 12:59:06 +09:00
Dr.Lt.Data
79943de808 fixed: install via git url - failed to install if the git url is exists in the default channel
https://github.com/ltdrdata/ComfyUI-Manager/issues/1651#issuecomment-2720408569
2025-03-14 12:53:59 +09:00
Dr.Lt.Data
e05f329602 bump version to 3.31 2025-03-14 00:59:11 +09:00
Dr.Lt.Data
eed0e8ebea update DB 2025-03-14 00:58:55 +09:00
SirWillance
731eb4fcbe Please verify my changes (#1643)
* Update custom-node-list.json

* Update custom-node-list.json

* Update custom-node-list.json

* Update custom-node-list.json

I felt the need to change the Title and the Description

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-03-14 00:53:36 +09:00
Dr.Lt.Data
44a63e4b6d update DB 2025-03-14 00:52:06 +09:00
CenFun
7651e5e48b UI improvement (#1625) 2025-03-14 00:51:37 +09:00
Dr.Lt.Data
2449636d32 update DB 2025-03-14 00:45:47 +09:00
Dr.Lt.Data
f9990ca8eb fixed: make_pip_cmd - add '-s' option 2025-03-13 22:48:13 +09:00
Dr.Lt.Data
c3eed981c0 fixed: robust validation when model downloading #2 2025-03-12 21:24:31 +09:00
Dr.Lt.Data
bbb54d4a08 fixed: robust validation when model downloading 2025-03-12 21:10:02 +09:00
Dr.Lt.Data
4566c585db fixed: a condition code wasn’t saved after editing... lol 2025-03-12 21:00:05 +09:00
Dr.Lt.Data
a946338a18 fixed: invalid channel exception when startup 2025-03-12 17:28:17 +09:00
Dr.Lt.Data
0a60a44478 fixed: several security bugs
refactor: remove serveal unused code
2025-03-12 11:32:16 +09:00
Dr.Lt.Data
cef0ad6707 update DB 2025-03-12 07:21:38 +09:00
Robin Huang
7176f0837a Add linux form factor. (#1648) 2025-03-12 07:20:06 +09:00
Yuan-Man
6b1f2b2d9d Add ComfyUI-StyleStudio node (#1639) 2025-03-12 07:15:58 +09:00
Laureηt
38a1a9b320 add comfyui-finegrain to custom-node-list.json (#1587) 2025-03-12 07:04:18 +09:00
Dr.Lt.Data
402e2c384f fixed: Issue where install.py would not run when installed in cnr. 2025-03-11 12:34:07 +09:00
Dr.Lt.Data
9d5faa096c update DB 2025-03-09 21:06:59 +09:00
Dr.Lt.Data
97d0dc20f1 update DB 2025-03-09 18:26:29 +09:00
Jerome Bacquet
8d99ff07b6 Update custom-node-list.json (#1630)
Add XenoFlow Plugin in the custom-node-list
2025-03-09 18:24:22 +09:00
Dr.Lt.Data
04fa540a8c fixed: crash on desktop version when displaying to print version information 2025-03-08 10:15:23 +09:00
Dr.Lt.Data
eb41867e04 update DB 2025-03-06 22:02:23 +09:00
雷诺探长
eee5d7d9e8 Update custom-node-list.json (#1601) 2025-03-06 21:51:04 +09:00
Dr.Lt.Data
e983f9ed35 bump version 3.30.2 2025-03-06 21:48:37 +09:00
Alexander Piskun
8b16ef641b small fix for running as py-module on windows (#1615) 2025-03-06 21:48:08 +09:00
Dr.Lt.Data
e87d616b7a fixed: normalize pip name
package name in requirements is 'comfyui-frontend-package'
but, package name from `pip freeze` is 'comfyui_frontend_package'
but, package name from `uv pip freeze` is 'comfyui-frontend-package'

https://github.com/ltdrdata/ComfyUI-Manager/pull/1615#issue-2898212382
2025-03-06 21:41:56 +09:00
Dr.Lt.Data
2220f325fc update DB 2025-03-06 21:30:28 +09:00
S4MUEL
b53ed47ccb Add ComfyUI-Image-Position-Blend (#1617)
* Add ComfyUI-Image-Position-Blend to custom node list

This adds my custom node for image position blending to the ComfyUI Manager list.

* Update custom-node-list.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-03-06 21:08:13 +09:00
Alexander Piskun
39df2743fe get_installed_packages: return python packages names in lowercase (#1614) 2025-03-06 21:04:33 +09:00
Dr.Lt.Data
3f729aaf03 update DB 2025-03-06 20:53:26 +09:00
Dr.Lt.Data
b7324621e4 update DB 2025-03-06 07:38:05 +09:00
Dr.Lt.Data
e8c782c8e1 feat: pip_auto_fix.list for custom PIPFixer
fixed: always reinstall comfyui-frontend-package

https://github.com/ltdrdata/ComfyUI-Manager/discussions/980#discussioncomment-12400709
2025-03-05 22:27:24 +09:00
Dr.Lt.Data
9136505565 bump version to v3.29 2025-03-05 21:19:23 +09:00
Dr.Lt.Data
f406d728cc fixed: use pyproject.toml if desktop version
- desktop version doesn't contains .git

modified: don't cache the sub fetched data of cnr
2025-03-05 21:18:56 +09:00
Yoland Yan
d649ca47c6 Add comfy version to query (#1608)
* Add comfy version to query

* Add form factor detection for ComfyUI node query
2025-03-05 21:18:45 +09:00
Dr.Lt.Data
e8111527b4 update DB 2025-03-05 21:00:30 +09:00
Alexander Piskun
2af66d7efc support of py-module in prestartup script (#1610) 2025-03-05 17:44:42 +09:00
Alexander Piskun
27706f37f6 Fixed typo in "update" cli command (#1609) 2025-03-05 17:00:19 +09:00
Dr.Lt.Data
3de17b2fa6 improve: pip fixer - support missing comfyui_frontend_package fixing 2025-03-05 12:55:39 +09:00
Dr.Lt.Data
22ecb5de95 update db 2025-03-05 08:15:03 +09:00
Dr.Lt.Data
992b8b3cb5 update DB 2025-03-04 22:24:05 +09:00
Dr.Lt.Data
bebc16d5a6 fixed: invalid log message 2025-03-04 22:07:15 +09:00
Dr.Lt.Data
ddb719f866 update DB 2025-03-04 22:05:03 +09:00
Dr.Lt.Data
0bd1bf2605 fixed: cm-cli - crash when comfyui doesn't have .git dir.
(support for desktop version)
2025-03-04 21:35:24 +09:00
Dr.Lt.Data
fd32ba4035 update DB 2025-03-04 12:50:27 +09:00
Dr.Lt.Data
22f723b920 modified: show more detailed info if updating failed 2025-03-04 12:37:39 +09:00
Dr.Lt.Data
1248bd0413 fixed: robust rmtree for windows environment
- reserve for deletion upon restart if a permission error occurs during rmtree

https://github.com/ltdrdata/ComfyUI-Manager/issues/1579
2025-03-03 21:34:38 +09:00
Dr.Lt.Data
c150eec2b6 update DB 2025-03-03 18:27:15 +09:00
Dr.Lt.Data
c7248c2d47 improve: PIPFixer
- now add numpy restriction when fixing opencv
2025-03-03 17:58:22 +09:00
Dr.Lt.Data
e71e68e298 modified: better error log when failed to update comfyui
https://github.com/ltdrdata/ComfyUI-Manager/issues/1576
2025-03-02 17:42:31 +09:00
Dr.Lt.Data
6969557693 fixed: stuck if cnr node cannot be resolved
https://github.com/ltdrdata/ComfyUI-Manager/issues/1596#issuecomment-2692415656
2025-03-02 17:28:53 +09:00
Dr.Lt.Data
f6be5ad839 modified: verbose reporting when initial fecthing is failed.
https://github.com/ltdrdata/ComfyUI-Manager/issues/1594
2025-03-02 17:07:00 +09:00
Dr.Lt.Data
cebe3664fd update DB 2025-03-02 16:08:30 +09:00
mango1010
cdab465c90 Added my custom node to the list (#1598) 2025-03-02 15:26:48 +09:00
keit
144384655c Add ComfyUI-Image-Toolkit node (#1600) 2025-03-02 15:25:41 +09:00
Dr.Lt.Data
0e213d6dab update DB 2025-03-01 01:59:34 +09:00
SirWillance
21294a4e4a Add Force of Will Suite Light to custom-node-list.json for Beginner-Friendly ComfyUI Prompt Refinement (#1592)
* 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-03-01 01:48:15 +09:00
Dr.Lt.Data
3ba4d44d9e update DB 2025-03-01 01:47:28 +09:00
Dr.Lt.Data
1f86ef5a37 update DB 2025-03-01 01:44:35 +09:00
Yuan-Man
fac60da333 Add ComfyUI-PhotoDoodle node (#1591) 2025-03-01 01:14:20 +09:00
Dr.Lt.Data
5a5a37dfee fixed: robust initial caching
https://github.com/comfyanonymous/ComfyUI/issues/7003#issuecomment-2690687621

modified: store `db_mode` setting to `config.ini`
https://github.com/ltdrdata/ComfyUI-Manager/issues/1582#issuecomment-2687332355

remove: fetch updates / skip updates
- 'updates' filter will trigger fetching
https://github.com/ltdrdata/ComfyUI-Manager/issues/1584

added: support for `disable_front` or `DISABLE_COMFYUI_MANAGER_FRONT`
2025-03-01 01:06:17 +09:00
Dr.Lt.Data
0d487bc14f update DB 2025-02-27 20:52:07 +09:00
Dr.Lt.Data
a52b4eb5ed update DB 2025-02-27 08:55:00 +09:00
Dr.Lt.Data
f1b7f5f52f fixed: Fixed the issue where attempting to install the nightly version resulted in installing the latest version instead. 2025-02-26 21:50:31 +09:00
Dr.Lt.Data
5ef58652bf remove useless code 2025-02-26 21:19:22 +09:00
Dr.Lt.Data
e26a9e75c6 update DB 2025-02-26 21:05:12 +09:00
Dr.Lt.Data
b0035ff4a7 update DB 2025-02-25 23:00:39 +09:00
orange90
94b6f9b2fe Update custom-node-list.json: (#1577)
* added  ComfyUI-Regex-Runner node
2025-02-25 22:44:31 +09:00
Dr.Lt.Data
cad1482b3f update doc 2025-02-25 22:27:21 +09:00
Dr.Lt.Data
ea7aafb3e6 fixed: When enabling the selected items, it fixed an issue where it performed a latest installation instead of enabling the previously disabled ones.
fixed: robust skipping installing/uninstalling/enabling of ComfyUI-Manager
2025-02-25 22:19:07 +09:00
Alexander Piskun
42b15ad4a5 restart action: support running as Python module (#1578) 2025-02-25 17:16:36 +09:00
Dr.Lt.Data
d3d613cca9 improved: cm-cli.sh - add --restore-to option to restore-snapshot command 2025-02-25 12:38:29 +09:00
Dr.Lt.Data
86893d999a fixed: Added the Python executable path to the PATH environment variable, preventing potential issues caused by a missing PATH.
https://github.com/ltdrdata/ComfyUI-Manager/issues/1554
2025-02-25 12:18:31 +09:00
Dr.Lt.Data
4fd17b0bf5 improved: advanced missing node detection based on embedded info
https://github.com/ltdrdata/ComfyUI-Manager/issues/1445

feat: Custom Nodes In Workflow
https://github.com/ltdrdata/ComfyUI-Manager/issues/990
https://github.com/ltdrdata/ComfyUI-Manager/issues/127

improved: show version on main dialog
modified: aux_id - use github_id if possible
removed: `fetch updates` button
2025-02-24 21:18:42 +09:00
Dr.Lt.Data
76d2206058 update DB 2025-02-24 21:00:14 +09:00
LAOGOU
51e8b608dc Update custom-node-list.json (#1575)
* Add Comfyui-Transform and LG_HotReload custom nodes

* Update custom-node-list.json
2025-02-24 20:31:45 +09:00
Dr.Lt.Data
a68330fb8f rollback wip code 2025-02-23 11:25:30 +09:00
Dr.Lt.Data
2449ad5c69 update DB 2025-02-23 11:08:07 +09:00
Dr.Lt.Data
064c812df3 update DB 2025-02-22 20:04:13 +09:00
bymyself
48d5ec9e66 Retain workflow versions when serializing node_versions (#1563)
* retain initial node_versions on serialize

* give precedence to workflow version

* set version info on node

* move patch to setup hook

* switch to nodeCreated
2025-02-22 17:42:36 +09:00
Dr.Lt.Data
914419fd1e update DB 2025-02-22 17:37:06 +09:00
The Dave
f005fc8ca0 added daves_nodes to custom node list for pull request (#1574) 2025-02-22 16:58:37 +09:00
RiceRound
43b7960de2 Add RiceRound Cloud Node (#1572) 2025-02-22 11:11:59 +09:00
Blueprint Coding
2ed1e58032 Update custom-node-list.json to match my node ID to Comfy registry ID (#1570) 2025-02-22 11:11:35 +09:00
Dr.Lt.Data
c63b212700 update DB 2025-02-20 12:33:06 +09:00
Dr.Lt.Data
e9df78c0e7 improved: When user do Switch ComfyUI, update the policy accordingly. 2025-02-20 12:20:04 +09:00
Dr.Lt.Data
b0daf81185 update dependencies in pyproject.toml 2025-02-19 22:09:30 +09:00
Dr.Lt.Data
cee4fdcbb0 fixed: apply ConfigParser(strict=False) to other callsites
https://github.com/ltdrdata/ComfyUI-Manager/pull/1561
2025-02-19 22:07:47 +09:00
Vanisper
df3cdfccb0 fix(git_utils): allow duplicate vscode-merge-base sections with strict=False (#1561)
- Set ConfigParser strict mode to False
- Resolves issue #1529 by permitting section duplicates
- Allow `vscode-merge-base` to appear multiple times in `.git/config`
2025-02-19 22:05:04 +09:00
Dr.Lt.Data
894042cd0e update DB 2025-02-19 22:02:10 +09:00
jmjoy
8123287952 Update model-list.json (#1564) 2025-02-19 21:40:20 +09:00
puke
bc677705d8 Update custom-node-list.json (#1562) 2025-02-19 21:39:41 +09:00
Dr.Lt.Data
5dd8ea8aab feat: update policy for updating ComfyUI
https://github.com/ltdrdata/ComfyUI-Manager/issues/1552

fixed: comfyui versions should be based on commit date
https://github.com/ltdrdata/ComfyUI-Manager/issues/1566

fixed: invalid identifying of nightly node packs which has `git@github.com:...` url
fixed: switch comfyui should be based on `master` branch instead of `main` branch
fixed: switch_to_default_branch - more robust switching
refactor: endpoints for policies
2025-02-19 21:34:13 +09:00
Dr.Lt.Data
41172be796 modified: don't show outdated ComfyUI message if desktop mode
modified: use __COMFYUI_DESKTOP_VERSION__ in notice board if desktop mode
2025-02-19 07:41:54 +09:00
36 changed files with 13797 additions and 6189 deletions

View File

@@ -150,6 +150,7 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
* Configurable pip auto fix: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_auto_fix.list`
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
@@ -306,12 +307,13 @@ The following settings are applied based on the section marked as `is_default`.
* Prevent the installation of specific pip packages
* List the package names one per line in the `pip_blacklist.list` file.
* Automatically Restoring pip Installation
* If you list pip spec requirements in `pip_auto_fix.list`, similar to `requirements.txt`, it will automatically restore the specified versions when starting ComfyUI or when versions get mismatched during various custom node installations.
* `--index-url` can be used.
* Use `aria2` as downloader
* [howto](docs/en/use_aria2.md)
* If you add the item `skip_migration_check = True` to `config.ini`, it will not check whether there are nodes that can be migrated at startup.
* This option can be used if performance issues occur in a Colab+GDrive environment.
## Environment Variables

View File

@@ -7,7 +7,10 @@ if not os.path.exists(cli_mode_flag):
sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
import manager_server # noqa: F401
import share_3rdparty # noqa: F401
WEB_DIRECTORY = "js"
import cm_global
if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
WEB_DIRECTORY = "js"
else:
print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")

View File

@@ -61,13 +61,17 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist
def check_comfyui_hash():
repo = git.Repo(comfy_path)
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
try:
repo = git.Repo(comfy_path)
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
except:
print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
core.comfy_ui_revision = 0
core.comfy_ui_commit_datetime = 0
cm_global.variables['comfyui.revision'] = core.comfy_ui_revision
core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
check_comfyui_hash() # This is a preparation step for manager_core
core.check_invalid_nodes()
@@ -76,7 +80,7 @@ core.check_invalid_nodes()
def read_downgrade_blacklist():
try:
import configparser
config = configparser.ConfigParser()
config = configparser.ConfigParser(strict=False)
config.read(core.manager_config.path)
default_conf = config['default']
@@ -152,6 +156,11 @@ class Ctx:
if y != '':
cm_global.pip_blacklist.add(y)
def update_custom_nodes_dir(self, target_dir):
import folder_paths
a, b = folder_paths.folder_names_and_paths['custom_nodes']
folder_paths.folder_names_and_paths['custom_nodes'] = [os.path.abspath(target_dir)], set()
@staticmethod
def get_startup_scripts_path():
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
@@ -245,7 +254,7 @@ def fix_node(node_spec_str, is_all=False, cnt_msg=''):
res = unified_manager.unified_fix(node_name, version_spec, no_deps=cmd_ctx.no_deps)
if not res.result:
print(f"ERROR: f{res.msg}")
print(f"[bold red]ERROR: f{res.msg}[/bold red]")
def uninstall_node(node_spec_str: str, is_all: bool = False, cnt_msg: str = ''):
@@ -638,7 +647,7 @@ def install(
cmd_ctx.set_channel_mode(channel, mode)
cmd_ctx.set_no_deps(no_deps)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
for_each_nodes(nodes, act=install_node)
pip_fixer.fix_broken()
@@ -676,7 +685,7 @@ def reinstall(
cmd_ctx.set_channel_mode(channel, mode)
cmd_ctx.set_no_deps(no_deps)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
for_each_nodes(nodes, act=reinstall_node)
pip_fixer.fix_broken()
@@ -702,7 +711,7 @@ def uninstall(
for_each_nodes(nodes, act=uninstall_node)
@app.command(help="Disable custom nodes")
@app.command(help="Update custom nodes")
def update(
nodes: List[str] = typer.Argument(
...,
@@ -730,7 +739,7 @@ def update(
if 'all' in nodes:
asyncio.run(auto_save_snapshot())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
for x in nodes:
if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -831,7 +840,7 @@ def fix(
if 'all' in nodes:
asyncio.run(auto_save_snapshot())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
for_each_nodes(nodes, fix_node, allow_all=True)
pip_fixer.fix_broken()
@@ -1038,13 +1047,17 @@ def save_snapshot(
):
cmd_ctx.set_user_directory(user_directory)
if output is None:
print("[bold red]ERROR: missing output path[/bold red]")
raise typer.Exit(code=1)
if(not output.endswith('.json') and not output.endswith('.yaml')):
print("ERROR: output path should be either '.json' or '.yaml' file.")
print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
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.")
print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
raise typer.Exit(code=1)
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
@@ -1075,10 +1088,17 @@ def restore_snapshot(
user_directory: str = typer.Option(
None,
help="user directory"
),
restore_to: Optional[str] = typer.Option(
None,
help="Manually specify the installation path for the custom node. Ignore user directory."
)
):
cmd_ctx.set_user_directory(user_directory)
if restore_to:
cmd_ctx.update_custom_nodes_dir(restore_to)
extras = []
if pip_non_url:
extras.append('--pip-non-url')
@@ -1099,7 +1119,7 @@ def restore_snapshot(
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
exit(1)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
try:
asyncio.run(core.restore_snapshot(snapshot_path, extras))
except Exception:
@@ -1131,7 +1151,7 @@ def restore_dependencies(
total = len(node_paths)
i = 1
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
for x in node_paths:
print("----------------------------------------------------------------------------------------------------")
print(f"Restoring [{i}/{total}]: {x}")
@@ -1150,7 +1170,7 @@ def post_install(
):
path = os.path.expanduser(path)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
unified_manager.execute_install_script('', path, instant_execution=True)
pip_fixer.fix_broken()
@@ -1194,8 +1214,7 @@ def install_deps(
print(f"[bold red]Invalid json file: {deps}[/bold red]")
exit(1)
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
for k in json_obj['custom_nodes'].keys():
state = core.simple_check_custom_node(k)
if state == 'installed':
@@ -1252,20 +1271,6 @@ def export_custom_node_ids(
print(f"{x['id']}@unknown", file=output_file)
@app.command(
"migrate",
help="Migrate legacy node system to new node system",
)
def migrate(
user_directory: str = typer.Option(
None,
help="user directory"
)
):
cmd_ctx.set_user_directory(user_directory)
asyncio.run(unified_manager.migrate_unmanaged_nodes())
if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
sys.exit(app())

View File

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

File diff suppressed because it is too large Load Diff

View File

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

View File

File diff suppressed because it is too large Load Diff

View File

@@ -112,4 +112,6 @@ def add_on_revision_detected(k, f):
variables['cm.on_revision_detected_handler'].append((k, f))
error_dict = {}
error_dict = {}
disable_front = False

View File

@@ -1,12 +1,15 @@
import requests
from dataclasses import dataclass
from typing import List
import manager_util
import toml
import os
import asyncio
import json
import os
import platform
import time
from dataclasses import dataclass
from typing import List
import manager_core
import manager_util
import requests
import toml
base_url = "https://api.comfy.org"
@@ -32,9 +35,43 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
page = 1
full_nodes = {}
# Determine form factor based on environment and platform
is_desktop = bool(os.environ.get('__COMFYUI_DESKTOP_VERSION__'))
system = platform.system().lower()
is_windows = system == 'windows'
is_mac = system == 'darwin'
is_linux = system == 'linux'
# Get ComfyUI version tag
if is_desktop:
# extract version from pyproject.toml instead of git tag
comfyui_ver = manager_core.get_current_comfyui_ver() or 'unknown'
else:
comfyui_ver = manager_core.get_comfyui_tag() or 'unknown'
if is_desktop:
if is_windows:
form_factor = 'desktop-win'
elif is_mac:
form_factor = 'desktop-mac'
else:
form_factor = 'other'
else:
if is_windows:
form_factor = 'git-windows'
elif is_mac:
form_factor = 'git-mac'
elif is_linux:
form_factor = 'git-linux'
else:
form_factor = 'other'
while remained:
sub_uri = f'{base_url}/nodes?page={page}&limit=30'
sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True), timeout=30)
# Add comfyui_version and form_factor to the API request
sub_uri = f'{base_url}/nodes?page={page}&limit=30&comfyui_version={comfyui_ver}&form_factor={form_factor}'
sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True, dont_cache=True), timeout=30)
remained = page < sub_json_obj['totalPages']
for x in sub_json_obj['nodes']:

View File

@@ -40,7 +40,8 @@ def git_url(fullpath):
if not os.path.exists(git_config_path):
return None
config = configparser.ConfigParser()
# Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
config = configparser.ConfigParser(strict=False)
config.read(git_config_path)
for k, v in config.items():
@@ -51,14 +52,29 @@ def git_url(fullpath):
def normalize_url(url) -> str:
if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
author = os.path.basename(os.path.dirname(url))
repo_name = os.path.basename(url)
url = f"https://github.com/{author}/{repo_name}"
github_id = normalize_to_github_id(url)
if github_id is not None:
url = f"https://github.com/{github_id}"
return url
def normalize_to_github_id(url) -> str:
if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
author = os.path.basename(os.path.dirname(url))
if author.startswith('git@github.com:'):
author = author.split(':')[1]
repo_name = os.path.basename(url)
if repo_name.endswith('.git'):
repo_name = repo_name[:-4]
return f"{author}/{repo_name}"
return None
def get_url_for_clone(url):
url = normalize_url(url)

View File

@@ -23,6 +23,7 @@ import yaml
import zipfile
import traceback
from concurrent.futures import ThreadPoolExecutor, as_completed
import toml
orig_print = print
@@ -42,7 +43,7 @@ import manager_downloader
from node_package import InstalledNodePackage
version_code = [3, 24]
version_code = [3, 31, 2]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -52,6 +53,11 @@ DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/ma
default_custom_nodes_path = None
class InvalidChannel(Exception):
def __init__(self, channel):
self.channel = channel
super().__init__(channel)
def get_default_custom_nodes_path():
global default_custom_nodes_path
if default_custom_nodes_path is None:
@@ -74,13 +80,31 @@ def get_custom_nodes_paths():
def get_comfyui_tag():
repo = git.Repo(comfy_path)
try:
repo = git.Repo(comfy_path)
return repo.git.describe('--tags')
except:
return None
def get_current_comfyui_ver():
"""
Extract version from pyproject.toml
"""
toml_path = os.path.join(comfy_path, 'pyproject.toml')
if not os.path.exists(toml_path):
return None
else:
try:
with open(toml_path, "r", encoding="utf-8") as f:
data = toml.load(f)
project = data.get('project', {})
return project.get('version')
except:
return None
def get_script_env():
new_env = os.environ.copy()
git_exe = get_config().get('git_exe')
@@ -154,7 +178,7 @@ def check_invalid_nodes():
# read env vars
comfy_path = os.environ.get('COMFYUI_PATH')
comfy_path: str = os.environ.get('COMFYUI_PATH')
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
if comfy_path is None:
@@ -232,6 +256,7 @@ comfy_ui_revision = "Unknown"
comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
channel_dict = None
valid_channels = set()
channel_list = None
@@ -336,7 +361,7 @@ def normalize_channel(channel):
if channel_url:
return channel_url
raise Exception(f"Invalid channel name '{channel}'")
raise InvalidChannel(channel)
class ManagedResult:
@@ -538,6 +563,8 @@ class UnifiedManager:
if node_package.is_disabled and node_package.is_unknown:
url = git_utils.git_url(node_package.fullpath)
if url is not None:
url = git_utils.normalize_url(url)
self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
if node_package.is_disabled and node_package.is_nightly:
@@ -548,6 +575,8 @@ class UnifiedManager:
if node_package.is_enabled and node_package.is_unknown:
url = git_utils.git_url(node_package.fullpath)
if url is not None:
url = git_utils.normalize_url(url)
self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
if node_package.is_from_cnr and node_package.is_disabled:
@@ -747,6 +776,11 @@ class UnifiedManager:
print(f"[bold red]ERROR: Invalid mode is specified `--mode {mode}`[/bold red]", file=sys.stderr)
return {}
# validate channel - only the channel set by the user is allowed.
if channel_url not in valid_channels:
logging.error(f'[ComfyUI-Manager] An invalid channel was used: {channel_url}')
raise InvalidChannel(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']:
try:
@@ -818,14 +852,14 @@ class UnifiedManager:
install_script_path = os.path.join(repo_path, "install.py")
requirements_path = os.path.join(repo_path, "requirements.txt")
res = True
if lazy_mode:
install_cmd = ["#LAZY-INSTALL-SCRIPT", sys.executable]
return try_install_script(url, repo_path, install_cmd)
else:
if os.path.exists(requirements_path) and not no_deps:
print("Install: pip packages")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
res = True
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
lines = manager_util.robust_readlines(requirements_path)
for line in lines:
package_name = remap_pip_package(line.strip())
@@ -836,15 +870,14 @@ class UnifiedManager:
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
pip_fixer.fix_broken()
return res
if os.path.exists(install_script_path) and install_script_path not in self.processed_install:
self.processed_install.add(install_script_path)
print("Install: install script")
install_cmd = [sys.executable, "install.py"]
return try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
return res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
return True
return res
def reserve_cnr_switch(self, target, zip_url, from_path, to_path, no_deps):
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
@@ -856,14 +889,6 @@ class UnifiedManager:
return True
def reserve_migration(self, moves):
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
with open(script_path, "a") as file:
obj = ["", "#LAZY-MIGRATION", moves]
file.write(f"{obj}\n")
return True
def unified_fix(self, node_id, version_spec, instant_execution=False, no_deps=False):
"""
fix dependencies
@@ -993,7 +1018,7 @@ class UnifiedManager:
return result
def unified_enable(self, node_id, version_spec=None):
def unified_enable(self, node_id: str, version_spec=None):
"""
priority if version_spec == None
1. CNR latest in disk
@@ -1005,6 +1030,9 @@ class UnifiedManager:
result = ManagedResult('enable')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: enabling '{node_id}'")
if version_spec is None:
version_spec = self.resolve_unspecified_version(node_id, guess_mode='inactive')
if version is None:
@@ -1059,8 +1087,8 @@ class UnifiedManager:
# update cache
if version_spec == 'unknown':
self.unknown_active_nodes[node_id] = self.unknown_inactive_nodes[node_id][0], to_path
del self.unknown_inactive_nodes[node_id]
self.unknown_active_nodes[node_id] = to_path
return result.with_target(to_path)
elif version_spec == 'nightly':
del self.nightly_inactive_nodes[node_id]
@@ -1070,9 +1098,12 @@ class UnifiedManager:
self.active_nodes[node_id] = version_spec, to_path
return result.with_target(to_path)
def unified_disable(self, node_id, is_unknown):
def unified_disable(self, node_id: str, is_unknown):
result = ManagedResult('disable')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: disabling '{node_id}'")
if is_unknown:
version_spec = 'unknown'
else:
@@ -1128,6 +1159,9 @@ class UnifiedManager:
"""
result = ManagedResult('uninstall')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: uninstalling '{node_id}'")
if is_unknown:
# remove from actives
repo_and_path = self.unknown_active_nodes.get(node_id)
@@ -1160,14 +1194,14 @@ class UnifiedManager:
ver_and_path = self.active_nodes.get(node_id)
if ver_and_path is not None and os.path.exists(ver_and_path[1]):
shutil.rmtree(ver_and_path[1])
try_rmtree(node_id, ver_and_path[1])
result.items.append(ver_and_path)
del self.active_nodes[node_id]
# remove from nightly inactives
fullpath = self.nightly_inactive_nodes.get(node_id)
if fullpath is not None and os.path.exists(fullpath):
shutil.rmtree(fullpath)
try_rmtree(node_id, fullpath)
result.items.append(('nightly', fullpath))
del self.nightly_inactive_nodes[node_id]
@@ -1175,7 +1209,7 @@ class UnifiedManager:
ver_map = self.cnr_inactive_nodes.get(node_id)
if ver_map is not None:
for key, fullpath in ver_map.items():
shutil.rmtree(fullpath)
try_rmtree(node_id, fullpath)
result.items.append((key, fullpath))
del self.cnr_inactive_nodes[node_id]
@@ -1184,9 +1218,12 @@ class UnifiedManager:
return result
def cnr_install(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
def cnr_install(self, node_id: str, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
result = ManagedResult('install-cnr')
if 'comfyui-manager' in node_id.lower():
return result.fail(f"ignored: installing '{node_id}'")
node_info = cnr_utils.install_node(node_id, version_spec)
if node_info is None or not node_info.download_url:
return result.fail(f'not available node: {node_id}@{version_spec}')
@@ -1231,10 +1268,13 @@ class UnifiedManager:
return result
def repo_install(self, url, repo_path, instant_execution=False, no_deps=False, return_postinstall=False):
def repo_install(self, url: str, repo_path: str, instant_execution=False, no_deps=False, return_postinstall=False):
result = ManagedResult('install-git')
result.append(url)
if 'comfyui-manager' in url.lower():
return result.fail(f"ignored: installing '{url}'")
if not is_valid_url(url):
return result.fail(f"Invalid git url: {url}")
@@ -1355,7 +1395,7 @@ class UnifiedManager:
else:
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: str, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
"""
priority if version_spec == None
1. CNR latest
@@ -1364,6 +1404,9 @@ class UnifiedManager:
remark: latest version_spec is not allowed. Must be resolved before call.
"""
if 'comfyui-manager' in node_id.lower():
return ManagedResult('skip').fail(f"ignored: installing '{node_id}'")
repo_url = None
if version_spec is None:
if self.is_enabled(node_id):
@@ -1374,7 +1417,11 @@ class UnifiedManager:
version_spec = self.resolve_unspecified_version(node_id)
if version_spec == 'unknown' or version_spec == 'nightly':
custom_nodes = await self.get_custom_nodes(channel, mode)
try:
custom_nodes = await self.get_custom_nodes(channel, mode)
except InvalidChannel as e:
return ManagedResult('fail').fail(f'Invalid channel is used: {e.channel}')
the_node = custom_nodes.get(node_id)
if the_node is not None:
if version_spec == 'unknown':
@@ -1401,7 +1448,7 @@ class UnifiedManager:
res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
if res.result:
if version_spec == 'unknown':
self.unknown_active_nodes[node_id] = to_path
self.unknown_active_nodes[node_id] = repo_url, to_path
elif version_spec == 'nightly':
cnr_utils.generate_cnr_id(to_path, node_id)
self.active_nodes[node_id] = 'nightly', to_path
@@ -1432,28 +1479,6 @@ class UnifiedManager:
return res
async def migrate_unmanaged_nodes(self):
"""
fix path for nightly and unknown nodes of unmanaged nodes
"""
await self.reload('cache')
await self.get_custom_nodes('default', 'cache')
print("Migration: STAGE 1")
moves = []
# migrate nightly inactive
for x, v in self.nightly_inactive_nodes.items():
if v.endswith('@nightly'):
continue
new_path = os.path.join(get_default_custom_nodes_path(), '.disabled', f"{x}@nightly")
moves.append((v, new_path))
self.reserve_migration(moves)
print("DONE (Migration reserved)")
unified_manager = UnifiedManager()
@@ -1468,7 +1493,7 @@ def identify_node_pack_from_path(fullpath):
# cnr
cnr = cnr_utils.read_cnr_info(fullpath)
if cnr is not None:
return module_name, cnr['version'], cnr['id']
return module_name, cnr['version'], cnr['id'], None
return None
else:
@@ -1476,10 +1501,18 @@ def identify_node_pack_from_path(fullpath):
cnr_id = cnr_utils.read_cnr_id(fullpath)
commit_hash = git_utils.get_commit_hash(fullpath)
github_id = git_utils.normalize_to_github_id(repo_url)
if github_id is None:
try:
github_id = os.path.basename(repo_url)
except:
logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
github_id = module_name
if cnr_id is not None:
return module_name, commit_hash, cnr_id
return module_name, commit_hash, cnr_id, github_id
else:
return module_name, commit_hash, ''
return module_name, commit_hash, '', github_id
def get_installed_node_packs():
@@ -1497,7 +1530,7 @@ def get_installed_node_packs():
is_disabled = not y.endswith('.disabled')
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': is_disabled }
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': is_disabled }
disabled_dirs = os.path.join(x, '.disabled')
if os.path.exists(disabled_dirs):
@@ -1510,13 +1543,19 @@ def get_installed_node_packs():
if info is None:
continue
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': False }
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': False }
return res
def refresh_channel_dict():
if channel_dict is None:
get_channel_dict()
def get_channel_dict():
global channel_dict
global valid_channels
if channel_dict is None:
channel_dict = {}
@@ -1530,6 +1569,7 @@ def get_channel_dict():
channel_info = x.split("::")
if len(channel_info) == 2:
channel_dict[channel_info[0]] = channel_info[1]
valid_channels.add(channel_info[1])
return channel_dict
@@ -1566,7 +1606,7 @@ manager_funcs = ManagerFuncs()
def write_config():
config = configparser.ConfigParser()
config = configparser.ConfigParser(strict=False)
config['default'] = {
'preview_method': manager_funcs.get_current_preview_method(),
@@ -1577,13 +1617,14 @@ def write_config():
'bypass_ssl': get_config()['bypass_ssl'],
"file_logging": get_config()['file_logging'],
'component_policy': get_config()['component_policy'],
'update_policy': get_config()['update_policy'],
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
'model_download_by_agent': get_config()['model_download_by_agent'],
'downgrade_blacklist': get_config()['downgrade_blacklist'],
'security_level': get_config()['security_level'],
'skip_migration_check': get_config()['skip_migration_check'],
'always_lazy_install': get_config()['always_lazy_install'],
'network_mode': get_config()['network_mode']
'network_mode': get_config()['network_mode'],
'db_mode': get_config()['db_mode'],
}
directory = os.path.dirname(manager_config_path)
@@ -1596,7 +1637,7 @@ def write_config():
def read_config():
try:
config = configparser.ConfigParser()
config = configparser.ConfigParser(strict=False)
config.read(manager_config_path)
default_conf = config['default']
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
@@ -1615,13 +1656,14 @@ def read_config():
'bypass_ssl': get_bool('bypass_ssl', False),
'file_logging': get_bool('file_logging', True),
'component_policy': default_conf.get('component_policy', 'workflow').lower(),
'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
'model_download_by_agent': get_bool('model_download_by_agent', False),
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
'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(),
'db_mode': default_conf.get('db_mode', 'cache').lower(),
}
except Exception:
@@ -1637,13 +1679,14 @@ def read_config():
'bypass_ssl': False,
'file_logging': True,
'component_policy': 'workflow',
'update_policy': 'stable-comfyui',
'windows_selector_event_loop_policy': False,
'model_download_by_agent': False,
'downgrade_blacklist': '',
'skip_migration_check': False,
'always_lazy_install': False,
'network_mode': 'public', # public | private | offline
'security_level': 'normal', # strong | normal | normal- | weak
'db_mode': 'cache', # local | cache | remote
}
@@ -1688,31 +1731,55 @@ def switch_to_default_branch(repo):
repo.git.checkout(default_branch)
return True
except:
# try checkout master
# try checkout main if failed
try:
repo.git.checkout(repo.heads.master)
return True
except:
try:
if remote_name is not None:
repo.git.checkout('-b', 'master', f'{remote_name}/master')
return True
except:
pass
try:
repo.git.checkout(repo.heads.main)
return True
except:
try:
if remote_name is not None:
repo.git.checkout('-b', 'main', f'{remote_name}/main')
return True
except:
pass
print("[ComfyUI Manager] Failed to switch to the default branch")
return False
def reserve_script(repo_path, install_cmds):
if not os.path.exists(manager_startup_script_path):
os.makedirs(manager_startup_script_path)
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
with open(script_path, "a") as file:
obj = [repo_path] + install_cmds
file.write(f"{obj}\n")
def try_rmtree(title, fullpath):
try:
shutil.rmtree(fullpath)
except Exception as e:
logging.warning(f"[ComfyUI-Manager] An error occurred while deleting '{fullpath}', so it has been scheduled for deletion upon restart.\nEXCEPTION: {e}")
reserve_script(title, ["#LAZY-DELETE-NODEPACK", fullpath])
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" or get_config()['always_lazy_install']
):
if not os.path.exists(manager_startup_script_path):
os.makedirs(manager_startup_script_path)
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
with open(script_path, "a") as file:
obj = [repo_path] + install_cmd
file.write(f"{obj}\n")
reserve_script(repo_path, install_cmd)
return True
else:
if len(install_cmd) == 5 and install_cmd[2:4] == ['pip', 'install']:
@@ -1729,7 +1796,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
if platform.system() != "Windows":
try:
if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
print("\n\n###################################################################")
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
@@ -1823,7 +1890,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
else:
if os.path.exists(requirements_path) and not no_deps:
print("Install: pip packages")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
with open(requirements_path, "r") as requirements_file:
for line in requirements_file:
#handle comments
@@ -2020,7 +2087,7 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
cnr = unified_manager.get_cnr_by_repo(url)
if cnr:
cnr_id = cnr['id']
return await unified_manager.install_by_id(cnr_id, version_spec='nightly')
return await unified_manager.install_by_id(cnr_id, version_spec='nightly', channel='default', mode='cache')
else:
repo_name = os.path.splitext(os.path.basename(url))[0]
@@ -2347,6 +2414,39 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
return True
def update_to_stable_comfyui(repo_path):
try:
repo = git.Repo(repo_path)
try:
repo.git.checkout(repo.heads.master)
except:
logging.error(f"[ComfyUI-Manager] Failed to checkout 'master' branch.\nrepo_path={repo_path}\nAvailable branches:")
for branch in repo.branches:
logging.error('\t'+branch.name)
return "fail", None
versions, current_tag, _ = get_comfyui_versions(repo)
if len(versions) == 0 or (len(versions) == 1 and versions[0] == 'nightly'):
logging.info("[ComfyUI-Manager] Unable to update to the stable ComfyUI version.")
return "fail", None
if versions[0] == 'nightly':
latest_tag = versions[1]
else:
latest_tag = versions[0]
if current_tag == latest_tag:
return "skip", None
else:
logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
repo.git.checkout(latest_tag)
return 'updated', latest_tag
except:
traceback.print_exc()
return "fail", None
def update_path(repo_path, instant_execution=False, no_deps=False):
if not os.path.exists(os.path.join(repo_path, '.git')):
return "fail"
@@ -2354,9 +2454,12 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
# version check
repo = git.Repo(repo_path)
is_switched = False
if repo.head.is_detached:
if not switch_to_default_branch(repo):
return "fail"
else:
is_switched = True
current_branch = repo.active_branch
branch_name = current_branch.name
@@ -2395,6 +2498,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
git_pull(repo_path)
execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
return "updated"
elif is_switched:
return "updated"
else:
return "skipped"
@@ -2492,15 +2597,12 @@ async def get_current_snapshot(custom_nodes_only = False):
# Get ComfyUI hash
repo_path = comfy_path
if not os.path.exists(os.path.join(repo_path, '.git')):
print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
return {}
comfyui_commit_hash = None
if not custom_nodes_only:
repo = git.Repo(repo_path)
comfyui_commit_hash = repo.head.commit.hexsha
if os.path.exists(os.path.join(repo_path, '.git')):
repo = git.Repo(repo_path)
comfyui_commit_hash = repo.head.commit.hexsha
git_custom_nodes = {}
cnr_custom_nodes = {}
file_custom_nodes = []
@@ -2705,9 +2807,6 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
if ext == 'https://github.com/comfyanonymous/ComfyUI':
pass
elif ext is not None:
if 'Fooocus' in ext:
print(f">> {node_name}")
used_exts.add(ext)
else:
unknown_nodes.add(node_name)
@@ -2983,6 +3082,10 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
# normalize github repo
for k, v in _git_info.items():
# robust filter out comfyui-manager while restoring snapshot
if 'comfyui-manager' in k.lower():
continue
norm_k = git_utils.normalize_url(k)
git_info[norm_k] = v
@@ -3056,8 +3159,6 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if x in git_info:
del git_info[x]
# remained nightly will be installed and migrated
# for unknown restore
todo_disable = []
todo_enable = []
@@ -3129,9 +3230,6 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
unified_manager.repo_install(repo_url, to_path, instant_execution=True, no_deps=False, return_postinstall=False)
cloned_repos.append(repo_name)
# reload
await unified_manager.migrate_unmanaged_nodes()
# print summary
for x in cloned_repos:
print(f"[ INSTALLED ] {x}")
@@ -3148,45 +3246,26 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
# print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")
# check need to migrate
need_to_migrate = False
def get_comfyui_versions(repo=None):
if repo is None:
repo = git.Repo(comfy_path)
try:
remote = get_remote_name(repo)
repo.remotes[remote].fetch()
except:
logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
async def check_need_to_migrate():
global need_to_migrate
await unified_manager.reload('cache')
await unified_manager.load_nightly(channel='default', mode='cache')
legacy_custom_nodes = []
for x in unified_manager.active_nodes.values():
if x[0] == 'nightly' and not x[1].endswith('@nightly'):
legacy_custom_nodes.append(x[1])
for x in unified_manager.nightly_inactive_nodes.values():
if not x.endswith('@nightly'):
legacy_custom_nodes.append(x)
if len(legacy_custom_nodes) > 0:
print("\n--------------------- ComfyUI-Manager migration notice --------------------")
print("The following custom nodes were installed using the old management method and require migration:\n")
print("\n".join(legacy_custom_nodes))
print("---------------------------------------------------------------------------\n")
need_to_migrate = True
def get_comfyui_versions():
repo = git.Repo(comfy_path)
versions = [x.name for x in repo.tags if x.name.startswith('v')]
versions.reverse() # nearest tag
# nearest tag
versions = sorted(versions, key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
versions = versions[:4]
current_tag = repo.git.describe('--tags')
if current_tag not in versions:
versions = sorted(versions + [current_tag], reverse=True)
versions = sorted(versions + [current_tag], key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
versions = versions[:4]
main_branch = repo.heads.master
@@ -3199,16 +3278,18 @@ def get_comfyui_versions():
versions[0] = 'nightly'
current_tag = 'nightly'
return versions, current_tag
return versions, current_tag, latest_tag
def switch_comfyui(tag):
repo = git.Repo(comfy_path)
if tag == 'nightly':
repo.git.checkout('main')
repo.remotes.origin.pull()
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'main' version")
repo.git.checkout('master')
tracking_branch = repo.active_branch.tracking_branch()
remote_name = tracking_branch.remote_name
repo.remotes[remote_name].pull()
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'master' version")
else:
repo.git.checkout(tag)
print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")
@@ -3223,7 +3304,7 @@ def resolve_giturl_from_path(fullpath):
if not os.path.exists(git_config_path):
return "unknown"
config = configparser.ConfigParser()
config = configparser.ConfigParser(strict=False)
config.read(git_config_path)
for k, v in config.items():

View File

@@ -187,6 +187,11 @@ set_preview_method(core.get_config()['preview_method'])
def set_component_policy(mode):
core.get_config()['component_policy'] = mode
def set_update_policy(mode):
core.get_config()['update_policy'] = mode
def set_db_mode(mode):
core.get_config()['db_mode'] = mode
def print_comfyui_version():
global comfy_ui_hash
@@ -209,7 +214,7 @@ def print_comfyui_version():
comfyui_tag = core.get_comfyui_tag()
try:
if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
except:
pass
@@ -268,14 +273,23 @@ import zipfile
import urllib.request
def get_model_dir(data, show_log=False):
def get_model_dir(data, show_log=False) -> str | None:
if 'download_model_base' in folder_paths.folder_names_and_paths:
models_base = folder_paths.folder_names_and_paths['download_model_base'][0][0]
else:
models_base = folder_paths.models_dir
# NOTE: Validate to prevent path traversal.
if any(char in data['filename'] for char in {'/', '\\', ':'}):
return None
def resolve_custom_node(save_path):
save_path = save_path[13:] # remove 'custom_nodes/'
# NOTE: Validate to prevent path traversal.
if save_path.startswith(os.path.sep) or ':' in save_path:
return None
repo_name = save_path.replace('\\','/').split('/')[0] # get custom node repo name
# NOTE: The creation of files within the custom node path should be removed in the future.
@@ -394,7 +408,6 @@ async def task_worker():
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}'"
@@ -445,27 +458,36 @@ async def task_worker():
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}'.")
logging.error(f"\nERROR: An error occurred while updating '{node_name}'. (res.result={res.result}, res.action={res.action})")
return base_res
except Exception:
traceback.print_exc()
return {'msg':f"An error occurred while updating '{node_name}'."}
async def do_update_comfyui() -> str:
async def do_update_comfyui(is_stable) -> str:
try:
repo_path = os.path.dirname(folder_paths.__file__)
res = core.update_path(repo_path)
latest_tag = None
if is_stable:
res, latest_tag = core.update_to_stable_comfyui(repo_path)
else:
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."
logging.error("ComfyUI update failed")
return "fail"
elif res == "updated":
logging.info("ComfyUI is updated.")
return "success"
if is_stable:
logging.info("ComfyUI is updated to latest stable version.")
return "success-stable-"+latest_tag
else:
logging.info("ComfyUI is updated to latest nightly version.")
return "success-nightly"
else: # skipped
logging.info("ComfyUI is up-to-date.")
return "skip"
except Exception:
traceback.print_exc()
@@ -597,7 +619,7 @@ async def task_worker():
elif kind == 'update-main':
msg = await do_update(item)
elif kind == 'update-comfyui':
msg = await do_update_comfyui()
msg = await do_update_comfyui(item[1])
elif kind == 'fix':
msg = await do_fix(item)
elif kind == 'uninstall':
@@ -805,7 +827,7 @@ async def fetch_customnode_list(request):
"""
provide unified custom node list
"""
if "skip_update" in request.rel_url.query and request.rel_url.query["skip_update"] == "true":
if request.rel_url.query.get("skip_update", '').lower() == "true":
skip_update = True
else:
skip_update = False
@@ -822,7 +844,7 @@ async def fetch_customnode_list(request):
core.populate_github_stats(node_packs, await json_obj_github)
core.populate_favorites(node_packs, await json_obj_extras)
check_state_of_git_node_pack(node_packs, False, do_update_check=not skip_update)
check_state_of_git_node_pack(node_packs, not skip_update, do_update_check=not skip_update)
for v in node_packs.values():
populate_markdown(v)
@@ -915,6 +937,7 @@ def check_model_installed(json_obj):
@routes.get("/externalmodel/getlist")
async def fetch_externalmodel_list(request):
# The model list is only allowed in the default channel, yet.
json_obj = await core.get_data_by_mode(request.rel_url.query["mode"], 'model-list.json')
check_model_installed(json_obj)
@@ -1183,8 +1206,15 @@ async def install_custom_node(request):
git_url = None
if json_data['version'] != 'unknown':
selected_version = json_data.get('selected_version', 'latest')
selected_version = json_data.get('selected_version')
if json_data['version'] != 'unknown' and selected_version != 'unknown':
if skip_post_install:
if cnr_id in core.unified_manager.nightly_inactive_nodes or cnr_id in core.unified_manager.cnr_inactive_nodes:
core.unified_manager.unified_enable(cnr_id)
return web.Response(status=200)
elif selected_version is None:
selected_version = 'latest'
if selected_version != 'nightly':
risky_level = 'low'
node_spec_str = f"{cnr_id}@{selected_version}"
@@ -1194,6 +1224,9 @@ async def install_custom_node(request):
if git_url is None:
logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
elif json_data['version'] != 'unknown' and selected_version == 'unknown':
logging.error(f"[ComfyUI-Manager] Invalid installation request: {json_data}")
return web.Response(status=400, text="Invalid installation request")
else:
# unknown
unknown_name = os.path.basename(json_data['files'][0])
@@ -1337,14 +1370,15 @@ async def update_custom_node(request):
@routes.get("/manager/queue/update_comfyui")
async def update_comfyui(request):
task_queue.put(("update-comfyui", ('comfyui',)))
is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
task_queue.put(("update-comfyui", ('comfyui', is_stable)))
return web.Response(status=200)
@routes.get("/comfyui_manager/comfyui_versions")
async def comfyui_versions(request):
try:
res, current = core.get_comfyui_versions()
res, current, latest = core.get_comfyui_versions()
return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
except Exception as e:
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
@@ -1384,17 +1418,14 @@ async def disable_node(request):
return web.Response(status=200)
@routes.get("/manager/migrate_unmanaged_nodes")
async def migrate_unmanaged_nodes(request):
logging.info("[ComfyUI-Manager] Migrating unmanaged nodes...")
await core.unified_manager.migrate_unmanaged_nodes()
logging.info("Done.")
return web.Response(status=200)
async def check_whitelist_for_model(item):
json_obj = await core.get_data_by_mode('cache', 'model-list.json')
@routes.get("/manager/need_to_migrate")
async def need_to_migrate(request):
return web.Response(text=str(core.need_to_migrate), status=200)
for x in json_obj.get('models', []):
if x['save_path'] == item['save_path'] and x['base'] == item['base'] and x['filename'] == item['filename']:
return True
return False
@routes.post("/manager/queue/install_model")
@@ -1405,6 +1436,11 @@ async def install_model(request):
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
# validate request
if not await check_whitelist_for_model(json_data):
logging.error(f"[ComfyUI-Manager] Invalid model install request is detected: {json_data}")
return web.Response(status=400, text="Invalid model install request is detected")
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', 'default')
@@ -1435,7 +1471,19 @@ async def preview_method(request):
return web.Response(status=200)
@routes.get("/manager/component/policy")
@routes.get("/manager/db_mode")
async def db_mode(request):
if "value" in request.rel_url.query:
set_db_mode(request.rel_url.query['value'])
core.write_config()
else:
return web.Response(text=core.get_config()['db_mode'], status=200)
return web.Response(status=200)
@routes.get("/manager/policy/component")
async def component_policy(request):
if "value" in request.rel_url.query:
set_component_policy(request.rel_url.query['value'])
@@ -1446,6 +1494,17 @@ async def component_policy(request):
return web.Response(status=200)
@routes.get("/manager/policy/update")
async def update_policy(request):
if "value" in request.rel_url.query:
set_update_policy(request.rel_url.query['value'])
core.write_config()
else:
return web.Response(text=core.get_config()['update_policy'], status=200)
return web.Response(status=200)
@routes.get("/manager/channel_url_list")
async def channel_url_list(request):
channels = core.get_channel_dict()
@@ -1499,22 +1558,27 @@ async def get_notice(request):
if match:
markdown_content = match.group(1)
version_tag = core.get_comfyui_tag()
if version_tag is None:
markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
version_tag = os.environ.get('__COMFYUI_DESKTOP_VERSION__')
if version_tag is not None:
markdown_content += f"<HR>ComfyUI: {version_tag} [Desktop]"
else:
markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})")
version_tag = core.get_comfyui_tag()
if version_tag is None:
markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
else:
markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})")
# markdown_content += f"<BR>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;()"
markdown_content += f"<BR>Manager: {core.version_str}"
markdown_content = add_target_blank(markdown_content)
try:
if core.comfy_ui_commit_datetime == datetime(1900, 1, 1, 0, 0, 0):
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI isn\'t git repo.</P>' + markdown_content
elif core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
if '__COMFYUI_DESKTOP_VERSION__' not in os.environ:
if core.comfy_ui_commit_datetime == datetime(1900, 1, 1, 0, 0, 0):
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI isn\'t git repo.</P>' + markdown_content
elif core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
except:
pass
@@ -1549,7 +1613,10 @@ def restart(self):
if '--windows-standalone-build' in sys_argv:
sys_argv.remove('--windows-standalone-build')
if sys.platform.startswith('win32'):
if sys_argv[0].endswith("__main__.py"): # this is a python module
module_name = os.path.basename(os.path.dirname(sys_argv[0]))
cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
elif sys.platform.startswith('win32'):
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
else:
cmds = [sys.executable] + sys_argv
@@ -1641,22 +1708,27 @@ cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
async def default_cache_update():
core.refresh_channel_dict()
channel_url = core.get_config()['channel_url']
async def get_cache(filename):
if core.get_config()['default_cache_as_channel_url']:
uri = f"{channel_url}/{filename}"
else:
uri = f"{core.DEFAULT_CHANNEL}/{filename}"
try:
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 = os.path.join(manager_util.cache_dir, cache_uri)
cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
json_obj = await manager_util.get_data(uri, True)
json_obj = await manager_util.get_data(uri, True)
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)
logging.info(f"[ComfyUI-Manager] default cache updated: {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)
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
except Exception as e:
logging.error(f"[ComfyUI-Manager] Failed to perform initial fetching '{filename}': {e}")
traceback.print_exc()
if core.get_config()['network_mode'] != 'offline':
a = get_cache("custom-node-list.json")
@@ -1676,11 +1748,6 @@ async def default_cache_update():
logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
# NOTE: hide migration button temporarily.
# if not core.get_config()['skip_migration_check']:
# await core.check_need_to_migrate()
# else:
# logging.info("[ComfyUI-Manager] Migration check is skipped...")
threading.Thread(target=lambda: asyncio.run(default_cache_update())).start()

View File

@@ -2,6 +2,7 @@
description:
`manager_util` is the lightest module shared across the prestartup_script, main code, and cm-cli of ComfyUI-Manager.
"""
import traceback
import aiohttp
import json
@@ -12,6 +13,8 @@ import subprocess
import sys
import re
import logging
import platform
import shlex
cache_lock = threading.Lock()
@@ -21,11 +24,21 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also up
use_uv = False
def add_python_path_to_env():
if platform.system() != "Windows":
sep = ':'
else:
sep = ';'
os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
def make_pip_cmd(cmd):
if use_uv:
return [sys.executable, '-m', 'uv', 'pip'] + cmd
return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
else:
return [sys.executable, '-m', 'pip'] + cmd
return [sys.executable, '-s', '-m', 'pip'] + cmd
# DON'T USE StrictVersion - cannot handle pre_release version
@@ -169,7 +182,7 @@ def save_to_cache(uri, json_obj, silent=False):
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False, dont_cache=False):
cache_uri = get_cache_path(uri)
if cache_mode and dont_wait:
@@ -188,11 +201,12 @@ async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=Fals
json_obj = await get_data(cache_uri, silent=silent)
else:
json_obj = await get_data(uri, silent=silent)
with cache_lock:
with open(cache_uri, "w", encoding='utf-8') as file:
json.dump(json_obj, file, indent=4, sort_keys=True)
if not silent:
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
if not dont_cache:
with cache_lock:
with open(cache_uri, "w", encoding='utf-8') as file:
json.dump(json_obj, file, indent=4, sort_keys=True)
if not silent:
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
return json_obj
@@ -232,7 +246,8 @@ def get_installed_packages(renew=False):
if y[0] == 'Package' or y[0].startswith('-'):
continue
pip_map[y[0]] = y[1]
normalized_name = y[0].lower().replace('-', '_')
pip_map[normalized_name] = y[1]
except subprocess.CalledProcessError:
logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
return set()
@@ -245,6 +260,46 @@ def clear_pip_cache():
pip_map = None
def parse_requirement_line(line):
tokens = shlex.split(line)
if not tokens:
return None
package_spec = tokens[0]
pattern = re.compile(
r'^(?P<package>[A-Za-z0-9_.+-]+)'
r'(?P<operator>==|>=|<=|!=|~=|>|<)?'
r'(?P<version>[A-Za-z0-9_.+-]*)$'
)
m = pattern.match(package_spec)
if not m:
return None
package = m.group('package')
operator = m.group('operator') or None
version = m.group('version') or None
index_url = None
if '--index-url' in tokens:
idx = tokens.index('--index-url')
if idx + 1 < len(tokens):
index_url = tokens[idx + 1]
res = {'package': package}
if operator is not None:
res['operator'] = operator
if version is not None:
res['version'] = StrictVersion(version)
if index_url is not None:
res['index_url'] = index_url
return res
torch_torchvision_torchaudio_version_map = {
'2.6.0': ('0.21.0', '2.6.0'),
'2.5.1': ('0.20.0', '2.5.0'),
@@ -264,9 +319,12 @@ torch_torchvision_torchaudio_version_map = {
}
class PIPFixer:
def __init__(self, prev_pip_versions):
def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
self.prev_pip_versions = { **prev_pip_versions }
self.comfyui_path = comfyui_path
self.manager_files_path = manager_files_path
def torch_rollback(self):
spec = self.prev_pip_versions['torch'].split('+')
@@ -346,7 +404,7 @@ class PIPFixer:
if len(targets) > 0:
for x in targets:
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"])
subprocess.check_output(cmd, universal_newlines=True)
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
@@ -361,10 +419,81 @@ class PIPFixer:
if StrictVersion(np) >= StrictVersion('2'):
cmd = make_pip_cmd(['install', "numpy<2"])
subprocess.check_output(cmd , universal_newlines=True)
logging.info("[ComfyUI-Manager] 'numpy' dependency were fixed")
except Exception as e:
logging.error("[ComfyUI-Manager] Failed to restore numpy")
logging.error(e)
# fix missing frontend
try:
# NOTE: package name in requirements is 'comfyui-frontend-package'
# but, package name from `pip freeze` is 'comfyui_frontend_package'
# but, package name from `uv pip freeze` is 'comfyui-frontend-package'
#
# get_installed_packages returns normalized name (i.e. comfyui_frontend_package)
if 'comfyui_frontend_package' not in new_pip_versions:
requirements_path = os.path.join(self.comfyui_path, 'requirements.txt')
with open(requirements_path, 'r') as file:
lines = file.readlines()
front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
cmd = make_pip_cmd(['install', front_line])
subprocess.check_output(cmd , universal_newlines=True)
logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
except Exception as e:
logging.error("[ComfyUI-Manager] Failed to restore comfyui-frontend-package")
logging.error(e)
# restore based on custom list
pip_auto_fix_path = os.path.join(self.manager_files_path, "pip_auto_fix.list")
if os.path.exists(pip_auto_fix_path):
with open(pip_auto_fix_path, 'r', encoding="UTF-8", errors="ignore") as f:
fixed_list = []
for x in f.readlines():
try:
parsed = parse_requirement_line(x)
need_to_reinstall = True
normalized_name = parsed['package'].lower().replace('-', '_')
if normalized_name in new_pip_versions:
if 'version' in parsed and 'operator' in parsed:
cur = StrictVersion(new_pip_versions[parsed['package']])
dest = parsed['version']
op = parsed['operator']
if cur == dest:
if op in ['==', '>=', '<=']:
need_to_reinstall = False
elif cur < dest:
if op in ['<=', '<', '~=', '!=']:
need_to_reinstall = False
elif cur > dest:
if op in ['>=', '>', '~=', '!=']:
need_to_reinstall = False
if need_to_reinstall:
cmd_args = ['install']
if 'version' in parsed and 'operator' in parsed:
cmd_args.append(parsed['package']+parsed['operator']+parsed['version'].version_string)
if 'index_url' in parsed:
cmd_args.append('--index-url')
cmd_args.append(parsed['index_url'])
cmd = make_pip_cmd(cmd_args)
subprocess.check_output(cmd, universal_newlines=True)
fixed_list.append(parsed['package'])
except Exception as e:
traceback.print_exc()
logging.error(f"[ComfyUI-Manager] Failed to restore '{x}'")
logging.error(e)
if len(fixed_list) > 0:
logging.info(f"[ComfyUI-Manager] dependencies in pip_auto_fix.json were fixed: {fixed_list}")
def sanitize(data):
return data.replace("<", "&lt;").replace(">", "&gt;")

View File

@@ -13,7 +13,7 @@ import {
import { OpenArtShareDialog } from "./comfyui-share-openart.js";
import {
free_models, install_pip, install_via_git_url, manager_instance,
rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt,
rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
infoToast, showTerminal, setNeedRestart
} from "./common.js";
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
@@ -21,6 +21,8 @@ import { CustomNodesManager } from "./custom-nodes-manager.js";
import { ModelManager } from "./model-manager.js";
import { SnapshotManager } from "./snapshot.js";
let manager_version = await getVersion();
var docStyle = document.createElement('style');
docStyle.innerHTML = `
.comfy-toast {
@@ -42,7 +44,7 @@ docStyle.innerHTML = `
#cm-manager-dialog {
width: 1000px;
height: 450px;
height: 455px;
box-sizing: content-box;
z-index: 1000;
overflow-y: auto;
@@ -139,7 +141,7 @@ docStyle.innerHTML = `
.cm-notice-board {
width: 290px;
height: 210px;
height: 230px;
overflow: auto;
color: var(--input-text);
border: 1px solid var(--descrip-text);
@@ -225,12 +227,12 @@ document.head.appendChild(docStyle);
var update_comfyui_button = null;
var switch_comfyui_button = null;
var fetch_updates_button = null;
var update_all_button = null;
var restart_stop_button = null;
var update_policy_combo = null;
let share_option = 'all';
var is_updating_all = false;
var is_updating = false;
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -477,6 +479,8 @@ async function updateComfyUI() {
const response = await api.fetchApi('/manager/queue/update_comfyui');
showTerminal();
is_updating = true;
await api.fetchApi('/manager/queue/start');
}
@@ -605,8 +609,14 @@ function showVersionSelectorDialog(versions, current, onSelect) {
}
async function switchComfyUI() {
switch_comfyui_button.disabled = true;
switch_comfyui_button.style.backgroundColor = "gray";
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
switch_comfyui_button.disabled = false;
switch_comfyui_button.style.backgroundColor = "";
if(res.status == 200) {
let obj = await res.json();
@@ -619,6 +629,15 @@ async function switchComfyUI() {
}
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
if(selected_version == 'nightly') {
update_policy_combo.value = 'nightly-comfyui';
api.fetchApi('/manager/policy/update?value=nightly-comfyui');
}
else {
update_policy_combo.value = 'stable-comfyui';
api.fetchApi('/manager/policy/update?value=stable-comfyui');
}
let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
if (response.status == 200) {
infoToast(`ComfyUI version is switched to ${selected_version}`);
@@ -633,57 +652,6 @@ async function switchComfyUI() {
}
}
async function fetchUpdates(update_check_checkbox) {
let prev_text = fetch_updates_button.innerText;
fetch_updates_button.innerText = "Fetching updates...";
fetch_updates_button.disabled = true;
fetch_updates_button.style.backgroundColor = "gray";
try {
var mode = manager_instance.datasrc_combo.value;
const response = await api.fetchApi(`/customnode/fetch_updates?mode=${mode}`);
if (response.status != 200 && response.status != 201) {
show_message('Failed to fetch updates.');
return false;
}
if (response.status == 201) {
show_message("There is an updated extension available.<BR><BR><P><B>NOTE:<BR>Fetch Updates is not an update.<BR>Please update from <button id='cm-install-customnodes-button'>Install Custom Nodes</button> </B></P>");
const button = document.getElementById('cm-install-customnodes-button');
button.addEventListener("click",
async function() {
app.ui.dialog.close();
if(!CustomNodesManager.instance) {
CustomNodesManager.instance = new CustomNodesManager(app, self);
}
await CustomNodesManager.instance.show(CustomNodesManager.ShowMode.UPDATE);
}
);
update_check_checkbox.checked = false;
}
else {
show_message('All extensions are already up-to-date with the latest versions.');
}
return true;
}
catch (exception) {
show_message(`Failed to update custom nodes / ${exception}`);
return false;
}
finally {
fetch_updates_button.disabled = false;
fetch_updates_button.innerText = prev_text;
fetch_updates_button.style.backgroundColor = "";
}
}
async function onQueueStatus(event) {
const isElectron = 'electronAPI' in window;
@@ -694,11 +662,11 @@ async function onQueueStatus(event) {
else if(event.detail.status == 'done') {
reset_action_buttons();
if(!is_updating_all) {
if(!is_updating) {
return;
}
is_updating_all = false;
is_updating = false;
let success_list = [];
let failed_list = [];
@@ -721,19 +689,25 @@ async function onQueueStatus(event) {
let msg = "";
if(success_list.length == 0 && comfyui_state != 'success') {
if(success_list.length == 0 && comfyui_state.startsWith('skip')) {
if(failed_list.length == 0) {
msg += "All custom nodes are already up to date.";
msg += "You are already up to date.";
}
}
else {
msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
if(comfyui_state == 'success') {
msg += "ComfyUI is updated.<BR><BR>";
if(comfyui_state == 'success-nightly') {
msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
infoToast("ComfyUI has been updated to the latest nightly version.");
}
else if(comfyui_state.startsWith('success-stable')) {
const ver = comfyui_state.split("-").pop();
msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
infoToast(`ComfyUI has been updated to ${ver}`);
}
else if(comfyui_state == 'skip') {
msg += "ComfyUI is already up-to-date.<BR><BR>"
msg += "ComfyUI is already up to date.<BR><BR>"
}
else if(comfyui_state != null) {
msg += "Failed to update ComfyUI.<BR><BR>"
@@ -790,8 +764,7 @@ async function onQueueStatus(event) {
api.addEventListener("cm-queue-status", onQueueStatus);
async function updateAll(update_comfyui, manager_dialog) {
let prev_text = update_all_button.innerText;
async function updateAll(update_comfyui) {
update_all_button.innerText = "Updating...";
set_inprogress_mode();
@@ -811,7 +784,7 @@ async function updateAll(update_comfyui, manager_dialog) {
customAlert('Another task is already in progress. Please stop the ongoing task first.');
}
else if(response.status == 200) {
is_updating_all = true;
is_updating = true;
await api.fetchApi('/manager/queue/start');
}
}
@@ -874,14 +847,6 @@ class ManagerMenuDialog extends ComfyDialog {
() => switchComfyUI()
});
fetch_updates_button =
$el("button.cm-button", {
type: "button",
textContent: "Fetch Updates",
onclick:
() => fetchUpdates(this.update_check_checkbox)
});
restart_stop_button =
$el("button.cm-button-red", {
type: "button",
@@ -895,7 +860,7 @@ class ManagerMenuDialog extends ComfyDialog {
type: "button",
textContent: "Update All Custom Nodes",
onclick:
() => updateAll(false, self)
() => updateAll(false)
});
}
else {
@@ -904,7 +869,7 @@ class ManagerMenuDialog extends ComfyDialog {
type: "button",
textContent: "Update All",
onclick:
() => updateAll(true, self)
() => updateAll(true)
});
}
@@ -934,7 +899,19 @@ class ManagerMenuDialog extends ComfyDialog {
}
}),
$el("button.cm-button", {
type: "button",
textContent: "Custom Nodes In Workflow",
onclick:
() => {
if(!CustomNodesManager.instance) {
CustomNodesManager.instance = new CustomNodesManager(app, self);
}
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
}
}),
$el("br", {}, []),
$el("button.cm-button", {
type: "button",
textContent: "Model Manager",
@@ -963,45 +940,19 @@ class ManagerMenuDialog extends ComfyDialog {
update_all_button,
update_comfyui_button,
switch_comfyui_button,
fetch_updates_button,
// fetch_updates_button,
$el("br", {}, []),
restart_stop_button,
];
let migration_btn =
$el("button.cm-button-orange", {
type: "button",
textContent: "Migrate to New Node System",
onclick: () => migrateAPI()
});
migration_btn.style.display = 'none';
res.push(migration_btn);
api.fetchApi('/manager/need_to_migrate')
.then(response => response.text())
.then(text => {
if (text === 'True') {
migration_btn.style.display = 'block';
}
})
.catch(error => {
console.error('Error checking migration status:', error);
});
return res;
}
createControlsLeft() {
let self = this;
const isElectron = 'electronAPI' in window;
this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
const uc_checkbox_text = $el("label",{for:"skip_update_check"},[" Skip update check"])
uc_checkbox_text.style.color = "var(--fg-color)";
uc_checkbox_text.style.cursor = "pointer";
this.update_check_checkbox.checked = true;
let self = this;
// db mode
this.datasrc_combo = document.createElement("select");
@@ -1011,6 +962,14 @@ class ManagerMenuDialog extends ComfyDialog {
this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
api.fetchApi('/manager/db_mode')
.then(response => response.text())
.then(data => { this.datasrc_combo.value = data; });
this.datasrc_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
});
// preview method
let preview_combo = document.createElement("select");
preview_combo.setAttribute("title", "Configure how latent variables will be decoded during preview in the sampling process.");
@@ -1073,25 +1032,6 @@ class ManagerMenuDialog extends ComfyDialog {
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
}
// default ui state
let component_policy_combo = document.createElement("select");
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
component_policy_combo.className = "cm-menu-combo";
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
api.fetchApi('/manager/component/policy')
.then(response => response.text())
.then(data => {
component_policy_combo.value = data;
set_component_policy(data);
});
component_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
set_component_policy(event.target.value);
});
api.fetchApi('/manager/share_option')
.then(response => response.text())
.then(data => {
@@ -1111,14 +1051,51 @@ class ManagerMenuDialog extends ComfyDialog {
}
});
let component_policy_combo = document.createElement("select");
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
component_policy_combo.className = "cm-menu-combo";
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
api.fetchApi('/manager/policy/component')
.then(response => response.text())
.then(data => {
component_policy_combo.value = data;
set_component_policy(data);
});
component_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
set_component_policy(event.target.value);
});
update_policy_combo = document.createElement("select");
if(isElectron)
update_policy_combo.style.display = 'none';
update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
update_policy_combo.className = "cm-menu-combo";
update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
api.fetchApi('/manager/policy/update')
.then(response => response.text())
.then(data => {
update_policy_combo.value = data;
});
update_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
});
return [
$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
$el("br", {}, []),
this.datasrc_combo,
channel_combo,
preview_combo,
share_combo,
component_policy_combo,
update_policy_combo,
$el("br", {}, []),
$el("br", {}, []),
@@ -1145,11 +1122,6 @@ class ManagerMenuDialog extends ComfyDialog {
install_pip(url, self);
}
}
}),
$el("button.cm-experimental-button", {
type: "button",
textContent: "Unload models",
onclick: () => { free_models(); }
})
]),
];
@@ -1278,7 +1250,7 @@ class ManagerMenuDialog extends ComfyDialog {
$el("div.comfy-modal-content",
[
$el("tr.cm-title", {}, [
$el("font", {size:6, color:"white"}, [`ComfyUI Manager Menu`])]
$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
),
$el("br", {}, []),
$el("div.cm-menu-container",
@@ -1420,13 +1392,12 @@ async function getVersion() {
return await version.text();
}
app.registerExtension({
name: "Comfy.ManagerMenu",
aboutPageBadges: [
{
label: `ComfyUI-Manager ${await getVersion()}`,
label: `ComfyUI-Manager ${manager_version}`,
url: 'https://github.com/ltdrdata/ComfyUI-Manager',
icon: 'pi pi-th-large'
}

View File

@@ -1,6 +1,7 @@
import { app } from "../../scripts/app.js";
import { api } from "../../scripts/api.js";
import { $el, ComfyDialog } from "../../scripts/ui.js";
import { getBestPosition, getPositionStyle, getRect } from './popover-helper.js';
function internalCustomConfirm(message, confirmMessage, cancelMessage) {
@@ -181,23 +182,6 @@ export function rebootAPI() {
}
export async function migrateAPI() {
let confirmed = await customConfirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")
if (confirmed) {
try {
await api.fetchApi("/manager/migrate_unmanaged_nodes");
api.fetchApi("/manager/reboot");
}
catch(exception) {
}
return true;
}
return false;
}
export var manager_instance = null;
export function setManagerInstance(obj) {
@@ -404,12 +388,14 @@ export async function fetchData(route, options) {
}
}
// https://cenfun.github.io/open-icons/
export const icons = {
search: '<svg viewBox="0 0 24 24" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m21 21-4.486-4.494M19 10.5a8.5 8.5 0 1 1-17 0 8.5 8.5 0 0 1 17 0"/></svg>',
extensions: '<svg viewBox="64 64 896 896" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M843.5 737.4c-12.4-75.2-79.2-129.1-155.3-125.4S550.9 676 546 752c-153.5-4.8-208-40.7-199.1-113.7 3.3-27.3 19.8-41.9 50.1-49 18.4-4.3 38.8-4.9 57.3-3.2 1.7.2 3.5.3 5.2.5 11.3 2.7 22.8 5 34.3 6.8 34.1 5.6 68.8 8.4 101.8 6.6 92.8-5 156-45.9 159.2-132.7 3.1-84.1-54.7-143.7-147.9-183.6-29.9-12.8-61.6-22.7-93.3-30.2-14.3-3.4-26.3-5.7-35.2-7.2-7.9-75.9-71.5-133.8-147.8-134.4S189.7 168 180.5 243.8s40 146.3 114.2 163.9 149.9-23.3 175.7-95.1c9.4 1.7 18.7 3.6 28 5.8 28.2 6.6 56.4 15.4 82.4 26.6 70.7 30.2 109.3 70.1 107.5 119.9-1.6 44.6-33.6 65.2-96.2 68.6-27.5 1.5-57.6-.9-87.3-5.8-8.3-1.4-15.9-2.8-22.6-4.3-3.9-.8-6.6-1.5-7.8-1.8l-3.1-.6c-2.2-.3-5.9-.8-10.7-1.3-25-2.3-52.1-1.5-78.5 4.6-55.2 12.9-93.9 47.2-101.1 105.8-15.7 126.2 78.6 184.7 276 188.9 29.1 70.4 106.4 107.9 179.6 87 73.3-20.9 119.3-93.4 106.9-168.6M329.1 345.2a83.3 83.3 0 1 1 .01-166.61 83.3 83.3 0 0 1-.01 166.61M695.6 845a83.3 83.3 0 1 1 .01-166.61A83.3 83.3 0 0 1 695.6 845"/></svg>',
conflicts: '<svg viewBox="0 0 400 400" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m397.2 350.4.2-.2-180-320-.2.2C213.8 24.2 207.4 20 200 20s-13.8 4.2-17.2 10.4l-.2-.2-180 320 .2.2c-1.6 2.8-2.8 6-2.8 9.6 0 11 9 20 20 20h360c11 0 20-9 20-20 0-3.6-1.2-6.8-2.8-9.6M220 340h-40v-40h40zm0-60h-40V120h40z"/></svg>',
passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>',
close: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 16 16"><g fill="currentColor"><path fill-rule="evenodd" clip-rule="evenodd" d="m7.116 8-4.558 4.558.884.884L8 8.884l4.558 4.558.884-.884L8.884 8l4.558-4.558-.884-.884L8 7.116 3.442 2.558l-.884.884L7.116 8z"/></g></svg>',
arrowRight: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 20 20"><path fill="currentColor" fill-rule="evenodd" d="m2.542 2.154 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Zm9 0 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Z"/></svg>'
}
export function sanitizeHTML(str) {
@@ -503,3 +489,166 @@ export function restoreColumnWidth(gridId, columns) {
});
}
export function getTimeAgo(dateStr) {
const date = new Date(dateStr);
if (!date || !(date instanceof Date) || isNaN(date.getTime())) {
return "";
}
const units = [
{ max: 2760000, value: 60000, name: 'minute', past: 'a minute ago', future: 'in a minute' },
{ max: 72000000, value: 3600000, name: 'hour', past: 'an hour ago', future: 'in an hour' },
{ max: 518400000, value: 86400000, name: 'day', past: 'yesterday', future: 'tomorrow' },
{ max: 2419200000, value: 604800000, name: 'week', past: 'last week', future: 'in a week' },
{ max: 28512000000, value: 2592000000, name: 'month', past: 'last month', future: 'in a month' }
];
const diff = Date.now() - date.getTime();
// less than a minute
if (Math.abs(diff) < 60000)
return 'just now';
for (let i = 0; i < units.length; i++) {
if (Math.abs(diff) < units[i].max) {
return format(diff, units[i].value, units[i].name, units[i].past, units[i].future, diff < 0);
}
}
function format(diff, divisor, unit, past, future, isInTheFuture) {
const val = Math.round(Math.abs(diff) / divisor);
if (isInTheFuture)
return val <= 1 ? future : 'in ' + val + ' ' + unit + 's';
return val <= 1 ? past : val + ' ' + unit + 's ago';
}
return format(diff, 31536000000, 'year', 'last year', 'in a year', diff < 0);
};
export const loadCss = (cssFile) => {
const cssPath = import.meta.resolve(cssFile);
//console.log(cssPath);
const $link = document.createElement("link");
$link.setAttribute("rel", 'stylesheet');
$link.setAttribute("href", cssPath);
document.head.appendChild($link);
};
export const copyText = (text) => {
return new Promise((resolve) => {
let err;
try {
navigator.clipboard.writeText(text);
} catch (e) {
err = e;
}
if (err) {
resolve(false);
} else {
resolve(true);
}
});
};
function renderPopover($elem, target, options = {}) {
// async microtask
queueMicrotask(() => {
const containerRect = getRect(window);
const targetRect = getRect(target);
const elemRect = getRect($elem);
const positionInfo = getBestPosition(
containerRect,
targetRect,
elemRect,
options.positions
);
const style = getPositionStyle(positionInfo, {
bgColor: options.bgColor,
borderColor: options.borderColor,
borderRadius: options.borderRadius
});
$elem.style.top = positionInfo.top + "px";
$elem.style.left = positionInfo.left + "px";
$elem.style.background = style.background;
});
}
let $popover;
export function hidePopover() {
if ($popover) {
$popover.remove();
$popover = null;
}
}
export function showPopover(target, text, className, options) {
hidePopover();
$popover = document.createElement("div");
$popover.className = ['cn-popover', className].filter(it => it).join(" ");
document.body.appendChild($popover);
$popover.innerHTML = text;
$popover.style.display = "block";
renderPopover($popover, target, {
borderRadius: 10,
... options
});
}
let $tooltip;
export function hideTooltip(target) {
if ($tooltip) {
$tooltip.style.display = "none";
$tooltip.innerHTML = "";
$tooltip.style.top = "0px";
$tooltip.style.left = "0px";
}
}
export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {}) {
if (!$tooltip) {
$tooltip = document.createElement("div");
$tooltip.className = className;
$tooltip.style.cssText = `
pointer-events: none;
position: fixed;
z-index: 10001;
padding: 20px;
color: #1e1e1e;
max-width: 350px;
filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
${Object.keys(styleMap).map(k=>k+":"+styleMap[k]+";").join("")}
`;
document.body.appendChild($tooltip);
}
$tooltip.innerHTML = text;
$tooltip.style.display = "block";
renderPopover($tooltip, target, {
positions: ['top', 'bottom', 'right', 'center'],
bgColor: "#ffffff",
borderColor: "#cccccc",
borderRadius: 5
});
}
function initTooltip () {
const mouseenterHandler = (e) => {
const target = e.target;
const text = target.getAttribute('tooltip');
if (text) {
showTooltip(target, text);
}
};
const mouseleaveHandler = (e) => {
const target = e.target;
const text = target.getAttribute('tooltip');
if (text) {
hideTooltip(target);
}
};
document.body.removeEventListener('mouseenter', mouseenterHandler, true);
document.body.removeEventListener('mouseleave', mouseleaveHandler, true);
document.body.addEventListener('mouseenter', mouseenterHandler, true);
document.body.addEventListener('mouseleave', mouseleaveHandler, true);
}
initTooltip();

View File

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

699
js/custom-nodes-manager.css Normal file
View File

@@ -0,0 +1,699 @@
.cn-manager {
--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
z-index: 1099;
width: 80%;
height: 80%;
display: flex;
flex-direction: column;
gap: 10px;
color: var(--fg-color);
font-family: arial, sans-serif;
text-underline-offset: 3px;
outline: none;
}
.cn-manager .cn-flex-auto {
flex: auto;
}
.cn-manager button {
font-size: 16px;
color: var(--input-text);
background-color: var(--comfy-input-bg);
border-radius: 8px;
border-color: var(--border-color);
border-style: solid;
margin: 0;
padding: 4px 8px;
min-width: 100px;
}
.cn-manager button:disabled,
.cn-manager input:disabled,
.cn-manager select:disabled {
color: gray;
}
.cn-manager button:disabled {
background-color: var(--comfy-input-bg);
}
.cn-manager .cn-manager-restart {
display: none;
background-color: #500000;
color: white;
}
.cn-manager .cn-manager-stop {
display: none;
background-color: #500000;
color: white;
}
.cn-manager .cn-manager-back {
align-items: center;
justify-content: center;
}
.arrow-icon {
height: 1em;
width: 1em;
margin-right: 5px;
transform: translateY(2px);
}
.cn-icon {
display: block;
width: 16px;
height: 16px;
}
.cn-icon svg {
display: block;
margin: 0;
pointer-events: none;
}
.cn-manager-header {
display: flex;
flex-wrap: wrap;
gap: 5px;
align-items: center;
padding: 0 5px;
}
.cn-manager-header label {
display: flex;
gap: 5px;
align-items: center;
}
.cn-manager-filter {
height: 28px;
line-height: 28px;
}
.cn-manager-keywords {
height: 28px;
line-height: 28px;
padding: 0 5px 0 26px;
background-size: 16px;
background-position: 5px center;
background-repeat: no-repeat;
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
}
.cn-manager-status {
padding-left: 10px;
}
.cn-manager-grid {
flex: auto;
border: 1px solid var(--border-color);
overflow: hidden;
position: relative;
}
.cn-manager-selection {
display: flex;
flex-wrap: wrap;
gap: 10px;
align-items: center;
}
.cn-manager-message {
position: relative;
}
.cn-manager-footer {
display: flex;
flex-wrap: wrap;
gap: 10px;
align-items: center;
}
.cn-manager-grid .tg-turbogrid {
font-family: var(--grid-font);
font-size: 15px;
background: var(--bg-color);
}
.cn-manager-grid .tg-turbogrid .tg-highlight::after {
position: absolute;
top: 0;
left: 0;
content: "";
display: block;
width: 100%;
height: 100%;
box-sizing: border-box;
background-color: #80bdff11;
pointer-events: none;
}
.cn-manager-grid .cn-pack-name a {
color: skyblue;
text-decoration: none;
word-break: break-word;
}
.cn-manager-grid .cn-pack-desc a {
color: #5555FF;
font-weight: bold;
text-decoration: none;
}
.cn-manager-grid .tg-cell a:hover {
text-decoration: underline;
}
.cn-manager-grid .cn-pack-version {
line-height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
height: 100%;
gap: 5px;
}
.cn-manager-grid .cn-pack-nodes {
line-height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
gap: 5px;
cursor: pointer;
height: 100%;
}
.cn-manager-grid .cn-pack-nodes:hover {
text-decoration: underline;
}
.cn-manager-grid .cn-pack-conflicts {
color: orange;
}
.cn-popover {
position: fixed;
z-index: 10000;
padding: 20px;
color: #1e1e1e;
filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
overflow: hidden;
}
.cn-flyover {
position: absolute;
top: 0;
right: 0;
z-index: 1000;
display: none;
width: 50%;
height: 100%;
background-color: var(--comfy-menu-bg);
animation-duration: 0.2s;
animation-fill-mode: both;
flex-direction: column;
}
.cn-flyover::before {
position: absolute;
top: 0;
content: "";
z-index: 10;
display: block;
width: 10px;
height: 100%;
pointer-events: none;
left: -10px;
background-image: linear-gradient(to left, rgb(0 0 0 / 20%), rgb(0 0 0 / 0%));
}
.cn-flyover-header {
height: 45px;
display: flex;
align-items: center;
gap: 5px;
border-bottom: 1px solid var(--border-color);
}
.cn-flyover-close {
display: flex;
align-items: center;
padding: 0 10px;
justify-content: center;
cursor: pointer;
opacity: 0.8;
height: 100%;
}
.cn-flyover-close:hover {
opacity: 1;
}
.cn-flyover-close svg {
display: block;
margin: 0;
pointer-events: none;
width: 20px;
height: 20px;
}
.cn-flyover-title {
display: flex;
align-items: center;
font-weight: bold;
gap: 10px;
flex: auto;
}
.cn-flyover-body {
height: calc(100% - 45px);
overflow-y: auto;
position: relative;
background-color: var(--comfy-menu-secondary-bg);
}
@keyframes cn-slide-in-right {
from {
visibility: visible;
transform: translate3d(100%, 0, 0);
}
to {
transform: translate3d(0, 0, 0);
}
}
.cn-slide-in-right {
animation-name: cn-slide-in-right;
}
@keyframes cn-slide-out-right {
from {
transform: translate3d(0, 0, 0);
}
to {
visibility: hidden;
transform: translate3d(100%, 0, 0);
}
}
.cn-slide-out-right {
animation-name: cn-slide-out-right;
}
.cn-nodes-list {
width: 100%;
}
.cn-nodes-row {
display: flex;
align-items: center;
gap: 10px;
}
.cn-nodes-row:nth-child(odd) {
background-color: rgb(0 0 0 / 5%);
}
.cn-nodes-row:hover {
background-color: rgb(0 0 0 / 10%);
}
.cn-nodes-sn {
text-align: right;
min-width: 35px;
color: var(--drag-text);
flex-shrink: 0;
font-size: 12px;
padding: 8px 5px;
}
.cn-nodes-name {
cursor: pointer;
white-space: nowrap;
flex-shrink: 0;
position: relative;
padding: 8px 5px;
}
.cn-nodes-name::after {
content: attr(action);
position: absolute;
pointer-events: none;
top: 50%;
left: 100%;
transform: translate(5px, -50%);
font-size: 12px;
color: var(--drag-text);
background-color: var(--comfy-input-bg);
border-radius: 10px;
border: 1px solid var(--border-color);
padding: 3px 8px;
display: none;
}
.cn-nodes-name.action::after {
display: block;
}
.cn-nodes-name:hover {
text-decoration: underline;
}
.cn-nodes-conflict .cn-nodes-name,
.cn-nodes-conflict .cn-icon {
color: orange;
}
.cn-conflicts-list {
display: flex;
flex-wrap: wrap;
gap: 5px;
align-items: center;
padding: 5px 0;
}
.cn-conflicts-list b {
font-weight: normal;
color: var(--descrip-text);
}
.cn-nodes-pack {
cursor: pointer;
color: skyblue;
}
.cn-nodes-pack:hover {
text-decoration: underline;
}
.cn-pack-badge {
font-size: 12px;
font-weight: normal;
background-color: var(--comfy-input-bg);
border-radius: 10px;
border: 1px solid var(--border-color);
padding: 3px 8px;
color: var(--error-text);
}
.cn-preview {
min-width: 300px;
max-width: 500px;
min-height: 120px;
overflow: hidden;
font-size: 12px;
pointer-events: none;
padding: 12px;
color: var(--fg-color);
}
.cn-preview-header {
display: flex;
gap: 8px;
align-items: center;
border-bottom: 1px solid var(--comfy-input-bg);
padding: 5px 10px;
}
.cn-preview-dot {
width: 8px;
height: 8px;
border-radius: 50%;
background-color: grey;
position: relative;
filter: drop-shadow(1px 2px 3px rgb(0 0 0 / 30%));
}
.cn-preview-dot.cn-preview-optional::after {
content: "";
position: absolute;
pointer-events: none;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-color: var(--comfy-input-bg);
border-radius: 50%;
width: 3px;
height: 3px;
}
.cn-preview-dot.cn-preview-grid {
border-radius: 0;
}
.cn-preview-dot.cn-preview-grid::before {
content: '';
position: absolute;
border-left: 1px solid var(--comfy-input-bg);
border-right: 1px solid var(--comfy-input-bg);
width: 4px;
height: 100%;
left: 2px;
top: 0;
z-index: 1;
}
.cn-preview-dot.cn-preview-grid::after {
content: '';
position: absolute;
border-top: 1px solid var(--comfy-input-bg);
border-bottom: 1px solid var(--comfy-input-bg);
width: 100%;
height: 4px;
left: 0;
top: 2px;
z-index: 1;
}
.cn-preview-name {
flex: auto;
font-size: 14px;
}
.cn-preview-io {
display: flex;
justify-content: space-between;
padding: 10px 10px;
}
.cn-preview-column > div {
display: flex;
gap: 10px;
align-items: center;
height: 18px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.cn-preview-input {
justify-content: flex-start;
}
.cn-preview-output {
justify-content: flex-end;
}
.cn-preview-list {
display: flex;
flex-direction: column;
gap: 3px;
padding: 0 10px 10px 10px;
}
.cn-preview-switch {
position: relative;
display: flex;
justify-content: space-between;
align-items: center;
background: var(--bg-color);
border: 2px solid var(--border-color);
border-radius: 10px;
text-wrap: nowrap;
padding: 2px 20px;
gap: 10px;
}
.cn-preview-switch::before,
.cn-preview-switch::after {
position: absolute;
pointer-events: none;
top: 50%;
transform: translate(0, -50%);
color: var(--fg-color);
opacity: 0.8;
}
.cn-preview-switch::before {
content: "◀";
left: 5px;
}
.cn-preview-switch::after {
content: "▶";
right: 5px;
}
.cn-preview-value {
color: var(--descrip-text);
}
.cn-preview-string {
min-height: 30px;
max-height: 300px;
background: var(--bg-color);
color: var(--descrip-text);
border-radius: 3px;
padding: 3px 5px;
overflow-y: auto;
overflow-x: hidden;
}
.cn-preview-description {
margin: 0px 10px 10px 10px;
padding: 6px;
background: var(--border-color);
color: var(--descrip-text);
border-radius: 5px;
font-style: italic;
word-break: break-word;
}
.cn-tag-list {
display: flex;
flex-wrap: wrap;
gap: 5px;
align-items: center;
margin-bottom: 5px;
}
.cn-tag-list > div {
background-color: var(--border-color);
border-radius: 5px;
padding: 0 5px;
}
.cn-install-buttons {
display: flex;
flex-direction: column;
gap: 3px;
padding: 3px;
align-items: center;
justify-content: center;
height: 100%;
}
.cn-selected-buttons {
display: flex;
gap: 5px;
align-items: center;
padding-right: 20px;
}
.cn-manager .cn-btn-enable {
background-color: #333399;
color: white;
}
.cn-manager .cn-btn-disable {
background-color: #442277;
color: white;
}
.cn-manager .cn-btn-update {
background-color: #1155AA;
color: white;
}
.cn-manager .cn-btn-try-update {
background-color: Gray;
color: white;
}
.cn-manager .cn-btn-try-fix {
background-color: #6495ED;
color: white;
}
.cn-manager .cn-btn-import-failed {
background-color: #AA1111;
font-size: 10px;
font-weight: bold;
color: white;
}
.cn-manager .cn-btn-install {
background-color: black;
color: white;
}
.cn-manager .cn-btn-try-install {
background-color: Gray;
color: white;
}
.cn-manager .cn-btn-uninstall {
background-color: #993333;
color: white;
}
.cn-manager .cn-btn-reinstall {
background-color: #993333;
color: white;
}
.cn-manager .cn-btn-switch {
background-color: #448833;
color: white;
}
@keyframes cn-btn-loading-bg {
0% {
left: 0;
}
100% {
left: -105px;
}
}
.cn-manager button.cn-btn-loading {
position: relative;
overflow: hidden;
border-color: rgb(0 119 207 / 80%);
background-color: var(--comfy-input-bg);
}
.cn-manager button.cn-btn-loading::after {
position: absolute;
top: 0;
left: 0;
content: "";
width: 500px;
height: 100%;
background-image: repeating-linear-gradient(
-45deg,
rgb(0 119 207 / 30%),
rgb(0 119 207 / 30%) 10px,
transparent 10px,
transparent 15px
);
animation: cn-btn-loading-bg 2s linear infinite;
}
.cn-manager-light .cn-pack-name a {
color: blue;
}
.cn-manager-light .cm-warn-note {
background-color: #ccc !important;
}
.cn-manager-light .cn-btn-install {
background-color: #333;
}

View File

File diff suppressed because it is too large Load Diff

213
js/model-manager.css Normal file
View File

@@ -0,0 +1,213 @@
.cmm-manager {
--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
z-index: 1099;
width: 80%;
height: 80%;
display: flex;
flex-direction: column;
gap: 10px;
color: var(--fg-color);
font-family: arial, sans-serif;
}
.cmm-manager .cmm-flex-auto {
flex: auto;
}
.cmm-manager button {
font-size: 16px;
color: var(--input-text);
background-color: var(--comfy-input-bg);
border-radius: 8px;
border-color: var(--border-color);
border-style: solid;
margin: 0;
padding: 4px 8px;
min-width: 100px;
}
.cmm-manager button:disabled,
.cmm-manager input:disabled,
.cmm-manager select:disabled {
color: gray;
}
.cmm-manager button:disabled {
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 {
display: flex;
flex-wrap: wrap;
gap: 5px;
align-items: center;
padding: 0 5px;
}
.cmm-manager-header label {
display: flex;
gap: 5px;
align-items: center;
}
.cmm-manager-type,
.cmm-manager-base,
.cmm-manager-filter {
height: 28px;
line-height: 28px;
}
.cmm-manager-keywords {
height: 28px;
line-height: 28px;
padding: 0 5px 0 26px;
background-size: 16px;
background-position: 5px center;
background-repeat: no-repeat;
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
}
.cmm-manager-status {
padding-left: 10px;
}
.cmm-manager-grid {
flex: auto;
border: 1px solid var(--border-color);
overflow: hidden;
}
.cmm-manager-selection {
display: flex;
flex-wrap: wrap;
gap: 10px;
align-items: center;
}
.cmm-manager-footer {
display: flex;
flex-wrap: wrap;
gap: 10px;
align-items: center;
}
.cmm-manager-grid .tg-turbogrid {
font-family: var(--grid-font);
font-size: 15px;
background: var(--bg-color);
}
.cmm-manager-grid .cmm-node-name a {
color: skyblue;
text-decoration: none;
word-break: break-word;
}
.cmm-manager-grid .cmm-node-desc a {
color: #5555FF;
font-weight: bold;
text-decoration: none;
}
.cmm-manager-grid .tg-cell a:hover {
text-decoration: underline;
}
.cmm-icon-passed {
width: 20px;
height: 20px;
position: absolute;
left: calc(50% - 10px);
top: calc(50% - 10px);
}
.cmm-manager .cmm-btn-enable {
background-color: blue;
color: white;
}
.cmm-manager .cmm-btn-disable {
background-color: MediumSlateBlue;
color: white;
}
.cmm-manager .cmm-btn-install {
background-color: black;
color: white;
}
.cmm-btn-download {
width: 18px;
height: 18px;
position: absolute;
left: calc(50% - 10px);
top: calc(50% - 10px);
cursor: pointer;
opacity: 0.8;
color: #fff;
}
.cmm-btn-download:hover {
opacity: 1;
}
.cmm-manager-light .cmm-btn-download {
color: #000;
}
@keyframes cmm-btn-loading-bg {
0% {
left: 0;
}
100% {
left: -105px;
}
}
.cmm-manager button.cmm-btn-loading {
position: relative;
overflow: hidden;
border-color: rgb(0 119 207 / 80%);
background-color: var(--comfy-input-bg);
}
.cmm-manager button.cmm-btn-loading::after {
position: absolute;
top: 0;
left: 0;
content: "";
width: 500px;
height: 100%;
background-image: repeating-linear-gradient(
-45deg,
rgb(0 119 207 / 30%),
rgb(0 119 207 / 30%) 10px,
transparent 10px,
transparent 15px
);
animation: cmm-btn-loading-bg 2s linear infinite;
}
.cmm-manager-light .cmm-node-name a {
color: blue;
}
.cmm-manager-light .cm-warn-note {
background-color: #ccc !important;
}
.cmm-manager-light .cmm-btn-install {
background-color: #333;
}

View File

@@ -3,236 +3,17 @@ import { $el } from "../../scripts/ui.js";
import {
manager_instance, rebootAPI,
fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
storeColumnWidth, restoreColumnWidth
storeColumnWidth, restoreColumnWidth, loadCss
} from "./common.js";
import { api } from "../../scripts/api.js";
// https://cenfun.github.io/turbogrid/api.html
import TG from "./turbogrid.esm.js";
loadCss("./model-manager.css");
const gridId = "model";
const pageCss = `
.cmm-manager {
--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
z-index: 1099;
width: 80%;
height: 80%;
display: flex;
flex-direction: column;
gap: 10px;
color: var(--fg-color);
font-family: arial, sans-serif;
}
.cmm-manager .cmm-flex-auto {
flex: auto;
}
.cmm-manager button {
font-size: 16px;
color: var(--input-text);
background-color: var(--comfy-input-bg);
border-radius: 8px;
border-color: var(--border-color);
border-style: solid;
margin: 0;
padding: 4px 8px;
min-width: 100px;
}
.cmm-manager button:disabled,
.cmm-manager input:disabled,
.cmm-manager select:disabled {
color: gray;
}
.cmm-manager button:disabled {
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 {
display: flex;
flex-wrap: wrap;
gap: 5px;
align-items: center;
padding: 0 5px;
}
.cmm-manager-header label {
display: flex;
gap: 5px;
align-items: center;
}
.cmm-manager-type,
.cmm-manager-base,
.cmm-manager-filter {
height: 28px;
line-height: 28px;
}
.cmm-manager-keywords {
height: 28px;
line-height: 28px;
padding: 0 5px 0 26px;
background-size: 16px;
background-position: 5px center;
background-repeat: no-repeat;
background-image: url("data:image/svg+xml;charset=utf8,${encodeURIComponent(icons.search.replace("currentColor", "#888"))}");
}
.cmm-manager-status {
padding-left: 10px;
}
.cmm-manager-grid {
flex: auto;
border: 1px solid var(--border-color);
overflow: hidden;
}
.cmm-manager-selection {
display: flex;
flex-wrap: wrap;
gap: 10px;
align-items: center;
}
.cmm-manager-message {
}
.cmm-manager-footer {
display: flex;
flex-wrap: wrap;
gap: 10px;
align-items: center;
}
.cmm-manager-grid .tg-turbogrid {
font-family: var(--grid-font);
font-size: 15px;
background: var(--bg-color);
}
.cmm-manager-grid .cmm-node-name a {
color: skyblue;
text-decoration: none;
word-break: break-word;
}
.cmm-manager-grid .cmm-node-desc a {
color: #5555FF;
font-weight: bold;
text-decoration: none;
}
.cmm-manager-grid .tg-cell a:hover {
text-decoration: underline;
}
.cmm-icon-passed {
width: 20px;
height: 20px;
position: absolute;
left: calc(50% - 10px);
top: calc(50% - 10px);
}
.cmm-manager .cmm-btn-enable {
background-color: blue;
color: white;
}
.cmm-manager .cmm-btn-disable {
background-color: MediumSlateBlue;
color: white;
}
.cmm-manager .cmm-btn-install {
background-color: black;
color: white;
}
.cmm-btn-download {
width: 18px;
height: 18px;
position: absolute;
left: calc(50% - 10px);
top: calc(50% - 10px);
cursor: pointer;
opacity: 0.8;
color: #fff;
}
.cmm-btn-download:hover {
opacity: 1;
}
.cmm-manager-light .cmm-btn-download {
color: #000;
}
@keyframes cmm-btn-loading-bg {
0% {
left: 0;
}
100% {
left: -105px;
}
}
.cmm-manager button.cmm-btn-loading {
position: relative;
overflow: hidden;
border-color: rgb(0 119 207 / 80%);
background-color: var(--comfy-input-bg);
}
.cmm-manager button.cmm-btn-loading::after {
position: absolute;
top: 0;
left: 0;
content: "";
width: 500px;
height: 100%;
background-image: repeating-linear-gradient(
-45deg,
rgb(0 119 207 / 30%),
rgb(0 119 207 / 30%) 10px,
transparent 10px,
transparent 15px
);
animation: cmm-btn-loading-bg 2s linear infinite;
}
.cmm-manager-light .cmm-node-name a {
color: blue;
}
.cmm-manager-light .cm-warn-note {
background-color: #ccc !important;
}
.cmm-manager-light .cmm-btn-install {
background-color: #333;
}
`;
const pageHtml = `
<div class="cmm-manager-header">
<label>Filter
@@ -283,14 +64,6 @@ export class ModelManager {
}
init() {
if (!document.querySelector(`style[context="${this.id}"]`)) {
const $style = document.createElement("style");
$style.setAttribute("context", this.id);
$style.innerHTML = pageCss;
document.head.appendChild($style);
}
this.element = $el("div", {
parent: document.body,
className: "comfy-modal cmm-manager"
@@ -561,7 +334,7 @@ export class ModelManager {
sortable: false,
align: 'center',
formatter: (url, rowItem, columnItem) => {
return `<a class="cmm-btn-download" title="Download file" href="${url}" target="_blank">${icons.download}</a>`;
return `<a class="cmm-btn-download" tooltip="Download file" href="${url}" target="_blank">${icons.download}</a>`;
}
}, {
id: 'size',

619
js/popover-helper.js Normal file
View File

@@ -0,0 +1,619 @@
const hasOwn = function(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key);
};
const isNum = function(num) {
if (typeof num !== 'number' || isNaN(num)) {
return false;
}
const isInvalid = function(n) {
if (n === Number.MAX_VALUE || n === Number.MIN_VALUE || n === Number.NEGATIVE_INFINITY || n === Number.POSITIVE_INFINITY) {
return true;
}
return false;
};
if (isInvalid(num)) {
return false;
}
return true;
};
const toNum = (num) => {
if (typeof (num) !== 'number') {
num = parseFloat(num);
}
if (isNaN(num)) {
num = 0;
}
num = Math.round(num);
return num;
};
const clamp = function(value, min, max) {
return Math.max(min, Math.min(max, value));
};
const isWindow = (obj) => {
return Boolean(obj && obj === obj.window);
};
const isDocument = (obj) => {
return Boolean(obj && obj.nodeType === 9);
};
const isElement = (obj) => {
return Boolean(obj && obj.nodeType === 1);
};
// ===========================================================================================
export const toRect = (obj) => {
if (obj) {
return {
left: toNum(obj.left || obj.x),
top: toNum(obj.top || obj.y),
width: toNum(obj.width),
height: toNum(obj.height)
};
}
return {
left: 0,
top: 0,
width: 0,
height: 0
};
};
export const getElement = (selector) => {
if (typeof selector === 'string' && selector) {
if (selector.startsWith('#')) {
return document.getElementById(selector.slice(1));
}
return document.querySelector(selector);
}
if (isDocument(selector)) {
return selector.body;
}
if (isElement(selector)) {
return selector;
}
};
export const getRect = (target, fixed) => {
if (!target) {
return toRect();
}
if (isWindow(target)) {
return {
left: 0,
top: 0,
width: window.innerWidth,
height: window.innerHeight
};
}
const elem = getElement(target);
if (!elem) {
return toRect(target);
}
const br = elem.getBoundingClientRect();
const rect = toRect(br);
// fix offset
if (!fixed) {
rect.left += window.scrollX;
rect.top += window.scrollY;
}
rect.width = elem.offsetWidth;
rect.height = elem.offsetHeight;
return rect;
};
// ===========================================================================================
const calculators = {
bottom: (info, containerRect, targetRect) => {
info.space = containerRect.top + containerRect.height - targetRect.top - targetRect.height - info.height;
info.top = targetRect.top + targetRect.height;
info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
},
top: (info, containerRect, targetRect) => {
info.space = targetRect.top - info.height - containerRect.top;
info.top = targetRect.top - info.height;
info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
},
right: (info, containerRect, targetRect) => {
info.space = containerRect.left + containerRect.width - targetRect.left - targetRect.width - info.width;
info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
info.left = targetRect.left + targetRect.width;
},
left: (info, containerRect, targetRect) => {
info.space = targetRect.left - info.width - containerRect.left;
info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
info.left = targetRect.left - info.width;
}
};
// with order
export const getDefaultPositions = () => {
return Object.keys(calculators);
};
const calculateSpace = (info, containerRect, targetRect) => {
const calculator = calculators[info.position];
calculator(info, containerRect, targetRect);
if (info.space >= 0) {
info.passed += 1;
}
};
// ===========================================================================================
const calculateAlignOffset = (info, containerRect, targetRect, alignType, sizeType) => {
const popoverStart = info[alignType];
const popoverSize = info[sizeType];
const containerStart = containerRect[alignType];
const containerSize = containerRect[sizeType];
const targetStart = targetRect[alignType];
const targetSize = targetRect[sizeType];
const targetCenter = targetStart + targetSize * 0.5;
// size overflow
if (popoverSize > containerSize) {
const overflow = (popoverSize - containerSize) * 0.5;
info[alignType] = containerStart - overflow;
info.offset = targetCenter - containerStart + overflow;
return;
}
const space1 = popoverStart - containerStart;
const space2 = (containerStart + containerSize) - (popoverStart + popoverSize);
// both side passed, default to center
if (space1 >= 0 && space2 >= 0) {
if (info.passed) {
info.passed += 2;
}
info.offset = popoverSize * 0.5;
return;
}
// one side passed
if (info.passed) {
info.passed += 1;
}
if (space1 < 0) {
const min = containerStart;
info[alignType] = min;
info.offset = targetCenter - min;
return;
}
// space2 < 0
const max = containerStart + containerSize - popoverSize;
info[alignType] = max;
info.offset = targetCenter - max;
};
const calculateHV = (info, containerRect) => {
if (['top', 'bottom'].includes(info.position)) {
info.top = clamp(info.top, containerRect.top, containerRect.top + containerRect.height - info.height);
return ['left', 'width'];
}
info.left = clamp(info.left, containerRect.left, containerRect.left + containerRect.width - info.width);
return ['top', 'height'];
};
const calculateOffset = (info, containerRect, targetRect) => {
const [alignType, sizeType] = calculateHV(info, containerRect);
calculateAlignOffset(info, containerRect, targetRect, alignType, sizeType);
info.offset = clamp(info.offset, 0, info[sizeType]);
};
// ===========================================================================================
const calculateDistance = (info, previousPositionInfo) => {
if (!previousPositionInfo) {
return;
}
// no change if position no change with previous
if (info.position === previousPositionInfo.position) {
return;
}
const ax = info.left + info.width * 0.5;
const ay = info.top + info.height * 0.5;
const bx = previousPositionInfo.left + previousPositionInfo.width * 0.5;
const by = previousPositionInfo.top + previousPositionInfo.height * 0.5;
const dx = Math.abs(ax - bx);
const dy = Math.abs(ay - by);
info.distance = Math.round(Math.sqrt(dx * dx + dy * dy));
};
// ===========================================================================================
const calculatePositionInfo = (info, containerRect, targetRect, previousPositionInfo) => {
calculateSpace(info, containerRect, targetRect);
calculateOffset(info, containerRect, targetRect);
calculateDistance(info, previousPositionInfo);
};
// ===========================================================================================
const calculateBestPosition = (containerRect, targetRect, infoMap, withOrder, previousPositionInfo) => {
// position space: +1
// align space:
// two side passed: +2
// one side passed: +1
const safePassed = 3;
if (previousPositionInfo) {
const prevInfo = infoMap[previousPositionInfo.position];
if (prevInfo) {
calculatePositionInfo(prevInfo, containerRect, targetRect);
if (prevInfo.passed >= safePassed) {
return prevInfo;
}
prevInfo.calculated = true;
}
}
const positionList = [];
Object.values(infoMap).forEach((info) => {
if (!info.calculated) {
calculatePositionInfo(info, containerRect, targetRect, previousPositionInfo);
}
positionList.push(info);
});
positionList.sort((a, b) => {
if (a.passed !== b.passed) {
return b.passed - a.passed;
}
if (withOrder && a.passed >= safePassed && b.passed >= safePassed) {
return a.index - b.index;
}
if (a.space !== b.space) {
return b.space - a.space;
}
return a.index - b.index;
});
// logTable(positionList);
return positionList[0];
};
// const logTable = (() => {
// let time_id;
// return (info) => {
// clearTimeout(time_id);
// time_id = setTimeout(() => {
// console.table(info);
// }, 10);
// };
// })();
// ===========================================================================================
const getAllowPositions = (positions, defaultAllowPositions) => {
if (!positions) {
return;
}
if (Array.isArray(positions)) {
positions = positions.join(',');
}
positions = String(positions).split(',').map((it) => it.trim().toLowerCase()).filter((it) => it);
positions = positions.filter((it) => defaultAllowPositions.includes(it));
if (!positions.length) {
return;
}
return positions;
};
const isPositionChanged = (info, previousPositionInfo) => {
if (!previousPositionInfo) {
return true;
}
if (info.left !== previousPositionInfo.left) {
return true;
}
if (info.top !== previousPositionInfo.top) {
return true;
}
return false;
};
// ===========================================================================================
// const log = (name, time) => {
// if (time > 0.1) {
// console.log(name, time);
// }
// };
export const getBestPosition = (containerRect, targetRect, popoverRect, positions, previousPositionInfo) => {
const defaultAllowPositions = getDefaultPositions();
let withOrder = true;
let allowPositions = getAllowPositions(positions, defaultAllowPositions);
if (!allowPositions) {
allowPositions = defaultAllowPositions;
withOrder = false;
}
// console.log('withOrder', withOrder);
// const start_time = performance.now();
const infoMap = {};
allowPositions.forEach((k, i) => {
infoMap[k] = {
position: k,
index: i,
top: 0,
left: 0,
width: popoverRect.width,
height: popoverRect.height,
space: 0,
offset: 0,
passed: 0,
distance: 0
};
});
// log('infoMap', performance.now() - start_time);
const bestPosition = calculateBestPosition(containerRect, targetRect, infoMap, withOrder, previousPositionInfo);
// check left/top
bestPosition.changed = isPositionChanged(bestPosition, previousPositionInfo);
return bestPosition;
};
// ===========================================================================================
const getTemplatePath = (width, height, arrowOffset, arrowSize, borderRadius) => {
const p = (px, py) => {
return [px, py].join(',');
};
const px = function(num, alignEnd) {
const floor = Math.floor(num);
let n = num < floor + 0.5 ? floor + 0.5 : floor + 1.5;
if (alignEnd) {
n -= 1;
}
return n;
};
const pxe = function(num) {
return px(num, true);
};
const ls = [];
const innerLeft = px(arrowSize);
const innerRight = pxe(width - arrowSize);
arrowOffset = clamp(arrowOffset, innerLeft, innerRight);
const innerTop = px(arrowSize);
const innerBottom = pxe(height - arrowSize);
const startPoint = p(innerLeft, innerTop + borderRadius);
const arrowPoint = p(arrowOffset, 1);
const LT = p(innerLeft, innerTop);
const RT = p(innerRight, innerTop);
const AOT = p(arrowOffset - arrowSize, innerTop);
const RRT = p(innerRight - borderRadius, innerTop);
ls.push(`M${startPoint}`);
ls.push(`V${innerBottom - borderRadius}`);
ls.push(`Q${p(innerLeft, innerBottom)} ${p(innerLeft + borderRadius, innerBottom)}`);
ls.push(`H${innerRight - borderRadius}`);
ls.push(`Q${p(innerRight, innerBottom)} ${p(innerRight, innerBottom - borderRadius)}`);
ls.push(`V${innerTop + borderRadius}`);
if (arrowOffset < innerLeft + arrowSize + borderRadius) {
ls.push(`Q${RT} ${RRT}`);
ls.push(`H${arrowOffset + arrowSize}`);
ls.push(`L${arrowPoint}`);
if (arrowOffset < innerLeft + arrowSize) {
ls.push(`L${LT}`);
ls.push(`L${startPoint}`);
} else {
ls.push(`L${AOT}`);
ls.push(`Q${LT} ${startPoint}`);
}
} else if (arrowOffset > innerRight - arrowSize - borderRadius) {
if (arrowOffset > innerRight - arrowSize) {
ls.push(`L${RT}`);
} else {
ls.push(`Q${RT} ${p(arrowOffset + arrowSize, innerTop)}`);
}
ls.push(`L${arrowPoint}`);
ls.push(`L${AOT}`);
ls.push(`H${innerLeft + borderRadius}`);
ls.push(`Q${LT} ${startPoint}`);
} else {
ls.push(`Q${RT} ${RRT}`);
ls.push(`H${arrowOffset + arrowSize}`);
ls.push(`L${arrowPoint}`);
ls.push(`L${AOT}`);
ls.push(`H${innerLeft + borderRadius}`);
ls.push(`Q${LT} ${startPoint}`);
}
return ls.join('');
};
const getPathData = function(position, width, height, arrowOffset, arrowSize, borderRadius) {
const handlers = {
bottom: () => {
const d = getTemplatePath(width, height, arrowOffset, arrowSize, borderRadius);
return {
d,
transform: ''
};
},
top: () => {
const d = getTemplatePath(width, height, width - arrowOffset, arrowSize, borderRadius);
return {
d,
transform: `rotate(180,${width * 0.5},${height * 0.5})`
};
},
left: () => {
const d = getTemplatePath(height, width, arrowOffset, arrowSize, borderRadius);
const x = (width - height) * 0.5;
const y = (height - width) * 0.5;
return {
d,
transform: `translate(${x} ${y}) rotate(90,${height * 0.5},${width * 0.5})`
};
},
right: () => {
const d = getTemplatePath(height, width, height - arrowOffset, arrowSize, borderRadius);
const x = (width - height) * 0.5;
const y = (height - width) * 0.5;
return {
d,
transform: `translate(${x} ${y}) rotate(-90,${height * 0.5},${width * 0.5})`
};
}
};
return handlers[position]();
};
// ===========================================================================================
// position style cache
const styleCache = {
// position: '',
// top: {},
// bottom: {},
// left: {},
// right: {}
};
export const getPositionStyle = (info, options = {}) => {
const o = {
bgColor: '#fff',
borderColor: '#ccc',
borderRadius: 5,
arrowSize: 10
};
Object.keys(o).forEach((k) => {
if (hasOwn(options, k)) {
const d = o[k];
const v = options[k];
if (typeof d === 'string') {
// string
if (typeof v === 'string' && v) {
o[k] = v;
}
} else {
// number
if (isNum(v) && v >= 0) {
o[k] = v;
}
}
}
});
const key = [
info.width,
info.height,
info.offset,
o.arrowSize,
o.borderRadius,
o.bgColor,
o.borderColor
].join('-');
const positionCache = styleCache[info.position];
if (positionCache && key === positionCache.key) {
const st = positionCache.style;
st.changed = styleCache.position !== info.position;
styleCache.position = info.position;
return st;
}
// console.log(options);
const data = getPathData(info.position, info.width, info.height, info.offset, o.arrowSize, o.borderRadius);
// console.log(data);
const viewBox = [0, 0, info.width, info.height].join(' ');
const svg = [
`<svg viewBox="${viewBox}" xmlns="http://www.w3.org/2000/svg">`,
`<path d="${data.d}" fill="${o.bgColor}" stroke="${o.borderColor}" transform="${data.transform}" />`,
'</svg>'
].join('');
// console.log(svg);
const backgroundImage = `url("data:image/svg+xml;charset=utf8,${encodeURIComponent(svg)}")`;
const background = `${backgroundImage} center no-repeat`;
const padding = `${o.arrowSize + o.borderRadius}px`;
const style = {
background,
backgroundImage,
padding,
changed: true
};
styleCache.position = info.position;
styleCache[info.position] = {
key,
style
};
return style;
};

View File

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

View File

@@ -1068,18 +1068,28 @@
"size": "19.1GB"
},
{
"name": "comfyanonymous/clip_l",
"name": "Comfy-Org/clip_l",
"type": "clip",
"base": "clip",
"save_path": "default",
"description": "clip_l model",
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders/tree/main",
"description": "clip_l model (for SD1.x, SD2.x, SDXL, SD3.5, FLUX.1, HunyuanVideo, ...) ",
"reference": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8",
"filename": "clip_l.safetensors",
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/clip_l.safetensors",
"url": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8/resolve/main/text_encoders/clip_l.safetensors",
"size": "246MB"
},
{
"name": "Comfy-Org/clip_g",
"type": "clip",
"base": "clip",
"save_path": "default",
"description": "clip_g model (for SDXL, SD3.5)",
"reference": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8",
"filename": "clip_g.safetensors",
"url": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8/resolve/main/text_encoders/clip_g.safetensors",
"size": "1.39GB"
},
{
"name": "v1-5-pruned-emaonly.ckpt",
@@ -3950,6 +3960,17 @@
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/vae/hunyuan_video_vae_bf16.safetensors",
"size": "493MB"
},
{
"name": "Comfy-Org/hunyuan_video_image_to_video_720p_bf16.safetensors",
"type": "diffusion_model",
"base": "Hunyuan Video",
"save_path": "diffusion_models/hunyuan_video",
"description": "Huyuan Video Image2Video diffusion model. repackaged version.",
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
"filename": "hunyuan_video_image_to_video_720p_bf16.safetensors",
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_image_to_video_720p_bf16.safetensors",
"size": "25.6GB"
},
{
"name": "Comfy-Org/llava_llama3_fp8_scaled.safetensors",
@@ -3973,6 +3994,17 @@
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp16.safetensors",
"size": "16.1GB"
},
{
"name": "Comfy-Org/llava_llama3_vision.safetensors",
"type": "clip_vision",
"base": "LLaVA-Llama-3",
"save_path": "text_encoders",
"description": "llava_llama3_vision clip vison model. This is required for using Hunyuan Video Image2Video.",
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
"filename": "llava_llama3_vision.safetensors",
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/clip_vision/llava_llama3_vision.safetensors",
"size": "649MB"
},
{
"name": "FLUX.1 [Schnell] Diffusion model",
@@ -4537,6 +4569,17 @@
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.1.safetensors",
"size": "5.72GB"
},
{
"name": "LTX-Video 2B v0.9.5 Checkpoint",
"type": "checkpoint",
"base": "LTX-Video",
"save_path": "checkpoints/LTXV",
"description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
"reference": "https://huggingface.co/Lightricks/LTX-Video",
"filename": "ltx-video-2b-v0.9.5.safetensors",
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.5.safetensors",
"size": "6.34GB"
},
{
"name": "XLabs-AI/flux-canny-controlnet-v3.safetensors",
@@ -4685,6 +4728,28 @@
"filename": "<huggingface>",
"url": "deepseek-ai/Janus-Pro-7B",
"size": "14.85GB"
},
{
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.fp16.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
"size": "167MB"
},
{
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
"size": "335MB"
}
]
}

View File

@@ -11,9 +11,387 @@
{
"author": "silveroxides",
"title": "ComfyUI-ModelUtils [WIP]",
"reference": "https://github.com/silveroxides/ComfyUI-ModelUtils",
"files": [
"https://github.com/silveroxides/ComfyUI-ModelUtils"
],
"install_type": "git-clone",
"description": "[WIP]Custom nodes for handling, inspecting, modifying and creating various model files."
},
{
"author": "thisiseddy-ab",
"title": "ComfyUI-Edins-Ultimate-Pack",
"reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
"files": [
"https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
],
"install_type": "git-clone",
"description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
},
{
"author": "longzoho",
"title": "ComfyUI-Qdrant-Saver",
"reference": "https://github.com/longzoho/ComfyUI-Qdrant-Saver",
"files": [
"https://github.com/longzoho/ComfyUI-Qdrant-Saver"
],
"install_type": "git-clone",
"description": "NODES: QDrant Saver Node"
},
{
"author": "RUFFY-369",
"title": "ComfyUI-FeatureBank",
"reference": "https://github.com/RUFFY-369/ComfyUI-FeatureBank",
"files": [
"https://github.com/RUFFY-369/ComfyUI-FeatureBank"
],
"install_type": "git-clone",
"description": "NODES: FeatureBankAttentionProcessor"
},
{
"author": "Pablerdo",
"title": "ComfyUI-Sa2VAWrapper [WIP]",
"reference": "https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper",
"files": [
"https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper"
],
"install_type": "git-clone",
"description": "Wrapper for the Sa2VA model"
},
{
"author": "S4MUEL-404",
"title": "ComfyUI-Folder-Images-Preview [UNSAFE]",
"reference": "https://github.com/S4MUEL-404/ComfyUI-Folder-Images-Preview",
"files": [
"https://github.com/S4MUEL-404/ComfyUI-Folder-Images-Preview"
],
"install_type": "git-clone",
"description": "A ComfyUI nodes , Generate a picture and quickly preview the pictures in the folder and the picture file name\n[w/This custom node has a path traversal vulnerability.]"
},
{
"author": "aria1th",
"title": "ComfyUI-camietagger-onnx",
"reference": "https://github.com/aria1th/ComfyUI-camietagger-onnx",
"files": [
"https://github.com/aria1th/ComfyUI-camietagger-onnx"
],
"install_type": "git-clone",
"description": "NODES: Camie Tagger"
},
{
"author": "zjkhurry",
"title": "comfyui_MetalFX [WIP]",
"reference": "https://github.com/zjkhurry/comfyui_MetalFX",
"files": [
"https://github.com/zjkhurry/comfyui_MetalFX"
],
"install_type": "git-clone",
"description": "A custom node for ComfyUI that enables high-quality image and video upscaling using Apple MetalFX technology.\nNOTE: The files in the repo are not organized."
},
{
"author": "IfnotFr",
"title": "ComfyUI-Connect [WIP]",
"reference": "https://github.com/IfnotFr/ComfyUI-Connect",
"files": [
"https://github.com/IfnotFr/ComfyUI-Connect"
],
"install_type": "git-clone",
"description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
},
{
"author": "RoyKillington",
"title": "Miscomfy Nodes [WIP]",
"reference": "https://github.com/RoyKillington/miscomfy-nodes",
"files": [
"https://github.com/RoyKillington/miscomfy-nodes"
],
"install_type": "git-clone",
"description": "A repo of custom nodes for ComfyUI, from interacting with certain APIs to whatever other miscellanea I end up making"
},
{
"author": "xmarked-ai",
"title": "ComfyUI_misc",
"reference": "https://github.com/xmarked-ai/ComfyUI_misc",
"files": [
"https://github.com/xmarked-ai/ComfyUI_misc"
],
"install_type": "git-clone",
"description": "NODES: Ace IntegerX, Ace FloatX, Ace Color FixX, White Balance X, Depth Displace X, Empty Latent X, KSampler Combo X, ..."
},
{
"author": "Elypha",
"title": "ComfyUI-Prompt-Helper [WIP]",
"reference": "https://github.com/Elypha/ComfyUI-Prompt-Helper",
"files": [
"https://github.com/Elypha/ComfyUI-Prompt-Helper"
],
"install_type": "git-clone",
"description": "Concat conditions and prompts for ComfyUI"
},
{
"author": "StoryWalker",
"title": "comfyui_flux_collection_advanced [WIP]",
"reference": "https://github.com/StoryWalker/comfyui_flux_collection_advanced",
"files": [
"https://github.com/StoryWalker/comfyui_flux_collection_advanced"
],
"install_type": "git-clone",
"description": "This is a collection focused in give a little more flexibility in the use of Flux models."
},
{
"author": "KurtHokke",
"title": "ComfyUI_KurtHokke-Nodes",
"reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes",
"files": [
"https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes"
],
"install_type": "git-clone",
"description": "ComfyUI_KurtHokke-Nodes"
},
{
"author": "OSAnimate",
"title": "ComfyUI-SpriteSheetMaker [WIP]",
"reference": "https://github.com/OSAnimate/ComfyUI-SpriteSheetMaker",
"files": [
"https://github.com/OSAnimate/ComfyUI-SpriteSheetMaker"
],
"install_type": "git-clone",
"description": "The sprite sheet maker node is a simple way to create sprite sheets and image grids.\nNOTE: The files in the repo are not organized."
},
{
"author": "BuffMcBigHuge",
"title": "ComfyUI-Buff-Nodes [WIP]",
"reference": "https://github.com/BuffMcBigHuge/ComfyUI-Buff-Nodes",
"files": [
"https://github.com/BuffMcBigHuge/ComfyUI-Buff-Nodes"
],
"install_type": "git-clone",
"description": "Assorted Nodes by BuffMcBigHuge"
},
{
"author": "ritikvirus",
"title": "ComfyUI Terminal Command Node [UNSAFE]",
"reference": "https://github.com/ritikvirus/comfyui-terminal-modal-node",
"files": [
"https://github.com/ritikvirus/comfyui-terminal-modal-node"
],
"install_type": "git-clone",
"description": "This repository provides a custom ComfyUI node that lets you execute arbitrary terminal commands directly from the ComfyUI interface. [w/This extension allows remote command execution.]"
},
{
"author": "pixuai",
"title": "ComfyUI-PixuAI",
"reference": "https://github.com/pixuai/ComfyUI-PixuAI",
"files": [
"https://github.com/pixuai/ComfyUI-PixuAI"
],
"install_type": "git-clone",
"description": "A collection of ComfyUI nodes designed to streamline prompt creation, organization, and discovery - making your workflows faster and more intuitive."
},
{
"author": "techidsk",
"title": "comfyui_molook_nodes [WIP]",
"reference": "https://github.com/techidsk/comfyui_molook_nodes",
"files": [
"https://github.com/techidsk/comfyui_molook_nodes"
],
"install_type": "git-clone",
"description": "Some extra nodes"
},
{
"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: North Noise"
},
{
"author": "ManuShamil",
"title": "ComfyUI_BodyEstimation_Nodes",
"reference": "https://github.com/ManuShamil/ComfyUI_BodyEstimation_Nodes",
"files": [
"https://github.com/ManuShamil/ComfyUI_BodyEstimation_Nodes"
],
"install_type": "git-clone",
"description": "NODES: CogitareLabsPoseIDExtractor"
},
{
"author": "MockbaTheBorg",
"title": "ComfyUI-Mockba",
"reference": "https://github.com/MockbaTheBorg/ComfyUI-Mockba",
"files": [
"https://github.com/MockbaTheBorg/ComfyUI-Mockba"
],
"install_type": "git-clone",
"description": "NODES: Image Batch/Flip/Rotate/Subtract/Dither, Barcode, Select, ..."
},
{
"author": "jcomeme",
"title": "AsunaroTools",
"reference": "https://github.com/jcomeme/ComfyUI-AsunaroTools",
"files": [
"https://github.com/jcomeme/ComfyUI-AsunaroTools"
],
"install_type": "git-clone",
"description": "A collection of custom nodes for ComfyUI"
},
{
"author": "ZHO-ZHO-ZHO",
"title": "ComfyUI Wan2.1 [WIP]",
"reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO",
"files": [
"https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO"
],
"install_type": "git-clone",
"description": "Its estimated that ComfyUI itself will support it soon, so go ahead and give it a try!"
},
{
"author": "kijai",
"title": "ComfyUI-WanVideoWrapper [WIP]",
"reference": "https://github.com/kijai/ComfyUI-WanVideoWrapper",
"files": [
"https://github.com/kijai/ComfyUI-WanVideoWrapper"
],
"install_type": "git-clone",
"description": "ComfyUI diffusers wrapper nodes for WanVideo"
},
{
"author": "ltdrdata",
"title": "comfyui-unsafe-torch [UNSAFE]",
"reference": "https://github.com/ltdrdata/comfyui-unsafe-torch",
"files": [
"https://github.com/ltdrdata/comfyui-unsafe-torch"
],
"install_type": "git-clone",
"description": "disable torch.load's `weigths_only`"
},
{
"author": "IfnotFr",
"title": "⚡ ComfyUI Connect [WIP]",
"reference": "https://github.com/IfnotFr/ComfyUI-Connect",
"files": [
"https://github.com/IfnotFr/ComfyUI-Connect"
],
"install_type": "git-clone",
"description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
},
{
"author": "muvich3n",
"title": "ComfyUI-Crop-Border",
"reference": "https://github.com/muvich3n/ComfyUI-Crop-Border",
"files": [
"https://github.com/muvich3n/ComfyUI-Crop-Border"
],
"install_type": "git-clone",
"description": "NODES: Crop Image Borders"
},
{
"author": "masmullin2000",
"title": "ComfyUI-MMYolo",
"reference": "https://github.com/masmullin2000/ComfyUI-MMYolo",
"files": [
"https://github.com/masmullin2000/ComfyUI-MMYolo"
],
"install_type": "git-clone",
"description": "A comfy node to find faces and output a mask"
},
{
"author": "Yeonri",
"title": "ComfyUI_LLM_Are_You_Listening [WIP]",
"reference": "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening",
"files": [
"https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening"
],
"install_type": "git-clone",
"description": "NODES: AYL_Node, AYL_GGUF_Node, AYL_API_Node\nNOTE: The files in the repo are not organized."
},
{
"author": "altkeyproject",
"title": "Dream Painter [WIP]",
"reference": "https://github.com/alt-key-project/comfyui-dream-painter",
"files": [
"https://github.com/alt-key-project/comfyui-dream-painter"
],
"install_type": "git-clone",
"description": "Provide utilities for 2D image generation and processing."
},
{
"author": "kimara-ai",
"title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
"reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
"files": [
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
],
"install_type": "git-clone",
"description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
},
{
"author": "krisshen2021",
"title": "comfyui_OpenRouterNodes [WIP]",
"reference": "https://github.com/krisshen2021/comfyui_OpenRouterNodes",
"files": [
"https://github.com/krisshen2021/comfyui_OpenRouterNodes"
],
"install_type": "git-clone",
"description": "LLM custom nodes for comfyui\nNOTE: The files in the repo are not organized."
},
{
"author": "Velour-Fog",
"title": "comfy-latent-nodes [UNSAFE]",
"reference": "https://github.com/Velour-Fog/comfy-latent-nodes",
"files": [
"https://github.com/Velour-Fog/comfy-latent-nodes"
],
"install_type": "git-clone",
"description": "ComfyUI nodes to save and load a latent to a specified directory. Saves time for doing operations on a latent such as upscaling without having to re-trigger the creation of the original latent.[w/This node can write files to an arbitrary path.]"
},
{
"author": "jgbyte",
"title": "ComfyUI-RandomCube [WIP]",
"reference": "https://github.com/jgbyte/ComfyUI-RandomCube",
"files": [
"https://github.com/jgbyte/ComfyUI-RandomCube"
],
"install_type": "git-clone",
"description": "NODES: RandomCubeGrid"
},
{
"author": "thot-experiment",
"title": "comfy-live-preview [WIP]",
"reference": "https://github.com/thot-experiment/comfy-live-preview",
"files": [
"https://github.com/thot-experiment/comfy-live-preview"
],
"install_type": "git-clone",
"description": "external live preview plugin for ComfyUI"
},
{
"author": "AhBumm",
"title": "ComfyUI-Upscayl",
"reference": "https://github.com/AhBumm/ComfyUI-Upscayl",
"files": [
"https://github.com/AhBumm/ComfyUI-Upscayl"
],
"nodename_pattern": "\\(BillBum\\)$",
"install_type": "git-clone",
"description": "NODES: Upscayl Upscaler"
},
{
"author": "NEZHA625",
"title": "ComfyUI-tools-by-dong [UNSAFE]",
"reference": "https://github.com/NEZHA625/ComfyUI-tools-by-dong",
"files": [
"https://github.com/NEZHA625/ComfyUI-tools-by-dong"
],
"install_type": "git-clone",
"description": "NODES: HuggingFaceUploadNode, ImageDownloader, LoraIterator, FileMoveNode, InputDetectionNode, ...\nNOTE: The files in the repo are not organized.[w/This node pack includes nodes that can modify arbitrary files.]"
},
{
"author": "if-ai",
"title": "ComfyUI-IF_Zonos [WIP]",
@@ -84,16 +462,6 @@
"install_type": "git-clone",
"description": "a custom comfyui node for '/fooocusinpaint_upload'\nNOTE: The files in the repo are not organized."
},
{
"author": "RodrigoSKohl",
"title": "Interior Design for Comfyui [WIP]",
"reference": "https://github.com/RodrigoSKohl/StableDesign-for-ComfyUI",
"files": [
"https://github.com/RodrigoSKohl/StableDesign-for-ComfyUI"
],
"install_type": "git-clone",
"description": "This node is based on MykolaL/StableDesign"
},
{
"author": "D1-3105",
"title": "ComfyUI-VideoStream",
@@ -144,16 +512,6 @@
"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",
@@ -204,16 +562,6 @@
"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",
@@ -427,13 +775,13 @@
},
{
"author": "HuangYuChuh",
"title": "ComfyUI-DeepSeek_Toolkit [WIP]",
"reference": "https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit",
"title": "ComfyUI-DeepSeek-Toolkit [WIP]",
"reference": "https://github.com/HuangYuChuh/ComfyUI-DeepSeek-Toolkit",
"files": [
"https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit"
"https://github.com/HuangYuChuh/ComfyUI-DeepSeek-Toolkit"
],
"install_type": "git-clone",
"description": "ComfyUI-DeepSeek_Toolkit is a deep learning toolkit for ComfyUI that integrates the DeepSeek Janus model, offering functionalities for image generation and image understanding.\nNOTE: The files in the repo are not organized."
"description": "ComfyUI-DeepSeek-Toolkit is a deep learning toolkit for ComfyUI that integrates the DeepSeek Janus model, offering functionalities for image generation and image understanding.\nNOTE: The files in the repo are not organized."
},
{
"author": "comfyuiblog",
@@ -565,16 +913,6 @@
"install_type": "git-clone",
"description": "nodes for deepseek api\nNOTE: The files in the repo are not organized."
},
{
"author": "807502278",
"title": "ComfyUI_TensorRT_Merge [WIP]",
"reference": "https://github.com/807502278/ComfyUI_TensorRT_Merge",
"files": [
"https://github.com/807502278/ComfyUI_TensorRT_Merge"
],
"install_type": "git-clone",
"description": "Non diffusion models supported by TensorRT, merged Comfyui plugin, added onnx automatic download and trt model conversion nodes."
},
{
"author": "IfnotFr",
"title": "ComfyUI-Ifnot-Pack",
@@ -843,7 +1181,7 @@
"https://github.com/yanhuifair/ComfyUI-FairLab"
],
"install_type": "git-clone",
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize"
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize, ..."
},
{
"author": "nomcycle",
@@ -1076,16 +1414,6 @@
"install_type": "git-clone",
"description": "NODES: File Mv, File Path, File Dir.\n[w/This is dangerous as it provides the ability to manipulate arbitrary user files.]"
},
{
"author": "scottmudge",
"title": "ComfyUI_BiscuitNodes",
"reference": "https://github.com/scottmudge/ComfyUI_BiscuitNodes",
"files": [
"https://github.com/scottmudge/ComfyUI_BiscuitNodes"
],
"install_type": "git-clone",
"description": "Load Image From Path Using File Selector"
},
{
"author": "JissiChoi",
"title": "ComfyUI-Jissi-List [WIP]",
@@ -1489,16 +1817,6 @@
"install_type": "git-clone",
"description": "a custom node for [a/Ultralight-Digital-Human](https://github.com/anliyuan/Ultralight-Digital-Human)\nNOTE: The files in the repo are not organized."
},
{
"author": "vahidzxc",
"title": "ComfyUI-My-Handy-Nodes",
"reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
"files": [
"https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
],
"install_type": "git-clone",
"description": "NODES:VahCropImage"
},
{
"author": "StartHua",
"title": "Comfyui_Flux_Style_Ctr [WIP]",
@@ -1742,16 +2060,6 @@
"install_type": "git-clone",
"description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
},
{
"author": "attashe",
"title": "ComfyUI-FluxRegionAttention [WIP]",
"reference": "https://github.com/attashe/ComfyUI-FluxRegionAttention",
"files": [
"https://github.com/attashe/ComfyUI-FluxRegionAttention"
],
"install_type": "git-clone",
"description": "Implement Region Attention for Flux model"
},
{
"author": "aria1th",
"title": "ComfyUI-SkipCFGSigmas",
@@ -1760,7 +2068,7 @@
"https://github.com/aria1th/ComfyUI-SkipCFGSigmas"
],
"install_type": "git-clone",
"description": "NODES:CFGControl_SKIPCFG"
"description": "NODES: CFGControl_SKIPCFG"
},
{
"author": "Clelstyn",
@@ -1810,7 +2118,7 @@
"https://github.com/oshtz/ComfyUI-oshtz-nodes"
],
"install_type": "git-clone",
"description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node"
"description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node\nNOTE: The files in the repo are not organized."
},
{
"author": "m-ai-studio",
@@ -1980,7 +2288,7 @@
"https://github.com/fablestudio/ComfyUI-Showrunner-Utils"
],
"install_type": "git-clone",
"description": "NODES:Align Face, Generate Timestamp"
"description": "NODES: Align Face, Generate Timestamp, GetMostCommonColors, Alpha Crop and Position Image, Shrink Image"
},
{
"author": "monate0615",
@@ -2648,13 +2956,14 @@
},
{
"author": "chrisdreid",
"title": "ComfyUI_EnvAutopsyAPI [UNSAFE]",
"title": "ComfyUI_EnvAutopsyAPI Debugger [UNSAFE]",
"id": "chrisdreid",
"reference": "https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI",
"files": [
"https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI"
],
"install_type": "git-clone",
"description": "ComfyUI_EnvAutopsyAPI is a powerful debugging tool designed for ComfyUI that provides in-depth analysis of your environment and dependencies through an API interface. This tool allows you to inspect environment variables, pip packages, and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server. MUST READ [a/THIS](https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI#%EF%B8%8F-warning-security-risk-%EF%B8%8F) before install.]"
"description": "A powerful debugging tool designed to provide in-depth analysis of your environment and dependencies by exposing API endpoints. This tool allows you to inspect environment variables, pip packages, python info and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server]"
},
{
"author": "Futureversecom",
@@ -2769,16 +3078,6 @@
"install_type":"git-clone",
"description":"The ComfyUI code is under review in the official repository. Meanwhile, a temporary version is available below for immediate community use. We welcome users to try our workflow and appreciate any inquiries or suggestions."
},
{
"author": "JichaoLiang",
"title": "Immortal_comfyUI",
"reference": "https://github.com/JichaoLiang/Immortal_comfyUI",
"files":[
"https://github.com/JichaoLiang/Immortal_comfyUI"
],
"install_type":"git-clone",
"description":"Nodes: NewNode, AppendNode, MergeNode, SetProperties, SaveToDirectory, ..."
},
{
"author": "melMass",
"title": "ComfyUI-Lygia",
@@ -4260,16 +4559,6 @@
"install_type": "git-clone",
"description": "Image manipulation nodes, Temperature control nodes, Tiling nodes, Primitive and operation nodes, ..."
},
{
"author": "PluMaZero",
"title": "ComfyUI-SpaceFlower",
"reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
"files": [
"https://github.com/PluMaZero/ComfyUI-SpaceFlower"
],
"install_type": "git-clone",
"description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
},
{
"author": "laksjdjf",
"title": "ssd-1b-comfyui",

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

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

View File

@@ -11,6 +11,156 @@
{
"author": "l1yongch1",
"title": "ComfyUI_PhiCaption [REMOVED]",
"reference": "https://github.com/l1yongch1/ComfyUI_PhiCaption",
"files": [
"https://github.com/l1yongch1/ComfyUI_PhiCaption"
],
"install_type": "git-clone",
"description": "In addition to achieving conventional single-image, single-round reverse engineering, it can also achieve single-image multi-round and multi-image single-round reverse engineering. Moreover, the Phi model has a better understanding of prompts."
},
{
"author": "nova-florealis",
"title": "comfyui-alien [REMOVED]",
"reference": "https://github.com/nova-florealis/comfyui-alien",
"files": [
"https://github.com/nova-florealis/comfyui-alien"
],
"install_type": "git-clone",
"description": "NODES: Text to Text (LLM), Text Output, Convert to Markdown, List Display (Debug)"
},
{
"author": "PluMaZero",
"title": "ComfyUI-SpaceFlower [REMOVED]",
"reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
"files": [
"https://github.com/PluMaZero/ComfyUI-SpaceFlower"
],
"install_type": "git-clone",
"description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
},
{
"author": "vahidzxc",
"title": "ComfyUI-My-Handy-Nodes [REMOVED]",
"reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
"files": [
"https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
],
"install_type": "git-clone",
"description": "NODES:VahCropImage"
},
{
"author": "Samulebotin",
"title": "ComfyUI-FreeVC_wrapper [REMOVED]",
"reference": "https://github.com/Samulebotin/ComfyUI-FreeVC_wrapper",
"files": [
"https://github.com/Samulebotin/ComfyUI-FreeVC_wrapper"
],
"install_type": "git-clone",
"description": "A voice conversion extension node for ComfyUI based on FreeVC, enabling high-quality voice conversion capabilities within the ComfyUI framework."
},
{
"author": "GoingAI1998",
"title": "ComfyUI Web Canvas Node [REMOVED]",
"reference": "https://github.com/GoingAI1998/Comfyui_imgcanvas",
"files": [
"https://github.com/GoingAI1998/Comfyui_imgcanvas"
],
"install_type": "git-clone",
"description": "ComfyUI_imgcanvas At present, I have not used the useful comfyui custom node about layer mixing, and I have written a comfyui runtime automatic pop-up window for layer editing node"
},
{
"author": "807502278",
"title": "ComfyUI_TensorRT_Merge [REMOVED]",
"reference": "https://github.com/807502278/ComfyUI_TensorRT_Merge",
"files": [
"https://github.com/807502278/ComfyUI_TensorRT_Merge"
],
"install_type": "git-clone",
"description": "Non diffusion models supported by TensorRT, merged Comfyui plugin, added onnx automatic download and trt model conversion nodes."
},
{
"author": "logtd",
"title": "ComfyUI-LTXTricks [DEPRECATED]",
"reference": "https://github.com/logtd/ComfyUI-LTXTricks",
"files": [
"https://github.com/logtd/ComfyUI-LTXTricks"
],
"install_type": "git-clone",
"description": "A set of nodes that provide additional controls for the LTX Video model"
},
{
"author": "JichaoLiang",
"title": "Immortal_comfyUI [REMOVED]",
"reference": "https://github.com/JichaoLiang/Immortal_comfyUI",
"files": [
"https://github.com/JichaoLiang/Immortal_comfyUI"
],
"install_type": "git-clone",
"description": "NODES:ImNewNode, ImAppendNode, MergeNode, SetProperties, SaveToDirectory, batchNodes, redirectToNode, SetEvent, ..."
},
{
"author": "Rvage0815",
"title": "ComfyUI-RvTools [REMOVED]",
"reference": "https://github.com/Rvage0815/ComfyUI-RvTools",
"files": [
"https://github.com/Rvage0815/ComfyUI-RvTools"
],
"install_type": "git-clone",
"description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
},
{
"author": "Rvage0815",
"title": "RvTComfyUI-RvTools_v2 [REMOVED]",
"reference": "https://github.com/Rvage0815/ComfyUI-RvTools_v2",
"files": [
"https://github.com/Rvage0815/ComfyUI-RvTools_v2"
],
"install_type": "git-clone",
"description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
},
{
"author": "scottmudge",
"title": "ComfyUI_BiscuitNodes [REMOVED]",
"reference": "https://github.com/scottmudge/ComfyUI_BiscuitNodes",
"files": [
"https://github.com/scottmudge/ComfyUI_BiscuitNodes"
],
"install_type": "git-clone",
"description": "Load Image From Path Using File Selector"
},
{
"author": "thanhduong0213929",
"title": "ComfyUI-DeepUnlock [REMOVED]",
"reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
"files": [
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
],
"install_type": "git-clone",
"description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
},
{
"author": "pathway8-sudo",
"title": "RMBG [REMOVED]",
"reference": "https://github.com/pathway8-sudo/RMBG",
"files": [
"https://github.com/pathway8-sudo/RMBG"
],
"install_type": "git-clone",
"description": "This repository provides a custom node for ComfyUI, leveraging the BriaRMBG model to remove backgrounds from images and output a transparent PNG."
},
{
"author": "iris-Neko",
"title": "ComfyUI_ascii_art [REMOVED]",
"reference": "https://github.com/iris-Neko/ComfyUI_ascii_art",
"files": [
"https://github.com/iris-Neko/ComfyUI_ascii_art"
],
"install_type": "git-clone",
"description": "ComfyUI node for [a/ASCII art controlnet](https://civitai.com/models/986392)"
},
{
"author": "apesplat",
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
@@ -85,7 +235,7 @@
},
{
"author": "myAiLemon",
"title": "MagicGetPromptAutomatically",
"title": "MagicGetPromptAutomatically [REMOVED]",
"reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
"files": [
"https://github.com/myAiLemon/MagicGetPromptAutomatically"

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,62 @@
{
"models": [
{
"name": "Comfy-Org/hunyuan_video_image_to_video_720p_bf16.safetensors",
"type": "diffusion_model",
"base": "Hunyuan Video",
"save_path": "diffusion_models/hunyuan_video",
"description": "Huyuan Video Image2Video diffusion model. repackaged version.",
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
"filename": "hunyuan_video_image_to_video_720p_bf16.safetensors",
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_image_to_video_720p_bf16.safetensors",
"size": "25.6GB"
},
{
"name": "Comfy-Org/llava_llama3_vision.safetensors",
"type": "clip_vision",
"base": "LLaVA-Llama-3",
"save_path": "text_encoders",
"description": "llava_llama3_vision clip vison model. This is required for using Hunyuan Video Image2Video.",
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
"filename": "llava_llama3_vision.safetensors",
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/clip_vision/llava_llama3_vision.safetensors",
"size": "649MB"
},
{
"name": "LTX-Video 2B v0.9.5 Checkpoint",
"type": "checkpoint",
"base": "LTX-Video",
"save_path": "checkpoints/LTXV",
"description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
"reference": "https://huggingface.co/Lightricks/LTX-Video",
"filename": "ltx-video-2b-v0.9.5.safetensors",
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.5.safetensors",
"size": "6.34GB"
},
{
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.fp16.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
"size": "167MB"
},
{
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
"type": "VAE",
"base": "Kolors",
"save_path": "vae/kolors",
"description": "Kolors VAE",
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
"filename": "diffusion_pytorch_model.safetensors",
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
"size": "335MB"
},
{
"name": "deepseek-ai/Janus-Pro-1B",
"type": "Janus-Pro",

View File

@@ -301,6 +301,16 @@
],
"install_type": "git-clone",
"description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
},
{
"author": "zentrocdot",
"title": "ComfyUI-Turtle_Graphics_Demos",
"reference": "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo",
"files": [
"https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo"
],
"description": "ComfyUI node for creating some Turtle Graphic demos.",
"install_type": "git-clone"
}
]
}

View File

@@ -1,4 +1,5 @@
import os
import shutil
import subprocess
import sys
import atexit
@@ -20,6 +21,8 @@ import cm_global
import manager_downloader
import folder_paths
manager_util.add_python_path_to_env()
import datetime
if hasattr(datetime, 'datetime'):
from datetime import datetime
@@ -95,7 +98,7 @@ def read_config():
global default_conf
try:
import configparser
config = configparser.ConfigParser()
config = configparser.ConfigParser(strict=False)
config.read(manager_config_path)
default_conf = config['default']
except Exception:
@@ -504,7 +507,7 @@ check_bypass_ssl()
# Perform install
processed_install = set()
script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
def is_installed(name):
@@ -686,20 +689,43 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
file.write('\n'.join(list(extracted)))
def execute_migration(moves):
import shutil
for x in moves:
if os.path.exists(x[0]) and not os.path.exists(x[1]):
shutil.move(x[0], x[1])
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
script_executed = False
# Check if script_list_path exists
if os.path.exists(script_list_path):
def execute_startup_script():
global script_executed
print("\n#######################################################################")
print("[ComfyUI-Manager] Starting dependency installation/(de)activation for the extension\n")
custom_nodelist_cache = None
def get_custom_node_paths():
nonlocal custom_nodelist_cache
if custom_nodelist_cache is None:
custom_nodelist_cache = set()
for base in folder_paths.get_folder_paths('custom_nodes'):
for x in os.listdir(base):
fullpath = os.path.join(base, x)
if os.path.isdir(fullpath):
custom_nodelist_cache.add(fullpath)
return custom_nodelist_cache
def execute_lazy_delete(path):
# Validate to prevent arbitrary paths from being deleted
if path not in get_custom_node_paths():
logging.error(f"## ComfyUI-Manager: The scheduled '{path}' is not a custom node path, so the deletion has been canceled.")
return
if not os.path.exists(path):
logging.info(f"## ComfyUI-Manager: SKIP-DELETE => '{path}' (already deleted)")
return
try:
shutil.rmtree(path)
logging.info(f"## ComfyUI-Manager: DELETE => '{path}'")
except Exception as e:
logging.error(f"## ComfyUI-Manager: Failed to delete '{path}' ({e})")
executed = set()
# Read each line from the file and convert it to a list using eval
with open(script_list_path, 'r', encoding="UTF-8", errors="ignore") as file:
@@ -720,8 +746,8 @@ if os.path.exists(script_list_path):
execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
execute_lazy_install_script(script[3], script[7])
elif script[1] == "#LAZY-MIGRATION":
execute_migration(script[2])
elif script[1] == "#LAZY-DELETE-NODEPACK":
execute_lazy_delete(script[2])
elif os.path.exists(script[0]):
if script[1] == "#FORCE":
@@ -731,7 +757,7 @@ if os.path.exists(script_list_path):
continue
print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}")
print(f"\n## Execute install/(de)activation script for '{script[0]}'")
print(f"\n## Execute management script for '{script[0]}'")
new_env = os.environ.copy()
if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
@@ -739,12 +765,12 @@ if os.path.exists(script_list_path):
exit_code = process_wrap(script[1:], script[0], env=new_env)
if exit_code != 0:
print(f"install/(de)activation script failed: {script[0]}")
print(f"management script failed: {script[0]}")
else:
print(f"\n## ComfyUI-Manager: CANCELED => {script[1:]}")
except Exception as e:
print(f"[ERROR] Failed to execute install/(de)activation script: {line} / {e}")
print(f"[ERROR] Failed to execute management script: {line} / {e}")
# Remove the script_list_path file
if os.path.exists(script_list_path):
@@ -754,6 +780,12 @@ if os.path.exists(script_list_path):
print("\n[ComfyUI-Manager] Startup script completed.")
print("#######################################################################\n")
# Check if script_list_path exists
if os.path.exists(script_list_path):
execute_startup_script()
pip_fixer.fix_broken()
del processed_install
@@ -773,7 +805,10 @@ if script_executed:
else:
sys_argv = sys.argv.copy()
if sys.platform.startswith('win32'):
if sys_argv[0].endswith("__main__.py"): # this is a python module
module_name = os.path.basename(os.path.dirname(sys_argv[0]))
cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
elif sys.platform.startswith('win32'):
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
else:
cmds = [sys.executable] + sys_argv
@@ -787,7 +822,7 @@ if script_executed:
def check_windows_event_loop_policy():
try:
import configparser
config = configparser.ConfigParser()
config = configparser.ConfigParser(strict=False)
config.read(manager_config_path)
default_conf = config['default']

View File

@@ -1,9 +1,9 @@
[project]
name = "comfyui-manager"
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.24"
version = "3.31.2"
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", "toml", "uv", "chardet"]
[project.urls]
Repository = "https://github.com/ltdrdata/ComfyUI-Manager"