Compare commits

...

98 Commits

Author SHA1 Message Date
Dr.Lt.Data
16db68aa8e updated: README.md
removed: useless scripts
fixed: robust installation of toml module
2025-01-03 18:55:05 +09:00
Dr.Lt.Data
ae3a525008 update README.md 2025-01-03 15:13:35 +09:00
Dr.Lt.Data
44cead1865 Merge branch 'main' into feat/cnr 2025-01-03 02:25:50 +09:00
Dr.Lt.Data
24b3068203 update DB 2025-01-03 02:24:45 +09:00
SKB
52db726c9b Update custom-node-list.json (#1389) 2025-01-03 01:46:29 +09:00
Dr.Lt.Data
de2b8fbd88 improved: add aboutBadge 2025-01-02 03:52:18 +09:00
Dr.Lt.Data
c2c8fbec3c improved: back button - better style 2025-01-02 03:21:46 +09:00
Dr.Lt.Data
7de3a7039a version marker 2025-01-02 03:00:45 +09:00
Dr.Lt.Data
3c11361502 Merge branch 'main' into feat/cnr
improved: support new front's prompt, alert api
modified: z-indices
2025-01-02 02:58:55 +09:00
Dr.Lt.Data
890ba0f818 fix: Fixed an issue where the ID of nodes registered only in the CNR could not be properly resolved.
https://github.com/ltdrdata/ComfyUI-Manager/issues/1376
2024-12-29 08:10:59 +09:00
Dr.Lt.Data
806fdd721d Merge branch 'main' into feat/cnr 2024-12-25 15:56:38 +09:00
Dr.Lt.Data
8aa3617a18 ruff check 2024-12-22 01:52:20 +09:00
Dr.Lt.Data
5e5235f5d1 remove suffix for enabled custom nodes 2024-12-22 01:42:32 +09:00
Dr.Lt.Data
cbcd2e14ce Merge branch 'feat/cnr' into feat/cnr-no-suffix 2024-12-21 18:28:46 +09:00
Dr.Lt.Data
b9227b1570 modified: hide migration button temporarily 2024-12-21 18:24:18 +09:00
Dr.Lt.Data
e058140bac Merge branch 'main' into feat/cnr 2024-12-21 18:11:14 +09:00
huchenlei
9503c34d5b Mark usages: 2024-12-20 15:21:52 -08:00
huchenlei
19be1f85da Move to git_utils 2024-12-20 15:02:58 -08:00
huchenlei
4e44c26beb handle installed 2024-12-20 14:56:39 -08:00
huchenlei
9d1ef85af8 Add NodePackage 2024-12-20 14:09:07 -08:00
Chenlei Hu
f8e5521b50 Merge pull request #1353 from huchenlei/attach_node_versions
Add extension to attach node versions
2024-12-19 15:42:24 -08:00
huchenlei
0ae2b7f338 nit 2024-12-19 15:39:24 -08:00
huchenlei
c2ac84c3d3 nit 2024-12-19 15:35:11 -08:00
huchenlei
fd29dc5133 Add extension to attach node versions 2024-12-19 15:29:56 -08:00
Chenlei Hu
aab45dff44 Merge pull request #1352 from huchenlei/fix_installed_module_name
Use module name without @Version in /customnode/installed object key
2024-12-19 15:25:56 -08:00
huchenlei
6fee2b8b10 Use module name without @version in /customnode/installed object key 2024-12-19 15:22:50 -08:00
Dr.Lt.Data
9b5adfeb2c feat: endpoint customnode/installed is added 2024-12-19 18:13:10 +09:00
Dr.Lt.Data
95ee037a44 refactor: print -> logging. 2024-12-19 15:50:23 +09:00
Dr.Lt.Data
3ecf3a359d Merge branch 'main' into feat/cnr 2024-12-19 15:35:11 +09:00
Dr.Lt.Data
31de8ffc3d implement: support --user-directory 2024-12-19 15:27:31 +09:00
Dr.Lt.Data
602d04e236 fix: prestartup - import error 2024-12-19 11:33:58 +09:00
Dr.Lt.Data
a44d1fbd37 fix: mismatches caused by manager-core integration 2024-12-19 09:29:30 +09:00
Dr.Lt.Data
e4bb21f25c fix: import error - cnr_utils.extract_package_as_zip 2024-12-19 08:20:39 +09:00
Dr.Lt.Data
87d447f7b5 apply manager-core modifications
- custom custom_nodes dir
2024-12-18 16:21:35 +09:00
Dr.Lt.Data
e2e1e23ab5 modified: Change the default from CNR to nightly
fixed: broken CNR installation
2024-12-18 15:00:23 +09:00
Dr.Lt.Data
46a6afcc19 refactor: ruff 2024-12-18 12:30:47 +09:00
Dr.Lt.Data
222254896c Merge branch 'main' into feat/cnr 2024-12-18 12:00:16 +09:00
Dr.Lt.Data
b8f153e4eb Merge branch 'main' into feat/cnr 2024-12-18 09:08:15 +09:00
Dr.Lt.Data
5f300b8aea Merge branch 'main' into feat/cnr 2024-11-22 07:27:27 +09:00
Dr.Lt.Data
093097cf31 Merge branch 'main' into feat/cnr 2024-11-17 15:39:49 +09:00
Dr.Lt.Data
eb5b512c34 Merge branch 'main' into feat/cnr 2024-11-14 02:26:53 +09:00
Dr.Lt.Data
1bd64e97cc Merge branch 'main' into feat/cnr 2024-11-11 16:51:56 +09:00
Dr.Lt.Data
b703384f6b Merge branch 'main' into feat/cnr 2024-11-11 13:42:13 +09:00
Dr.Lt.Data
d968c55e48 Merge branch 'main' into feat/cnr 2024-11-05 19:52:17 +09:00
Dr.Lt.Data
bc4126f526 Merge branch 'main' into feat/cnr 2024-10-30 03:49:32 +09:00
Dr.Lt.Data
41d4ba9721 Merge branch 'main' into feat/cnr 2024-10-20 14:07:08 +09:00
Dr.Lt.Data
5e5e567181 Merge branch 'main' into feat/cnr 2024-10-16 08:36:21 +09:00
Dr.Lt.Data
a6eaba7e18 Merge branch 'main' into feat/cnr 2024-10-15 23:36:42 +09:00
Dr.Lt.Data
f8221b9b5d Merge branch 'main' into feat/cnr 2024-10-13 17:06:19 +09:00
Dr.Lt.Data
f4442972bc Merge branch 'main' into feat/cnr 2024-10-08 19:47:38 +09:00
Dr.Lt.Data
aa4b3d81ba Merge branch 'main' into feat/cnr 2024-10-05 15:35:48 +09:00
Dr.Lt.Data
cbb6432803 Merge branch 'main' into feat/cnr 2024-09-29 17:18:47 +09:00
Dr.Lt.Data
14afc8d998 Merge branch 'main' into feat/cnr 2024-09-26 09:51:01 +09:00
Dr.Lt.Data
e83e15b9fc Merge branch 'main' into feat/cnr 2024-09-26 08:57:29 +09:00
Dr.Lt.Data
76db17c7f8 Merge branch 'main' into feat/cnr 2024-09-24 09:03:32 +09:00
Dr.Lt.Data
d48c936770 Merge branch 'main' into feat/cnr 2024-09-24 02:07:19 +09:00
Dr.Lt.Data
527c994d43 Merge branch 'main' into feat/cnr 2024-09-23 01:18:25 +09:00
Dr.Lt.Data
800faf96d4 Merge branch 'main' into feat/cnr 2024-09-21 01:38:51 +09:00
Dr.Lt.Data
2c3a11012f Merge branch 'main' into feat/cnr 2024-09-19 02:45:39 +09:00
Dr.Lt.Data
95311cb225 Merge branch 'main' into feat/cnr 2024-09-19 01:57:15 +09:00
Dr.Lt.Data
70471b54f6 hotfix: updating cnr node - invalid garbage handling 2024-09-18 01:21:32 +09:00
Dr.Lt.Data
f0205c8eba Merge branch 'main' into feat/cnr 2024-09-17 23:30:36 +09:00
Dr.Lt.Data
1a5fa290a3 Merge branch 'main' into feat/cnr 2024-09-13 01:46:04 +09:00
Dr.Lt.Data
4fc50d5019 Merge branch 'main' into feat/cnr 2024-09-11 00:08:36 +09:00
Dr.Lt.Data
a1c90ceb52 modify: close button -> back button 2024-09-08 16:51:41 +09:00
Dr.Lt.Data
ecda9bd34e add favorites button 2024-09-08 16:42:36 +09:00
Dr.Lt.Data
a952009d4a modified: remove uninstall/switch/disable button for ComfyUI-Manager in the list
feat: support favorites list
2024-09-08 15:53:54 +09:00
Dr.Lt.Data
6f2e1345b2 Merge branch 'main' into feat/cnr 2024-09-08 13:48:35 +09:00
Dr.Lt.Data
7b93c831de Merge branch 'main' into feat/cnr 2024-09-05 22:18:56 +09:00
Dr.Lt.Data
80e1fcd672 Merge branch 'main' into feat/cnr 2024-09-01 15:49:03 +09:00
Dr.Lt.Data
bff8dbee30 Merge branch 'main' into feat/cnr 2024-08-29 21:53:37 +09:00
Dr.Lt.Data
32c828670a fix: update_all - nightly version issue 2024-08-29 21:27:10 +09:00
Dr.Lt.Data
ad1faee2ef fix: snapshot 2024-08-28 02:09:00 +09:00
Dr.Lt.Data
005fa14254 fix: execute_install_script - missing pip install except first pip item in requirements.txt 2024-08-24 18:40:25 +09:00
Dr.Lt.Data
7b60b69968 Merge branch 'main' into feat/cnr 2024-08-24 17:20:59 +09:00
Dr.Lt.Data
ed123750d9 postponed processing for cnr switch & migration 2024-08-22 03:38:22 +09:00
Dr.Lt.Data
bede95cd05 improve: better comfyui switch
show 'nightly' if current commit is latest commit.
2024-08-22 02:10:04 +09:00
Dr.Lt.Data
693a226a41 improve: comfyui version switch
top 4 + nightly
2024-08-22 02:08:23 +09:00
Dr.Lt.Data
7ec2793c9a Merge branch 'main' into feat/cnr 2024-08-22 01:47:55 +09:00
Dr.Lt.Data
a1f7f7069f comfyui version switch 2024-08-21 01:33:55 +09:00
Dr.Lt.Data
f74d8cb470 print stash message.
https://github.com/ltdrdata/ComfyUI-Manager/issues/976#issuecomment-2295670323
2024-08-21 00:45:04 +09:00
Dr.Lt.Data
b02cb2b833 Merge branch 'main' into feat/cnr 2024-08-18 13:02:39 +09:00
Dr.Lt.Data
243b65961f unknown fix 2024-08-17 16:55:23 +09:00
Dr.Lt.Data
a6d20b0865 Merge branch 'main' into feat/cnr 2024-08-17 16:35:22 +09:00
Dr.Lt.Data
06b79287e2 Merge branch 'main' into feat/cnr 2024-08-16 00:10:02 +09:00
Dr.Lt.Data
e906d27606 fix: nightly url mismatch if ssh github url is used
fix: don't show pure cnr node unless default channel
2024-08-15 23:44:12 +09:00
Dr.Lt.Data
0968dd85aa fix: undefined show_message
fix: invalid disable for nightly
2024-08-15 22:45:37 +09:00
Dr.Lt.Data
75240a028a Merge branch 'main' into feat/cnr 2024-08-14 02:02:33 +09:00
Dr.Lt.Data
3335c82350 Merge branch 'main' into feat/cnr 2024-08-08 22:52:07 +09:00
Dr.Lt.Data
e16e72cbbd feat: config.ini - skip_migration_check is supported. 2024-08-04 22:39:13 +09:00
Dr.Lt.Data
0b6f7962a4 fix: should not be displayed switch button if unknown node 2024-08-04 16:34:40 +09:00
Dr.Lt.Data
ea3413be9b conservative migration system
keep original repo name as possible if unknown node
2024-08-04 16:26:23 +09:00
Dr.Lt.Data
10055f578b Merge branch 'main' into feat/cnr 2024-08-04 16:03:25 +09:00
Dr.Lt.Data
cddd000848 Merge branch 'main' into feat/cnr 2024-08-02 03:25:30 +09:00
Dr.Lt.Data
cdb400d32b implement: invalid installation handling
- print invalid installation nodes on terminal
(installed by `comfy registryinstall`)

- show only 'reinstall' menu if invalid installation node in gui
(and show INVALID marker)
2024-07-31 02:08:30 +09:00
Dr.Lt.Data
8e1f792cd1 fix: crash by version handling 2024-07-27 22:08:19 +09:00
Max Klein
f0299e07f9 added support for --no-deps option to node install and reinstall (#886)
* added support for `--no-deps` option to node install and reinstall

* post rebase fixup

* fixup help msg for --no-deps option
2024-07-27 01:52:07 +09:00
Dr.Lt.Data
b3be556837 support CNR 2024-07-25 00:24:58 +09:00
55 changed files with 7533 additions and 4076 deletions

3
.gitignore vendored
View File

@@ -1,6 +1,8 @@
__pycache__/
.idea/
.vscode/
.history/
*.code-workspace
.tmp
.cache
config.ini
@@ -15,3 +17,4 @@ github-stats-cache.json
pip_overrides.json
*.json
check2.sh
/venv/

172
README.md
View File

@@ -2,15 +2,10 @@
**ComfyUI-Manager** is an extension designed to enhance the usability of [ComfyUI](https://github.com/comfyanonymous/ComfyUI). It offers management functions to **install, remove, disable, and enable** various custom nodes of ComfyUI. Furthermore, this extension provides a hub feature and convenience functions to access a wide range of information within ComfyUI.
![menu](misc/menu.jpg)
![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/dialog.jpg)
## NOTICE
* V2.48.1: Security policy has been changed. Downloads of models in the list are allowed under the 'normal' security level.
* V2.47: Security policy has been changed. The former 'normal' is now 'normal-', and 'normal' no longer allows high-risk features, even if your ComfyUI is local.
* V2.37 Show a ✅ mark to accounts that have been active on GitHub for more than six months.
* V2.33 Security policy is applied.
* V2.21 [cm-cli](docs/en/cm-cli.md) tool is added.
* V2.18 to V2.18.3 is not functioning due to a severe bug. Users on these versions are advised to promptly update to V2.18.4. Please navigate to the `ComfyUI/custom_nodes/ComfyUI-Manager` directory and execute `git pull` to update.
* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
* You can see whole nodes info on [ComfyUI Nodes Info](https://ltdrdata.github.io/) page.
## Installation
@@ -20,7 +15,7 @@
To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:
1. goto `ComfyUI/custom_nodes` dir in terminal(cmd)
2. `git clone https://github.com/ltdrdata/ComfyUI-Manager.git`
2. `git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager`
3. Restart ComfyUI
@@ -32,7 +27,7 @@ To install ComfyUI-Manager in addition to an existing installation of ComfyUI, y
2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
3. double click `install-manager-for-portable-version.bat` batch file
![portable-install](misc/portable-install.png)
![portable-install](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/portable-install.jpg)
### Installation[method3] (Installation through comfy-cli: install ComfyUI and ComfyUI-Manager at once.)
@@ -68,15 +63,13 @@ To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you c
3. `./install-comfyui-venv-linux.sh`
### Installation Precautions
* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/ComfyUI-Manager`
* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/comfyui-manager`
* Installing in a compressed file format is not recommended.
* **DON'T**: Decompress directly into the `ComfyUI/custom_nodes` location, resulting in the Manager contents like `__init__.py` being placed directly in that directory.
* You have to remove all ComfyUI-Manager files from `ComfyUI/custom_nodes`
* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager`.
* You have to move `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager` to `ComfyUI/custom_nodes/ComfyUI-Manager`
* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager-main`.
* In such cases, `ComfyUI-Manager` may operate, but it won't be recognized within `ComfyUI-Manager`, and updates cannot be performed. It also poses the risk of duplicate installations.
* You have to rename `ComfyUI/custom_nodes/ComfyUI-Manager-main` to `ComfyUI/custom_nodes/ComfyUI-Manager`
* In such cases, `ComfyUI-Manager` may operate, but it won't be recognized within `ComfyUI-Manager`, and updates cannot be performed. It also poses the risk of duplicate installations. Remove it and install properly via `git clone` method.
You can execute ComfyUI by running either `./run_gpu.sh` or `./run_cpu.sh` depending on your system configuration.
@@ -87,42 +80,17 @@ This repository provides Colab notebooks that allow you to install and use Comfy
* Support for basic installation of ComfyUI-Manager
* Support for automatically installing dependencies of custom nodes upon restarting Colab notebooks.
## Changes
* **2.38** `Install Custom Nodes` menu is changed to `Custom Nodes Manager`.
* **2.21** [cm-cli](docs/en/cm-cli.md) tool is added.
* **2.4** Copy the connections of the nearest node by double-clicking.
* **2.2.3** Support Components System
* **0.29** Add `Update all` feature
* **0.25** support db channel
* You can directly modify the db channel settings in the `config.ini` file.
* If you want to maintain a new DB channel, please modify the `channels.list` and submit a PR.
* **0.23** support multiple selection
* **0.18.1** `skip update check` feature added.
* A feature that allows quickly opening windows in environments where update checks take a long time.
* **0.17.1** Bug fix for the issue where enable/disable of the web extension was not working. Compatibility patch for StableSwarmUI.
* Requires latest version of ComfyUI (Revision: 1240)
* **0.17** Support preview method setting feature.
* **0.14** Support robust update.
* **0.13** Support additional 'pip' section for install spec.
* **0.12** Better installation support for Windows.
* **0.9** Support keyword search in installer menu.
* **V0.7.1** Bug fix for the issue where updates were not being applied on Windows.
* **For those who have been using versions 0.6, please perform a manual git pull in the custom_nodes/ComfyUI-Manager directory.**
* **V0.7** To address the issue of a slow list refresh, separate the fetch update and update check processes.
* **V0.6** Support extension installation for missing nodes.
* **V0.5** Removed external git program dependencies.
## How To Use
1. Click "Manager" button on main menu
![mainmenu](misc/main.jpg)
![mainmenu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/topbar.jpg)
2. If you click on 'Install Custom Nodes' or 'Install Models', an installer dialog will open.
![menu](misc/menu.jpg)
![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/dialog.jpg)
* There are three DB modes: `DB: Channel (1day cache)`, `DB: Local`, and `DB: Channel (remote)`.
* `Channel (1day cache)` utilizes Channel cache information with a validity period of one day to quickly display the list.
@@ -138,9 +106,9 @@ This repository provides Colab notebooks that allow you to install and use Comfy
3. Click 'Install' or 'Try Install' button.
![node-install-dialog](misc/custom-nodes.jpg)
![node-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/custom-nodes.jpg)
![model-install-dialog](misc/models.png)
![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/models.jpg)
* Installed: This item is already installed.
* Install: Clicking this button will install the item.
@@ -150,39 +118,46 @@ This repository provides Colab notebooks that allow you to install and use Comfy
* Channel settings have a broad impact, affecting not only the node list but also all functions like "Update all."
* Conflicted Nodes with a yellow background show a list of nodes conflicting with other extensions in the respective extension. This issue needs to be addressed by the developer, and users should be aware that due to these conflicts, some nodes may not function correctly and may need to be installed accordingly.
4. If you set the `Badge:` item in the menu as `Badge: Nickname`, `Badge: Nickname (hide built-in)`, `Badge: #ID Nickname`, `Badge: #ID Nickname (hide built-in)` the information badge will be displayed on the node.
* When selecting (hide built-in), it hides the 🦊 icon, which signifies built-in nodes.
* Nodes without any indication on the badge are custom nodes that Manager cannot recognize.
* `Badge: Nickname` displays the nickname of custom nodes, while `Badge: #ID Nickname` also includes the internal ID of the node.
![model-install-dialog](misc/nickname.jpg)
5. Share
![menu](misc/main.jpg) ![share](misc/share.jpg)
4. Share
![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/topbar.jpg) ![share](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/share.jpg)
* You can share the workflow by clicking the Share button at the bottom of the main menu or selecting Share Output from the Context Menu of the Image node.
* Currently, it supports sharing via [https://comfyworkflows.com/](https://comfyworkflows.com/),
[https://openart.ai](https://openart.ai/workflows/dev), [https://youml.com](https://youml.com)
as well as through the Matrix channel.
![menu](misc/share-setting.jpg)
![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/share-setting.jpg)
* Through the Share settings in the Manager menu, you can configure the behavior of the Share button in the Main menu or Share Output button on Context Menu.
* `None`: hide from Main menu
* `All`: Show a dialog where the user can select a title for sharing.
## Paths
In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/default/ComfyUI-Manager/`.
* <USER_DIRECTORY>
* If executed without any options, the path defaults to ComfyUI/user.
* It can be set using --user-directory <USER_DIRECTORY>.
* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
* 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`
## Snapshot-Manager
* When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
* Snapshot file dir: `ComfyUI-Manager/snapshots`
* Snapshot file dir: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
* You can rename snapshot file.
* Press the "Restore" button to revert to the installation status of the respective snapshot.
* However, for custom nodes not managed by Git, snapshot support is incomplete.
* When you press `Restore`, it will take effect on the next ComfyUI startup.
* The selected snapshot file is saved in `ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
* The selected snapshot file is saved in `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
![model-install-dialog](misc/snapshot.jpg)
![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)
## cm-cli: command line tools for power user
@@ -199,38 +174,7 @@ This repository provides Colab notebooks that allow you to install and use Comfy
## Custom node support guide
* Currently, the system operates by cloning the git repository and sequentially installing the dependencies listed in requirements.txt using pip, followed by invoking the install.py script. In the future, we plan to discuss and determine the specifications for supporting custom nodes.
* Please submit a pull request to update either the custom-node-list.json or model-list.json file.
* The scanner currently provides a detection function for missing nodes, which is capable of detecting nodes described by the following two patterns.
```
NODE_CLASS_MAPPINGS = {
"ExecutionSwitch": ExecutionSwitch,
"ExecutionBlocker": ExecutionBlocker,
...
}
NODE_CLASS_MAPPINGS.update({
"UniFormer-SemSegPreprocessor": Uniformer_SemSegPreprocessor,
"SemSegPreprocessor": Uniformer_SemSegPreprocessor,
})
```
* Or you can provide manually `node_list.json` file.
* When you write a docstring in the header of the .py file for the Node as follows, it will be used for managing the database in the Manager.
* Currently, only the `nickname` is being used, but other parts will also be utilized in the future.
* The `nickname` will be the name displayed on the badge of the node.
* If there is no `nickname`, it will be truncated to 20 characters from the arbitrarily written title and used.
```
"""
@author: Dr.Lt.Data
@title: Impact Pack
@nickname: Impact Pack
@description: This extension offers various detector nodes and detailer nodes that allow you to configure a workflow that automatically enhances facial details. And provide iterative upscaler.
"""
```
* https://docs.comfy.org/registry/overview
* **Special purpose files** (optional)
@@ -259,12 +203,12 @@ NODE_CLASS_MAPPINGS.update({
}
```
* `<current timestamp>` Ensure that the timestamp is always unique.
* "components" should have the same structure as the content of the file stored in ComfyUI-Manager/components.
* "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
* `<component name>`: The name should be in the format `<prefix>::<node name>`.
* `<compnent nodeata>`: In the nodedata of the group node.
* `<version>`: Only two formats are allowed: `major.minor.patch` or `major.minor`. (e.g. `1.0`, `2.2.1`)
* `<datetime>`: Saved time
* `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in ComfyUI-Manager/components.
* `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
* `<category>`: If there is neither a category nor a packname, it is saved in the components category.
```
"version":"1.0",
@@ -281,11 +225,11 @@ NODE_CLASS_MAPPINGS.update({
## Support of missing nodes installation
![missing-menu](misc/missing-menu.jpg)
![missing-menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-dialog.jpg)
* When you click on the ```Install Missing Custom Nodes``` button in the menu, it displays a list of extension nodes that contain nodes not currently present in the workflow.
![missing-list](misc/missing-list.jpg)
![missing-list](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg)
## Additional Feature
@@ -320,6 +264,9 @@ NODE_CLASS_MAPPINGS.update({
* 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.
## Scanner
When you run the `scan.sh` script:
@@ -336,12 +283,8 @@ When you run the `scan.sh` script:
## Troubleshooting
* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the ComfyUI-Manager/config.ini file that is generated.
* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini` file that is generated.
* If updating ComfyUI-Manager itself fails, please go to the **ComfyUI-Manager** directory and execute the command `git update-ref refs/remotes/origin/main a361cc1 && git fetch --all && git pull`.
* Alternatively, download the update-fix.py script from [update-fix.py](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/update-fix.py) and place it in the ComfyUI-Manager directory. Then, run it using your Python command.
For the portable version, use `..\..\..\python_embeded\python.exe update-fix.py`.
* For cases where nodes like `PreviewTextNode` from `ComfyUI_Custom_Nodes_AlekPet` are only supported as front-end nodes, we currently do not provide missing nodes for them.
* Currently, `vid2vid` is not being updated, causing compatibility issues.
* If you encounter the error message `Overlapped Object has pending operation at deallocation on Comfyui Manager load` under Windows
* Edit `config.ini` file: add `windows_selector_event_loop_policy = True`
* if `SSL: CERTIFICATE_VERIFY_FAILED` error is occured.
@@ -375,41 +318,6 @@ When you run the `scan.sh` script:
* Update ComfyUI
## TODO: Unconventional form of custom node list
* https://github.com/diontimmer/Sample-Diffusion-ComfyUI-Extension
* https://github.com/senshilabs/NINJA-plugin
* https://github.com/MockbaTheBorg/Nodes
* https://github.com/StartHua/Comfyui_GPT_Story
* https://github.com/NielsGercama/comfyui_customsampling
* https://github.com/wrightdaniel2017/ComfyUI-VideoLipSync
* https://github.com/bxdsjs/ComfyUI-Image-preprocessing
* https://github.com/SMUELDigital/ComfyUI-ONSET
* https://github.com/SimithWang/comfyui-renameImages
* https://github.com/icefairy64/comfyui-model-tilt
* https://github.com/andrewharp/ComfyUI-EasyNodes
* https://github.com/SimithWang/comfyui-renameImages
* https://github.com/Tcheko243/ComfyUI-Photographer-Alpha7-Nodes
* https://github.com/Limbicnation/ComfyUINodeToolbox
* https://github.com/APZmedia/ComfyUI-APZmedia-srtTools
## Roadmap
- [x] System displaying information about failed custom nodes import.
- [x] Guide for missing nodes in ComfyUI vanilla nodes.
- [x] Collision checking system for nodes with the same ID across extensions.
- [x] Template sharing system. (-> Component system based on Group Nodes)
- [x] 3rd party API system.
- [ ] Auto migration for custom nodes with changed structures.
- [ ] Version control feature for nodes.
- [ ] List of currently used custom nodes.
- [x] Download support multiple model download.
- [x] Model download via url.
- [x] List sorting (custom nodes).
- [x] List sorting (model).
- [ ] Provides description of node.
# Disclaimer
* This extension simply provides the convenience of installing custom nodes and does not guarantee their proper functioning.

View File

@@ -9,6 +9,7 @@ files=(
"alter-list.json"
"extension-node-map.json"
"github-stats.json"
"extras.json"
"node_db/new/custom-node-list.json"
"node_db/new/model-list.json"
"node_db/new/extension-node-map.json"

871
cm-cli.py
View File

File diff suppressed because it is too large Load Diff

2
cm-cli.sh Executable file
View File

@@ -0,0 +1,2 @@
#!/bin/bash
python cm-cli.py $*

View File

@@ -5654,6 +5654,16 @@
"install_type": "git-clone",
"description": "Nodes: Shadertoy, Load Audio (from Path), Audio Frame Transform (Shadertoy), Audio Frame Transform (Beats)"
},
{
"author": "tocubed",
"title": "ComfyUI-EvTexture",
"reference": "https://github.com/tocubed/ComfyUI-EvTexture",
"files": [
"https://github.com/tocubed/ComfyUI-EvTexture"
],
"install_type": "git-clone",
"description": "Wrapper for EvTexture Video Upscaler: [a/https://github.com/DachunKai/EvTexture](https://github.com/DachunKai/EvTexture)"
},
{
"author": "ntc-ai",
"title": "ComfyUI - Apply LoRA Stacker with DARE",
@@ -7397,6 +7407,16 @@
"install_type": "git-clone",
"description": "A custom node for ComfyUI that adds cinematic and movie scene styles to video generation prompts. This node helps create more dynamic and professional-looking video outputs by incorporating iconic movie scene aesthetics."
},
{
"author": "ShmuelRonen",
"title": "ComfyUI-LatentSyncWrapper",
"reference": "https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper",
"files": [
"https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper"
],
"install_type": "git-clone",
"description": "This node provides lip-sync capabilities in ComfyUI using ByteDance's LatentSync model. It allows you to synchronize video lips with audio input."
},
{
"author": "redhottensors",
"title": "ComfyUI-Prediction",
@@ -7493,6 +7513,16 @@
"install_type": "git-clone",
"description": "A ComfyUI node for removing image backgrounds using RMBG-2.0"
},
{
"author": "1038lab",
"title": "ComfyUI-WildPromptor",
"reference": "https://github.com/1038lab/ComfyUI-WildPromptor",
"files": [
"https://github.com/1038lab/ComfyUI-WildPromptor"
],
"install_type": "git-clone",
"description": "Create dynamic prompts with wildcard list."
},
{
"author": "Klinter",
"title": "Klinter_nodes",
@@ -16279,6 +16309,26 @@
"install_type": "git-clone",
"description": "NODES:Google Translate"
},
{
"author": "sweetndata",
"title": "ComfyUI-Image-Harmonizer",
"reference": "https://github.com/sweetndata/ComfyUI-Image-Harmonizer",
"files": [
"https://github.com/sweetndata/ComfyUI-Image-Harmonizer"
],
"install_type": "git-clone",
"description": "NODES:Image-Harmonizer"
},
{
"author": "sweetndata",
"title": "ComfyUI_Sticker_Compositer",
"reference": "https://github.com/sweetndata/ComfyUI_Sticker_Compositer",
"files": [
"https://github.com/sweetndata/ComfyUI_Sticker_Compositer"
],
"install_type": "git-clone",
"description": "NODES:Sticker Compositer.\nbackground frame + sticker"
},
{
"author": "BlackVortexAI",
"title": "BV Nodes",
@@ -17433,16 +17483,6 @@
"install_type": "git-clone",
"description": "A collection of custom nodes by arcum42. Currently focused on saving metadata in images so that Civitai picks it up, pulling Civitai information, and misc helper nodes."
},
{
"author": "sweetndata",
"title": "ComfyUI-Image-Harmonizer",
"reference": "https://github.com/sweetndata/ComfyUI-Image-Harmonizer",
"files": [
"https://github.com/sweetndata/ComfyUI-Image-Harmonizer"
],
"install_type": "git-clone",
"description": "NODES:Image-Harmonizer"
},
{
"author": "Tomudo",
"title": "ComfyUI-ascii-art",
@@ -18655,7 +18695,7 @@
"https://github.com/SKBv0/ComfyUI_SKBundle"
],
"install_type": "git-clone",
"description": "A collection of custom nodes designed to enhance your workflow in ComfyUI. These nodes were developed to meet my own needs while working with ComfyUI. Although I'm not a programmer, I created these nodes with the help of Cursor AI and will continue to develop them over time."
"description": "Nodes: MultiText, TextBox, TitlePlus, SeamlessTexture, AspectRatioPlus, DisplayEverything, ComparerPlus, AnySwitch, Node Design Tools..."
},
{
"author": "civen-cn",
@@ -18707,6 +18747,17 @@
"install_type": "git-clone",
"description": "Rembg Background Removal Node for ComfyUI"
},
{
"author": "sanbuphy",
"title": "ComfyUI-AudioLDM",
"reference": "https://github.com/sanbuphy/ComfyUI-AudioLDM",
"files": [
"https://github.com/sanbuphy/ComfyUI-AudioLDM"
],
"install_type": "git-clone",
"description": "ComfyUI Workflow to run audioldm-l-full pipeline\n[a/https://huggingface.co/cvssp/audioldm-l-full](https://huggingface.co/cvssp/audioldm-l-full)"
},

View File

@@ -46,6 +46,21 @@
"title_aux": "ComfyUI-RMBG"
}
],
"https://github.com/1038lab/ComfyUI-WildPromptor": [
[
"AllInOneList",
"KeywordPicker",
"PromptBuilder",
"PromptConcat",
"WildPromptorAllInOne",
"WildPromptorGenerator",
"WildPromptor_DataToPromptList",
"WildPromptor_Enhancer"
],
{
"title_aux": "ComfyUI-WildPromptor"
}
],
"https://github.com/111496583yzy/comfyui-PuzzleCrack-Effect": [
[
"MyJigsawPuzzleEffect",
@@ -2748,6 +2763,7 @@
"AD_ImageSaver",
"AD_LoadImageAdvanced",
"AD_PromptReplace",
"AD_TextIndexer",
"AD_TextListToString",
"AD_TextSaver",
"AD_TxtToCSVCombiner",
@@ -5746,6 +5762,7 @@
"AspectSize",
"AspectSizeV2",
"BatchOffset",
"BatchRangeInsert",
"BatchRangeSwap",
"BatchThief",
"DJZ-LoadLatent",
@@ -7278,6 +7295,14 @@
"title_aux": "ComfyUI-ImageMotionGuider"
}
],
"https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper": [
[
"D_LatentSyncNode"
],
{
"title_aux": "ComfyUI-LatentSyncWrapper"
}
],
"https://github.com/ShmuelRonen/ComfyUI-SVDResizer": [
[
"SVDRsizer"
@@ -8378,6 +8403,15 @@
"title_aux": "ComfyUI String Tools"
}
],
"https://github.com/Taremin/webui-monaco-prompt": [
[
"WebuiMonacoPromptFind",
"WebuiMonacoPromptReplace"
],
{
"title_aux": "WebUI Monaco Prompt"
}
],
"https://github.com/TeaCrab/ComfyUI-TeaNodes": [
[
"TC_ColorFill",
@@ -10291,8 +10325,11 @@
],
"https://github.com/andygill/comfyui-sunflower-nodes": [
[
"ChannelSelect",
"DepthViewToIsometric",
"DisparityToDepthView",
"EquirectangularToRectilinear",
"ImageChannelSelect",
"MaskChannelSelect",
"ResizeDown"
],
{
@@ -12075,6 +12112,7 @@
"LayerUtility: AddBlindWaterMark",
"LayerUtility: CreateQRCode",
"LayerUtility: DecodeQRCode",
"LayerUtility: DeepSeekAPI",
"LayerUtility: Florence2Image2Prompt",
"LayerUtility: Gemini",
"LayerUtility: GetColorTone",
@@ -15233,6 +15271,8 @@
"Griptape Agent Config: OpenAI Drivers",
"Griptape Agent Config: OpenAI [DEPRECATED]",
"Griptape Audio Transcription Driver: OpenAI",
"Griptape Code: Run Griptape Cloud Structure",
"Griptape Code: Run Python",
"Griptape Combine: Merge Inputs",
"Griptape Combine: Merge Texts",
"Griptape Combine: RAG Module List",
@@ -18653,6 +18693,7 @@
"StringListFromCSV",
"StringListToCSV",
"StringMatcher",
"StringTranslate",
"TimeFormatter"
],
{
@@ -18762,7 +18803,8 @@
[
"AutoDownloadBiRefNetModel",
"LoadRembgByBiRefNetModel",
"RembgByBiRefNet"
"RembgByBiRefNet",
"RembgByBiRefNetAdvanced"
],
{
"title_aux": "ComfyUI_BiRefNet_ll"
@@ -20354,6 +20396,7 @@
],
"https://github.com/mithamunda/ComfyUI-TogetherVision": [
[
"Together Image \ud83c\udfa8",
"Together Vision \ud83d\udd0d",
"TogetherVisionNode"
],
@@ -22483,6 +22526,16 @@
"title_aux": "ComfyUI_FlipStreamViewer"
}
],
"https://github.com/sanbuphy/ComfyUI-AudioLDM": [
[
"AudioLDM",
"PreviewAudioLDM",
"SaveAudioLDM"
],
{
"title_aux": "ComfyUI-AudioLDM"
}
],
"https://github.com/sdfxai/SDFXBridgeForComfyUI": [
[
"SDFXClipTextEncode"
@@ -23758,6 +23811,14 @@
"title_aux": "ComfyUI-googletrans"
}
],
"https://github.com/sweetndata/ComfyUI_Sticker_Compositer": [
[
"Sticker_Compositer"
],
{
"title_aux": "ComfyUI_Sticker_Compositer"
}
],
"https://github.com/syaofox/ComfyUI_fnodes": [
[
"AddImageBorder-",
@@ -24087,6 +24148,17 @@
"title_aux": "ComfyUI-AudioReactor"
}
],
"https://github.com/tocubed/ComfyUI-EvTexture": [
[
"EVTEventsToImage",
"EVTLoadEvTextureModel",
"EVTTextureUpscaleVideo",
"EVTVideoToEvents"
],
{
"title_aux": "ComfyUI-EvTexture"
}
],
"https://github.com/tomudo/ComfyUI-ascii-art": [
[
"ImageToAscii"

26
extras.json Normal file
View File

@@ -0,0 +1,26 @@
{
"favorites": [
"comfyui_ipadapter_plus",
"comfyui-animatediff-evolved",
"comfyui_controlnet_aux",
"comfyui-impact-pack",
"comfyui-impact-subpack",
"comfyui-custom-scripts",
"comfyui-layerdiffuse",
"comfyui-liveportraitkj",
"aigodlike-comfyui-translation",
"comfyui-reactor-node",
"comfyui_instantid",
"sd-dynamic-thresholding",
"pr-was-node-suite-comfyui-47064894",
"comfyui-advancedliveportrait",
"comfyui_layerstyle",
"efficiency-nodes-comfyui",
"comfyui-crystools",
"comfyui-advanced-controlnet",
"comfyui-videohelpersuite",
"comfyui-kjnodes",
"comfy-mtb",
"comfyui_essentials"
]
}

View File

@@ -5,7 +5,6 @@ import traceback
import git
import configparser
import re
import json
import yaml
import requests
@@ -13,6 +12,14 @@ from tqdm.auto import tqdm
from git.remote import RemoteProgress
comfy_path = os.environ.get('COMFYUI_PATH')
if comfy_path is None:
print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
comfy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
def download_url(url, dest_folder, filename=None):
# Ensure the destination folder exists
if not os.path.exists(dest_folder):
@@ -59,9 +66,11 @@ class GitProgress(RemoteProgress):
self.pbar.refresh()
def gitclone(custom_nodes_path, url, target_hash=None):
def gitclone(custom_nodes_path, url, target_hash=None, repo_path=None):
repo_name = os.path.splitext(os.path.basename(url))[0]
repo_path = os.path.join(custom_nodes_path, repo_name)
if repo_path is None:
repo_path = os.path.join(custom_nodes_path, repo_name)
# Clone the repository from the remote URL
repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
@@ -94,7 +103,12 @@ def gitcheck(path, do_fetch=False):
# Get the current commit hash and the commit hash of the remote branch
commit_hash = repo.head.commit.hexsha
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
if f'{remote_name}/{branch_name}' in repo.refs:
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
else:
print("CUSTOM NODE CHECK: True") # non default branch is treated as updatable
return
# Compare the commit hashes to determine if the local repository is behind the remote repository
if commit_hash != remote_commit_hash:
@@ -113,11 +127,8 @@ def gitcheck(path, do_fetch=False):
def switch_to_default_branch(repo):
show_result = repo.git.remote("show", "origin")
matches = re.search(r"\s*HEAD branch:\s*(.*)", show_result)
if matches:
default_branch = matches.group(1)
repo.git.checkout(default_branch)
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
repo.git.checkout(default_branch)
def gitpull(path):
@@ -128,6 +139,7 @@ def gitpull(path):
# Pull the latest changes from the remote repository
repo = git.Repo(path)
if repo.is_dirty():
print(f"STASH: '{path}' is dirty.")
repo.git.stash()
commit_hash = repo.head.commit.hexsha
@@ -141,6 +153,11 @@ def gitpull(path):
remote_name = current_branch.tracking_branch().remote_name
remote = repo.remote(name=remote_name)
if f'{remote_name}/{branch_name}' not in repo.refs:
switch_to_default_branch(repo)
current_branch = repo.active_branch
branch_name = current_branch.name
remote.fetch()
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
@@ -166,9 +183,7 @@ def gitpull(path):
def checkout_comfyui_hash(target_hash):
repo_path = os.path.abspath(os.path.join(working_directory, '..')) # ComfyUI dir
repo = git.Repo(repo_path)
repo = git.Repo(comfy_path)
commit_hash = repo.head.commit.hexsha
if commit_hash != target_hash:
@@ -250,6 +265,9 @@ def checkout_custom_node_hash(git_custom_node_infos):
# clone missing
for k, v in git_custom_node_infos.items():
if 'ComfyUI-Manager' in k:
continue
if not v['disabled']:
repo_name = k.split('/')[-1]
if repo_name.endswith('.git'):
@@ -258,7 +276,7 @@ def checkout_custom_node_hash(git_custom_node_infos):
path = os.path.join(working_directory, repo_name)
if not os.path.exists(path):
print(f"CLONE: {path}")
gitclone(working_directory, k, v['hash'])
gitclone(working_directory, k, target_hash=v['hash'])
def invalidate_custom_node_file(file_custom_node_infos):
@@ -308,19 +326,18 @@ def invalidate_custom_node_file(file_custom_node_infos):
download_url(url, working_directory)
def apply_snapshot(target):
def apply_snapshot(path):
try:
path = os.path.join(os.path.dirname(__file__), 'snapshots', f"{target}")
if os.path.exists(path):
if not target.endswith('.json') and not target.endswith('.yaml'):
if not path.endswith('.json') and not path.endswith('.yaml'):
print(f"Snapshot file not found: `{path}`")
print("APPLY SNAPSHOT: False")
return None
with open(path, 'r', encoding="UTF-8") as snapshot_file:
if target.endswith('.json'):
if path.endswith('.json'):
info = json.load(snapshot_file)
elif target.endswith('.yaml'):
elif path.endswith('.yaml'):
info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
info = info['custom_nodes']
else:
@@ -425,7 +442,11 @@ setup_environment()
try:
if sys.argv[1] == "--clone":
gitclone(sys.argv[2], sys.argv[3])
repo_path = None
if len(sys.argv) > 4:
repo_path = sys.argv[4]
gitclone(sys.argv[2], sys.argv[3], repo_path=repo_path)
elif sys.argv[1] == "--check":
gitcheck(sys.argv[2], False)
elif sys.argv[1] == "--fetch":
@@ -446,5 +467,5 @@ try:
except Exception as e:
print(e)
sys.exit(-1)

View File

File diff suppressed because it is too large Load Diff

131
glob/cnr_utils.py Normal file
View File

@@ -0,0 +1,131 @@
import requests
from dataclasses import dataclass
from typing import List
import manager_util
import toml
import os
base_url = "https://api.comfy.org"
async def get_cnr_data(page=1, limit=1000, cache_mode=True):
try:
uri = f'{base_url}/nodes?page={page}&limit={limit}'
json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
for v in json_obj['nodes']:
if 'latest_version' not in v:
v['latest_version'] = dict(version='nightly')
return json_obj['nodes']
except:
res = {}
print("Cannot connect to comfyregistry.")
return res
@dataclass
class NodeVersion:
changelog: str
dependencies: List[str]
deprecated: bool
id: str
version: str
download_url: str
def map_node_version(api_node_version):
"""
Maps node version data from API response to NodeVersion dataclass.
Args:
api_data (dict): The 'node_version' part of the API response.
Returns:
NodeVersion: An instance of NodeVersion dataclass populated with data from the API.
"""
return NodeVersion(
changelog=api_node_version.get(
"changelog", ""
), # Provide a default value if 'changelog' is missing
dependencies=api_node_version.get(
"dependencies", []
), # Provide a default empty list if 'dependencies' is missing
deprecated=api_node_version.get(
"deprecated", False
), # Assume False if 'deprecated' is not specified
id=api_node_version[
"id"
], # 'id' should be mandatory; raise KeyError if missing
version=api_node_version[
"version"
], # 'version' should be mandatory; raise KeyError if missing
download_url=api_node_version.get(
"downloadUrl", ""
), # Provide a default value if 'downloadUrl' is missing
)
def install_node(node_id, version=None):
"""
Retrieves the node version for installation.
Args:
node_id (str): The unique identifier of the node.
version (str, optional): Specific version of the node to retrieve. If omitted, the latest version is returned.
Returns:
NodeVersion: Node version data or error message.
"""
if version is None:
url = f"{base_url}/nodes/{node_id}/install"
else:
url = f"{base_url}/nodes/{node_id}/install?version={version}"
response = requests.get(url)
if response.status_code == 200:
# Convert the API response to a NodeVersion object
return map_node_version(response.json())
else:
return None
def all_versions_of_node(node_id):
url = f"https://api.comfy.org/nodes/{node_id}/versions"
response = requests.get(url)
if response.status_code == 200:
return response.json()
else:
return None
def read_cnr_info(fullpath):
try:
toml_path = os.path.join(fullpath, 'pyproject.toml')
tracking_path = os.path.join(fullpath, '.tracking')
if not os.path.exists(toml_path) or not os.path.exists(tracking_path):
return None # not valid CNR node pack
with open(toml_path, "r", encoding="utf-8") as f:
data = toml.load(f)
project = data.get('project', {})
name = project.get('name')
version = project.get('version')
urls = project.get('urls', {})
repository = urls.get('Repository')
if name and version: # repository is optional
return {
"id": name,
"version": version,
"url": repository
}
return None
except Exception:
return None # not valid CNR node pack

61
glob/git_utils.py Normal file
View File

@@ -0,0 +1,61 @@
import os
import configparser
def is_git_repo(path: str) -> bool:
""" Check if the path is a git repository. """
# NOTE: Checking it through `git.Repo` must be avoided.
# It locks the file, causing issues on Windows.
return os.path.exists(os.path.join(path, '.git'))
def get_commit_hash(fullpath):
git_head = os.path.join(fullpath, '.git', 'HEAD')
if os.path.exists(git_head):
with open(git_head) as f:
line = f.readline()
if line.startswith("ref: "):
ref = os.path.join(fullpath, '.git', line[5:].strip())
if os.path.exists(ref):
with open(ref) as f2:
return f2.readline().strip()
else:
return "unknown"
else:
return line
return "unknown"
def git_url(fullpath):
"""
resolve version of unclassified custom node based on remote url in .git/config
"""
git_config_path = os.path.join(fullpath, '.git', 'config')
if not os.path.exists(git_config_path):
return None
config = configparser.ConfigParser()
config.read(git_config_path)
for k, v in config.items():
if k.startswith('remote ') and 'url' in v:
return v['url']
return None
def normalize_url(url) -> str:
url = url.replace("git@github.com:", "https://github.com/")
if url.endswith('.git'):
url = url[:-4]
return url
def normalize_url_http(url) -> str:
url = url.replace("https://github.com/", "git@github.com:")
if url.endswith('.git'):
url = url[:-4]
return url

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,7 @@
import os
from urllib.parse import urlparse
import urllib
import sys
aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
HF_ENDPOINT = os.getenv('HF_ENDPOINT')
@@ -14,6 +16,27 @@ if aria2 is not None:
aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))
def basic_download_url(url, dest_folder, filename):
import requests
# Ensure the destination folder exists
if not os.path.exists(dest_folder):
os.makedirs(dest_folder)
# Full path to save the file
dest_path = os.path.join(dest_folder, filename)
# Download the file
response = requests.get(url, stream=True)
if response.status_code == 200:
with open(dest_path, 'wb') as file:
for chunk in response.iter_content(chunk_size=1024):
if chunk:
file.write(chunk)
else:
raise Exception(f"Failed to download file from {url}")
def download_url(model_url: str, model_dir: str, filename: str):
if HF_ENDPOINT:
model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
@@ -21,7 +44,6 @@ def download_url(model_url: str, model_dir: str, filename: str):
return aria2_download_url(model_url, model_dir, filename)
else:
from torchvision.datasets.utils import download_url as torchvision_download_url
return torchvision_download_url(model_url, model_dir, filename)
@@ -67,3 +89,26 @@ def aria2_download_url(model_url: str, model_dir: str, filename: str):
progress_bar.update(download.completed_length - progress_bar.n)
time.sleep(1)
download.update()
def download_url_with_agent(url, save_path):
try:
headers = {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'}
req = urllib.request.Request(url, headers=headers)
response = urllib.request.urlopen(req)
data = response.read()
if not os.path.exists(os.path.dirname(save_path)):
os.makedirs(os.path.dirname(save_path))
with open(save_path, 'wb') as f:
f.write(data)
except Exception as e:
print(f"Download error: {url} / {e}", file=sys.stderr)
return False
print("Installation was successful.")
return True

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,17 @@
import aiohttp
import json
import threading
import os
from datetime import datetime
import subprocess
import sys
import re
cache_lock = threading.Lock()
comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
cache_dir = os.path.join(comfyui_manager_path, '.cache')
# DON'T USE StrictVersion - cannot handle pre_release version
# try:
@@ -66,8 +78,89 @@ class StrictVersion:
return not self == other
def simple_hash(input_string):
hash_value = 0
for char in input_string:
hash_value = (hash_value * 31 + ord(char)) % (2**32)
return hash_value
def is_file_created_within_one_day(file_path):
if not os.path.exists(file_path):
return False
file_creation_time = os.path.getctime(file_path)
current_time = datetime.now().timestamp()
time_difference = current_time - file_creation_time
return time_difference <= 86400
async def get_data(uri, silent=False):
if not silent:
print(f"FETCH DATA from: {uri}", end="")
if uri.startswith("http"):
async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
headers = {
'Cache-Control': 'no-cache',
'Pragma': 'no-cache',
'Expires': '0'
}
async with session.get(uri, headers=headers) as resp:
json_text = await resp.text()
else:
with cache_lock:
with open(uri, "r", encoding="utf-8") as f:
json_text = f.read()
json_obj = json.loads(json_text)
if not silent:
print(" [DONE]")
return json_obj
async def get_data_with_cache(uri, silent=False, cache_mode=True):
cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
cache_uri = os.path.join(cache_dir, cache_uri+'.json')
if cache_mode and is_file_created_within_one_day(cache_uri):
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:
print(f"[ComfyUI-Manager] default cache updated: {uri}")
return json_obj
def sanitize_tag(x):
return x.replace('<', '&lt;').replace('>', '&gt;')
def extract_package_as_zip(file_path, extract_path):
import zipfile
try:
with zipfile.ZipFile(file_path, "r") as zip_ref:
zip_ref.extractall(extract_path)
extracted_files = zip_ref.namelist()
print(f"Extracted zip file to {extract_path}")
return extracted_files
except zipfile.BadZipFile:
print(f"File '{file_path}' is not a zip or is corrupted.")
return None
pip_map = None
def get_installed_packages(renew=False):
global pip_map
@@ -212,3 +305,12 @@ class PIPFixer:
except Exception as e:
print("[manager-core] Failed to restore numpy")
print(e)
def sanitize(data):
return data.replace("<", "&lt;").replace(">", "&gt;")
def sanitize_filename(input_string):
result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
return result_string

72
glob/node_package.py Normal file
View File

@@ -0,0 +1,72 @@
from __future__ import annotations
from dataclasses import dataclass
import os
from git_utils import get_commit_hash
@dataclass
class InstalledNodePackage:
"""Information about an installed node package."""
id: str
fullpath: str
disabled: bool
version: str
@property
def is_unknown(self) -> bool:
return self.version == "unknown"
@property
def is_nightly(self) -> bool:
return self.version == "nightly"
@property
def is_from_cnr(self) -> bool:
return not self.is_unknown and not self.is_nightly
@property
def is_enabled(self) -> bool:
return not self.disabled
@property
def is_disabled(self) -> bool:
return self.disabled
def get_commit_hash(self) -> str:
return get_commit_hash(self.fullpath)
def isValid(self) -> bool:
if self.is_from_cnr:
return os.path.exists(os.path.join(self.fullpath, '.tracking'))
return True
@staticmethod
def from_fullpath(fullpath: str, resolve_from_path) -> InstalledNodePackage:
parent_folder_name = os.path.basename(os.path.dirname(fullpath))
module_name = os.path.basename(fullpath)
if module_name.endswith(".disabled"):
node_id = module_name[:-9]
disabled = True
elif parent_folder_name == ".disabled":
# Nodes under custom_nodes/.disabled/* are disabled
node_id = module_name
disabled = True
else:
node_id = module_name
disabled = False
info = resolve_from_path(fullpath)
if info is None:
version = 'unknown'
else:
node_id = info['id'] # robust module guessing
version = info['ver']
return InstalledNodePackage(
id=node_id, fullpath=fullpath, disabled=disabled, version=version
)

View File

@@ -65,10 +65,10 @@ async def share_option(request):
def get_openart_auth():
if not os.path.exists(os.path.join(core.comfyui_manager_path, ".openart_key")):
if not os.path.exists(os.path.join(core.manager_files_path, ".openart_key")):
return None
try:
with open(os.path.join(core.comfyui_manager_path, ".openart_key"), "r") as f:
with open(os.path.join(core.manager_files_path, ".openart_key"), "r") as f:
openart_key = f.read().strip()
return openart_key if openart_key else None
except:
@@ -76,10 +76,10 @@ def get_openart_auth():
def get_matrix_auth():
if not os.path.exists(os.path.join(core.comfyui_manager_path, "matrix_auth")):
if not os.path.exists(os.path.join(core.manager_files_path, "matrix_auth")):
return None
try:
with open(os.path.join(core.comfyui_manager_path, "matrix_auth"), "r") as f:
with open(os.path.join(core.manager_files_path, "matrix_auth"), "r") as f:
matrix_auth = f.read()
homeserver, username, password = matrix_auth.strip().split("\n")
if not homeserver or not username or not password:
@@ -94,10 +94,10 @@ def get_matrix_auth():
def get_comfyworkflows_auth():
if not os.path.exists(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey")):
if not os.path.exists(os.path.join(core.manager_files_path, "comfyworkflows_sharekey")):
return None
try:
with open(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey"), "r") as f:
with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
share_key = f.read()
if not share_key.strip():
return None
@@ -107,10 +107,10 @@ def get_comfyworkflows_auth():
def get_youml_settings():
if not os.path.exists(os.path.join(core.comfyui_manager_path, ".youml")):
if not os.path.exists(os.path.join(core.manager_files_path, ".youml")):
return None
try:
with open(os.path.join(core.comfyui_manager_path, ".youml"), "r") as f:
with open(os.path.join(core.manager_files_path, ".youml"), "r") as f:
youml_settings = f.read().strip()
return youml_settings if youml_settings else None
except:
@@ -118,7 +118,7 @@ def get_youml_settings():
def set_youml_settings(settings):
with open(os.path.join(core.comfyui_manager_path, ".youml"), "w") as f:
with open(os.path.join(core.manager_files_path, ".youml"), "w") as f:
f.write(settings)
@@ -135,7 +135,7 @@ async def api_get_openart_auth(request):
async def api_set_openart_auth(request):
json_data = await request.json()
openart_key = json_data['openart_key']
with open(os.path.join(core.comfyui_manager_path, ".openart_key"), "w") as f:
with open(os.path.join(core.manager_files_path, ".openart_key"), "w") as f:
f.write(openart_key)
return web.Response(status=200)
@@ -178,14 +178,14 @@ async def api_get_comfyworkflows_auth(request):
@PromptServer.instance.routes.post("/manager/set_esheep_workflow_and_images")
async def set_esheep_workflow_and_images(request):
json_data = await request.json()
with open(os.path.join(core.comfyui_manager_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
json.dump(json_data, file, indent=4)
return web.Response(status=200)
@PromptServer.instance.routes.get("/manager/get_esheep_workflow_and_images")
async def get_esheep_workflow_and_images(request):
with open(os.path.join(core.comfyui_manager_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
data = json.load(file)
return web.Response(status=200, text=json.dumps(data))
@@ -194,12 +194,12 @@ def set_matrix_auth(json_data):
homeserver = json_data['homeserver']
username = json_data['username']
password = json_data['password']
with open(os.path.join(core.comfyui_manager_path, "matrix_auth"), "w") as f:
with open(os.path.join(core.manager_files_path, "matrix_auth"), "w") as f:
f.write("\n".join([homeserver, username, password]))
def set_comfyworkflows_auth(comfyworkflows_sharekey):
with open(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey"), "w") as f:
with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
f.write(comfyworkflows_sharekey)
@@ -317,7 +317,7 @@ async def share_art(request):
form.add_field("shareWorkflowTitle", title)
form.add_field("shareWorkflowDescription", description)
form.add_field("shareWorkflowIsNSFW", str(is_nsfw).lower())
form.add_field("currentSnapshot", json.dumps(core.get_current_snapshot()))
form.add_field("currentSnapshot", json.dumps(await core.get_current_snapshot()))
form.add_field("modelsInfo", json.dumps(models_info))
async with session.post(

View File

@@ -1,6 +1,6 @@
import { api } from "../../scripts/api.js";
import { app } from "../../scripts/app.js";
import { sleep, customConfirm } from "./common.js";
import { sleep, customConfirm, customAlert } from "./common.js";
async function tryInstallCustomNode(event) {
let msg = '-= [ComfyUI Manager] extension installation request =-\n\n';
@@ -19,7 +19,7 @@ async function tryInstallCustomNode(event) {
msg += `\n\nRequest message:\n${event.detail.msg}`;
if(event.detail.target.installed == 'True') {
alert(msg);
customAlert(msg);
return;
}
const res = await customConfirm(msg);

View File

@@ -11,7 +11,9 @@ import {
showYouMLShareDialog
} from "./comfyui-share-common.js";
import { OpenArtShareDialog } from "./comfyui-share-openart.js";
import { free_models, install_pip, install_via_git_url, manager_instance, rebootAPI, setManagerInstance, show_message } from "./common.js";
import {
free_models, install_pip, install_via_git_url, manager_instance,
rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.js";
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
import { CustomNodesManager } from "./custom-nodes-manager.js";
import { ModelManager } from "./model-manager.js";
@@ -239,6 +241,7 @@ function is_legacy_front() {
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 badge_mode = "none";
@@ -287,6 +290,18 @@ const style = `
color: white !important;
}
.cm-button-orange {
width: 310px;
height: 30px;
position: relative;
overflow: hidden;
font-size: 17px !important;
font-weight: bold;
background-color: orange !important;
color: black !important;
}
.cm-experimental-button {
width: 290px;
height: 30px;
@@ -595,6 +610,154 @@ async function updateComfyUI() {
}
}
function showVersionSelectorDialog(versions, current, onSelect) {
const dialog = new ComfyDialog();
dialog.element.style.zIndex = 1100;
dialog.element.style.width = "300px";
dialog.element.style.padding = "0";
dialog.element.style.backgroundColor = "#2a2a2a";
dialog.element.style.border = "1px solid #3a3a3a";
dialog.element.style.borderRadius = "8px";
dialog.element.style.boxSizing = "border-box";
dialog.element.style.overflow = "hidden";
const contentStyle = {
width: "300px",
display: "flex",
flexDirection: "column",
alignItems: "center",
padding: "20px",
boxSizing: "border-box",
gap: "15px"
};
let selectedVersion = versions[0];
const versionList = $el("select", {
multiple: true,
size: Math.min(10, versions.length),
style: {
width: "260px",
height: "auto",
backgroundColor: "#383838",
color: "#ffffff",
border: "1px solid #4a4a4a",
borderRadius: "4px",
padding: "5px",
boxSizing: "border-box"
}
},
versions.map((v, index) => $el("option", {
value: v,
textContent: v,
selected: v === current
}))
);
versionList.addEventListener('change', (e) => {
selectedVersion = e.target.value;
Array.from(e.target.options).forEach(opt => {
opt.selected = opt.value === selectedVersion;
});
});
const content = $el("div", {
style: contentStyle
}, [
$el("h3", {
textContent: "Select Version",
style: {
color: "#ffffff",
backgroundColor: "#1a1a1a",
padding: "10px 15px",
margin: "0 0 10px 0",
width: "260px",
textAlign: "center",
borderRadius: "4px",
boxSizing: "border-box",
whiteSpace: "nowrap",
overflow: "hidden",
textOverflow: "ellipsis"
}
}),
versionList,
$el("div", {
style: {
display: "flex",
justifyContent: "space-between",
width: "260px",
gap: "10px"
}
}, [
$el("button", {
textContent: "Cancel",
onclick: () => dialog.close(),
style: {
flex: "1",
padding: "8px",
backgroundColor: "#4a4a4a",
color: "#ffffff",
border: "none",
borderRadius: "4px",
cursor: "pointer",
whiteSpace: "nowrap",
overflow: "hidden",
textOverflow: "ellipsis"
}
}),
$el("button", {
textContent: "Select",
onclick: () => {
if (selectedVersion) {
onSelect(selectedVersion);
dialog.close();
} else {
customAlert("Please select a version.");
}
},
style: {
flex: "1",
padding: "8px",
backgroundColor: "#4CAF50",
color: "#ffffff",
border: "none",
borderRadius: "4px",
cursor: "pointer",
whiteSpace: "nowrap",
overflow: "hidden",
textOverflow: "ellipsis"
}
}),
])
]);
dialog.show(content);
}
async function switchComfyUI() {
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
if(res.status == 200) {
let obj = await res.json();
let versions = [];
let default_version;
for(let v of obj.versions) {
default_version = v;
versions.push(v);
}
showVersionSelectorDialog(versions, obj.current, (selected_version) => {
api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
});
}
else {
show_message('Failed to fetch ComfyUI versions.');
}
}
async function fetchUpdates(update_check_checkbox) {
let prev_text = fetch_updates_button.innerText;
fetch_updates_button.innerText = "Fetching updates...";
@@ -745,6 +908,14 @@ class ManagerMenuDialog extends ComfyDialog {
() => updateComfyUI()
});
switch_comfyui_button =
$el("button.cm-button", {
type: "button",
textContent: "Switch ComfyUI",
onclick:
() => switchComfyUI()
});
fetch_updates_button =
$el("button.cm-button", {
type: "button",
@@ -803,8 +974,8 @@ class ManagerMenuDialog extends ComfyDialog {
$el("button.cm-button", {
type: "button",
textContent: "Install via Git URL",
onclick: () => {
var url = prompt("Please enter the URL of the Git repository to install", "");
onclick: async () => {
var url = await customPrompt("Please enter the URL of the Git repository to install", "");
if (url !== null) {
install_via_git_url(url, self);
@@ -815,6 +986,7 @@ class ManagerMenuDialog extends ComfyDialog {
$el("br", {}, []),
update_all_button,
update_comfyui_button,
switch_comfyui_button,
fetch_updates_button,
$el("br", {}, []),
@@ -838,6 +1010,28 @@ class ManagerMenuDialog extends ComfyDialog {
}),
];
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;
}
@@ -1048,8 +1242,8 @@ class ManagerMenuDialog extends ComfyDialog {
type: "button",
textContent: "Install PIP packages",
onclick:
() => {
var url = prompt("Please enumerate the pip packages to be installed.\n\nExample: insightface opencv-python-headless>=4.1.1\n", "");
async () => {
var url = await customPrompt("Please enumerate the pip packages to be installed.\n\nExample: insightface opencv-python-headless>=4.1.1\n", "");
if (url !== null) {
install_pip(url, self);
@@ -1313,9 +1507,23 @@ class ManagerMenuDialog extends ComfyDialog {
}
}
async function getVersion() {
let version = await api.fetchApi(`/manager/version`);
return await version.text();
}
app.registerExtension({
name: "Comfy.ManagerMenu",
aboutPageBadges: [
{
label: `ComfyUI-Manager ${await getVersion()}`,
url: 'https://github.com/ltdrdata/ComfyUI-Manager',
icon: 'pi pi-th-large'
}
],
init() {
$el("style", {
textContent: style,
@@ -1340,7 +1548,6 @@ app.registerExtension({
try {
// new style Manager buttons
// unload models button into new style Manager button
let cmGroup = new (await import("../../scripts/ui/components/buttonGroup.js")).ComfyButtonGroup(
new(await import("../../scripts/ui/components/button.js")).ComfyButton({
@@ -1354,6 +1561,19 @@ app.registerExtension({
content: "Manager",
classList: "comfyui-button comfyui-menu-mobile-collapse primary"
}).element,
new(await import("../../scripts/ui/components/button.js")).ComfyButton({
icon: "star",
action: () => {
if(!manager_instance)
setManagerInstance(new ManagerMenuDialog());
if(!CustomNodesManager.instance) {
CustomNodesManager.instance = new CustomNodesManager(app, self);
}
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.FAVORITES);
},
tooltip: "Show favorite custom node list"
}).element,
new(await import("../../scripts/ui/components/button.js")).ComfyButton({
icon: "vacuum-outline",
action: () => {

View File

@@ -4,6 +4,7 @@ import { $el, ComfyDialog } from "../../scripts/ui.js";
import { CopusShareDialog } from "./comfyui-share-copus.js";
import { OpenArtShareDialog } from "./comfyui-share-openart.js";
import { YouMLShareDialog } from "./comfyui-share-youml.js";
import { customAlert } from "./common.js";
export const SUPPORTED_OUTPUT_NODE_TYPES = [
"PreviewImage",
@@ -252,9 +253,9 @@ export const showShareDialog = async (share_option) => {
if (potential_output_nodes.length === 0) {
// todo: add support for other output node types (animatediff combine, etc.)
const supported_nodes_string = SUPPORTED_OUTPUT_NODE_TYPES.join(", ");
alert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
customAlert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
} else {
alert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
customAlert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
}
return false;
}
@@ -512,7 +513,7 @@ export class ShareDialogChooser extends ComfyDialog {
}
show() {
this.element.style.display = "block";
this.element.style.zIndex = 1100;
this.element.style.zIndex = 1099;
}
}
export class ShareDialog extends ComfyDialog {
@@ -861,7 +862,7 @@ export class ShareDialog extends ComfyDialog {
if (destinations.includes("matrix")) {
let definedMatrixAuth = !!this.matrix_homeserver_input.value && !!this.matrix_username_input.value && !!this.matrix_password_input.value;
if (!definedMatrixAuth) {
alert("Please set your Matrix account details.");
customAlert("Please set your Matrix account details.");
return;
}
}
@@ -878,9 +879,9 @@ export class ShareDialog extends ComfyDialog {
if (potential_output_nodes.length === 0) {
// todo: add support for other output node types (animatediff combine, etc.)
const supported_nodes_string = SUPPORTED_OUTPUT_NODE_TYPES.join(", ");
alert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
customAlert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
} else {
alert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
customAlert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
}
this.selectedOutputIndex = 0;
this.close();
@@ -918,16 +919,16 @@ export class ShareDialog extends ComfyDialog {
try {
const response_json = await response.json();
if (response_json.error) {
alert(response_json.error);
customAlert(response_json.error);
this.close();
return;
} else {
alert("Failed to share your art. Please try again.");
customAlert("Failed to share your art. Please try again.");
this.close();
return;
}
} catch (e) {
alert("Failed to share your art. Please try again.");
customAlert("Failed to share your art. Please try again.");
this.close();
return;
}

View File

@@ -1,5 +1,7 @@
import { app } from "../../scripts/app.js";
import { $el, ComfyDialog } from "../../scripts/ui.js";
import { customAlert } from "./common.js";
const env = "prod";
let DEFAULT_HOMEPAGE_URL = "https://copus.io";
@@ -603,7 +605,7 @@ export class CopusShareDialog extends ComfyDialog {
this.shareButton.textContent = "Sharing...";
await this.share();
} catch (e) {
alert(e.message);
customAlert(e.message);
}
this.shareButton.disabled = false;
this.shareButton.textContent = "Share";

View File

@@ -1,6 +1,7 @@
import {app} from "../../scripts/app.js";
import {api} from "../../scripts/api.js";
import {ComfyDialog, $el} from "../../scripts/ui.js";
import { customAlert } from "./common.js";
const LOCAL_STORAGE_KEY = "openart_comfy_workflow_key";
const DEFAULT_HOMEPAGE_URL = "https://openart.ai/workflows/dev?developer=true";
@@ -431,7 +432,7 @@ export class OpenArtShareDialog extends ComfyDialog {
this.shareButton.textContent = "Sharing...";
await this.share();
} catch (e) {
alert(e.message);
customAlert(e.message);
}
this.shareButton.disabled = false;
this.shareButton.textContent = "Share";

View File

@@ -1,6 +1,7 @@
import {app} from "../../scripts/app.js";
import {api} from "../../scripts/api.js";
import {ComfyDialog, $el} from "../../scripts/ui.js";
import { customAlert } from "./common.js";
const BASE_URL = "https://youml.com";
//const BASE_URL = "http://localhost:3000";
@@ -347,7 +348,7 @@ export class YouMLShareDialog extends ComfyDialog {
this.shareButton.textContent = "Sharing...";
await this.share();
} catch (e) {
alert(e.message);
customAlert(e.message);
} finally {
this.shareButton.disabled = false;
this.shareButton.textContent = "Share";

View File

@@ -96,7 +96,7 @@ function internalCustomConfirm(message, confirmMessage, cancelMessage) {
export function show_message(msg) {
app.ui.dialog.show(msg);
app.ui.dialog.element.style.zIndex = 1100;
app.ui.dialog.element.style.zIndex = 1099;
}
export async function sleep(ms) {
@@ -120,6 +120,34 @@ export async function customConfirm(message) {
}
}
export function customAlert(message) {
try {
window['app'].extensionManager.toast.addAlert(message);
}
catch {
alert(message);
}
}
export async function customPrompt(title, message) {
try {
let res = await
window['app'].extensionManager.dialog
.prompt({
title: title,
message: message
});
return res;
}
catch {
return prompt(title, message)
}
}
export function rebootAPI() {
if ('electronAPI' in window) {
window.electronAPI.restartApp();
@@ -138,6 +166,24 @@ export function rebootAPI() {
return false;
}
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) {

View File

@@ -1,6 +1,6 @@
import { app } from "../../scripts/app.js";
import { api } from "../../scripts/api.js"
import { sleep, show_message, customConfirm } from "./common.js";
import { sleep, show_message, customConfirm, customAlert } from "./common.js";
import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
import { ComfyDialog, $el } from "../../scripts/ui.js";
@@ -456,7 +456,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
this.invalidateControl();
this.element.style.display = "block";
this.element.style.zIndex = 1100;
this.element.style.zIndex = 1099;
this.element.style.width = "500px";
this.element.style.height = "480px";
}
@@ -622,7 +622,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
self.version_string.value = self.default_ver;
}
else {
alert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
customAlert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
}
};

View File

File diff suppressed because it is too large Load Diff

View File

@@ -10,7 +10,7 @@ import TG from "./turbogrid.esm.js";
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: 1100;
z-index: 1099;
width: 80%;
height: 80%;
display: flex;
@@ -235,7 +235,7 @@ const pageHtml = `
<div class="cmm-manager-selection"></div>
<div class="cmm-manager-message"></div>
<div class="cmm-manager-footer">
<button class="cmm-manager-close">Close</button>
<button class="cmm-manager-back">Back</button>
<div class="cmm-flex-auto"></div>
</div>
`;
@@ -365,10 +365,12 @@ export class ModelManager {
}
},
".cmm-manager-close": {
click: (e) => this.close()
".cmm-manager-back": {
click: (e) => {
this.close()
manager_instance.show();
}
},
};
Object.keys(eventsMap).forEach(selector => {
const target = this.element.querySelector(selector);

View File

@@ -291,7 +291,7 @@ export class SnapshotManager extends ComfyDialog {
try {
this.invalidateControl();
this.element.style.display = "block";
this.element.style.zIndex = 1100;
this.element.style.zIndex = 1099;
}
catch(exception) {
app.ui.dialog.show(`Failed to get external model list. / ${exception}`);

84
js/workflow-metadata.js Normal file
View File

@@ -0,0 +1,84 @@
/**
* Attaches metadata to the workflow on save
* - 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"
}
},
*/
import { app } from "../../scripts/app.js";
import { api } from "../../scripts/api.js";
class WorkflowMetadataExtension {
constructor() {
this.name = "Comfy.CustomNodesManager.WorkflowMetadata";
this.installedNodeVersions = {};
this.comfyCoreVersion = null;
}
/**
* Get the installed node versions
* @returns {Promise<Record<string, string>>} The mapping from node name to version
* version can either be a git commit hash or a semantic version such as "1.0.0"
*/
async getInstalledNodeVersions() {
const res = await api.fetchApi("/customnode/installed");
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 nodeVersion = this.installedNodeVersions[nodePackageName];
nodeVersions[nodePackageName] = nodeVersion;
} 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.installedNodeVersions = await this.getInstalledNodeVersions();
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);
// Add metadata to the workflow
if (!workflow.extra) {
workflow.extra = {};
}
const graph = this;
workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
return workflow;
};
}
}
app.registerExtension(new WorkflowMetadataExtension());

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 164 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

View File

@@ -11,6 +11,66 @@
{
"author": "ciga2011",
"title": "ComfyUI-AppGen [UNSAFE]",
"reference": "https://github.com/ciga2011/ComfyUI-AppGen",
"files": [
"https://github.com/ciga2011/ComfyUI-AppGen"
],
"install_type": "git-clone",
"description": "A ComfyUI node pack designed to generate and edit Single Page Applications (SPAs) using natural language.[w/This extension allows arbitrary JavaScript code to be executed through the execution of workflows.]"
},
{
"author": "DraconicDragon",
"title": "ComfyUI e621 booru Toolkit",
"reference": "https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit",
"files": [
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit"
],
"install_type": "git-clone",
"description": "for now: just custom node(s) to fetch tags from a given danbooru (soon e621 too) post link\ncurrently only supports danbooru-style urls + api response formats\nthis repo is a rewrite of: [a/https://github.com/yffyhk/comfyui_auto_danbooru](https://github.com/yffyhk/comfyui_auto_danbooru)"
},
{
"author": "ai-business-hql",
"title": "comfyUIAgent [WIP]",
"reference": "https://github.com/ai-business-hql/comfyUIAgent",
"files": [
"https://github.com/ai-business-hql/comfyUIAgent"
],
"install_type": "git-clone",
"description": "test"
},
{
"author": "Grey3016",
"title": "Save2Icon",
"reference": "https://github.com/Grey3016/Save2Icon",
"files": [
"https://github.com/Grey3016/Save2Icon"
],
"install_type": "git-clone",
"description": "NODES: Save2Icon"
},
{
"author": "sh570655308",
"title": "ComfyUI-TopazVideoAI [WIP]",
"reference": "https://github.com/sh570655308/ComfyUI-TopazVideoAI",
"files": [
"https://github.com/sh570655308/ComfyUI-TopazVideoAI"
],
"install_type": "git-clone",
"description": "NODES: Topaz Video AI (Upscale & Frame Interpolation)\nNOTE1:Requirements: Licensed installation of TopazVideoAI\nNOTE2: The files in the repo are not organized."
},
{
"author": "Chargeuk",
"title": "ComfyUI-vts-nodes [WIP]",
"reference": "https://github.com/Chargeuk/ComfyUI-vts-nodes",
"files": [
"https://github.com/Chargeuk/ComfyUI-vts-nodes"
],
"install_type": "git-clone",
"description": "NODES: Clean Text, Color Mask To Mask, Conditioning Set Batch Mask, Merge Delimited Text, Reduce Batch Size, Text To Batch Prompt, To Text, "
},
{
"author": "ryanontheinside",
"title": "ComfyUI_YoloNasObjectDetection_Tensorrt [WIP]",
@@ -1127,7 +1187,7 @@
"https://github.com/wilzamguerrero/Comfyui-zZzZz"
],
"install_type": "git-clone",
"description": "NODES:Download Z, Compress Z, Move Z, Delete Z, Rename Z, Create Z"
"description": "NODES:Download Z, Compress Z, Move Z, Delete Z, Rename Z, Create Z, Infinite Z, Share Screen Z"
},
{
"author": "monate0615",

View File

@@ -507,6 +507,20 @@
"title_aux": "ComfyUI_bd_customNodes"
}
],
"https://github.com/Chargeuk/ComfyUI-vts-nodes": [
[
"VTS Clean Text",
"VTS Color Mask To Mask",
"VTS Conditioning Set Batch Mask",
"VTS Merge Delimited Text",
"VTS Reduce Batch Size",
"VTS To Text",
"Vts Text To Batch Prompt"
],
{
"title_aux": "ComfyUI-vts-nodes [WIP]"
}
],
"https://github.com/ChrisColeTech/ComfyUI-Get-Random-File": [
[
"Get Image File By Index",
@@ -636,6 +650,15 @@
"title_aux": "ComfyUI_LineBreakInserter"
}
],
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [
[
"GetBooruImageInfo",
"TagEncode"
],
{
"title_aux": "ComfyUI e621 booru Toolkit"
}
],
"https://github.com/Eagle-CN/ComfyUI-Addoor": [
[
"AD_AnyFileList",
@@ -651,6 +674,7 @@
"AD_ImageSaver",
"AD_LoadImageAdvanced",
"AD_PromptReplace",
"AD_TextIndexer",
"AD_TextListToString",
"AD_TextSaver",
"AD_TxtToCSVCombiner",
@@ -743,6 +767,14 @@
"title_aux": "ComfyUI-LivePortraitKJ-MPS"
}
],
"https://github.com/Grey3016/Save2Icon": [
[
"Save2Icon"
],
{
"title_aux": "Save2Icon"
}
],
"https://github.com/GrindHouse66/ComfyUI-GH_Tools": [
[
"GHImg_Sizer",
@@ -1897,6 +1929,17 @@
"title_aux": "Python Interpreter ComfyUI Node [UNSAFE]"
}
],
"https://github.com/ciga2011/ComfyUI-AppGen": [
[
"AG_APP_EDIT",
"AG_APP_GEN",
"AG_APP_SANDBOX",
"AG_CODER_LLM"
],
{
"title_aux": "ComfyUI-AppGen [UNSAFE]"
}
],
"https://github.com/comfyanonymous/ComfyUI": [
[
"AddNoise",
@@ -2252,7 +2295,6 @@
],
"https://github.com/dihan/comfyui-random-kps": [
[
"InstantIDFace",
"RandomFaceKeypoints"
],
{
@@ -3905,6 +3947,14 @@
"title_aux": "ComfyUI-GigapixelAI [WIP]"
}
],
"https://github.com/sh570655308/ComfyUI-TopazVideoAI": [
[
"TopazVideoAI"
],
{
"title_aux": "ComfyUI-TopazVideoAI [WIP]"
}
],
"https://github.com/shadowcz007/ComfyUI-PuLID-Test": [
[
"ApplyPulid",
@@ -4245,6 +4295,7 @@
"https://github.com/watarika/ComfyUI-Text-Utility": [
[
"LoadTextFile",
"RemoveComments",
"SaveTextFile"
],
{

View File

File diff suppressed because it is too large Load Diff

View File

@@ -9,6 +9,56 @@
},
{
"author": "tocubed",
"title": "ComfyUI-EvTexture",
"reference": "https://github.com/tocubed/ComfyUI-EvTexture",
"files": [
"https://github.com/tocubed/ComfyUI-EvTexture"
],
"install_type": "git-clone",
"description": "Wrapper for EvTexture Video Upscaler: [a/https://github.com/DachunKai/EvTexture](https://github.com/DachunKai/EvTexture)"
},
{
"author": "ShmuelRonen",
"title": "ComfyUI-LatentSyncWrapper",
"reference": "https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper",
"files": [
"https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper"
],
"install_type": "git-clone",
"description": "This node provides lip-sync capabilities in ComfyUI using ByteDance's LatentSync model. It allows you to synchronize video lips with audio input."
},
{
"author": "sanbuphy",
"title": "ComfyUI-AudioLDM",
"reference": "https://github.com/sanbuphy/ComfyUI-AudioLDM",
"files": [
"https://github.com/sanbuphy/ComfyUI-AudioLDM"
],
"install_type": "git-clone",
"description": "ComfyUI Workflow to run audioldm-l-full pipeline\n[a/https://huggingface.co/cvssp/audioldm-l-full](https://huggingface.co/cvssp/audioldm-l-full)"
},
{
"author": "1038lab",
"title": "ComfyUI-WildPromptor",
"reference": "https://github.com/1038lab/ComfyUI-WildPromptor",
"files": [
"https://github.com/1038lab/ComfyUI-WildPromptor"
],
"install_type": "git-clone",
"description": "Create dynamic prompts with wildcard list."
},
{
"author": "sweetndata",
"title": "ComfyUI_Sticker_Compositer",
"reference": "https://github.com/sweetndata/ComfyUI_Sticker_Compositer",
"files": [
"https://github.com/sweetndata/ComfyUI_Sticker_Compositer"
],
"install_type": "git-clone",
"description": "NODES:Sticker Compositer.\nbackground frame + sticker"
},
{
"author": "Jash-Vora",
"title": "FitDiT",
@@ -635,67 +685,6 @@
],
"install_type": "git-clone",
"description": "A collection of batch operation toolkits suitable for ComfyUI"
},
{
"author": "pollockjj",
"title": "ComfyUI-MultiGPU",
"reference": "https://github.com/pollockjj/ComfyUI-MultiGPU",
"files": [
"https://github.com/pollockjj/ComfyUI-MultiGPU"
],
"install_type": "git-clone",
"description": "Experimental nodes for using multiple GPUs in a single ComfyUI workflow.\nOriginal repo: [a/https://github.com/neuratech-ai/ComfyUI-MultiGPU](https://github.com/neuratech-ai/ComfyUI-MultiGPU)"
},
{
"author": "PressWagon",
"title": "ComfyUI-StringsAndThings",
"reference": "https://github.com/PressWagon/ComfyUI-StringsAndThings",
"files": [
"https://github.com/PressWagon/ComfyUI-StringsAndThings"
],
"install_type": "git-clone",
"description": "EA collection of ComfyUI custom nodes for formatting and debugging string data with the intention of collecting generation data to be processed by a custom node pack like comfy-image-saver, as well as miscellaneous extra nodes to experiment with."
},
{
"author": "42lux",
"title": "Just a bunch of QOL nodes by 42lux",
"id": "comfyui-42lux",
"reference": "https://github.com/42lux/ComfyUI-42lux",
"files": [
"https://github.com/42lux/ComfyUI-42lux"
],
"install_type": "git-clone",
"description": "Just a bunch of QOL nodes. Normalized Flux Sampling, High Res Latent Picker, Textbox with Token Counter."
},
{
"author": "if-ai",
"title": "ComfyUI-IF_Trellis",
"reference": "https://github.com/if-ai/ComfyUI-IF_Trellis",
"files": [
"https://github.com/if-ai/ComfyUI-IF_Trellis"
],
"install_type": "git-clone",
"description": "ComfyUI TRELLIS is a large 3D asset generation in various formats, such as Radiance Fields, 3D Gaussians, and meshes. The cornerstone of TRELLIS is a unified Structured LATent (SLAT) representation that allows decoding to different output formats and Rectified Flow Transformers tailored for SLAT as the powerful backbones."
},
{
"author": "itsjustregi",
"title": "ComfyUI-EasyNoobai",
"reference": "https://github.com/regiellis/ComfyUI-EasyNoobai",
"files": [
"https://github.com/regiellis/ComfyUI-EasyNoobai"
],
"install_type": "git-clone",
"description": "Simple set of nodes to assist with prompt generation for NOOBAI XL / Illustrious models"
},
{
"author": "shinich39",
"title": "comfyui-textarea-command",
"reference": "https://github.com/shinich39/comfyui-textarea-command",
"files": [
"https://github.com/shinich39/comfyui-textarea-command"
],
"install_type": "git-clone",
"description": "Add command and comment in textarea. (e.g. // Disabled line)"
}
]
}

View File

@@ -46,6 +46,21 @@
"title_aux": "ComfyUI-RMBG"
}
],
"https://github.com/1038lab/ComfyUI-WildPromptor": [
[
"AllInOneList",
"KeywordPicker",
"PromptBuilder",
"PromptConcat",
"WildPromptorAllInOne",
"WildPromptorGenerator",
"WildPromptor_DataToPromptList",
"WildPromptor_Enhancer"
],
{
"title_aux": "ComfyUI-WildPromptor"
}
],
"https://github.com/111496583yzy/comfyui-PuzzleCrack-Effect": [
[
"MyJigsawPuzzleEffect",
@@ -2748,6 +2763,7 @@
"AD_ImageSaver",
"AD_LoadImageAdvanced",
"AD_PromptReplace",
"AD_TextIndexer",
"AD_TextListToString",
"AD_TextSaver",
"AD_TxtToCSVCombiner",
@@ -5746,6 +5762,7 @@
"AspectSize",
"AspectSizeV2",
"BatchOffset",
"BatchRangeInsert",
"BatchRangeSwap",
"BatchThief",
"DJZ-LoadLatent",
@@ -7278,6 +7295,14 @@
"title_aux": "ComfyUI-ImageMotionGuider"
}
],
"https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper": [
[
"D_LatentSyncNode"
],
{
"title_aux": "ComfyUI-LatentSyncWrapper"
}
],
"https://github.com/ShmuelRonen/ComfyUI-SVDResizer": [
[
"SVDRsizer"
@@ -8378,6 +8403,15 @@
"title_aux": "ComfyUI String Tools"
}
],
"https://github.com/Taremin/webui-monaco-prompt": [
[
"WebuiMonacoPromptFind",
"WebuiMonacoPromptReplace"
],
{
"title_aux": "WebUI Monaco Prompt"
}
],
"https://github.com/TeaCrab/ComfyUI-TeaNodes": [
[
"TC_ColorFill",
@@ -10291,8 +10325,11 @@
],
"https://github.com/andygill/comfyui-sunflower-nodes": [
[
"ChannelSelect",
"DepthViewToIsometric",
"DisparityToDepthView",
"EquirectangularToRectilinear",
"ImageChannelSelect",
"MaskChannelSelect",
"ResizeDown"
],
{
@@ -12075,6 +12112,7 @@
"LayerUtility: AddBlindWaterMark",
"LayerUtility: CreateQRCode",
"LayerUtility: DecodeQRCode",
"LayerUtility: DeepSeekAPI",
"LayerUtility: Florence2Image2Prompt",
"LayerUtility: Gemini",
"LayerUtility: GetColorTone",
@@ -15233,6 +15271,8 @@
"Griptape Agent Config: OpenAI Drivers",
"Griptape Agent Config: OpenAI [DEPRECATED]",
"Griptape Audio Transcription Driver: OpenAI",
"Griptape Code: Run Griptape Cloud Structure",
"Griptape Code: Run Python",
"Griptape Combine: Merge Inputs",
"Griptape Combine: Merge Texts",
"Griptape Combine: RAG Module List",
@@ -18653,6 +18693,7 @@
"StringListFromCSV",
"StringListToCSV",
"StringMatcher",
"StringTranslate",
"TimeFormatter"
],
{
@@ -18762,7 +18803,8 @@
[
"AutoDownloadBiRefNetModel",
"LoadRembgByBiRefNetModel",
"RembgByBiRefNet"
"RembgByBiRefNet",
"RembgByBiRefNetAdvanced"
],
{
"title_aux": "ComfyUI_BiRefNet_ll"
@@ -20354,6 +20396,7 @@
],
"https://github.com/mithamunda/ComfyUI-TogetherVision": [
[
"Together Image \ud83c\udfa8",
"Together Vision \ud83d\udd0d",
"TogetherVisionNode"
],
@@ -22483,6 +22526,16 @@
"title_aux": "ComfyUI_FlipStreamViewer"
}
],
"https://github.com/sanbuphy/ComfyUI-AudioLDM": [
[
"AudioLDM",
"PreviewAudioLDM",
"SaveAudioLDM"
],
{
"title_aux": "ComfyUI-AudioLDM"
}
],
"https://github.com/sdfxai/SDFXBridgeForComfyUI": [
[
"SDFXClipTextEncode"
@@ -23758,6 +23811,14 @@
"title_aux": "ComfyUI-googletrans"
}
],
"https://github.com/sweetndata/ComfyUI_Sticker_Compositer": [
[
"Sticker_Compositer"
],
{
"title_aux": "ComfyUI_Sticker_Compositer"
}
],
"https://github.com/syaofox/ComfyUI_fnodes": [
[
"AddImageBorder-",
@@ -24087,6 +24148,17 @@
"title_aux": "ComfyUI-AudioReactor"
}
],
"https://github.com/tocubed/ComfyUI-EvTexture": [
[
"EVTEventsToImage",
"EVTLoadEvTextureModel",
"EVTTextureUpscaleVideo",
"EVTVideoToEvents"
],
{
"title_aux": "ComfyUI-EvTexture"
}
],
"https://github.com/tomudo/ComfyUI-ascii-art": [
[
"ImageToAscii"

View File

@@ -4,8 +4,8 @@
"imageio_ffmpeg": "imageio",
"diffusers~=0.21.4": "diffusers",
"huggingface_hub": "huggingface-hub",
"numpy<1.24>=1.18": "numpy",
"numpy>=1.18.5, <1.25.0": "numpy",
"numpy<1.24>=1.18": "numpy==1.26.4",
"numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
"opencv-contrib-python": "opencv-contrib-python-headless",
"opencv-python": "opencv-contrib-python-headless",
"opencv-python-headless": "opencv-contrib-python-headless",

View File

@@ -4,8 +4,8 @@
"imageio_ffmpeg": "imageio",
"diffusers~=0.21.4": "diffusers",
"huggingface_hub": "huggingface-hub",
"numpy<1.24>=1.18": "numpy",
"numpy>=1.18.5, <1.25.0": "numpy",
"numpy<1.24>=1.18": "numpy==1.26.4",
"numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
"opencv-contrib-python": "opencv-contrib-python-headless",
"opencv-python": "opencv-contrib-python-headless",
"opencv-python-headless": "opencv-contrib-python-headless",

View File

@@ -1,4 +1,3 @@
import datetime
import os
import subprocess
import sys
@@ -15,8 +14,11 @@ glob_path = os.path.join(os.path.dirname(__file__), "glob")
sys.path.append(glob_path)
import security_check
from manager_util import PIPFixer, StrictVersion, get_installed_packages, clear_pip_cache
import manager_util
import cm_global
import manager_downloader
from datetime import datetime
import folder_paths
security_check.security_check()
@@ -71,17 +73,20 @@ cm_global.register_api('cm.register_message_collapse', register_message_collapse
cm_global.register_api('cm.is_import_failed_extension', is_import_failed_extension)
comfyui_manager_path = os.path.dirname(__file__)
custom_nodes_path = os.path.abspath(os.path.join(comfyui_manager_path, ".."))
startup_script_path = os.path.join(comfyui_manager_path, "startup-scripts")
restore_snapshot_path = os.path.join(startup_script_path, "restore-snapshot.json")
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
git_script_path = os.path.join(comfyui_manager_path, "git_helper.py")
pip_overrides_path = os.path.join(comfyui_manager_path, "pip_overrides.json")
cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
cm_global.pip_overrides = {}
if os.path.exists(pip_overrides_path):
with open(pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
if os.path.exists(manager_pip_overrides_path):
with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
cm_global.pip_overrides = json.load(json_file)
cm_global.pip_overrides['numpy'] = 'numpy<2'
cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40' # for security
@@ -144,15 +149,18 @@ try:
postfix = ""
# Logger setup
log_path_base = None
if enable_file_logging:
if os.path.exists(f"comfyui{postfix}.log"):
if os.path.exists(f"comfyui{postfix}.prev.log"):
if os.path.exists(f"comfyui{postfix}.prev2.log"):
os.remove(f"comfyui{postfix}.prev2.log")
os.rename(f"comfyui{postfix}.prev.log", f"comfyui{postfix}.prev2.log")
os.rename(f"comfyui{postfix}.log", f"comfyui{postfix}.prev.log")
log_path_base = os.path.join(folder_paths.user_directory, 'comfyui')
log_file = open(f"comfyui{postfix}.log", "w", encoding="utf-8", errors="ignore")
if os.path.exists(f"{log_path_base}{postfix}.log"):
if os.path.exists(f"{log_path_base}{postfix}.prev.log"):
if os.path.exists(f"{log_path_base}{postfix}.prev2.log"):
os.remove(f"{log_path_base}{postfix}.prev2.log")
os.rename(f"{log_path_base}{postfix}.prev.log", f"{log_path_base}{postfix}.prev2.log")
os.rename(f"{log_path_base}{postfix}.log", f"{log_path_base}{postfix}.prev.log")
log_file = open(f"{log_path_base}{postfix}.log", "w", encoding="utf-8", errors="ignore")
log_lock = threading.Lock()
@@ -173,7 +181,7 @@ try:
write_stderr = wrapper_stderr
pat_tqdm = r'\d+%.*\[(.*?)\]'
pat_import_fail = r'seconds \(IMPORT FAILED\):.*[/\\]custom_nodes[/\\](.*)$'
pat_import_fail = r'seconds \(IMPORT FAILED\):(.*)$'
is_start_mode = True
@@ -206,7 +214,7 @@ try:
if is_start_mode:
match = re.search(pat_import_fail, message)
if match:
import_failed_extensions.add(match.group(1))
import_failed_extensions.add(match.group(1).strip())
if 'Starting server' in message:
is_start_mode = False
@@ -228,7 +236,7 @@ try:
def sync_write(self, message, file_only=False):
with log_lock:
timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
if self.last_char != '\n':
log_file.write(message)
else:
@@ -292,7 +300,7 @@ try:
if is_start_mode:
match = re.search(pat_import_fail, message)
if match:
import_failed_extensions.add(match.group(1))
import_failed_extensions.add(match.group(1).strip())
if 'Starting server' in message:
is_start_mode = False
@@ -310,6 +318,7 @@ except Exception as e:
try:
import git # noqa: F401
import toml # noqa: F401
except ModuleNotFoundError:
my_path = os.path.dirname(__file__)
requirements_path = os.path.join(my_path, "requirements.txt")
@@ -331,14 +340,14 @@ except:
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
print("** ComfyUI startup time:", datetime.datetime.now())
print("** ComfyUI startup time:", datetime.now())
print("** Platform:", platform.system())
print("** Python version:", sys.version)
print("** Python executable:", sys.executable)
print("** ComfyUI Path:", comfy_path)
if enable_file_logging:
print("** Log path:", os.path.abspath('comfyui.log'))
if log_path_base is not None:
print("** Log path:", os.path.abspath(f'{log_path_base}.log'))
else:
print("** Log path: file logging is disabled")
@@ -384,8 +393,8 @@ check_bypass_ssl()
# Perform install
processed_install = set()
script_list_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "startup-scripts", "install-scripts.txt")
pip_fixer = PIPFixer(get_installed_packages())
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())
def is_installed(name):
@@ -404,18 +413,18 @@ def is_installed(name):
return True
if name in cm_global.pip_downgrade_blacklist:
pips = get_installed_packages()
pips = manager_util.get_installed_packages()
if match is None:
if name in pips:
return True
elif match.group(2) in ['<=', '==', '<']:
if name in pips:
if StrictVersion(pips[name]) >= StrictVersion(match.group(3)):
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
return True
pkg = get_installed_packages().get(name.lower())
pkg = manager_util.get_installed_packages().get(name.lower())
if pkg is None:
return False # update if not installed
@@ -423,9 +432,9 @@ def is_installed(name):
return True # don't update if version is not specified
if match.group(2) in ['>', '>=']:
if StrictVersion(pkg) < StrictVersion(match.group(3)):
if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
return False
elif StrictVersion(pkg) > StrictVersion(match.group(3)):
elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
return True # prevent downgrade
@@ -457,53 +466,11 @@ if os.path.exists(restore_snapshot_path):
print(prefix, msg, end="")
print("[ComfyUI-Manager] Restore snapshot.")
cmd_str = [sys.executable, git_script_path, '--apply-snapshot', restore_snapshot_path]
new_env = os.environ.copy()
new_env["COMFYUI_PATH"] = comfy_path
exit_code = process_wrap(cmd_str, custom_nodes_path, handler=msg_capture, env=new_env)
repository_name = ''
for url in cloned_repos:
try:
repository_name = url.split("/")[-1].strip()
repo_path = os.path.join(custom_nodes_path, repository_name)
repo_path = os.path.abspath(repo_path)
requirements_path = os.path.join(repo_path, 'requirements.txt')
install_script_path = os.path.join(repo_path, 'install.py')
this_exit_code = 0
if os.path.exists(requirements_path):
with open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file:
for line in file:
package_name = remap_pip_package(line.strip())
if package_name and not is_installed(package_name):
if not package_name.startswith('#'):
if '--index-url' in package_name:
s = package_name.split('--index-url')
install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
else:
install_cmd = [sys.executable, "-m", "pip", "install", package_name]
this_exit_code += process_wrap(install_cmd, repo_path)
if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
processed_install.add(f'{repo_path}/install.py')
install_cmd = [sys.executable, install_script_path]
print(f">>> {install_cmd} / {repo_path}")
new_env = os.environ.copy()
new_env["COMFYUI_PATH"] = comfy_path
this_exit_code += process_wrap(install_cmd, repo_path, env=new_env)
if this_exit_code != 0:
print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
except Exception as e:
print(e)
print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
if exit_code != 0:
print("[ComfyUI-Manager] Restore snapshot failed.")
@@ -547,6 +514,65 @@ def execute_lazy_install_script(repo_path, executable):
process_wrap(install_cmd, repo_path, env=new_env)
def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom_nodes_path):
import uuid
import shutil
# 1. download
archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip" # should be unpredictable name - security precaution
download_path = os.path.join(custom_nodes_path, archive_name)
manager_downloader.download_url(zip_url, custom_nodes_path, archive_name)
# 2. extract files into <node_id>@<cur_ver>
extracted = manager_util.extract_package_as_zip(download_path, from_path)
os.remove(download_path)
if extracted is None:
if len(os.listdir(from_path)) == 0:
shutil.rmtree(from_path)
print(f'Empty archive file: {target}')
return False
# 3. calculate garbage files (.tracking - extracted)
tracking_info_file = os.path.join(from_path, '.tracking')
prev_files = set()
with open(tracking_info_file, 'r') as f:
for line in f:
prev_files.add(line.strip())
garbage = prev_files.difference(extracted)
garbage = [os.path.join(custom_nodes_path, x) for x in garbage]
# 4-1. remove garbage files
for x in garbage:
if os.path.isfile(x):
os.remove(x)
# 4-2. remove garbage dir if empty
for x in garbage:
if os.path.isdir(x):
if not os.listdir(x):
os.rmdir(x)
# 5. rename dir name <node_id>@<prev_ver> ==> <node_id>@<cur_ver>
print(f"'{from_path}' is moved to '{to_path}'")
shutil.move(from_path, to_path)
# 6. create .tracking file
tracking_info_file = os.path.join(to_path, '.tracking')
with open(tracking_info_file, "w", encoding='utf-8') as file:
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]}'")
# Check if script_list_path exists
if os.path.exists(script_list_path):
print("\n#######################################################################")
@@ -568,6 +594,13 @@ if os.path.exists(script_list_path):
if script[1] == "#LAZY-INSTALL-SCRIPT":
execute_lazy_install_script(script[0], script[2])
elif script[1] == "#LAZY-CNR-SWITCH-SCRIPT":
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 os.path.exists(script[0]):
if script[1] == "#FORCE":
del script[1]
@@ -601,7 +634,7 @@ pip_fixer.fix_broken()
del processed_install
del pip_fixer
clear_pip_cache()
manager_util.clear_pip_cache()
def check_windows_event_loop_policy():

View File

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

View File

@@ -5,4 +5,5 @@ transformers
huggingface-hub>0.20
typer
rich
typing-extensions
typing-extensions
toml

View File

@@ -1,6 +1,6 @@
git clone https://github.com/comfyanonymous/ComfyUI
cd ComfyUI/custom_nodes
git clone https://github.com/ltdrdata/ComfyUI-Manager
git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
cd ..
python -m venv venv
source venv/bin/activate

View File

@@ -1,6 +1,6 @@
git clone https://github.com/comfyanonymous/ComfyUI
cd ComfyUI/custom_nodes
git clone https://github.com/ltdrdata/ComfyUI-Manager
git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
cd ..
python -m venv venv
call venv/Scripts/activate

View File

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

View File

@@ -1,12 +0,0 @@
import git
commit_hash = "a361cc1"
repo = git.Repo('.')
if repo.is_dirty():
repo.git.stash()
repo.git.update_ref("refs/remotes/origin/main", commit_hash)
repo.remotes.origin.fetch()
repo.git.pull("origin", "main")