Compare commits
333 Commits
3.16
...
docs/node-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
729ff5a34b | ||
|
|
416122d61d | ||
|
|
d3c625e791 | ||
|
|
ca2c41783c | ||
|
|
e2a6446585 | ||
|
|
839790b5ab | ||
|
|
58b9946936 | ||
|
|
a19ba22eaf | ||
|
|
117715aa22 | ||
|
|
891a5a85ee | ||
|
|
166debfabb | ||
|
|
7258a09fe5 | ||
|
|
058a436187 | ||
|
|
1950802c55 | ||
|
|
eb52a03372 | ||
|
|
f8aa428be3 | ||
|
|
ec0893f136 | ||
|
|
92b99ea963 | ||
|
|
02cd52bb65 | ||
|
|
af1ec2c87b | ||
|
|
41006c3a33 | ||
|
|
116a6d500d | ||
|
|
87d0ac807f | ||
|
|
fc943172eb | ||
|
|
9daa5a2fbd | ||
|
|
b7b2746a61 | ||
|
|
d66a4fbfc8 | ||
|
|
683a172ad8 | ||
|
|
6e12358f5a | ||
|
|
8bcf16dc90 | ||
|
|
65c0a2a1f5 | ||
|
|
115236eb9c | ||
|
|
08de942abe | ||
|
|
e9dff83290 | ||
|
|
3bc6c7584d | ||
|
|
22a2bf1584 | ||
|
|
79ece5f72c | ||
|
|
5da6fe1373 | ||
|
|
48c10d0b95 | ||
|
|
9bb56b1457 | ||
|
|
83420fd828 | ||
|
|
52f4b9506f | ||
|
|
b501e9b20b | ||
|
|
1f7ae5319a | ||
|
|
68c201239d | ||
|
|
6e4e43f612 | ||
|
|
81c3708f39 | ||
|
|
f4d2bbde34 | ||
|
|
d14b42a42c | ||
|
|
0e9c32344c | ||
|
|
30c4ea06af | ||
|
|
8211264993 | ||
|
|
67cf5b49e1 | ||
|
|
8e7ba18e05 | ||
|
|
8359e1063e | ||
|
|
ca078e54b9 | ||
|
|
f7e930c5a2 | ||
|
|
479d95e1c8 | ||
|
|
2b0ff08eef | ||
|
|
67a487db15 | ||
|
|
2488cb3458 | ||
|
|
157e6336fa | ||
|
|
d808a1f406 | ||
|
|
2bb4d8cd63 | ||
|
|
a8164e1631 | ||
|
|
a31d286945 | ||
|
|
12eeef4cf0 | ||
|
|
ce8e6dc36e | ||
|
|
7a32e544a7 | ||
|
|
e16e9d7a0e | ||
|
|
821f908dbc | ||
|
|
e007e6f897 | ||
|
|
94f496fd65 | ||
|
|
d2ce35d2e6 | ||
|
|
2eeebb32dc | ||
|
|
f6d636d82f | ||
|
|
0cd397623e | ||
|
|
5978b6c9ee | ||
|
|
9e132811bc | ||
|
|
3a3b5c1f92 | ||
|
|
26be01ff82 | ||
|
|
8f6dd92374 | ||
|
|
d50b71a887 | ||
|
|
3bc9cbc767 | ||
|
|
b6f6b4fd8a | ||
|
|
a66bada8a3 | ||
|
|
a804f7de19 | ||
|
|
72a61a9966 | ||
|
|
b08bb658ea | ||
|
|
7b28bf608b | ||
|
|
b57747fdf1 | ||
|
|
0735271b10 | ||
|
|
770cd0f9f5 | ||
|
|
32b6266dd9 | ||
|
|
2a8412a2bf | ||
|
|
0c4d289002 | ||
|
|
cee01fec25 | ||
|
|
f00686f3f2 | ||
|
|
bd33f7726e | ||
|
|
22ab526b0c | ||
|
|
af269d198d | ||
|
|
995ef6356e | ||
|
|
aa3bf77c28 | ||
|
|
15667c1259 | ||
|
|
c7b6b565da | ||
|
|
3214ab52c6 | ||
|
|
e3062ff613 | ||
|
|
036b63efe7 | ||
|
|
8d3e1d60d0 | ||
|
|
59876452f4 | ||
|
|
04972ad87f | ||
|
|
c7e69f4e26 | ||
|
|
7a59b6d0d9 | ||
|
|
d227ad97a4 | ||
|
|
b93a474dae | ||
|
|
a5fe075bf3 | ||
|
|
17e5c3d2f5 | ||
|
|
27bfc539f7 | ||
|
|
821fded09d | ||
|
|
ec4a2aa873 | ||
|
|
d6b2d54f3f | ||
|
|
97ae67bb9a | ||
|
|
765514a33f | ||
|
|
e2cdcc96c4 | ||
|
|
0738b2a73f | ||
|
|
98db79910e | ||
|
|
0b21a05aac | ||
|
|
4b71db54aa | ||
|
|
a6bc890f36 | ||
|
|
76903c39e1 | ||
|
|
cf9ed1c631 | ||
|
|
50fc1389b0 | ||
|
|
c70cb2868b | ||
|
|
12fa571aa2 | ||
|
|
4a3018760f | ||
|
|
d005d06cf8 | ||
|
|
a87e3f9ee9 | ||
|
|
52b9a3f3a0 | ||
|
|
c01a7e41d0 | ||
|
|
fe301bb91a | ||
|
|
a42953e3be | ||
|
|
1899255a69 | ||
|
|
908a1009d2 | ||
|
|
fb9c68fc32 | ||
|
|
d54ec0eb05 | ||
|
|
a386948fd1 | ||
|
|
007b812ede | ||
|
|
0ddb0cec03 | ||
|
|
e687f83fbf | ||
|
|
458c9de70f | ||
|
|
87a652d038 | ||
|
|
d889df4c89 | ||
|
|
a2e72d26aa | ||
|
|
a4fdc874e7 | ||
|
|
dfbe382d60 | ||
|
|
0d56ebb1bf | ||
|
|
9e66da174e | ||
|
|
55fcb00168 | ||
|
|
68aa534e1d | ||
|
|
7fd94a401b | ||
|
|
2b9cec50ce | ||
|
|
d1a80cf082 | ||
|
|
fb445aa510 | ||
|
|
4b904934ef | ||
|
|
d6295a00e6 | ||
|
|
3b01673829 | ||
|
|
a5e83a807f | ||
|
|
ddd766ce58 | ||
|
|
a6d2fd36fb | ||
|
|
9156d6bdba | ||
|
|
d18a3ffeff | ||
|
|
e933eaa2b0 | ||
|
|
5393653ddc | ||
|
|
1f3274d3f5 | ||
|
|
39eaa76b8a | ||
|
|
e5396713ce | ||
|
|
79943de808 | ||
|
|
e05f329602 | ||
|
|
eed0e8ebea | ||
|
|
731eb4fcbe | ||
|
|
44a63e4b6d | ||
|
|
7651e5e48b | ||
|
|
2449636d32 | ||
|
|
f9990ca8eb | ||
|
|
c3eed981c0 | ||
|
|
bbb54d4a08 | ||
|
|
4566c585db | ||
|
|
a946338a18 | ||
|
|
0a60a44478 | ||
|
|
cef0ad6707 | ||
|
|
7176f0837a | ||
|
|
6b1f2b2d9d | ||
|
|
38a1a9b320 | ||
|
|
402e2c384f | ||
|
|
9d5faa096c | ||
|
|
97d0dc20f1 | ||
|
|
8d99ff07b6 | ||
|
|
04fa540a8c | ||
|
|
eb41867e04 | ||
|
|
eee5d7d9e8 | ||
|
|
e983f9ed35 | ||
|
|
8b16ef641b | ||
|
|
e87d616b7a | ||
|
|
2220f325fc | ||
|
|
b53ed47ccb | ||
|
|
39df2743fe | ||
|
|
3f729aaf03 | ||
|
|
b7324621e4 | ||
|
|
e8c782c8e1 | ||
|
|
9136505565 | ||
|
|
f406d728cc | ||
|
|
d649ca47c6 | ||
|
|
e8111527b4 | ||
|
|
2af66d7efc | ||
|
|
27706f37f6 | ||
|
|
3de17b2fa6 | ||
|
|
22ecb5de95 | ||
|
|
992b8b3cb5 | ||
|
|
bebc16d5a6 | ||
|
|
ddb719f866 | ||
|
|
0bd1bf2605 | ||
|
|
fd32ba4035 | ||
|
|
22f723b920 | ||
|
|
1248bd0413 | ||
|
|
c150eec2b6 | ||
|
|
c7248c2d47 | ||
|
|
e71e68e298 | ||
|
|
6969557693 | ||
|
|
f6be5ad839 | ||
|
|
cebe3664fd | ||
|
|
cdab465c90 | ||
|
|
144384655c | ||
|
|
0e213d6dab | ||
|
|
21294a4e4a | ||
|
|
3ba4d44d9e | ||
|
|
1f86ef5a37 | ||
|
|
fac60da333 | ||
|
|
5a5a37dfee | ||
|
|
0d487bc14f | ||
|
|
a52b4eb5ed | ||
|
|
f1b7f5f52f | ||
|
|
5ef58652bf | ||
|
|
e26a9e75c6 | ||
|
|
b0035ff4a7 | ||
|
|
94b6f9b2fe | ||
|
|
cad1482b3f | ||
|
|
ea7aafb3e6 | ||
|
|
42b15ad4a5 | ||
|
|
d3d613cca9 | ||
|
|
86893d999a | ||
|
|
4fd17b0bf5 | ||
|
|
76d2206058 | ||
|
|
51e8b608dc | ||
|
|
a68330fb8f | ||
|
|
2449ad5c69 | ||
|
|
064c812df3 | ||
|
|
48d5ec9e66 | ||
|
|
914419fd1e | ||
|
|
f005fc8ca0 | ||
|
|
43b7960de2 | ||
|
|
2ed1e58032 | ||
|
|
c63b212700 | ||
|
|
e9df78c0e7 | ||
|
|
b0daf81185 | ||
|
|
cee4fdcbb0 | ||
|
|
df3cdfccb0 | ||
|
|
894042cd0e | ||
|
|
8123287952 | ||
|
|
bc677705d8 | ||
|
|
5dd8ea8aab | ||
|
|
41172be796 | ||
|
|
ad1b4a9a86 | ||
|
|
e0e3ec02b3 | ||
|
|
a6cc392473 | ||
|
|
36f48b8656 | ||
|
|
3d883ca37d | ||
|
|
34ed81ca64 | ||
|
|
a9e0880572 | ||
|
|
9500e1c3c4 | ||
|
|
d81aa9cbbc | ||
|
|
21d4b25c2d | ||
|
|
0080783a11 | ||
|
|
2c3f44a3f8 | ||
|
|
3ddf414097 | ||
|
|
59fb63f1f7 | ||
|
|
fa1b514440 | ||
|
|
1579c58876 | ||
|
|
153d044331 | ||
|
|
f2496f7054 | ||
|
|
99022f4f3d | ||
|
|
60a5e4f261 | ||
|
|
661586d3b6 | ||
|
|
abc26cf906 | ||
|
|
12351bada7 | ||
|
|
a6816d53d7 | ||
|
|
3b0709f5f2 | ||
|
|
d7af7e2917 | ||
|
|
6516e62d33 | ||
|
|
6b832edd2f | ||
|
|
eebace1652 | ||
|
|
6ff6e05408 | ||
|
|
aaf569ca8c | ||
|
|
31eef6222e | ||
|
|
9963afa558 | ||
|
|
5b2e2fcf9d | ||
|
|
cc746e59a1 | ||
|
|
2cdb1c519d | ||
|
|
426074ded9 | ||
|
|
772a096615 | ||
|
|
e113e011cb | ||
|
|
22266484bd | ||
|
|
559c011420 | ||
|
|
411c0633a3 | ||
|
|
488f023bdf | ||
|
|
22878f4ef8 | ||
|
|
e732a39fea | ||
|
|
62b4bf7af4 | ||
|
|
47a525ddb4 | ||
|
|
f4360725e0 | ||
|
|
b86607cd41 | ||
|
|
bf57de85c3 | ||
|
|
2dd6118ff4 | ||
|
|
816a53a7b1 | ||
|
|
ced93b0525 | ||
|
|
524ff9a4a6 | ||
|
|
f15032f905 | ||
|
|
d7d31a19e5 | ||
|
|
df2a7ddca4 | ||
|
|
ba9c71ffa4 | ||
|
|
21b6c6569c | ||
|
|
92aba9565a | ||
|
|
6ea0aebb0b | ||
|
|
b5cdcb75b4 |
6
.github/workflows/publish.yml
vendored
6
.github/workflows/publish.yml
vendored
@@ -7,15 +7,19 @@ on:
|
|||||||
paths:
|
paths:
|
||||||
- "pyproject.toml"
|
- "pyproject.toml"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
issues: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
publish-node:
|
publish-node:
|
||||||
name: Publish Custom Node to registry
|
name: Publish Custom Node to registry
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: ${{ github.repository_owner == 'ltdrdata' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Publish Custom Node
|
- name: Publish Custom Node
|
||||||
uses: Comfy-Org/publish-node-action@main
|
uses: Comfy-Org/publish-node-action@v1
|
||||||
with:
|
with:
|
||||||
## Add your own personal access token to your Github Repository secrets and reference it here.
|
## Add your own personal access token to your Github Repository secrets and reference it here.
|
||||||
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
|
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
|
||||||
45
README.md
45
README.md
@@ -149,6 +149,8 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
|
|||||||
* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
|
* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
|
||||||
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
|
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
|
||||||
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
|
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
|
||||||
|
* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
|
||||||
|
* Configurable pip auto fix: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_auto_fix.list`
|
||||||
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
|
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
|
||||||
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
|
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
|
||||||
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
|
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
|
||||||
@@ -256,15 +258,23 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
[default]
|
[default]
|
||||||
git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
|
git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
|
||||||
use_uv = <Use uv instead of pip for dependency installation.>
|
use_uv = <Use uv instead of pip for dependency installation.>
|
||||||
channel_url = https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
|
default_cache_as_channel_url = <Determines whether to retrieve the DB designated as channel_url at startup>
|
||||||
bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
|
bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
|
||||||
file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
|
file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
|
||||||
windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
|
windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
|
||||||
model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
|
model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
|
||||||
downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
|
downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
|
||||||
security_level = <Set the security level.>
|
security_level = <Set the security level => strong|normal|normal-|weak>
|
||||||
|
always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
|
||||||
|
network_mode = <Set the network mode => public|private|offline>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
* network_mode:
|
||||||
|
- public: An environment that uses a typical public network.
|
||||||
|
- private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
|
||||||
|
- offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
|
||||||
|
|
||||||
|
|
||||||
## Additional Feature
|
## Additional Feature
|
||||||
* Logging to file feature
|
* Logging to file feature
|
||||||
* This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
|
* This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
|
||||||
@@ -294,12 +304,39 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
* When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
|
* When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
|
||||||
* Please refer to the `pip_overrides.json.template` file.
|
* Please refer to the `pip_overrides.json.template` file.
|
||||||
|
|
||||||
|
* Prevent the installation of specific pip packages
|
||||||
|
* List the package names one per line in the `pip_blacklist.list` file.
|
||||||
|
|
||||||
|
* Automatically Restoring pip Installation
|
||||||
|
* If you list pip spec requirements in `pip_auto_fix.list`, similar to `requirements.txt`, it will automatically restore the specified versions when starting ComfyUI or when versions get mismatched during various custom node installations.
|
||||||
|
* `--index-url` can be used.
|
||||||
|
|
||||||
* Use `aria2` as downloader
|
* Use `aria2` as downloader
|
||||||
* [howto](docs/en/use_aria2.md)
|
* [howto](docs/en/use_aria2.md)
|
||||||
|
|
||||||
* If you add the item `skip_migration_check = True` to `config.ini`, it will not check whether there are nodes that can be migrated at startup.
|
|
||||||
* This option can be used if performance issues occur in a Colab+GDrive environment.
|
|
||||||
|
|
||||||
|
## Environment Variables
|
||||||
|
|
||||||
|
The following features can be configured using environment variables:
|
||||||
|
|
||||||
|
* **COMFYUI_PATH**: The installation path of ComfyUI
|
||||||
|
* **GITHUB_ENDPOINT**: Reverse proxy configuration for environments with limited access to GitHub
|
||||||
|
* **HF_ENDPOINT**: Reverse proxy configuration for environments with limited access to Hugging Face
|
||||||
|
|
||||||
|
|
||||||
|
### Example 1:
|
||||||
|
Redirecting `https://github.com/ltdrdata/ComfyUI-Impact-Pack` to `https://mirror.ghproxy.com/https://github.com/ltdrdata/ComfyUI-Impact-Pack`
|
||||||
|
|
||||||
|
```
|
||||||
|
GITHUB_ENDPOINT=https://mirror.ghproxy.com/https://github.com
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Example 2:
|
||||||
|
Changing `https://huggingface.co/path/to/somewhere` to `https://some-hf-mirror.com/path/to/somewhere`
|
||||||
|
|
||||||
|
```
|
||||||
|
HF_ENDPOINT=https://some-hf-mirror.com
|
||||||
|
```
|
||||||
|
|
||||||
## Scanner
|
## Scanner
|
||||||
When you run the `scan.sh` script:
|
When you run the `scan.sh` script:
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
"""
|
||||||
|
This file is the entry point for the ComfyUI-Manager package, handling CLI-only mode and initial setup.
|
||||||
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
@@ -7,7 +11,10 @@ if not os.path.exists(cli_mode_flag):
|
|||||||
sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
|
sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
|
||||||
import manager_server # noqa: F401
|
import manager_server # noqa: F401
|
||||||
import share_3rdparty # noqa: F401
|
import share_3rdparty # noqa: F401
|
||||||
WEB_DIRECTORY = "js"
|
import cm_global
|
||||||
|
|
||||||
|
if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
|
||||||
|
WEB_DIRECTORY = "js"
|
||||||
else:
|
else:
|
||||||
print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
|
print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
|
||||||
|
|
||||||
|
|||||||
131
cm-cli.py
131
cm-cli.py
@@ -32,6 +32,7 @@ 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)
|
print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
|
||||||
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
|
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
|
||||||
|
|
||||||
|
# This should be placed here
|
||||||
sys.path.append(comfy_path)
|
sys.path.append(comfy_path)
|
||||||
|
|
||||||
import utils.extra_config
|
import utils.extra_config
|
||||||
@@ -42,23 +43,39 @@ import cnr_utils
|
|||||||
|
|
||||||
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
||||||
cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
|
cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
|
||||||
|
if sys.version_info < (3, 13):
|
||||||
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
else:
|
||||||
|
cm_global.pip_overrides = {}
|
||||||
|
|
||||||
if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json")):
|
if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json")):
|
||||||
with open(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json"), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json"), 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
cm_global.pip_overrides = json.load(json_file)
|
cm_global.pip_overrides = json.load(json_file)
|
||||||
|
|
||||||
|
|
||||||
|
if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list")):
|
||||||
|
with open(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list"), 'r', encoding="UTF-8", errors="ignore") as f:
|
||||||
|
for x in f.readlines():
|
||||||
|
y = x.strip()
|
||||||
|
if y != '':
|
||||||
|
cm_global.pip_blacklist.add(y)
|
||||||
|
|
||||||
|
|
||||||
def check_comfyui_hash():
|
def check_comfyui_hash():
|
||||||
repo = git.Repo(comfy_path)
|
try:
|
||||||
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
|
repo = git.Repo(comfy_path)
|
||||||
|
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
|
||||||
|
core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
|
||||||
|
except:
|
||||||
|
print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
|
||||||
|
core.comfy_ui_revision = 0
|
||||||
|
core.comfy_ui_commit_datetime = 0
|
||||||
|
|
||||||
cm_global.variables['comfyui.revision'] = core.comfy_ui_revision
|
cm_global.variables['comfyui.revision'] = core.comfy_ui_revision
|
||||||
|
|
||||||
core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
|
|
||||||
|
|
||||||
|
|
||||||
check_comfyui_hash() # This is a preparation step for manager_core
|
check_comfyui_hash() # This is a preparation step for manager_core
|
||||||
core.check_invalid_nodes()
|
core.check_invalid_nodes()
|
||||||
@@ -67,7 +84,7 @@ core.check_invalid_nodes()
|
|||||||
def read_downgrade_blacklist():
|
def read_downgrade_blacklist():
|
||||||
try:
|
try:
|
||||||
import configparser
|
import configparser
|
||||||
config = configparser.ConfigParser()
|
config = configparser.ConfigParser(strict=False)
|
||||||
config.read(core.manager_config.path)
|
config.read(core.manager_config.path)
|
||||||
default_conf = config['default']
|
default_conf = config['default']
|
||||||
|
|
||||||
@@ -134,7 +151,21 @@ class Ctx:
|
|||||||
if os.path.exists(core.manager_pip_overrides_path):
|
if os.path.exists(core.manager_pip_overrides_path):
|
||||||
with open(core.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(core.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 = json.load(json_file)
|
||||||
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
|
||||||
|
if sys.version_info < (3, 13):
|
||||||
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
|
||||||
|
if os.path.exists(core.manager_pip_blacklist_path):
|
||||||
|
with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||||
|
for x in f.readlines():
|
||||||
|
y = x.strip()
|
||||||
|
if y != '':
|
||||||
|
cm_global.pip_blacklist.add(y)
|
||||||
|
|
||||||
|
def update_custom_nodes_dir(self, target_dir):
|
||||||
|
import folder_paths
|
||||||
|
a, b = folder_paths.folder_names_and_paths['custom_nodes']
|
||||||
|
folder_paths.folder_names_and_paths['custom_nodes'] = [os.path.abspath(target_dir)], set()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_startup_scripts_path():
|
def get_startup_scripts_path():
|
||||||
@@ -159,13 +190,18 @@ class Ctx:
|
|||||||
cmd_ctx = Ctx()
|
cmd_ctx = Ctx()
|
||||||
|
|
||||||
|
|
||||||
def install_node(node_spec_str, is_all=False, cnt_msg=''):
|
def install_node(node_spec_str, is_all=False, cnt_msg='', **kwargs):
|
||||||
|
exit_on_fail = kwargs.get('exit_on_fail', False)
|
||||||
|
print(f"install_node exit on fail:{exit_on_fail}...")
|
||||||
|
|
||||||
if core.is_valid_url(node_spec_str):
|
if core.is_valid_url(node_spec_str):
|
||||||
# install via urls
|
# install via urls
|
||||||
res = asyncio.run(core.gitclone_install(node_spec_str, no_deps=cmd_ctx.no_deps))
|
res = asyncio.run(core.gitclone_install(node_spec_str, no_deps=cmd_ctx.no_deps))
|
||||||
if not res.result:
|
if not res.result:
|
||||||
print(res.msg)
|
print(res.msg)
|
||||||
print(f"[bold red]ERROR: An error occurred while installing '{node_spec_str}'.[/bold red]")
|
print(f"[bold red]ERROR: An error occurred while installing '{node_spec_str}'.[/bold red]")
|
||||||
|
if exit_on_fail:
|
||||||
|
sys.exit(1)
|
||||||
else:
|
else:
|
||||||
print(f"{cnt_msg} [INSTALLED] {node_spec_str:50}")
|
print(f"{cnt_msg} [INSTALLED] {node_spec_str:50}")
|
||||||
else:
|
else:
|
||||||
@@ -200,6 +236,8 @@ def install_node(node_spec_str, is_all=False, cnt_msg=''):
|
|||||||
print("")
|
print("")
|
||||||
else:
|
else:
|
||||||
print(f"[bold red]ERROR: An error occurred while installing '{node_name}'.\n{res.msg}[/bold red]")
|
print(f"[bold red]ERROR: An error occurred while installing '{node_name}'.\n{res.msg}[/bold red]")
|
||||||
|
if exit_on_fail:
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
def reinstall_node(node_spec_str, is_all=False, cnt_msg=''):
|
def reinstall_node(node_spec_str, is_all=False, cnt_msg=''):
|
||||||
@@ -229,7 +267,7 @@ def fix_node(node_spec_str, is_all=False, cnt_msg=''):
|
|||||||
res = unified_manager.unified_fix(node_name, version_spec, no_deps=cmd_ctx.no_deps)
|
res = unified_manager.unified_fix(node_name, version_spec, no_deps=cmd_ctx.no_deps)
|
||||||
|
|
||||||
if not res.result:
|
if not res.result:
|
||||||
print(f"ERROR: f{res.msg}")
|
print(f"[bold red]ERROR: f{res.msg}[/bold red]")
|
||||||
|
|
||||||
|
|
||||||
def uninstall_node(node_spec_str: str, is_all: bool = False, cnt_msg: str = ''):
|
def uninstall_node(node_spec_str: str, is_all: bool = False, cnt_msg: str = ''):
|
||||||
@@ -561,7 +599,7 @@ def get_all_installed_node_specs():
|
|||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
def for_each_nodes(nodes, act, allow_all=True):
|
def for_each_nodes(nodes, act, allow_all=True, **kwargs):
|
||||||
is_all = False
|
is_all = False
|
||||||
if allow_all and 'all' in nodes:
|
if allow_all and 'all' in nodes:
|
||||||
is_all = True
|
is_all = True
|
||||||
@@ -573,7 +611,7 @@ def for_each_nodes(nodes, act, allow_all=True):
|
|||||||
i = 1
|
i = 1
|
||||||
for x in nodes:
|
for x in nodes:
|
||||||
try:
|
try:
|
||||||
act(x, is_all=is_all, cnt_msg=f'{i}/{total}')
|
act(x, is_all=is_all, cnt_msg=f'{i}/{total}', **kwargs)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"ERROR: {e}")
|
print(f"ERROR: {e}")
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
@@ -617,13 +655,17 @@ def install(
|
|||||||
None,
|
None,
|
||||||
help="user directory"
|
help="user directory"
|
||||||
),
|
),
|
||||||
|
exit_on_fail: bool = typer.Option(
|
||||||
|
False,
|
||||||
|
help="Exit on failure"
|
||||||
|
)
|
||||||
):
|
):
|
||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
cmd_ctx.set_channel_mode(channel, mode)
|
cmd_ctx.set_channel_mode(channel, mode)
|
||||||
cmd_ctx.set_no_deps(no_deps)
|
cmd_ctx.set_no_deps(no_deps)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for_each_nodes(nodes, act=install_node)
|
for_each_nodes(nodes, act=install_node, exit_on_fail=exit_on_fail)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
|
|
||||||
@@ -660,7 +702,7 @@ def reinstall(
|
|||||||
cmd_ctx.set_channel_mode(channel, mode)
|
cmd_ctx.set_channel_mode(channel, mode)
|
||||||
cmd_ctx.set_no_deps(no_deps)
|
cmd_ctx.set_no_deps(no_deps)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for_each_nodes(nodes, act=reinstall_node)
|
for_each_nodes(nodes, act=reinstall_node)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -686,7 +728,7 @@ def uninstall(
|
|||||||
for_each_nodes(nodes, act=uninstall_node)
|
for_each_nodes(nodes, act=uninstall_node)
|
||||||
|
|
||||||
|
|
||||||
@app.command(help="Disable custom nodes")
|
@app.command(help="Update custom nodes")
|
||||||
def update(
|
def update(
|
||||||
nodes: List[str] = typer.Argument(
|
nodes: List[str] = typer.Argument(
|
||||||
...,
|
...,
|
||||||
@@ -714,7 +756,7 @@ def update(
|
|||||||
if 'all' in nodes:
|
if 'all' in nodes:
|
||||||
asyncio.run(auto_save_snapshot())
|
asyncio.run(auto_save_snapshot())
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
|
|
||||||
for x in nodes:
|
for x in nodes:
|
||||||
if x.lower() in ['comfyui', 'comfy', 'all']:
|
if x.lower() in ['comfyui', 'comfy', 'all']:
|
||||||
@@ -815,7 +857,7 @@ def fix(
|
|||||||
if 'all' in nodes:
|
if 'all' in nodes:
|
||||||
asyncio.run(auto_save_snapshot())
|
asyncio.run(auto_save_snapshot())
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for_each_nodes(nodes, fix_node, allow_all=True)
|
for_each_nodes(nodes, fix_node, allow_all=True)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -1012,11 +1054,28 @@ def save_snapshot(
|
|||||||
user_directory: str = typer.Option(
|
user_directory: str = typer.Option(
|
||||||
None,
|
None,
|
||||||
help="user directory"
|
help="user directory"
|
||||||
)
|
),
|
||||||
|
full_snapshot: Annotated[
|
||||||
|
bool,
|
||||||
|
typer.Option(
|
||||||
|
show_default=False, help="If the snapshot should include custom node, ComfyUI version and pip versions (default), or only custom node details"
|
||||||
|
),
|
||||||
|
] = True,
|
||||||
):
|
):
|
||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
|
|
||||||
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output))
|
if output is not None:
|
||||||
|
if(not output.endswith('.json') and not output.endswith('.yaml')):
|
||||||
|
print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
|
dir_path = os.path.dirname(output)
|
||||||
|
|
||||||
|
if(dir_path != '' and not os.path.exists(dir_path)):
|
||||||
|
print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
|
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
|
||||||
print(f"Current snapshot is saved as `{path}`")
|
print(f"Current snapshot is saved as `{path}`")
|
||||||
|
|
||||||
|
|
||||||
@@ -1044,10 +1103,17 @@ def restore_snapshot(
|
|||||||
user_directory: str = typer.Option(
|
user_directory: str = typer.Option(
|
||||||
None,
|
None,
|
||||||
help="user directory"
|
help="user directory"
|
||||||
|
),
|
||||||
|
restore_to: Optional[str] = typer.Option(
|
||||||
|
None,
|
||||||
|
help="Manually specify the installation path for the custom node. Ignore user directory."
|
||||||
)
|
)
|
||||||
):
|
):
|
||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
|
|
||||||
|
if restore_to:
|
||||||
|
cmd_ctx.update_custom_nodes_dir(restore_to)
|
||||||
|
|
||||||
extras = []
|
extras = []
|
||||||
if pip_non_url:
|
if pip_non_url:
|
||||||
extras.append('--pip-non-url')
|
extras.append('--pip-non-url')
|
||||||
@@ -1068,7 +1134,7 @@ def restore_snapshot(
|
|||||||
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
|
print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
try:
|
try:
|
||||||
asyncio.run(core.restore_snapshot(snapshot_path, extras))
|
asyncio.run(core.restore_snapshot(snapshot_path, extras))
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -1100,7 +1166,7 @@ def restore_dependencies(
|
|||||||
total = len(node_paths)
|
total = len(node_paths)
|
||||||
i = 1
|
i = 1
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
for x in node_paths:
|
for x in node_paths:
|
||||||
print("----------------------------------------------------------------------------------------------------")
|
print("----------------------------------------------------------------------------------------------------")
|
||||||
print(f"Restoring [{i}/{total}]: {x}")
|
print(f"Restoring [{i}/{total}]: {x}")
|
||||||
@@ -1119,7 +1185,7 @@ def post_install(
|
|||||||
):
|
):
|
||||||
path = os.path.expanduser(path)
|
path = os.path.expanduser(path)
|
||||||
|
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
unified_manager.execute_install_script('', path, instant_execution=True)
|
unified_manager.execute_install_script('', path, instant_execution=True)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -1163,8 +1229,7 @@ def install_deps(
|
|||||||
print(f"[bold red]Invalid json file: {deps}[/bold red]")
|
print(f"[bold red]Invalid json file: {deps}[/bold red]")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
|
||||||
for k in json_obj['custom_nodes'].keys():
|
for k in json_obj['custom_nodes'].keys():
|
||||||
state = core.simple_check_custom_node(k)
|
state = core.simple_check_custom_node(k)
|
||||||
if state == 'installed':
|
if state == 'installed':
|
||||||
@@ -1221,20 +1286,6 @@ def export_custom_node_ids(
|
|||||||
print(f"{x['id']}@unknown", file=output_file)
|
print(f"{x['id']}@unknown", file=output_file)
|
||||||
|
|
||||||
|
|
||||||
@app.command(
|
|
||||||
"migrate",
|
|
||||||
help="Migrate legacy node system to new node system",
|
|
||||||
)
|
|
||||||
def migrate(
|
|
||||||
user_directory: str = typer.Option(
|
|
||||||
None,
|
|
||||||
help="user directory"
|
|
||||||
)
|
|
||||||
):
|
|
||||||
cmd_ctx.set_user_directory(user_directory)
|
|
||||||
asyncio.run(unified_manager.migrate_unmanaged_nodes())
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
|
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
|
||||||
sys.exit(app())
|
sys.exit(app())
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -122,7 +122,8 @@ ComfyUI-Loopchain
|
|||||||
* `--pip-non-url`: Restore for pip packages registered on PyPI.
|
* `--pip-non-url`: Restore for pip packages registered on PyPI.
|
||||||
* `--pip-non-local-url`: Restore for pip packages registered at web URLs.
|
* `--pip-non-local-url`: Restore for pip packages registered at web URLs.
|
||||||
* `--pip-local-url`: Restore for pip packages specified by local paths.
|
* `--pip-local-url`: Restore for pip packages specified by local paths.
|
||||||
|
* `--user-directory`: Set the user directory.
|
||||||
|
* `--restore-to`: The path where the restored custom nodes will be installed. (When this option is applied, only the custom nodes installed in the target path are recognized as installed.)
|
||||||
|
|
||||||
### 5. CLI Only Mode
|
### 5. CLI Only Mode
|
||||||
|
|
||||||
|
|||||||
@@ -123,7 +123,8 @@ ComfyUI-Loopchain
|
|||||||
* `--pip-non-url`: PyPI 에 등록된 pip 패키지들에 대해서 복구를 수행
|
* `--pip-non-url`: PyPI 에 등록된 pip 패키지들에 대해서 복구를 수행
|
||||||
* `--pip-non-local-url`: web URL에 등록된 pip 패키지들에 대해서 복구를 수행
|
* `--pip-non-local-url`: web URL에 등록된 pip 패키지들에 대해서 복구를 수행
|
||||||
* `--pip-local-url`: local 경로를 지정하고 있는 pip 패키지들에 대해서 복구를 수행
|
* `--pip-local-url`: local 경로를 지정하고 있는 pip 패키지들에 대해서 복구를 수행
|
||||||
|
* `--user-directory`: 사용자 디렉토리 설정
|
||||||
|
* `--restore-to`: 복구될 커스텀 노드가 설치될 경로. (이 옵션을 적용할 경우 오직 대상 경로에 설치된 custom nodes 만 설치된 것으로 인식함.)
|
||||||
|
|
||||||
### 5. CLI only mode
|
### 5. CLI only mode
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -154,14 +154,27 @@ def switch_to_default_branch(repo):
|
|||||||
repo.git.checkout(default_branch)
|
repo.git.checkout(default_branch)
|
||||||
return True
|
return True
|
||||||
except:
|
except:
|
||||||
|
# try checkout master
|
||||||
|
# try checkout main if failed
|
||||||
try:
|
try:
|
||||||
repo.git.checkout(repo.heads.master)
|
repo.git.checkout(repo.heads.master)
|
||||||
|
return True
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
if remote_name is not None:
|
if remote_name is not None:
|
||||||
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
||||||
|
return True
|
||||||
except:
|
except:
|
||||||
pass
|
try:
|
||||||
|
repo.git.checkout(repo.heads.main)
|
||||||
|
return True
|
||||||
|
except:
|
||||||
|
try:
|
||||||
|
if remote_name is not None:
|
||||||
|
repo.git.checkout('-b', 'main', f'{remote_name}/main')
|
||||||
|
return True
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
print("[ComfyUI Manager] Failed to switch to the default branch")
|
print("[ComfyUI Manager] Failed to switch to the default branch")
|
||||||
return False
|
return False
|
||||||
@@ -389,12 +402,13 @@ def apply_snapshot(path):
|
|||||||
git_custom_node_infos = info['git_custom_nodes']
|
git_custom_node_infos = info['git_custom_nodes']
|
||||||
file_custom_node_infos = info['file_custom_nodes']
|
file_custom_node_infos = info['file_custom_nodes']
|
||||||
|
|
||||||
checkout_comfyui_hash(comfyui_hash)
|
if comfyui_hash:
|
||||||
|
checkout_comfyui_hash(comfyui_hash)
|
||||||
checkout_custom_node_hash(git_custom_node_infos)
|
checkout_custom_node_hash(git_custom_node_infos)
|
||||||
invalidate_custom_node_file(file_custom_node_infos)
|
invalidate_custom_node_file(file_custom_node_infos)
|
||||||
|
|
||||||
print("APPLY SNAPSHOT: True")
|
print("APPLY SNAPSHOT: True")
|
||||||
if 'pips' in info:
|
if 'pips' in info and info['pips']:
|
||||||
return info['pips']
|
return info['pips']
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|||||||
11118
github-stats.json
11118
github-stats.json
File diff suppressed because it is too large
Load Diff
@@ -113,3 +113,5 @@ def add_on_revision_detected(k, f):
|
|||||||
|
|
||||||
|
|
||||||
error_dict = {}
|
error_dict = {}
|
||||||
|
|
||||||
|
disable_front = False
|
||||||
@@ -1,12 +1,15 @@
|
|||||||
import requests
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from typing import List
|
|
||||||
import manager_util
|
|
||||||
import toml
|
|
||||||
import os
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import json
|
import json
|
||||||
|
import os
|
||||||
|
import platform
|
||||||
import time
|
import time
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
import manager_core
|
||||||
|
import manager_util
|
||||||
|
import requests
|
||||||
|
import toml
|
||||||
|
|
||||||
base_url = "https://api.comfy.org"
|
base_url = "https://api.comfy.org"
|
||||||
|
|
||||||
@@ -32,9 +35,43 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
|||||||
page = 1
|
page = 1
|
||||||
|
|
||||||
full_nodes = {}
|
full_nodes = {}
|
||||||
|
|
||||||
|
|
||||||
|
# Determine form factor based on environment and platform
|
||||||
|
is_desktop = bool(os.environ.get('__COMFYUI_DESKTOP_VERSION__'))
|
||||||
|
system = platform.system().lower()
|
||||||
|
is_windows = system == 'windows'
|
||||||
|
is_mac = system == 'darwin'
|
||||||
|
is_linux = system == 'linux'
|
||||||
|
|
||||||
|
# Get ComfyUI version tag
|
||||||
|
if is_desktop:
|
||||||
|
# extract version from pyproject.toml instead of git tag
|
||||||
|
comfyui_ver = manager_core.get_current_comfyui_ver() or 'unknown'
|
||||||
|
else:
|
||||||
|
comfyui_ver = manager_core.get_comfyui_tag() or 'unknown'
|
||||||
|
|
||||||
|
if is_desktop:
|
||||||
|
if is_windows:
|
||||||
|
form_factor = 'desktop-win'
|
||||||
|
elif is_mac:
|
||||||
|
form_factor = 'desktop-mac'
|
||||||
|
else:
|
||||||
|
form_factor = 'other'
|
||||||
|
else:
|
||||||
|
if is_windows:
|
||||||
|
form_factor = 'git-windows'
|
||||||
|
elif is_mac:
|
||||||
|
form_factor = 'git-mac'
|
||||||
|
elif is_linux:
|
||||||
|
form_factor = 'git-linux'
|
||||||
|
else:
|
||||||
|
form_factor = 'other'
|
||||||
|
|
||||||
while remained:
|
while remained:
|
||||||
sub_uri = f'{base_url}/nodes?page={page}&limit=30'
|
# Add comfyui_version and form_factor to the API request
|
||||||
sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True), timeout=30)
|
sub_uri = f'{base_url}/nodes?page={page}&limit=30&comfyui_version={comfyui_ver}&form_factor={form_factor}'
|
||||||
|
sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True, dont_cache=True), timeout=30)
|
||||||
remained = page < sub_json_obj['totalPages']
|
remained = page < sub_json_obj['totalPages']
|
||||||
|
|
||||||
for x in sub_json_obj['nodes']:
|
for x in sub_json_obj['nodes']:
|
||||||
@@ -173,7 +210,10 @@ def read_cnr_info(fullpath):
|
|||||||
|
|
||||||
project = data.get('project', {})
|
project = data.get('project', {})
|
||||||
name = project.get('name').strip().lower()
|
name = project.get('name').strip().lower()
|
||||||
version = project.get('version')
|
|
||||||
|
# normalize version
|
||||||
|
# for example: 2.5 -> 2.5.0
|
||||||
|
version = str(manager_util.StrictVersion(project.get('version')))
|
||||||
|
|
||||||
urls = project.get('urls', {})
|
urls = project.get('urls', {})
|
||||||
repository = urls.get('Repository')
|
repository = urls.get('Repository')
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ import os
|
|||||||
import configparser
|
import configparser
|
||||||
|
|
||||||
|
|
||||||
|
GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
|
||||||
|
|
||||||
|
|
||||||
def is_git_repo(path: str) -> bool:
|
def is_git_repo(path: str) -> bool:
|
||||||
""" Check if the path is a git repository. """
|
""" Check if the path is a git repository. """
|
||||||
# NOTE: Checking it through `git.Repo` must be avoided.
|
# NOTE: Checking it through `git.Repo` must be avoided.
|
||||||
@@ -37,7 +40,8 @@ def git_url(fullpath):
|
|||||||
if not os.path.exists(git_config_path):
|
if not os.path.exists(git_config_path):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
config = configparser.ConfigParser()
|
# Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
|
||||||
|
config = configparser.ConfigParser(strict=False)
|
||||||
config.read(git_config_path)
|
config.read(git_config_path)
|
||||||
|
|
||||||
for k, v in config.items():
|
for k, v in config.items():
|
||||||
@@ -46,16 +50,36 @@ def git_url(fullpath):
|
|||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def normalize_url(url) -> str:
|
def normalize_url(url) -> str:
|
||||||
url = url.replace("git@github.com:", "https://github.com/")
|
github_id = normalize_to_github_id(url)
|
||||||
if url.endswith('.git'):
|
if github_id is not None:
|
||||||
url = url[:-4]
|
url = f"https://github.com/{github_id}"
|
||||||
|
|
||||||
return url
|
return url
|
||||||
|
|
||||||
def normalize_url_http(url) -> str:
|
|
||||||
url = url.replace("https://github.com/", "git@github.com:")
|
def normalize_to_github_id(url) -> str:
|
||||||
if url.endswith('.git'):
|
if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
|
||||||
url = url[:-4]
|
author = os.path.basename(os.path.dirname(url))
|
||||||
|
|
||||||
|
if author.startswith('git@github.com:'):
|
||||||
|
author = author.split(':')[1]
|
||||||
|
|
||||||
|
repo_name = os.path.basename(url)
|
||||||
|
if repo_name.endswith('.git'):
|
||||||
|
repo_name = repo_name[:-4]
|
||||||
|
|
||||||
|
return f"{author}/{repo_name}"
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_url_for_clone(url):
|
||||||
|
url = normalize_url(url)
|
||||||
|
|
||||||
|
if GITHUB_ENDPOINT is not None and url.startswith('https://github.com/'):
|
||||||
|
url = GITHUB_ENDPOINT + url[18:] # url[18:] -> remove `https://github.com`
|
||||||
|
|
||||||
return url
|
return url
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -3,9 +3,15 @@ from urllib.parse import urlparse
|
|||||||
import urllib
|
import urllib
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
|
import requests
|
||||||
|
from huggingface_hub import HfApi
|
||||||
|
from tqdm.auto import tqdm
|
||||||
|
|
||||||
|
|
||||||
aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
|
aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
|
||||||
HF_ENDPOINT = os.getenv('HF_ENDPOINT')
|
HF_ENDPOINT = os.getenv('HF_ENDPOINT')
|
||||||
|
|
||||||
|
|
||||||
if aria2 is not None:
|
if aria2 is not None:
|
||||||
secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
|
secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
|
||||||
url = urlparse(aria2)
|
url = urlparse(aria2)
|
||||||
@@ -117,3 +123,37 @@ def download_url_with_agent(url, save_path):
|
|||||||
|
|
||||||
print("Installation was successful.")
|
print("Installation was successful.")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
# NOTE: snapshot_download doesn't provide file size tqdm.
|
||||||
|
def download_repo_in_bytes(repo_id, local_dir):
|
||||||
|
api = HfApi()
|
||||||
|
repo_info = api.repo_info(repo_id=repo_id, files_metadata=True)
|
||||||
|
|
||||||
|
os.makedirs(local_dir, exist_ok=True)
|
||||||
|
|
||||||
|
total_size = 0
|
||||||
|
for file_info in repo_info.siblings:
|
||||||
|
if file_info.size is not None:
|
||||||
|
total_size += file_info.size
|
||||||
|
|
||||||
|
pbar = tqdm(total=total_size, unit="B", unit_scale=True, desc="Downloading")
|
||||||
|
|
||||||
|
for file_info in repo_info.siblings:
|
||||||
|
out_path = os.path.join(local_dir, file_info.rfilename)
|
||||||
|
os.makedirs(os.path.dirname(out_path), exist_ok=True)
|
||||||
|
|
||||||
|
if file_info.size is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
download_url = f"https://huggingface.co/{repo_id}/resolve/main/{file_info.rfilename}"
|
||||||
|
|
||||||
|
with requests.get(download_url, stream=True) as r, open(out_path, "wb") as f:
|
||||||
|
r.raise_for_status()
|
||||||
|
for chunk in r.iter_content(chunk_size=65536):
|
||||||
|
if chunk:
|
||||||
|
f.write(chunk)
|
||||||
|
pbar.update(len(chunk))
|
||||||
|
|
||||||
|
pbar.close()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -21,8 +21,11 @@ import logging
|
|||||||
import asyncio
|
import asyncio
|
||||||
import queue
|
import queue
|
||||||
|
|
||||||
|
import manager_downloader
|
||||||
|
|
||||||
|
|
||||||
logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
|
logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
|
||||||
|
logging.info("[ComfyUI-Manager] network_mode: " + core.get_config()['network_mode'])
|
||||||
|
|
||||||
comfy_ui_hash = "-"
|
comfy_ui_hash = "-"
|
||||||
comfyui_tag = None
|
comfyui_tag = None
|
||||||
@@ -30,6 +33,7 @@ comfyui_tag = None
|
|||||||
SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
||||||
SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
||||||
SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
|
||||||
|
SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower."
|
||||||
|
|
||||||
routes = PromptServer.instance.routes
|
routes = PromptServer.instance.routes
|
||||||
|
|
||||||
@@ -51,8 +55,14 @@ def handle_stream(stream, prefix):
|
|||||||
from comfy.cli_args import args
|
from comfy.cli_args import args
|
||||||
import latent_preview
|
import latent_preview
|
||||||
|
|
||||||
|
def is_loopback(address):
|
||||||
|
import ipaddress
|
||||||
|
try:
|
||||||
|
return ipaddress.ip_address(address).is_loopback
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
|
||||||
is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
|
is_local_mode = is_loopback(args.listen)
|
||||||
|
|
||||||
|
|
||||||
model_dir_name_map = {
|
model_dir_name_map = {
|
||||||
@@ -81,11 +91,11 @@ def is_allowed_security_level(level):
|
|||||||
return False
|
return False
|
||||||
elif level == 'high':
|
elif level == 'high':
|
||||||
if is_local_mode:
|
if is_local_mode:
|
||||||
return core.get_config()['security_level'].lower() in ['weak', 'normal-']
|
return core.get_config()['security_level'] in ['weak', 'normal-']
|
||||||
else:
|
else:
|
||||||
return core.get_config()['security_level'].lower() == 'weak'
|
return core.get_config()['security_level'] == 'weak'
|
||||||
elif level == 'middle':
|
elif level == 'middle':
|
||||||
return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
|
return core.get_config()['security_level'] in ['weak', 'normal', 'normal-']
|
||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@@ -96,7 +106,7 @@ async def get_risky_level(files, pip_packages):
|
|||||||
|
|
||||||
all_urls = set()
|
all_urls = set()
|
||||||
for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
|
for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
|
||||||
all_urls.update(x['files'])
|
all_urls.update(x.get('files', []))
|
||||||
|
|
||||||
for x in files:
|
for x in files:
|
||||||
if x not in all_urls:
|
if x not in all_urls:
|
||||||
@@ -104,8 +114,7 @@ async def get_risky_level(files, pip_packages):
|
|||||||
|
|
||||||
all_pip_packages = set()
|
all_pip_packages = set()
|
||||||
for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
|
for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
|
||||||
if "pip" in x:
|
all_pip_packages.update(x.get('pip', []))
|
||||||
all_pip_packages.update(x['pip'])
|
|
||||||
|
|
||||||
for p in pip_packages:
|
for p in pip_packages:
|
||||||
if p not in all_pip_packages:
|
if p not in all_pip_packages:
|
||||||
@@ -169,7 +178,7 @@ def set_preview_method(method):
|
|||||||
else:
|
else:
|
||||||
args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
|
args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
|
||||||
|
|
||||||
core.get_config()['preview_method'] = args.preview_method
|
core.get_config()['preview_method'] = method
|
||||||
|
|
||||||
|
|
||||||
set_preview_method(core.get_config()['preview_method'])
|
set_preview_method(core.get_config()['preview_method'])
|
||||||
@@ -178,6 +187,11 @@ set_preview_method(core.get_config()['preview_method'])
|
|||||||
def set_component_policy(mode):
|
def set_component_policy(mode):
|
||||||
core.get_config()['component_policy'] = mode
|
core.get_config()['component_policy'] = mode
|
||||||
|
|
||||||
|
def set_update_policy(mode):
|
||||||
|
core.get_config()['update_policy'] = mode
|
||||||
|
|
||||||
|
def set_db_mode(mode):
|
||||||
|
core.get_config()['db_mode'] = mode
|
||||||
|
|
||||||
def print_comfyui_version():
|
def print_comfyui_version():
|
||||||
global comfy_ui_hash
|
global comfy_ui_hash
|
||||||
@@ -200,7 +214,7 @@ def print_comfyui_version():
|
|||||||
comfyui_tag = core.get_comfyui_tag()
|
comfyui_tag = core.get_comfyui_tag()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
|
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
|
||||||
logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
|
logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
@@ -265,8 +279,17 @@ def get_model_dir(data, show_log=False):
|
|||||||
else:
|
else:
|
||||||
models_base = folder_paths.models_dir
|
models_base = folder_paths.models_dir
|
||||||
|
|
||||||
|
# NOTE: Validate to prevent path traversal.
|
||||||
|
if any(char in data['filename'] for char in {'/', '\\', ':'}):
|
||||||
|
return None
|
||||||
|
|
||||||
def resolve_custom_node(save_path):
|
def resolve_custom_node(save_path):
|
||||||
save_path = save_path[13:] # remove 'custom_nodes/'
|
save_path = save_path[13:] # remove 'custom_nodes/'
|
||||||
|
|
||||||
|
# NOTE: Validate to prevent path traversal.
|
||||||
|
if save_path.startswith(os.path.sep) or ':' in save_path:
|
||||||
|
return None
|
||||||
|
|
||||||
repo_name = save_path.replace('\\','/').split('/')[0] # get custom node repo name
|
repo_name = save_path.replace('\\','/').split('/')[0] # get custom node repo name
|
||||||
|
|
||||||
# NOTE: The creation of files within the custom node path should be removed in the future.
|
# NOTE: The creation of files within the custom node path should be removed in the future.
|
||||||
@@ -306,7 +329,10 @@ def get_model_path(data, show_log=False):
|
|||||||
if base_model is None:
|
if base_model is None:
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
return os.path.join(base_model, data['filename'])
|
if data['filename'] == '<huggingface>':
|
||||||
|
return os.path.join(base_model, os.path.basename(data['url']))
|
||||||
|
else:
|
||||||
|
return os.path.join(base_model, data['filename'])
|
||||||
|
|
||||||
|
|
||||||
def check_state_of_git_node_pack(node_packs, do_fetch=False, do_update_check=True, do_update=False):
|
def check_state_of_git_node_pack(node_packs, do_fetch=False, do_update_check=True, do_update=False):
|
||||||
@@ -382,7 +408,6 @@ async def task_worker():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
|
node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
|
||||||
|
|
||||||
if node_spec is None:
|
if node_spec is None:
|
||||||
logging.error(f"Cannot resolve install target: '{node_spec_str}'")
|
logging.error(f"Cannot resolve install target: '{node_spec_str}'")
|
||||||
return f"Cannot resolve install target: '{node_spec_str}'"
|
return f"Cannot resolve install target: '{node_spec_str}'"
|
||||||
@@ -404,22 +429,69 @@ async def task_worker():
|
|||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
return f"Installation failed:\n{node_spec_str}"
|
return f"Installation failed:\n{node_spec_str}"
|
||||||
|
|
||||||
async def do_update(item) -> str:
|
async def do_update(item):
|
||||||
ui_id, node_name, node_ver = item
|
ui_id, node_name, node_ver = item
|
||||||
|
|
||||||
try:
|
try:
|
||||||
res = core.unified_manager.unified_update(node_name, node_ver)
|
res = core.unified_manager.unified_update(node_name, node_ver)
|
||||||
|
|
||||||
|
if res.ver == 'unknown':
|
||||||
|
url = core.unified_manager.unknown_active_nodes[node_name][0]
|
||||||
|
title = os.path.basename(url)
|
||||||
|
else:
|
||||||
|
url = core.unified_manager.cnr_map[node_name].get('repository')
|
||||||
|
title = core.unified_manager.cnr_map[node_name]['name']
|
||||||
|
|
||||||
manager_util.clear_pip_cache()
|
manager_util.clear_pip_cache()
|
||||||
|
|
||||||
if res.result:
|
if url is not None:
|
||||||
return 'success'
|
base_res = {'url': url, 'title': title}
|
||||||
|
else:
|
||||||
|
base_res = {'title': title}
|
||||||
|
|
||||||
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
|
if res.result:
|
||||||
|
if res.action == 'skip':
|
||||||
|
base_res['msg'] = 'skip'
|
||||||
|
return base_res
|
||||||
|
else:
|
||||||
|
base_res['msg'] = 'success'
|
||||||
|
return base_res
|
||||||
|
|
||||||
|
base_res['msg'] = f"An error occurred while updating '{node_name}'."
|
||||||
|
logging.error(f"\nERROR: An error occurred while updating '{node_name}'. (res.result={res.result}, res.action={res.action})")
|
||||||
|
return base_res
|
||||||
except Exception:
|
except Exception:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|
||||||
return f"An error occurred while updating '{node_name}'."
|
return {'msg':f"An error occurred while updating '{node_name}'."}
|
||||||
|
|
||||||
|
async def do_update_comfyui(is_stable) -> str:
|
||||||
|
try:
|
||||||
|
repo_path = os.path.dirname(folder_paths.__file__)
|
||||||
|
latest_tag = None
|
||||||
|
if is_stable:
|
||||||
|
res, latest_tag = core.update_to_stable_comfyui(repo_path)
|
||||||
|
else:
|
||||||
|
res = core.update_path(repo_path)
|
||||||
|
|
||||||
|
if res == "fail":
|
||||||
|
logging.error("ComfyUI update failed")
|
||||||
|
return "fail"
|
||||||
|
elif res == "updated":
|
||||||
|
if is_stable:
|
||||||
|
logging.info("ComfyUI is updated to latest stable version.")
|
||||||
|
return "success-stable-"+latest_tag
|
||||||
|
else:
|
||||||
|
logging.info("ComfyUI is updated to latest nightly version.")
|
||||||
|
return "success-nightly"
|
||||||
|
else: # skipped
|
||||||
|
logging.info("ComfyUI is up-to-date.")
|
||||||
|
return "skip"
|
||||||
|
|
||||||
|
except Exception:
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
|
return "An error occurred while updating 'comfyui'."
|
||||||
|
|
||||||
async def do_fix(item) -> str:
|
async def do_fix(item) -> str:
|
||||||
ui_id, node_name, node_ver = item
|
ui_id, node_name, node_ver = item
|
||||||
@@ -478,7 +550,18 @@ async def task_worker():
|
|||||||
try:
|
try:
|
||||||
if model_path is not None:
|
if model_path is not None:
|
||||||
logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
|
logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
|
||||||
if not core.get_config()['model_download_by_agent'] and (
|
|
||||||
|
if json_data['filename'] == '<huggingface>':
|
||||||
|
if os.path.exists(os.path.join(model_path, os.path.dirname(json_data['url']))):
|
||||||
|
logging.error(f"[ComfyUI-Manager] the model path already exists: {model_path}")
|
||||||
|
return f"The model path already exists: {model_path}"
|
||||||
|
|
||||||
|
logging.info(f"[ComfyUI-Manager] Downloading '{model_url}' into '{model_path}'")
|
||||||
|
manager_downloader.download_repo_in_bytes(repo_id=model_url, local_dir=model_path)
|
||||||
|
|
||||||
|
return 'success'
|
||||||
|
|
||||||
|
elif not core.get_config()['model_download_by_agent'] and (
|
||||||
model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
|
model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
|
||||||
model_dir = get_model_dir(json_data, True)
|
model_dir = get_model_dir(json_data, True)
|
||||||
download_url(model_url, model_dir, filename=json_data['filename'])
|
download_url(model_url, model_dir, filename=json_data['filename'])
|
||||||
@@ -494,13 +577,13 @@ async def task_worker():
|
|||||||
if res and model_path.endswith('.zip'):
|
if res and model_path.endswith('.zip'):
|
||||||
res = core.unzip(model_path)
|
res = core.unzip(model_path)
|
||||||
else:
|
else:
|
||||||
logging.error(f"Model installation error: invalid model type - {json_data['type']}")
|
logging.error(f"[ComfyUI-Manager] Model installation error: invalid model type - {json_data['type']}")
|
||||||
|
|
||||||
if res:
|
if res:
|
||||||
return 'success'
|
return 'success'
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.error(f"[ERROR] {e}", file=sys.stderr)
|
logging.error(f"[ComfyUI-Manager] ERROR: {e}", file=sys.stderr)
|
||||||
|
|
||||||
return f"Model installation error: {model_url}"
|
return f"Model installation error: {model_url}"
|
||||||
|
|
||||||
@@ -533,6 +616,10 @@ async def task_worker():
|
|||||||
msg = await do_install_model(item)
|
msg = await do_install_model(item)
|
||||||
elif kind == 'update':
|
elif kind == 'update':
|
||||||
msg = await do_update(item)
|
msg = await do_update(item)
|
||||||
|
elif kind == 'update-main':
|
||||||
|
msg = await do_update(item)
|
||||||
|
elif kind == 'update-comfyui':
|
||||||
|
msg = await do_update_comfyui(item[1])
|
||||||
elif kind == 'fix':
|
elif kind == 'fix':
|
||||||
msg = await do_fix(item)
|
msg = await do_fix(item)
|
||||||
elif kind == 'uninstall':
|
elif kind == 'uninstall':
|
||||||
@@ -552,6 +639,15 @@ async def task_worker():
|
|||||||
if kind == 'install-model':
|
if kind == 'install-model':
|
||||||
model_result[ui_id] = msg
|
model_result[ui_id] = msg
|
||||||
ui_target = "model_manager"
|
ui_target = "model_manager"
|
||||||
|
elif kind == 'update-main':
|
||||||
|
nodepack_result[ui_id] = msg
|
||||||
|
ui_target = "main"
|
||||||
|
elif kind == 'update-comfyui':
|
||||||
|
nodepack_result['comfyui'] = msg
|
||||||
|
ui_target = "main"
|
||||||
|
elif kind == 'update':
|
||||||
|
nodepack_result[ui_id] = msg['msg']
|
||||||
|
ui_target = "nodepack_manager"
|
||||||
else:
|
else:
|
||||||
nodepack_result[ui_id] = msg
|
nodepack_result[ui_id] = msg
|
||||||
ui_target = "nodepack_manager"
|
ui_target = "nodepack_manager"
|
||||||
@@ -626,49 +722,46 @@ async def fetch_updates(request):
|
|||||||
return web.Response(status=400)
|
return web.Response(status=400)
|
||||||
|
|
||||||
|
|
||||||
@routes.get("/customnode/update_all")
|
@routes.get("/manager/queue/update_all")
|
||||||
async def update_all(request):
|
async def update_all(request):
|
||||||
if not is_allowed_security_level('middle'):
|
if not is_allowed_security_level('middle'):
|
||||||
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
||||||
return web.Response(status=403)
|
return web.Response(status=403)
|
||||||
|
|
||||||
try:
|
with task_worker_lock:
|
||||||
await core.save_snapshot_with_postfix('autosave')
|
is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
|
||||||
|
if is_processing:
|
||||||
|
return web.Response(status=401)
|
||||||
|
|
||||||
if request.rel_url.query["mode"] == "local":
|
await core.save_snapshot_with_postfix('autosave')
|
||||||
channel = 'local'
|
|
||||||
else:
|
|
||||||
channel = core.get_config()['channel_url']
|
|
||||||
|
|
||||||
await core.unified_manager.reload(request.rel_url.query["mode"])
|
if request.rel_url.query["mode"] == "local":
|
||||||
await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
|
channel = 'local'
|
||||||
|
else:
|
||||||
|
channel = core.get_config()['channel_url']
|
||||||
|
|
||||||
updated_cnr = []
|
await core.unified_manager.reload(request.rel_url.query["mode"])
|
||||||
for k, v in core.unified_manager.active_nodes.items():
|
await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
|
||||||
if v[0] != 'nightly':
|
|
||||||
res = core.unified_manager.unified_update(k, v[0])
|
|
||||||
if res.action == 'switch-cnr' and res:
|
|
||||||
updated_cnr.append(k)
|
|
||||||
|
|
||||||
res = core.unified_manager.fetch_or_pull_git_repo(is_pull=True)
|
for k, v in core.unified_manager.active_nodes.items():
|
||||||
|
if k == 'comfyui-manager':
|
||||||
|
# skip updating comfyui-manager if desktop version
|
||||||
|
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
|
||||||
|
continue
|
||||||
|
|
||||||
res['updated'] += updated_cnr
|
update_item = k, k, v[0]
|
||||||
|
task_queue.put(("update-main", update_item))
|
||||||
|
|
||||||
for x in res['failed']:
|
for k, v in core.unified_manager.unknown_active_nodes.items():
|
||||||
logging.error(f"PULL FAILED: {x}")
|
if k == 'comfyui-manager':
|
||||||
|
# skip updating comfyui-manager if desktop version
|
||||||
|
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
|
||||||
|
continue
|
||||||
|
|
||||||
if len(res['updated']) == 0 and len(res['failed']) == 0:
|
update_item = k, k, 'unknown'
|
||||||
status = 200
|
task_queue.put(("update-main", update_item))
|
||||||
else:
|
|
||||||
status = 201
|
|
||||||
|
|
||||||
logging.info("\nDone.")
|
return web.Response(status=200)
|
||||||
return web.json_response(res, status=status, content_type='application/json')
|
|
||||||
except:
|
|
||||||
traceback.print_exc()
|
|
||||||
return web.Response(status=400)
|
|
||||||
finally:
|
|
||||||
manager_util.clear_pip_cache()
|
|
||||||
|
|
||||||
|
|
||||||
def convert_markdown_to_html(input_text):
|
def convert_markdown_to_html(input_text):
|
||||||
@@ -734,7 +827,7 @@ async def fetch_customnode_list(request):
|
|||||||
"""
|
"""
|
||||||
provide unified custom node list
|
provide unified custom node list
|
||||||
"""
|
"""
|
||||||
if "skip_update" in request.rel_url.query and request.rel_url.query["skip_update"] == "true":
|
if request.rel_url.query.get("skip_update", '').lower() == "true":
|
||||||
skip_update = True
|
skip_update = True
|
||||||
else:
|
else:
|
||||||
skip_update = False
|
skip_update = False
|
||||||
@@ -751,7 +844,7 @@ async def fetch_customnode_list(request):
|
|||||||
core.populate_github_stats(node_packs, await json_obj_github)
|
core.populate_github_stats(node_packs, await json_obj_github)
|
||||||
core.populate_favorites(node_packs, await json_obj_extras)
|
core.populate_favorites(node_packs, await json_obj_extras)
|
||||||
|
|
||||||
check_state_of_git_node_pack(node_packs, False, do_update_check=not skip_update)
|
check_state_of_git_node_pack(node_packs, not skip_update, do_update_check=not skip_update)
|
||||||
|
|
||||||
for v in node_packs.values():
|
for v in node_packs.values():
|
||||||
populate_markdown(v)
|
populate_markdown(v)
|
||||||
@@ -787,15 +880,18 @@ async def fetch_customnode_alternatives(request):
|
|||||||
|
|
||||||
|
|
||||||
def check_model_installed(json_obj):
|
def check_model_installed(json_obj):
|
||||||
def is_exists(model_dir_name, file_name):
|
def is_exists(model_dir_name, filename, url):
|
||||||
|
if filename == '<huggingface>':
|
||||||
|
filename = os.path.basename(url)
|
||||||
|
|
||||||
dirs = folder_paths.get_folder_paths(model_dir_name)
|
dirs = folder_paths.get_folder_paths(model_dir_name)
|
||||||
|
|
||||||
for x in dirs:
|
for x in dirs:
|
||||||
if os.path.exists(os.path.join(x, file_name)):
|
if os.path.exists(os.path.join(x, filename)):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
model_dir_names = ['checkpoints', 'loras', 'vae', 'text_encoders', 'diffusion_models', 'clip_vision', 'embeddings',
|
model_dir_names = ['checkpoints', 'loras', 'vae', 'text_encoders', 'diffusion_models', 'clip_vision', 'embeddings',
|
||||||
'diffusers', 'vae_approx', 'controlnet', 'gligen', 'upscale_models', 'hypernetworks',
|
'diffusers', 'vae_approx', 'controlnet', 'gligen', 'upscale_models', 'hypernetworks',
|
||||||
'photomaker', 'classifiers']
|
'photomaker', 'classifiers']
|
||||||
@@ -815,25 +911,33 @@ def check_model_installed(json_obj):
|
|||||||
if item['save_path'] == 'default':
|
if item['save_path'] == 'default':
|
||||||
model_dir_name = model_dir_name_map.get(item['type'].lower())
|
model_dir_name = model_dir_name_map.get(item['type'].lower())
|
||||||
if model_dir_name is not None:
|
if model_dir_name is not None:
|
||||||
item['installed'] = str(is_exists(model_dir_name, item['filename']))
|
item['installed'] = str(is_exists(model_dir_name, item['filename'], item['url']))
|
||||||
else:
|
else:
|
||||||
item['installed'] = 'False'
|
item['installed'] = 'False'
|
||||||
else:
|
else:
|
||||||
model_dir_name = item['save_path'].split('/')[0]
|
model_dir_name = item['save_path'].split('/')[0]
|
||||||
if model_dir_name in folder_paths.folder_names_and_paths:
|
if model_dir_name in folder_paths.folder_names_and_paths:
|
||||||
if is_exists(model_dir_name, item['filename']):
|
if is_exists(model_dir_name, item['filename'], item['url']):
|
||||||
item['installed'] = 'True'
|
item['installed'] = 'True'
|
||||||
|
|
||||||
if 'installed' not in item:
|
if 'installed' not in item:
|
||||||
fullpath = os.path.join(folder_paths.models_dir, item['save_path'], item['filename'])
|
if item['filename'] == '<huggingface>':
|
||||||
|
filename = os.path.basename(item['url'])
|
||||||
|
else:
|
||||||
|
filename = item['filename']
|
||||||
|
|
||||||
|
fullpath = os.path.join(folder_paths.models_dir, item['save_path'], filename)
|
||||||
|
|
||||||
item['installed'] = 'True' if os.path.exists(fullpath) else 'False'
|
item['installed'] = 'True' if os.path.exists(fullpath) else 'False'
|
||||||
|
|
||||||
with concurrent.futures.ThreadPoolExecutor(8) as executor:
|
with concurrent.futures.ThreadPoolExecutor(8) as executor:
|
||||||
for item in json_obj['models']:
|
for item in json_obj['models']:
|
||||||
executor.submit(process_model_phase, item)
|
executor.submit(process_model_phase, item)
|
||||||
|
|
||||||
|
|
||||||
@routes.get("/externalmodel/getlist")
|
@routes.get("/externalmodel/getlist")
|
||||||
async def fetch_externalmodel_list(request):
|
async def fetch_externalmodel_list(request):
|
||||||
|
# The model list is only allowed in the default channel, yet.
|
||||||
json_obj = await core.get_data_by_mode(request.rel_url.query["mode"], 'model-list.json')
|
json_obj = await core.get_data_by_mode(request.rel_url.query["mode"], 'model-list.json')
|
||||||
|
|
||||||
check_model_installed(json_obj)
|
check_model_installed(json_obj)
|
||||||
@@ -1102,8 +1206,15 @@ async def install_custom_node(request):
|
|||||||
|
|
||||||
git_url = None
|
git_url = None
|
||||||
|
|
||||||
if json_data['version'] != 'unknown':
|
selected_version = json_data.get('selected_version')
|
||||||
selected_version = json_data.get('selected_version', 'latest')
|
if json_data['version'] != 'unknown' and selected_version != 'unknown':
|
||||||
|
if skip_post_install:
|
||||||
|
if cnr_id in core.unified_manager.nightly_inactive_nodes or cnr_id in core.unified_manager.cnr_inactive_nodes:
|
||||||
|
core.unified_manager.unified_enable(cnr_id)
|
||||||
|
return web.Response(status=200)
|
||||||
|
elif selected_version is None:
|
||||||
|
selected_version = 'latest'
|
||||||
|
|
||||||
if selected_version != 'nightly':
|
if selected_version != 'nightly':
|
||||||
risky_level = 'low'
|
risky_level = 'low'
|
||||||
node_spec_str = f"{cnr_id}@{selected_version}"
|
node_spec_str = f"{cnr_id}@{selected_version}"
|
||||||
@@ -1113,6 +1224,9 @@ async def install_custom_node(request):
|
|||||||
if git_url is None:
|
if git_url is None:
|
||||||
logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
|
logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
|
||||||
return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
|
return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
|
||||||
|
elif json_data['version'] != 'unknown' and selected_version == 'unknown':
|
||||||
|
logging.error(f"[ComfyUI-Manager] Invalid installation request: {json_data}")
|
||||||
|
return web.Response(status=400, text="Invalid installation request")
|
||||||
else:
|
else:
|
||||||
# unknown
|
# unknown
|
||||||
unknown_name = os.path.basename(json_data['files'][0])
|
unknown_name = os.path.basename(json_data['files'][0])
|
||||||
@@ -1254,32 +1368,17 @@ async def update_custom_node(request):
|
|||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
@routes.get("/comfyui_manager/update_comfyui")
|
@routes.get("/manager/queue/update_comfyui")
|
||||||
async def update_comfyui(request):
|
async def update_comfyui(request):
|
||||||
logging.info("Update ComfyUI")
|
is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
|
||||||
|
task_queue.put(("update-comfyui", ('comfyui', is_stable)))
|
||||||
try:
|
return web.Response(status=200)
|
||||||
repo_path = os.path.dirname(folder_paths.__file__)
|
|
||||||
res = core.update_path(repo_path)
|
|
||||||
if res == "fail":
|
|
||||||
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
|
||||||
return web.Response(status=400)
|
|
||||||
elif res == "updated":
|
|
||||||
logging.info("ComfyUI is updated.")
|
|
||||||
return web.Response(status=201)
|
|
||||||
else: # skipped
|
|
||||||
logging.info("ComfyUI is up-to-date.")
|
|
||||||
return web.Response(status=200)
|
|
||||||
except Exception as e:
|
|
||||||
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
|
|
||||||
|
|
||||||
return web.Response(status=400)
|
|
||||||
|
|
||||||
|
|
||||||
@routes.get("/comfyui_manager/comfyui_versions")
|
@routes.get("/comfyui_manager/comfyui_versions")
|
||||||
async def comfyui_versions(request):
|
async def comfyui_versions(request):
|
||||||
try:
|
try:
|
||||||
res, current = core.get_comfyui_versions()
|
res, current, latest = core.get_comfyui_versions()
|
||||||
return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
|
return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
|
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
|
||||||
@@ -1319,17 +1418,20 @@ async def disable_node(request):
|
|||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
@routes.get("/manager/migrate_unmanaged_nodes")
|
async def check_whitelist_for_model(item):
|
||||||
async def migrate_unmanaged_nodes(request):
|
json_obj = await core.get_data_by_mode('cache', 'model-list.json')
|
||||||
logging.info("[ComfyUI-Manager] Migrating unmanaged nodes...")
|
|
||||||
await core.unified_manager.migrate_unmanaged_nodes()
|
|
||||||
logging.info("Done.")
|
|
||||||
return web.Response(status=200)
|
|
||||||
|
|
||||||
|
for x in json_obj.get('models', []):
|
||||||
|
if x['save_path'] == item['save_path'] and x['base'] == item['base'] and x['filename'] == item['filename']:
|
||||||
|
return True
|
||||||
|
|
||||||
@routes.get("/manager/need_to_migrate")
|
json_obj = await core.get_data_by_mode('local', 'model-list.json')
|
||||||
async def need_to_migrate(request):
|
|
||||||
return web.Response(text=str(core.need_to_migrate), status=200)
|
for x in json_obj.get('models', []):
|
||||||
|
if x['save_path'] == item['save_path'] and x['base'] == item['base'] and x['filename'] == item['filename']:
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
@routes.post("/manager/queue/install_model")
|
@routes.post("/manager/queue/install_model")
|
||||||
@@ -1338,10 +1440,15 @@ async def install_model(request):
|
|||||||
|
|
||||||
if not is_allowed_security_level('middle'):
|
if not is_allowed_security_level('middle'):
|
||||||
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
||||||
return web.Response(status=403)
|
return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
|
||||||
|
|
||||||
|
# validate request
|
||||||
|
if not await check_whitelist_for_model(json_data):
|
||||||
|
logging.error(f"[ComfyUI-Manager] Invalid model install request is detected: {json_data}")
|
||||||
|
return web.Response(status=400, text="Invalid model install request is detected")
|
||||||
|
|
||||||
if not json_data['filename'].endswith('.safetensors') and not is_allowed_security_level('high'):
|
if not json_data['filename'].endswith('.safetensors') and not is_allowed_security_level('high'):
|
||||||
models_json = await core.get_data_by_mode('cache', 'model-list.json')
|
models_json = await core.get_data_by_mode('cache', 'model-list.json', 'default')
|
||||||
|
|
||||||
is_belongs_to_whitelist = False
|
is_belongs_to_whitelist = False
|
||||||
for x in models_json['models']:
|
for x in models_json['models']:
|
||||||
@@ -1350,8 +1457,8 @@ async def install_model(request):
|
|||||||
break
|
break
|
||||||
|
|
||||||
if not is_belongs_to_whitelist:
|
if not is_belongs_to_whitelist:
|
||||||
logging.error(SECURITY_MESSAGE_NORMAL_MINUS)
|
logging.error(SECURITY_MESSAGE_NORMAL_MINUS_MODEL)
|
||||||
return web.Response(status=403)
|
return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
|
||||||
|
|
||||||
install_item = json_data.get('ui_id'), json_data
|
install_item = json_data.get('ui_id'), json_data
|
||||||
task_queue.put(("install-model", install_item))
|
task_queue.put(("install-model", install_item))
|
||||||
@@ -1370,7 +1477,19 @@ async def preview_method(request):
|
|||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
@routes.get("/manager/component/policy")
|
@routes.get("/manager/db_mode")
|
||||||
|
async def db_mode(request):
|
||||||
|
if "value" in request.rel_url.query:
|
||||||
|
set_db_mode(request.rel_url.query['value'])
|
||||||
|
core.write_config()
|
||||||
|
else:
|
||||||
|
return web.Response(text=core.get_config()['db_mode'], status=200)
|
||||||
|
|
||||||
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@routes.get("/manager/policy/component")
|
||||||
async def component_policy(request):
|
async def component_policy(request):
|
||||||
if "value" in request.rel_url.query:
|
if "value" in request.rel_url.query:
|
||||||
set_component_policy(request.rel_url.query['value'])
|
set_component_policy(request.rel_url.query['value'])
|
||||||
@@ -1381,6 +1500,17 @@ async def component_policy(request):
|
|||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
|
@routes.get("/manager/policy/update")
|
||||||
|
async def update_policy(request):
|
||||||
|
if "value" in request.rel_url.query:
|
||||||
|
set_update_policy(request.rel_url.query['value'])
|
||||||
|
core.write_config()
|
||||||
|
else:
|
||||||
|
return web.Response(text=core.get_config()['update_policy'], status=200)
|
||||||
|
|
||||||
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
@routes.get("/manager/channel_url_list")
|
@routes.get("/manager/channel_url_list")
|
||||||
async def channel_url_list(request):
|
async def channel_url_list(request):
|
||||||
channels = core.get_channel_dict()
|
channels = core.get_channel_dict()
|
||||||
@@ -1434,22 +1564,27 @@ async def get_notice(request):
|
|||||||
|
|
||||||
if match:
|
if match:
|
||||||
markdown_content = match.group(1)
|
markdown_content = match.group(1)
|
||||||
version_tag = core.get_comfyui_tag()
|
version_tag = os.environ.get('__COMFYUI_DESKTOP_VERSION__')
|
||||||
if version_tag is None:
|
if version_tag is not None:
|
||||||
markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
|
markdown_content += f"<HR>ComfyUI: {version_tag} [Desktop]"
|
||||||
else:
|
else:
|
||||||
markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
|
version_tag = core.get_comfyui_tag()
|
||||||
f" ({core.comfy_ui_commit_datetime.date()})")
|
if version_tag is None:
|
||||||
|
markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
|
||||||
|
else:
|
||||||
|
markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
|
||||||
|
f" ({core.comfy_ui_commit_datetime.date()})")
|
||||||
# markdown_content += f"<BR> ()"
|
# markdown_content += f"<BR> ()"
|
||||||
markdown_content += f"<BR>Manager: {core.version_str}"
|
markdown_content += f"<BR>Manager: {core.version_str}"
|
||||||
|
|
||||||
markdown_content = add_target_blank(markdown_content)
|
markdown_content = add_target_blank(markdown_content)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if core.comfy_ui_commit_datetime == datetime(1900, 1, 1, 0, 0, 0):
|
if '__COMFYUI_DESKTOP_VERSION__' not in os.environ:
|
||||||
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI isn\'t git repo.</P>' + markdown_content
|
if core.comfy_ui_commit_datetime == datetime(1900, 1, 1, 0, 0, 0):
|
||||||
elif core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
|
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI isn\'t git repo.</P>' + markdown_content
|
||||||
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
|
elif core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
|
||||||
|
markdown_content = '<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -1484,7 +1619,10 @@ def restart(self):
|
|||||||
if '--windows-standalone-build' in sys_argv:
|
if '--windows-standalone-build' in sys_argv:
|
||||||
sys_argv.remove('--windows-standalone-build')
|
sys_argv.remove('--windows-standalone-build')
|
||||||
|
|
||||||
if sys.platform.startswith('win32'):
|
if sys_argv[0].endswith("__main__.py"): # this is a python module
|
||||||
|
module_name = os.path.basename(os.path.dirname(sys_argv[0]))
|
||||||
|
cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
|
||||||
|
elif sys.platform.startswith('win32'):
|
||||||
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
|
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
|
||||||
else:
|
else:
|
||||||
cmds = [sys.executable] + sys_argv
|
cmds = [sys.executable] + sys_argv
|
||||||
@@ -1576,37 +1714,46 @@ cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
|
|||||||
|
|
||||||
|
|
||||||
async def default_cache_update():
|
async def default_cache_update():
|
||||||
|
core.refresh_channel_dict()
|
||||||
|
channel_url = core.get_config()['channel_url']
|
||||||
async def get_cache(filename):
|
async def get_cache(filename):
|
||||||
uri = f"{core.DEFAULT_CHANNEL}/{filename}"
|
try:
|
||||||
cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
|
if core.get_config()['default_cache_as_channel_url']:
|
||||||
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
uri = f"{channel_url}/{filename}"
|
||||||
|
else:
|
||||||
|
uri = f"{core.DEFAULT_CHANNEL}/{filename}"
|
||||||
|
|
||||||
json_obj = await manager_util.get_data(uri, True)
|
cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
|
||||||
|
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
||||||
|
|
||||||
with manager_util.cache_lock:
|
json_obj = await manager_util.get_data(uri, True)
|
||||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
|
||||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
|
||||||
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
|
||||||
|
|
||||||
a = get_cache("custom-node-list.json")
|
with manager_util.cache_lock:
|
||||||
b = get_cache("extension-node-map.json")
|
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||||
c = get_cache("model-list.json")
|
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||||
d = get_cache("alter-list.json")
|
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
||||||
e = get_cache("github-stats.json")
|
except Exception as e:
|
||||||
|
logging.error(f"[ComfyUI-Manager] Failed to perform initial fetching '{filename}': {e}")
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
await asyncio.gather(a, b, c, d, e)
|
if core.get_config()['network_mode'] != 'offline':
|
||||||
|
a = get_cache("custom-node-list.json")
|
||||||
|
b = get_cache("extension-node-map.json")
|
||||||
|
c = get_cache("model-list.json")
|
||||||
|
d = get_cache("alter-list.json")
|
||||||
|
e = get_cache("github-stats.json")
|
||||||
|
|
||||||
# load at least once
|
await asyncio.gather(a, b, c, d, e)
|
||||||
await core.unified_manager.reload('remote', dont_wait=False)
|
|
||||||
await core.unified_manager.get_custom_nodes('default', 'remote')
|
if core.get_config()['network_mode'] == 'private':
|
||||||
|
logging.info("[ComfyUI-Manager] The private comfyregistry is not yet supported in `network_mode=private`.")
|
||||||
|
else:
|
||||||
|
# load at least once
|
||||||
|
await core.unified_manager.reload('remote', dont_wait=False)
|
||||||
|
await core.unified_manager.get_custom_nodes(channel_url, 'remote')
|
||||||
|
|
||||||
logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
|
logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
|
||||||
|
|
||||||
# NOTE: hide migration button temporarily.
|
|
||||||
# if not core.get_config()['skip_migration_check']:
|
|
||||||
# await core.check_need_to_migrate()
|
|
||||||
# else:
|
|
||||||
# logging.info("[ComfyUI-Manager] Migration check is skipped...")
|
|
||||||
|
|
||||||
threading.Thread(target=lambda: asyncio.run(default_cache_update())).start()
|
threading.Thread(target=lambda: asyncio.run(default_cache_update())).start()
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
description:
|
description:
|
||||||
`manager_util` is the lightest module shared across the prestartup_script, main code, and cm-cli of ComfyUI-Manager.
|
`manager_util` is the lightest module shared across the prestartup_script, main code, and cm-cli of ComfyUI-Manager.
|
||||||
"""
|
"""
|
||||||
|
import traceback
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import json
|
import json
|
||||||
@@ -12,6 +13,9 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
import logging
|
import logging
|
||||||
|
import platform
|
||||||
|
import shlex
|
||||||
|
import cm_global
|
||||||
|
|
||||||
|
|
||||||
cache_lock = threading.Lock()
|
cache_lock = threading.Lock()
|
||||||
@@ -21,12 +25,28 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also up
|
|||||||
|
|
||||||
use_uv = False
|
use_uv = False
|
||||||
|
|
||||||
def make_pip_cmd(cmd):
|
|
||||||
if use_uv:
|
|
||||||
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
|
||||||
else:
|
|
||||||
return [sys.executable, '-m', 'pip'] + cmd
|
|
||||||
|
|
||||||
|
def add_python_path_to_env():
|
||||||
|
if platform.system() != "Windows":
|
||||||
|
sep = ':'
|
||||||
|
else:
|
||||||
|
sep = ';'
|
||||||
|
|
||||||
|
os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
|
||||||
|
|
||||||
|
|
||||||
|
def make_pip_cmd(cmd):
|
||||||
|
if 'python_embeded' in sys.executable:
|
||||||
|
if use_uv:
|
||||||
|
return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
|
||||||
|
else:
|
||||||
|
return [sys.executable, '-s', '-m', 'pip'] + cmd
|
||||||
|
else:
|
||||||
|
# FIXED: https://github.com/ltdrdata/ComfyUI-Manager/issues/1667
|
||||||
|
if use_uv:
|
||||||
|
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
||||||
|
else:
|
||||||
|
return [sys.executable, '-m', 'pip'] + cmd
|
||||||
|
|
||||||
# DON'T USE StrictVersion - cannot handle pre_release version
|
# DON'T USE StrictVersion - cannot handle pre_release version
|
||||||
# try:
|
# try:
|
||||||
@@ -130,7 +150,12 @@ async def get_data(uri, silent=False):
|
|||||||
with open(uri, "r", encoding="utf-8") as f:
|
with open(uri, "r", encoding="utf-8") as f:
|
||||||
json_text = f.read()
|
json_text = f.read()
|
||||||
|
|
||||||
json_obj = json.loads(json_text)
|
try:
|
||||||
|
json_obj = json.loads(json_text)
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[ComfyUI-Manager] An error occurred while fetching '{uri}': {e}")
|
||||||
|
|
||||||
|
return {}
|
||||||
|
|
||||||
if not silent:
|
if not silent:
|
||||||
print(" [DONE]")
|
print(" [DONE]")
|
||||||
@@ -164,7 +189,7 @@ def save_to_cache(uri, json_obj, silent=False):
|
|||||||
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
||||||
|
|
||||||
|
|
||||||
async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
|
async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False, dont_cache=False):
|
||||||
cache_uri = get_cache_path(uri)
|
cache_uri = get_cache_path(uri)
|
||||||
|
|
||||||
if cache_mode and dont_wait:
|
if cache_mode and dont_wait:
|
||||||
@@ -183,11 +208,12 @@ async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=Fals
|
|||||||
json_obj = await get_data(cache_uri, silent=silent)
|
json_obj = await get_data(cache_uri, silent=silent)
|
||||||
else:
|
else:
|
||||||
json_obj = await get_data(uri, silent=silent)
|
json_obj = await get_data(uri, silent=silent)
|
||||||
with cache_lock:
|
if not dont_cache:
|
||||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
with cache_lock:
|
||||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||||
if not silent:
|
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||||
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
if not silent:
|
||||||
|
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
||||||
|
|
||||||
return json_obj
|
return json_obj
|
||||||
|
|
||||||
@@ -227,10 +253,11 @@ def get_installed_packages(renew=False):
|
|||||||
if y[0] == 'Package' or y[0].startswith('-'):
|
if y[0] == 'Package' or y[0].startswith('-'):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
pip_map[y[0]] = y[1]
|
normalized_name = y[0].lower().replace('-', '_')
|
||||||
|
pip_map[normalized_name] = y[1]
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
|
logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
|
||||||
return set()
|
return {}
|
||||||
|
|
||||||
return pip_map
|
return pip_map
|
||||||
|
|
||||||
@@ -240,7 +267,48 @@ def clear_pip_cache():
|
|||||||
pip_map = None
|
pip_map = None
|
||||||
|
|
||||||
|
|
||||||
|
def parse_requirement_line(line):
|
||||||
|
tokens = shlex.split(line)
|
||||||
|
if not tokens:
|
||||||
|
return None
|
||||||
|
|
||||||
|
package_spec = tokens[0]
|
||||||
|
|
||||||
|
pattern = re.compile(
|
||||||
|
r'^(?P<package>[A-Za-z0-9_.+-]+)'
|
||||||
|
r'(?P<operator>==|>=|<=|!=|~=|>|<)?'
|
||||||
|
r'(?P<version>[A-Za-z0-9_.+-]*)$'
|
||||||
|
)
|
||||||
|
m = pattern.match(package_spec)
|
||||||
|
if not m:
|
||||||
|
return None
|
||||||
|
|
||||||
|
package = m.group('package')
|
||||||
|
operator = m.group('operator') or None
|
||||||
|
version = m.group('version') or None
|
||||||
|
|
||||||
|
index_url = None
|
||||||
|
if '--index-url' in tokens:
|
||||||
|
idx = tokens.index('--index-url')
|
||||||
|
if idx + 1 < len(tokens):
|
||||||
|
index_url = tokens[idx + 1]
|
||||||
|
|
||||||
|
res = {'package': package}
|
||||||
|
|
||||||
|
if operator is not None:
|
||||||
|
res['operator'] = operator
|
||||||
|
|
||||||
|
if version is not None:
|
||||||
|
res['version'] = StrictVersion(version)
|
||||||
|
|
||||||
|
if index_url is not None:
|
||||||
|
res['index_url'] = index_url
|
||||||
|
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
torch_torchvision_torchaudio_version_map = {
|
torch_torchvision_torchaudio_version_map = {
|
||||||
|
'2.7.0': ('0.22.0', '2.7.0'),
|
||||||
'2.6.0': ('0.21.0', '2.6.0'),
|
'2.6.0': ('0.21.0', '2.6.0'),
|
||||||
'2.5.1': ('0.20.0', '2.5.0'),
|
'2.5.1': ('0.20.0', '2.5.0'),
|
||||||
'2.5.0': ('0.20.0', '2.5.0'),
|
'2.5.0': ('0.20.0', '2.5.0'),
|
||||||
@@ -259,9 +327,12 @@ torch_torchvision_torchaudio_version_map = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class PIPFixer:
|
class PIPFixer:
|
||||||
def __init__(self, prev_pip_versions):
|
def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
|
||||||
self.prev_pip_versions = { **prev_pip_versions }
|
self.prev_pip_versions = { **prev_pip_versions }
|
||||||
|
self.comfyui_path = comfyui_path
|
||||||
|
self.manager_files_path = manager_files_path
|
||||||
|
|
||||||
def torch_rollback(self):
|
def torch_rollback(self):
|
||||||
spec = self.prev_pip_versions['torch'].split('+')
|
spec = self.prev_pip_versions['torch'].split('+')
|
||||||
@@ -341,8 +412,9 @@ class PIPFixer:
|
|||||||
|
|
||||||
if len(targets) > 0:
|
if len(targets) > 0:
|
||||||
for x in targets:
|
for x in targets:
|
||||||
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
|
if sys.version_info < (3, 13):
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"])
|
||||||
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -350,16 +422,93 @@ class PIPFixer:
|
|||||||
logging.error(e)
|
logging.error(e)
|
||||||
|
|
||||||
# fix numpy
|
# fix numpy
|
||||||
|
if sys.version_info >= (3, 13):
|
||||||
|
logging.info("[ComfyUI-Manager] In Python 3.13 and above, PIP Fixer does not downgrade `numpy` below version 2.0. If you need to force a downgrade of `numpy`, please use `pip_auto_fix.list`.")
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
np = new_pip_versions.get('numpy')
|
||||||
|
if cm_global.pip_overrides.get('numpy') == 'numpy<2':
|
||||||
|
if np is not None:
|
||||||
|
if StrictVersion(np) >= StrictVersion('2'):
|
||||||
|
cmd = make_pip_cmd(['install', "numpy<2"])
|
||||||
|
subprocess.check_output(cmd , universal_newlines=True)
|
||||||
|
|
||||||
|
logging.info("[ComfyUI-Manager] 'numpy' dependency were fixed")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error("[ComfyUI-Manager] Failed to restore numpy")
|
||||||
|
logging.error(e)
|
||||||
|
|
||||||
|
# fix missing frontend
|
||||||
try:
|
try:
|
||||||
np = new_pip_versions.get('numpy')
|
# NOTE: package name in requirements is 'comfyui-frontend-package'
|
||||||
if np is not None:
|
# but, package name from `pip freeze` is 'comfyui_frontend_package'
|
||||||
if StrictVersion(np) >= StrictVersion('2'):
|
# but, package name from `uv pip freeze` is 'comfyui-frontend-package'
|
||||||
cmd = make_pip_cmd(['install', "numpy<2"])
|
#
|
||||||
|
# get_installed_packages returns normalized name (i.e. comfyui_frontend_package)
|
||||||
|
if 'comfyui_frontend_package' not in new_pip_versions:
|
||||||
|
requirements_path = os.path.join(self.comfyui_path, 'requirements.txt')
|
||||||
|
|
||||||
|
with open(requirements_path, 'r') as file:
|
||||||
|
lines = file.readlines()
|
||||||
|
|
||||||
|
front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
|
||||||
|
if front_line is None:
|
||||||
|
logging.info("[ComfyUI-Manager] Skipped fixing the 'comfyui-frontend-package' dependency because the ComfyUI is outdated.")
|
||||||
|
else:
|
||||||
|
cmd = make_pip_cmd(['install', front_line])
|
||||||
subprocess.check_output(cmd , universal_newlines=True)
|
subprocess.check_output(cmd , universal_newlines=True)
|
||||||
|
logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logging.error("[ComfyUI-Manager] Failed to restore numpy")
|
logging.error("[ComfyUI-Manager] Failed to restore comfyui-frontend-package")
|
||||||
logging.error(e)
|
logging.error(e)
|
||||||
|
|
||||||
|
# restore based on custom list
|
||||||
|
pip_auto_fix_path = os.path.join(self.manager_files_path, "pip_auto_fix.list")
|
||||||
|
if os.path.exists(pip_auto_fix_path):
|
||||||
|
with open(pip_auto_fix_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||||
|
fixed_list = []
|
||||||
|
|
||||||
|
for x in f.readlines():
|
||||||
|
try:
|
||||||
|
parsed = parse_requirement_line(x)
|
||||||
|
need_to_reinstall = True
|
||||||
|
|
||||||
|
normalized_name = parsed['package'].lower().replace('-', '_')
|
||||||
|
if normalized_name in new_pip_versions:
|
||||||
|
if 'version' in parsed and 'operator' in parsed:
|
||||||
|
cur = StrictVersion(new_pip_versions[parsed['package']])
|
||||||
|
dest = parsed['version']
|
||||||
|
op = parsed['operator']
|
||||||
|
if cur == dest:
|
||||||
|
if op in ['==', '>=', '<=']:
|
||||||
|
need_to_reinstall = False
|
||||||
|
elif cur < dest:
|
||||||
|
if op in ['<=', '<', '~=', '!=']:
|
||||||
|
need_to_reinstall = False
|
||||||
|
elif cur > dest:
|
||||||
|
if op in ['>=', '>', '~=', '!=']:
|
||||||
|
need_to_reinstall = False
|
||||||
|
|
||||||
|
if need_to_reinstall:
|
||||||
|
cmd_args = ['install']
|
||||||
|
if 'version' in parsed and 'operator' in parsed:
|
||||||
|
cmd_args.append(parsed['package']+parsed['operator']+parsed['version'].version_string)
|
||||||
|
|
||||||
|
if 'index_url' in parsed:
|
||||||
|
cmd_args.append('--index-url')
|
||||||
|
cmd_args.append(parsed['index_url'])
|
||||||
|
|
||||||
|
cmd = make_pip_cmd(cmd_args)
|
||||||
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
|
fixed_list.append(parsed['package'])
|
||||||
|
except Exception as e:
|
||||||
|
traceback.print_exc()
|
||||||
|
logging.error(f"[ComfyUI-Manager] Failed to restore '{x}'")
|
||||||
|
logging.error(e)
|
||||||
|
|
||||||
|
if len(fixed_list) > 0:
|
||||||
|
logging.info(f"[ComfyUI-Manager] dependencies in pip_auto_fix.json were fixed: {fixed_list}")
|
||||||
|
|
||||||
def sanitize(data):
|
def sanitize(data):
|
||||||
return data.replace("<", "<").replace(">", ">")
|
return data.replace("<", "<").replace(">", ">")
|
||||||
@@ -368,3 +517,23 @@ def sanitize(data):
|
|||||||
def sanitize_filename(input_string):
|
def sanitize_filename(input_string):
|
||||||
result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
|
result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
|
||||||
return result_string
|
return result_string
|
||||||
|
|
||||||
|
|
||||||
|
def robust_readlines(fullpath):
|
||||||
|
import chardet
|
||||||
|
try:
|
||||||
|
with open(fullpath, "r") as f:
|
||||||
|
return f.readlines()
|
||||||
|
except:
|
||||||
|
encoding = None
|
||||||
|
with open(fullpath, "rb") as f:
|
||||||
|
raw_data = f.read()
|
||||||
|
result = chardet.detect(raw_data)
|
||||||
|
encoding = result['encoding']
|
||||||
|
|
||||||
|
if encoding is not None:
|
||||||
|
with open(fullpath, "r", encoding=encoding) as f:
|
||||||
|
return f.readlines()
|
||||||
|
|
||||||
|
print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
|
||||||
|
return []
|
||||||
|
|||||||
@@ -13,12 +13,16 @@ import {
|
|||||||
import { OpenArtShareDialog } from "./comfyui-share-openart.js";
|
import { OpenArtShareDialog } from "./comfyui-share-openart.js";
|
||||||
import {
|
import {
|
||||||
free_models, install_pip, install_via_git_url, manager_instance,
|
free_models, install_pip, install_via_git_url, manager_instance,
|
||||||
rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.js";
|
rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
|
||||||
|
infoToast, showTerminal, setNeedRestart
|
||||||
|
} from "./common.js";
|
||||||
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
|
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
|
||||||
import { CustomNodesManager } from "./custom-nodes-manager.js";
|
import { CustomNodesManager } from "./custom-nodes-manager.js";
|
||||||
import { ModelManager } from "./model-manager.js";
|
import { ModelManager } from "./model-manager.js";
|
||||||
import { SnapshotManager } from "./snapshot.js";
|
import { SnapshotManager } from "./snapshot.js";
|
||||||
|
|
||||||
|
let manager_version = await getVersion();
|
||||||
|
|
||||||
var docStyle = document.createElement('style');
|
var docStyle = document.createElement('style');
|
||||||
docStyle.innerHTML = `
|
docStyle.innerHTML = `
|
||||||
.comfy-toast {
|
.comfy-toast {
|
||||||
@@ -40,7 +44,7 @@ docStyle.innerHTML = `
|
|||||||
|
|
||||||
#cm-manager-dialog {
|
#cm-manager-dialog {
|
||||||
width: 1000px;
|
width: 1000px;
|
||||||
height: 450px;
|
height: 455px;
|
||||||
box-sizing: content-box;
|
box-sizing: content-box;
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
@@ -137,7 +141,7 @@ docStyle.innerHTML = `
|
|||||||
|
|
||||||
.cm-notice-board {
|
.cm-notice-board {
|
||||||
width: 290px;
|
width: 290px;
|
||||||
height: 210px;
|
height: 230px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
color: var(--input-text);
|
color: var(--input-text);
|
||||||
border: 1px solid var(--descrip-text);
|
border: 1px solid var(--descrip-text);
|
||||||
@@ -223,9 +227,13 @@ document.head.appendChild(docStyle);
|
|||||||
|
|
||||||
var update_comfyui_button = null;
|
var update_comfyui_button = null;
|
||||||
var switch_comfyui_button = null;
|
var switch_comfyui_button = null;
|
||||||
var fetch_updates_button = null;
|
|
||||||
var update_all_button = null;
|
var update_all_button = null;
|
||||||
|
var restart_stop_button = null;
|
||||||
|
var update_policy_combo = null;
|
||||||
|
|
||||||
let share_option = 'all';
|
let share_option = 'all';
|
||||||
|
var is_updating = false;
|
||||||
|
|
||||||
|
|
||||||
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
|
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
|
||||||
const style = `
|
const style = `
|
||||||
@@ -424,102 +432,56 @@ async function init_notice(notice) {
|
|||||||
|
|
||||||
await init_share_option();
|
await init_share_option();
|
||||||
|
|
||||||
async function fetchNicknames() {
|
|
||||||
const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
|
|
||||||
const mappings = await response1.json();
|
|
||||||
|
|
||||||
let result = {};
|
async function set_inprogress_mode() {
|
||||||
let nickname_patterns = [];
|
update_comfyui_button.disabled = true;
|
||||||
|
update_comfyui_button.style.backgroundColor = "gray";
|
||||||
|
|
||||||
for (let i in mappings) {
|
update_all_button.disabled = true;
|
||||||
let item = mappings[i];
|
update_all_button.style.backgroundColor = "gray";
|
||||||
var nickname;
|
|
||||||
if (item[1].nickname) {
|
|
||||||
nickname = item[1].nickname;
|
|
||||||
}
|
|
||||||
else if (item[1].title) {
|
|
||||||
nickname = item[1].title;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
nickname = item[1].title_aux;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let j in item[0]) {
|
switch_comfyui_button.disabled = true;
|
||||||
result[item[0][j]] = nickname;
|
switch_comfyui_button.style.backgroundColor = "gray";
|
||||||
}
|
|
||||||
|
|
||||||
if(item[1].nodename_pattern) {
|
restart_stop_button.innerText = 'Stop';
|
||||||
nickname_patterns.push([item[1].nodename_pattern, nickname]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return [result, nickname_patterns];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const [nicknames, nickname_patterns] = await fetchNicknames();
|
|
||||||
|
|
||||||
function getNickname(node, nodename) {
|
async function reset_action_buttons() {
|
||||||
if(node.nickname) {
|
const isElectron = 'electronAPI' in window;
|
||||||
return node.nickname;
|
|
||||||
|
if(isElectron) {
|
||||||
|
update_all_button.innerText = "Update All Custom Nodes";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (nicknames[nodename]) {
|
update_all_button.innerText = "Update All";
|
||||||
node.nickname = nicknames[nodename];
|
|
||||||
}
|
|
||||||
else if(node.getInnerNodes) {
|
|
||||||
let pure_name = getPureName(node);
|
|
||||||
let groupNode = app.graph.extra?.groupNodes?.[pure_name];
|
|
||||||
if(groupNode) {
|
|
||||||
let packname = groupNode.packname;
|
|
||||||
node.nickname = packname;
|
|
||||||
}
|
|
||||||
return node.nickname;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for(let i in nickname_patterns) {
|
|
||||||
let item = nickname_patterns[i];
|
|
||||||
if(nodename.match(item[0])) {
|
|
||||||
node.nickname = item[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return node.nickname;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
update_comfyui_button.innerText = "Update ComfyUI";
|
||||||
|
switch_comfyui_button.innerText = "Switch ComfyUI";
|
||||||
|
restart_stop_button.innerText = 'Restart';
|
||||||
|
|
||||||
|
update_comfyui_button.disabled = false;
|
||||||
|
update_all_button.disabled = false;
|
||||||
|
switch_comfyui_button.disabled = false;
|
||||||
|
|
||||||
|
update_comfyui_button.style.backgroundColor = "";
|
||||||
|
update_all_button.style.backgroundColor = "";
|
||||||
|
switch_comfyui_button.style.backgroundColor = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
async function updateComfyUI() {
|
async function updateComfyUI() {
|
||||||
let prev_text = update_comfyui_button.innerText;
|
let prev_text = update_comfyui_button.innerText;
|
||||||
update_comfyui_button.innerText = "Updating ComfyUI...";
|
update_comfyui_button.innerText = "Updating ComfyUI...";
|
||||||
update_comfyui_button.disabled = true;
|
|
||||||
update_comfyui_button.style.backgroundColor = "gray";
|
|
||||||
|
|
||||||
try {
|
set_inprogress_mode();
|
||||||
const response = await api.fetchApi('/comfyui_manager/update_comfyui');
|
|
||||||
|
|
||||||
if (response.status == 400) {
|
const response = await api.fetchApi('/manager/queue/update_comfyui');
|
||||||
show_message('Failed to update ComfyUI.');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.status == 201) {
|
showTerminal();
|
||||||
show_message('ComfyUI has been successfully updated.');
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
show_message('ComfyUI is already up to date with the latest version.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
is_updating = true;
|
||||||
}
|
await api.fetchApi('/manager/queue/start');
|
||||||
catch (exception) {
|
|
||||||
show_message(`Failed to update ComfyUI / ${exception}`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
update_comfyui_button.disabled = false;
|
|
||||||
update_comfyui_button.innerText = prev_text;
|
|
||||||
update_comfyui_button.style.backgroundColor = "";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function showVersionSelectorDialog(versions, current, onSelect) {
|
function showVersionSelectorDialog(versions, current, onSelect) {
|
||||||
@@ -647,143 +609,183 @@ function showVersionSelectorDialog(versions, current, onSelect) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function switchComfyUI() {
|
async function switchComfyUI() {
|
||||||
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
switch_comfyui_button.disabled = true;
|
||||||
|
switch_comfyui_button.style.backgroundColor = "gray";
|
||||||
|
|
||||||
if(res.status == 200) {
|
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
||||||
let obj = await res.json();
|
|
||||||
|
|
||||||
let versions = [];
|
switch_comfyui_button.disabled = false;
|
||||||
let default_version;
|
switch_comfyui_button.style.backgroundColor = "";
|
||||||
|
|
||||||
for(let v of obj.versions) {
|
if(res.status == 200) {
|
||||||
default_version = v;
|
let obj = await res.json();
|
||||||
versions.push(v);
|
|
||||||
}
|
|
||||||
|
|
||||||
showVersionSelectorDialog(versions, obj.current, (selected_version) => {
|
let versions = [];
|
||||||
api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
let default_version;
|
||||||
});
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
show_message('Failed to fetch ComfyUI versions.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
for(let v of obj.versions) {
|
||||||
async function fetchUpdates(update_check_checkbox) {
|
default_version = v;
|
||||||
let prev_text = fetch_updates_button.innerText;
|
versions.push(v);
|
||||||
fetch_updates_button.innerText = "Fetching updates...";
|
|
||||||
fetch_updates_button.disabled = true;
|
|
||||||
fetch_updates_button.style.backgroundColor = "gray";
|
|
||||||
|
|
||||||
try {
|
|
||||||
var mode = manager_instance.datasrc_combo.value;
|
|
||||||
|
|
||||||
const response = await api.fetchApi(`/customnode/fetch_updates?mode=${mode}`);
|
|
||||||
|
|
||||||
if (response.status != 200 && response.status != 201) {
|
|
||||||
show_message('Failed to fetch updates.');
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (response.status == 201) {
|
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
|
||||||
show_message("There is an updated extension available.<BR><BR><P><B>NOTE:<BR>Fetch Updates is not an update.<BR>Please update from <button id='cm-install-customnodes-button'>Install Custom Nodes</button> </B></P>");
|
if(selected_version == 'nightly') {
|
||||||
|
update_policy_combo.value = 'nightly-comfyui';
|
||||||
|
api.fetchApi('/manager/policy/update?value=nightly-comfyui');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
update_policy_combo.value = 'stable-comfyui';
|
||||||
|
api.fetchApi('/manager/policy/update?value=stable-comfyui');
|
||||||
|
}
|
||||||
|
|
||||||
const button = document.getElementById('cm-install-customnodes-button');
|
let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
||||||
button.addEventListener("click",
|
if (response.status == 200) {
|
||||||
async function() {
|
infoToast(`ComfyUI version is switched to ${selected_version}`);
|
||||||
app.ui.dialog.close();
|
}
|
||||||
|
else {
|
||||||
|
customAlert('Failed to switch ComfyUI version.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
customAlert('Failed to fetch ComfyUI versions.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(!CustomNodesManager.instance) {
|
async function onQueueStatus(event) {
|
||||||
CustomNodesManager.instance = new CustomNodesManager(app, self);
|
const isElectron = 'electronAPI' in window;
|
||||||
|
|
||||||
|
if(event.detail.status == 'in_progress') {
|
||||||
|
set_inprogress_mode();
|
||||||
|
update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
|
||||||
|
}
|
||||||
|
else if(event.detail.status == 'done') {
|
||||||
|
reset_action_buttons();
|
||||||
|
|
||||||
|
if(!is_updating) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
is_updating = false;
|
||||||
|
|
||||||
|
let success_list = [];
|
||||||
|
let failed_list = [];
|
||||||
|
let comfyui_state = null;
|
||||||
|
|
||||||
|
for(let k in event.detail.nodepack_result){
|
||||||
|
let v = event.detail.nodepack_result[k];
|
||||||
|
|
||||||
|
if(k == 'comfyui') {
|
||||||
|
comfyui_state = v;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(v.msg == 'success') {
|
||||||
|
success_list.push(k);
|
||||||
|
}
|
||||||
|
else if(v.msg != 'skip')
|
||||||
|
failed_list.push(k);
|
||||||
|
}
|
||||||
|
|
||||||
|
let msg = "";
|
||||||
|
|
||||||
|
if(success_list.length == 0 && comfyui_state.startsWith('skip')) {
|
||||||
|
if(failed_list.length == 0) {
|
||||||
|
msg += "You are already up to date.";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
|
||||||
|
|
||||||
|
if(comfyui_state == 'success-nightly') {
|
||||||
|
msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
|
||||||
|
infoToast("ComfyUI has been updated to the latest nightly version.");
|
||||||
|
}
|
||||||
|
else if(comfyui_state.startsWith('success-stable')) {
|
||||||
|
const ver = comfyui_state.split("-").pop();
|
||||||
|
msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
|
||||||
|
infoToast(`ComfyUI has been updated to ${ver}`);
|
||||||
|
}
|
||||||
|
else if(comfyui_state == 'skip') {
|
||||||
|
msg += "ComfyUI is already up to date.<BR><BR>"
|
||||||
|
}
|
||||||
|
else if(comfyui_state != null) {
|
||||||
|
msg += "Failed to update ComfyUI.<BR><BR>"
|
||||||
|
}
|
||||||
|
|
||||||
|
if(success_list.length > 0) {
|
||||||
|
msg += "The following custom nodes have been updated:<ul>";
|
||||||
|
for(let x in success_list) {
|
||||||
|
let k = success_list[x];
|
||||||
|
let url = event.detail.nodepack_result[k].url;
|
||||||
|
let title = event.detail.nodepack_result[k].title;
|
||||||
|
if(url) {
|
||||||
|
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
msg += `<li>${k}</li>`;
|
||||||
}
|
}
|
||||||
await CustomNodesManager.instance.show(CustomNodesManager.ShowMode.UPDATE);
|
|
||||||
}
|
}
|
||||||
);
|
msg += "</ul>";
|
||||||
|
}
|
||||||
|
|
||||||
update_check_checkbox.checked = false;
|
setNeedRestart(true);
|
||||||
}
|
|
||||||
else {
|
|
||||||
show_message('All extensions are already up-to-date with the latest versions.');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
if(failed_list.length > 0) {
|
||||||
}
|
msg += '<br>The update for the following custom nodes has failed:<ul>';
|
||||||
catch (exception) {
|
for(let x in failed_list) {
|
||||||
show_message(`Failed to update custom nodes / ${exception}`);
|
let k = failed_list[x];
|
||||||
return false;
|
let url = event.detail.nodepack_result[k].url;
|
||||||
}
|
let title = event.detail.nodepack_result[k].title;
|
||||||
finally {
|
if(url) {
|
||||||
fetch_updates_button.disabled = false;
|
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
|
||||||
fetch_updates_button.innerText = prev_text;
|
}
|
||||||
fetch_updates_button.style.backgroundColor = "";
|
else {
|
||||||
|
msg += `<li>${k}</li>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
msg += '</ul>'
|
||||||
|
}
|
||||||
|
|
||||||
|
show_message(msg);
|
||||||
|
|
||||||
|
const rebootButton = document.getElementById('cm-reboot-button5');
|
||||||
|
rebootButton?.addEventListener("click",
|
||||||
|
function() {
|
||||||
|
if(rebootAPI()) {
|
||||||
|
manager_dialog.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function updateAll(update_check_checkbox, manager_dialog) {
|
api.addEventListener("cm-queue-status", onQueueStatus);
|
||||||
let prev_text = update_all_button.innerText;
|
|
||||||
update_all_button.innerText = "Updating all...(ComfyUI)";
|
|
||||||
update_all_button.disabled = true;
|
|
||||||
update_all_button.style.backgroundColor = "gray";
|
|
||||||
|
|
||||||
try {
|
|
||||||
var mode = manager_instance.datasrc_combo.value;
|
|
||||||
|
|
||||||
update_all_button.innerText = "Updating all...";
|
async function updateAll(update_comfyui) {
|
||||||
const response1 = await api.fetchApi('/comfyui_manager/update_comfyui');
|
update_all_button.innerText = "Updating...";
|
||||||
const response2 = await api.fetchApi(`/customnode/update_all?mode=${mode}`);
|
|
||||||
|
|
||||||
if (response2.status == 403) {
|
set_inprogress_mode();
|
||||||
show_message('This action is not allowed with this security level configuration.');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response1.status == 400 || response2.status == 400) {
|
var mode = manager_instance.datasrc_combo.value;
|
||||||
show_message('Failed to update ComfyUI or several extensions.<BR><BR>See terminal log.<BR>');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(response1.status == 201 || response2.status == 201) {
|
showTerminal();
|
||||||
const update_info = await response2.json();
|
|
||||||
|
|
||||||
let failed_list = "";
|
if(update_comfyui) {
|
||||||
if(update_info.failed.length > 0) {
|
update_all_button.innerText = "Updating ComfyUI...";
|
||||||
failed_list = "<BR>FAILED: "+update_info.failed.join(", ");
|
await api.fetchApi('/manager/queue/update_comfyui');
|
||||||
}
|
|
||||||
|
|
||||||
let updated_list = "";
|
|
||||||
if(update_info.updated.length > 0) {
|
|
||||||
updated_list = "<BR>UPDATED: "+update_info.updated.join(", ");
|
|
||||||
}
|
|
||||||
|
|
||||||
show_message(
|
|
||||||
"ComfyUI and all extensions have been updated to the latest version.<BR>To apply the updated custom node, please <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI. And refresh browser.<BR>"
|
|
||||||
+failed_list
|
|
||||||
+updated_list
|
|
||||||
);
|
|
||||||
|
|
||||||
const rebootButton = document.getElementById('cm-reboot-button5');
|
|
||||||
rebootButton.addEventListener("click",
|
|
||||||
function() {
|
|
||||||
if(rebootAPI()) {
|
|
||||||
manager_dialog.close();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
show_message('ComfyUI and all extensions are already up-to-date with the latest versions.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
catch (exception) {
|
|
||||||
show_message(`Failed to update ComfyUI or several extensions / ${exception}`);
|
const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
|
||||||
return false;
|
|
||||||
|
if (response.status == 401) {
|
||||||
|
customAlert('Another task is already in progress. Please stop the ongoing task first.');
|
||||||
}
|
}
|
||||||
finally {
|
else if(response.status == 200) {
|
||||||
update_all_button.disabled = false;
|
is_updating = true;
|
||||||
update_all_button.innerText = prev_text;
|
await api.fetchApi('/manager/queue/start');
|
||||||
update_all_button.style.backgroundColor = "";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -807,11 +809,21 @@ const isOutputNode = (node) => {
|
|||||||
return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
|
return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function restartOrStop() {
|
||||||
|
if(restart_stop_button.innerText == 'Restart'){
|
||||||
|
rebootAPI();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
api.fetchApi('/manager/queue/reset');
|
||||||
|
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// -----------
|
// -----------
|
||||||
class ManagerMenuDialog extends ComfyDialog {
|
class ManagerMenuDialog extends ComfyDialog {
|
||||||
createControlsMid() {
|
createControlsMid() {
|
||||||
let self = this;
|
let self = this;
|
||||||
const isElectron = 'electronAPI' in window;
|
const isElectron = 'electronAPI' in window;
|
||||||
|
|
||||||
update_comfyui_button =
|
update_comfyui_button =
|
||||||
$el("button.cm-button", {
|
$el("button.cm-button", {
|
||||||
@@ -835,21 +847,31 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
() => switchComfyUI()
|
() => switchComfyUI()
|
||||||
});
|
});
|
||||||
|
|
||||||
fetch_updates_button =
|
restart_stop_button =
|
||||||
$el("button.cm-button", {
|
$el("button.cm-button-red", {
|
||||||
type: "button",
|
type: "button",
|
||||||
textContent: "Fetch Updates",
|
textContent: "Restart",
|
||||||
onclick:
|
onclick: () => restartOrStop()
|
||||||
() => fetchUpdates(this.update_check_checkbox)
|
|
||||||
});
|
});
|
||||||
|
|
||||||
update_all_button =
|
if(isElectron) {
|
||||||
$el("button.cm-button", {
|
update_all_button =
|
||||||
type: "button",
|
$el("button.cm-button", {
|
||||||
textContent: "Update All",
|
type: "button",
|
||||||
onclick:
|
textContent: "Update All Custom Nodes",
|
||||||
() => updateAll(this.update_check_checkbox, self)
|
onclick:
|
||||||
});
|
() => updateAll(false)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
update_all_button =
|
||||||
|
$el("button.cm-button", {
|
||||||
|
type: "button",
|
||||||
|
textContent: "Update All",
|
||||||
|
onclick:
|
||||||
|
() => updateAll(true)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const res =
|
const res =
|
||||||
[
|
[
|
||||||
@@ -877,7 +899,19 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
$el("button.cm-button", {
|
||||||
|
type: "button",
|
||||||
|
textContent: "Custom Nodes In Workflow",
|
||||||
|
onclick:
|
||||||
|
() => {
|
||||||
|
if(!CustomNodesManager.instance) {
|
||||||
|
CustomNodesManager.instance = new CustomNodesManager(app, self);
|
||||||
|
}
|
||||||
|
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
|
||||||
|
$el("br", {}, []),
|
||||||
$el("button.cm-button", {
|
$el("button.cm-button", {
|
||||||
type: "button",
|
type: "button",
|
||||||
textContent: "Model Manager",
|
textContent: "Model Manager",
|
||||||
@@ -906,49 +940,19 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
update_all_button,
|
update_all_button,
|
||||||
update_comfyui_button,
|
update_comfyui_button,
|
||||||
switch_comfyui_button,
|
switch_comfyui_button,
|
||||||
fetch_updates_button,
|
// fetch_updates_button,
|
||||||
|
|
||||||
$el("br", {}, []),
|
$el("br", {}, []),
|
||||||
$el("button.cm-button-red", {
|
restart_stop_button,
|
||||||
type: "button",
|
|
||||||
textContent: "Restart",
|
|
||||||
onclick: () => rebootAPI()
|
|
||||||
}),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
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;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
createControlsLeft() {
|
createControlsLeft() {
|
||||||
let self = this;
|
const isElectron = 'electronAPI' in window;
|
||||||
|
|
||||||
this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
|
let self = this;
|
||||||
const uc_checkbox_text = $el("label",{for:"skip_update_check"},[" Skip update check"])
|
|
||||||
uc_checkbox_text.style.color = "var(--fg-color)";
|
|
||||||
uc_checkbox_text.style.cursor = "pointer";
|
|
||||||
this.update_check_checkbox.checked = true;
|
|
||||||
|
|
||||||
// db mode
|
// db mode
|
||||||
this.datasrc_combo = document.createElement("select");
|
this.datasrc_combo = document.createElement("select");
|
||||||
@@ -958,6 +962,14 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
|
this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
|
||||||
this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
|
this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
|
||||||
|
|
||||||
|
api.fetchApi('/manager/db_mode')
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(data => { this.datasrc_combo.value = data; });
|
||||||
|
|
||||||
|
this.datasrc_combo.addEventListener('change', function (event) {
|
||||||
|
api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
|
||||||
|
});
|
||||||
|
|
||||||
// preview method
|
// preview method
|
||||||
let preview_combo = document.createElement("select");
|
let preview_combo = document.createElement("select");
|
||||||
preview_combo.setAttribute("title", "Configure how latent variables will be decoded during preview in the sampling process.");
|
preview_combo.setAttribute("title", "Configure how latent variables will be decoded during preview in the sampling process.");
|
||||||
@@ -1020,25 +1032,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
|
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
|
||||||
}
|
}
|
||||||
|
|
||||||
// default ui state
|
|
||||||
let component_policy_combo = document.createElement("select");
|
|
||||||
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
|
|
||||||
component_policy_combo.className = "cm-menu-combo";
|
|
||||||
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
|
|
||||||
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
|
|
||||||
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
|
|
||||||
api.fetchApi('/manager/component/policy')
|
|
||||||
.then(response => response.text())
|
|
||||||
.then(data => {
|
|
||||||
component_policy_combo.value = data;
|
|
||||||
set_component_policy(data);
|
|
||||||
});
|
|
||||||
|
|
||||||
component_policy_combo.addEventListener('change', function (event) {
|
|
||||||
api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
|
|
||||||
set_component_policy(event.target.value);
|
|
||||||
});
|
|
||||||
|
|
||||||
api.fetchApi('/manager/share_option')
|
api.fetchApi('/manager/share_option')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
@@ -1058,14 +1051,51 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let component_policy_combo = document.createElement("select");
|
||||||
|
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
|
||||||
|
component_policy_combo.className = "cm-menu-combo";
|
||||||
|
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
|
||||||
|
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
|
||||||
|
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
|
||||||
|
api.fetchApi('/manager/policy/component')
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(data => {
|
||||||
|
component_policy_combo.value = data;
|
||||||
|
set_component_policy(data);
|
||||||
|
});
|
||||||
|
|
||||||
|
component_policy_combo.addEventListener('change', function (event) {
|
||||||
|
api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
|
||||||
|
set_component_policy(event.target.value);
|
||||||
|
});
|
||||||
|
|
||||||
|
update_policy_combo = document.createElement("select");
|
||||||
|
|
||||||
|
if(isElectron)
|
||||||
|
update_policy_combo.style.display = 'none';
|
||||||
|
|
||||||
|
update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
|
||||||
|
update_policy_combo.className = "cm-menu-combo";
|
||||||
|
update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
|
||||||
|
update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
|
||||||
|
api.fetchApi('/manager/policy/update')
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(data => {
|
||||||
|
update_policy_combo.value = data;
|
||||||
|
});
|
||||||
|
|
||||||
|
update_policy_combo.addEventListener('change', function (event) {
|
||||||
|
api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
|
||||||
|
});
|
||||||
|
|
||||||
return [
|
return [
|
||||||
$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
|
|
||||||
$el("br", {}, []),
|
$el("br", {}, []),
|
||||||
this.datasrc_combo,
|
this.datasrc_combo,
|
||||||
channel_combo,
|
channel_combo,
|
||||||
preview_combo,
|
preview_combo,
|
||||||
share_combo,
|
share_combo,
|
||||||
component_policy_combo,
|
component_policy_combo,
|
||||||
|
update_policy_combo,
|
||||||
$el("br", {}, []),
|
$el("br", {}, []),
|
||||||
|
|
||||||
$el("br", {}, []),
|
$el("br", {}, []),
|
||||||
@@ -1092,11 +1122,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
install_pip(url, self);
|
install_pip(url, self);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}),
|
|
||||||
$el("button.cm-experimental-button", {
|
|
||||||
type: "button",
|
|
||||||
textContent: "Unload models",
|
|
||||||
onclick: () => { free_models(); }
|
|
||||||
})
|
})
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
@@ -1225,7 +1250,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
$el("div.comfy-modal-content",
|
$el("div.comfy-modal-content",
|
||||||
[
|
[
|
||||||
$el("tr.cm-title", {}, [
|
$el("tr.cm-title", {}, [
|
||||||
$el("font", {size:6, color:"white"}, [`ComfyUI Manager Menu`])]
|
$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
|
||||||
),
|
),
|
||||||
$el("br", {}, []),
|
$el("br", {}, []),
|
||||||
$el("div.cm-menu-container",
|
$el("div.cm-menu-container",
|
||||||
@@ -1367,13 +1392,12 @@ async function getVersion() {
|
|||||||
return await version.text();
|
return await version.text();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
app.registerExtension({
|
app.registerExtension({
|
||||||
name: "Comfy.ManagerMenu",
|
name: "Comfy.ManagerMenu",
|
||||||
|
|
||||||
aboutPageBadges: [
|
aboutPageBadges: [
|
||||||
{
|
{
|
||||||
label: `ComfyUI-Manager ${await getVersion()}`,
|
label: `ComfyUI-Manager ${manager_version}`,
|
||||||
url: 'https://github.com/ltdrdata/ComfyUI-Manager',
|
url: 'https://github.com/ltdrdata/ComfyUI-Manager',
|
||||||
icon: 'pi pi-th-large'
|
icon: 'pi pi-th-large'
|
||||||
}
|
}
|
||||||
|
|||||||
282
js/common.js
282
js/common.js
@@ -1,6 +1,7 @@
|
|||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
import { api } from "../../scripts/api.js";
|
import { api } from "../../scripts/api.js";
|
||||||
import { $el, ComfyDialog } from "../../scripts/ui.js";
|
import { $el, ComfyDialog } from "../../scripts/ui.js";
|
||||||
|
import { getBestPosition, getPositionStyle, getRect } from './popover-helper.js';
|
||||||
|
|
||||||
|
|
||||||
function internalCustomConfirm(message, confirmMessage, cancelMessage) {
|
function internalCustomConfirm(message, confirmMessage, cancelMessage) {
|
||||||
@@ -181,23 +182,6 @@ export function rebootAPI() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export async function migrateAPI() {
|
|
||||||
let confirmed = await customConfirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")
|
|
||||||
if (confirmed) {
|
|
||||||
try {
|
|
||||||
await api.fetchApi("/manager/migrate_unmanaged_nodes");
|
|
||||||
api.fetchApi("/manager/reboot");
|
|
||||||
}
|
|
||||||
catch(exception) {
|
|
||||||
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export var manager_instance = null;
|
export var manager_instance = null;
|
||||||
|
|
||||||
export function setManagerInstance(obj) {
|
export function setManagerInstance(obj) {
|
||||||
@@ -404,19 +388,267 @@ export async function fetchData(route, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://cenfun.github.io/open-icons/
|
||||||
export const icons = {
|
export const icons = {
|
||||||
search: '<svg viewBox="0 0 24 24" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m21 21-4.486-4.494M19 10.5a8.5 8.5 0 1 1-17 0 8.5 8.5 0 0 1 17 0"/></svg>',
|
search: '<svg viewBox="0 0 24 24" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m21 21-4.486-4.494M19 10.5a8.5 8.5 0 1 1-17 0 8.5 8.5 0 0 1 17 0"/></svg>',
|
||||||
extensions: '<svg viewBox="64 64 896 896" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M843.5 737.4c-12.4-75.2-79.2-129.1-155.3-125.4S550.9 676 546 752c-153.5-4.8-208-40.7-199.1-113.7 3.3-27.3 19.8-41.9 50.1-49 18.4-4.3 38.8-4.9 57.3-3.2 1.7.2 3.5.3 5.2.5 11.3 2.7 22.8 5 34.3 6.8 34.1 5.6 68.8 8.4 101.8 6.6 92.8-5 156-45.9 159.2-132.7 3.1-84.1-54.7-143.7-147.9-183.6-29.9-12.8-61.6-22.7-93.3-30.2-14.3-3.4-26.3-5.7-35.2-7.2-7.9-75.9-71.5-133.8-147.8-134.4S189.7 168 180.5 243.8s40 146.3 114.2 163.9 149.9-23.3 175.7-95.1c9.4 1.7 18.7 3.6 28 5.8 28.2 6.6 56.4 15.4 82.4 26.6 70.7 30.2 109.3 70.1 107.5 119.9-1.6 44.6-33.6 65.2-96.2 68.6-27.5 1.5-57.6-.9-87.3-5.8-8.3-1.4-15.9-2.8-22.6-4.3-3.9-.8-6.6-1.5-7.8-1.8l-3.1-.6c-2.2-.3-5.9-.8-10.7-1.3-25-2.3-52.1-1.5-78.5 4.6-55.2 12.9-93.9 47.2-101.1 105.8-15.7 126.2 78.6 184.7 276 188.9 29.1 70.4 106.4 107.9 179.6 87 73.3-20.9 119.3-93.4 106.9-168.6M329.1 345.2a83.3 83.3 0 1 1 .01-166.61 83.3 83.3 0 0 1-.01 166.61M695.6 845a83.3 83.3 0 1 1 .01-166.61A83.3 83.3 0 0 1 695.6 845"/></svg>',
|
|
||||||
conflicts: '<svg viewBox="0 0 400 400" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m397.2 350.4.2-.2-180-320-.2.2C213.8 24.2 207.4 20 200 20s-13.8 4.2-17.2 10.4l-.2-.2-180 320 .2.2c-1.6 2.8-2.8 6-2.8 9.6 0 11 9 20 20 20h360c11 0 20-9 20-20 0-3.6-1.2-6.8-2.8-9.6M220 340h-40v-40h40zm0-60h-40V120h40z"/></svg>',
|
conflicts: '<svg viewBox="0 0 400 400" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m397.2 350.4.2-.2-180-320-.2.2C213.8 24.2 207.4 20 200 20s-13.8 4.2-17.2 10.4l-.2-.2-180 320 .2.2c-1.6 2.8-2.8 6-2.8 9.6 0 11 9 20 20 20h360c11 0 20-9 20-20 0-3.6-1.2-6.8-2.8-9.6M220 340h-40v-40h40zm0-60h-40V120h40z"/></svg>',
|
||||||
passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
|
passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
|
||||||
download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
|
download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>',
|
||||||
|
close: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 16 16"><g fill="currentColor"><path fill-rule="evenodd" clip-rule="evenodd" d="m7.116 8-4.558 4.558.884.884L8 8.884l4.558 4.558.884-.884L8.884 8l4.558-4.558-.884-.884L8 7.116 3.442 2.558l-.884.884L7.116 8z"/></g></svg>',
|
||||||
|
arrowRight: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 20 20"><path fill="currentColor" fill-rule="evenodd" d="m2.542 2.154 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Zm9 0 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Z"/></svg>'
|
||||||
}
|
}
|
||||||
|
|
||||||
export function sanitizeHTML(str) {
|
export function sanitizeHTML(str) {
|
||||||
return str
|
return str
|
||||||
.replace(/&/g, "&")
|
.replace(/&/g, "&")
|
||||||
.replace(/</g, "<")
|
.replace(/</g, "<")
|
||||||
.replace(/>/g, ">")
|
.replace(/>/g, ">")
|
||||||
.replace(/"/g, """)
|
.replace(/"/g, """)
|
||||||
.replace(/'/g, "'");
|
.replace(/'/g, "'");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function showTerminal() {
|
||||||
|
try {
|
||||||
|
const panel = app.extensionManager.bottomPanel;
|
||||||
|
const isTerminalVisible = panel.bottomPanelVisible && panel.activeBottomPanelTab.id === 'logs-terminal';
|
||||||
|
if (!isTerminalVisible)
|
||||||
|
panel.toggleBottomPanelTab('logs-terminal');
|
||||||
|
}
|
||||||
|
catch(exception) {
|
||||||
|
// do nothing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let need_restart = false;
|
||||||
|
|
||||||
|
export function setNeedRestart(value) {
|
||||||
|
need_restart = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onReconnected(event) {
|
||||||
|
if(need_restart) {
|
||||||
|
setNeedRestart(false);
|
||||||
|
|
||||||
|
const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
|
||||||
|
if (!confirmed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
window.location.reload(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
api.addEventListener('reconnected', onReconnected);
|
||||||
|
|
||||||
|
const storeId = "comfyui-manager-grid";
|
||||||
|
let timeId;
|
||||||
|
export function storeColumnWidth(gridId, columnItem) {
|
||||||
|
clearTimeout(timeId);
|
||||||
|
timeId = setTimeout(() => {
|
||||||
|
let data = {};
|
||||||
|
const dataStr = localStorage.getItem(storeId);
|
||||||
|
if (dataStr) {
|
||||||
|
try {
|
||||||
|
data = JSON.parse(dataStr);
|
||||||
|
} catch (e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!data[gridId]) {
|
||||||
|
data[gridId] = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
data[gridId][columnItem.id] = columnItem.width;
|
||||||
|
|
||||||
|
localStorage.setItem(storeId, JSON.stringify(data));
|
||||||
|
|
||||||
|
}, 200)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function restoreColumnWidth(gridId, columns) {
|
||||||
|
const dataStr = localStorage.getItem(storeId);
|
||||||
|
if (!dataStr) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let data;
|
||||||
|
try {
|
||||||
|
data = JSON.parse(dataStr);
|
||||||
|
} catch (e) {}
|
||||||
|
if(!data) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const widthMap = data[gridId];
|
||||||
|
if (!widthMap) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
columns.forEach(columnItem => {
|
||||||
|
const w = widthMap[columnItem.id];
|
||||||
|
if (w) {
|
||||||
|
columnItem.width = w;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getTimeAgo(dateStr) {
|
||||||
|
const date = new Date(dateStr);
|
||||||
|
|
||||||
|
if (!date || !(date instanceof Date) || isNaN(date.getTime())) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
const units = [
|
||||||
|
{ max: 2760000, value: 60000, name: 'minute', past: 'a minute ago', future: 'in a minute' },
|
||||||
|
{ max: 72000000, value: 3600000, name: 'hour', past: 'an hour ago', future: 'in an hour' },
|
||||||
|
{ max: 518400000, value: 86400000, name: 'day', past: 'yesterday', future: 'tomorrow' },
|
||||||
|
{ max: 2419200000, value: 604800000, name: 'week', past: 'last week', future: 'in a week' },
|
||||||
|
{ max: 28512000000, value: 2592000000, name: 'month', past: 'last month', future: 'in a month' }
|
||||||
|
];
|
||||||
|
const diff = Date.now() - date.getTime();
|
||||||
|
// less than a minute
|
||||||
|
if (Math.abs(diff) < 60000)
|
||||||
|
return 'just now';
|
||||||
|
for (let i = 0; i < units.length; i++) {
|
||||||
|
if (Math.abs(diff) < units[i].max) {
|
||||||
|
return format(diff, units[i].value, units[i].name, units[i].past, units[i].future, diff < 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function format(diff, divisor, unit, past, future, isInTheFuture) {
|
||||||
|
const val = Math.round(Math.abs(diff) / divisor);
|
||||||
|
if (isInTheFuture)
|
||||||
|
return val <= 1 ? future : 'in ' + val + ' ' + unit + 's';
|
||||||
|
return val <= 1 ? past : val + ' ' + unit + 's ago';
|
||||||
|
}
|
||||||
|
return format(diff, 31536000000, 'year', 'last year', 'in a year', diff < 0);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const loadCss = (cssFile) => {
|
||||||
|
const cssPath = import.meta.resolve(cssFile);
|
||||||
|
//console.log(cssPath);
|
||||||
|
const $link = document.createElement("link");
|
||||||
|
$link.setAttribute("rel", 'stylesheet');
|
||||||
|
$link.setAttribute("href", cssPath);
|
||||||
|
document.head.appendChild($link);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const copyText = (text) => {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
let err;
|
||||||
|
try {
|
||||||
|
navigator.clipboard.writeText(text);
|
||||||
|
} catch (e) {
|
||||||
|
err = e;
|
||||||
|
}
|
||||||
|
if (err) {
|
||||||
|
resolve(false);
|
||||||
|
} else {
|
||||||
|
resolve(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
function renderPopover($elem, target, options = {}) {
|
||||||
|
// async microtask
|
||||||
|
queueMicrotask(() => {
|
||||||
|
|
||||||
|
const containerRect = getRect(window);
|
||||||
|
const targetRect = getRect(target);
|
||||||
|
const elemRect = getRect($elem);
|
||||||
|
|
||||||
|
const positionInfo = getBestPosition(
|
||||||
|
containerRect,
|
||||||
|
targetRect,
|
||||||
|
elemRect,
|
||||||
|
options.positions
|
||||||
|
);
|
||||||
|
const style = getPositionStyle(positionInfo, {
|
||||||
|
bgColor: options.bgColor,
|
||||||
|
borderColor: options.borderColor,
|
||||||
|
borderRadius: options.borderRadius
|
||||||
|
});
|
||||||
|
|
||||||
|
$elem.style.top = positionInfo.top + "px";
|
||||||
|
$elem.style.left = positionInfo.left + "px";
|
||||||
|
$elem.style.background = style.background;
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let $popover;
|
||||||
|
export function hidePopover() {
|
||||||
|
if ($popover) {
|
||||||
|
$popover.remove();
|
||||||
|
$popover = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export function showPopover(target, text, className, options) {
|
||||||
|
hidePopover();
|
||||||
|
$popover = document.createElement("div");
|
||||||
|
$popover.className = ['cn-popover', className].filter(it => it).join(" ");
|
||||||
|
document.body.appendChild($popover);
|
||||||
|
$popover.innerHTML = text;
|
||||||
|
$popover.style.display = "block";
|
||||||
|
renderPopover($popover, target, {
|
||||||
|
borderRadius: 10,
|
||||||
|
... options
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let $tooltip;
|
||||||
|
export function hideTooltip(target) {
|
||||||
|
if ($tooltip) {
|
||||||
|
$tooltip.style.display = "none";
|
||||||
|
$tooltip.innerHTML = "";
|
||||||
|
$tooltip.style.top = "0px";
|
||||||
|
$tooltip.style.left = "0px";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {}) {
|
||||||
|
if (!$tooltip) {
|
||||||
|
$tooltip = document.createElement("div");
|
||||||
|
$tooltip.className = className;
|
||||||
|
$tooltip.style.cssText = `
|
||||||
|
pointer-events: none;
|
||||||
|
position: fixed;
|
||||||
|
z-index: 10001;
|
||||||
|
padding: 20px;
|
||||||
|
color: #1e1e1e;
|
||||||
|
max-width: 350px;
|
||||||
|
filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
|
||||||
|
${Object.keys(styleMap).map(k=>k+":"+styleMap[k]+";").join("")}
|
||||||
|
`;
|
||||||
|
document.body.appendChild($tooltip);
|
||||||
|
}
|
||||||
|
|
||||||
|
$tooltip.innerHTML = text;
|
||||||
|
$tooltip.style.display = "block";
|
||||||
|
renderPopover($tooltip, target, {
|
||||||
|
positions: ['top', 'bottom', 'right', 'center'],
|
||||||
|
bgColor: "#ffffff",
|
||||||
|
borderColor: "#cccccc",
|
||||||
|
borderRadius: 5
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function initTooltip () {
|
||||||
|
const mouseenterHandler = (e) => {
|
||||||
|
const target = e.target;
|
||||||
|
const text = target.getAttribute('tooltip');
|
||||||
|
if (text) {
|
||||||
|
showTooltip(target, text);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const mouseleaveHandler = (e) => {
|
||||||
|
const target = e.target;
|
||||||
|
const text = target.getAttribute('tooltip');
|
||||||
|
if (text) {
|
||||||
|
hideTooltip(target);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
document.body.removeEventListener('mouseenter', mouseenterHandler, true);
|
||||||
|
document.body.removeEventListener('mouseleave', mouseleaveHandler, true);
|
||||||
|
document.body.addEventListener('mouseenter', mouseenterHandler, true);
|
||||||
|
document.body.addEventListener('mouseleave', mouseleaveHandler, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
initTooltip();
|
||||||
@@ -709,7 +709,7 @@ app.handleFile = handleFile;
|
|||||||
|
|
||||||
let current_component_policy = 'workflow';
|
let current_component_policy = 'workflow';
|
||||||
try {
|
try {
|
||||||
api.fetchApi('/manager/component/policy')
|
api.fetchApi('/manager/policy/component')
|
||||||
.then(response => response.text())
|
.then(response => response.text())
|
||||||
.then(data => { current_component_policy = data; });
|
.then(data => { current_component_policy = data; });
|
||||||
}
|
}
|
||||||
|
|||||||
699
js/custom-nodes-manager.css
Normal file
699
js/custom-nodes-manager.css
Normal file
@@ -0,0 +1,699 @@
|
|||||||
|
.cn-manager {
|
||||||
|
--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
||||||
|
z-index: 1099;
|
||||||
|
width: 80%;
|
||||||
|
height: 80%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
color: var(--fg-color);
|
||||||
|
font-family: arial, sans-serif;
|
||||||
|
text-underline-offset: 3px;
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-flex-auto {
|
||||||
|
flex: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager button {
|
||||||
|
font-size: 16px;
|
||||||
|
color: var(--input-text);
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
border-radius: 8px;
|
||||||
|
border-color: var(--border-color);
|
||||||
|
border-style: solid;
|
||||||
|
margin: 0;
|
||||||
|
padding: 4px 8px;
|
||||||
|
min-width: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager button:disabled,
|
||||||
|
.cn-manager input:disabled,
|
||||||
|
.cn-manager select:disabled {
|
||||||
|
color: gray;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager button:disabled {
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-manager-restart {
|
||||||
|
display: none;
|
||||||
|
background-color: #500000;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-manager-stop {
|
||||||
|
display: none;
|
||||||
|
background-color: #500000;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-manager-back {
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.arrow-icon {
|
||||||
|
height: 1em;
|
||||||
|
width: 1em;
|
||||||
|
margin-right: 5px;
|
||||||
|
transform: translateY(2px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-icon {
|
||||||
|
display: block;
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-icon svg {
|
||||||
|
display: block;
|
||||||
|
margin: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-header {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 5px;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-header label {
|
||||||
|
display: flex;
|
||||||
|
gap: 5px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-filter {
|
||||||
|
height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-keywords {
|
||||||
|
height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
padding: 0 5px 0 26px;
|
||||||
|
background-size: 16px;
|
||||||
|
background-position: 5px center;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-status {
|
||||||
|
padding-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid {
|
||||||
|
flex: auto;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-selection {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-message {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-footer {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .tg-turbogrid {
|
||||||
|
font-family: var(--grid-font);
|
||||||
|
font-size: 15px;
|
||||||
|
background: var(--bg-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .tg-turbogrid .tg-highlight::after {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
content: "";
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
background-color: #80bdff11;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .cn-pack-name a {
|
||||||
|
color: skyblue;
|
||||||
|
text-decoration: none;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .cn-pack-desc a {
|
||||||
|
color: #5555FF;
|
||||||
|
font-weight: bold;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .tg-cell a:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .cn-pack-version {
|
||||||
|
line-height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
height: 100%;
|
||||||
|
gap: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .cn-pack-nodes {
|
||||||
|
line-height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .cn-pack-nodes:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-grid .cn-pack-conflicts {
|
||||||
|
color: orange;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-popover {
|
||||||
|
position: fixed;
|
||||||
|
z-index: 10000;
|
||||||
|
padding: 20px;
|
||||||
|
color: #1e1e1e;
|
||||||
|
filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
z-index: 1000;
|
||||||
|
display: none;
|
||||||
|
width: 50%;
|
||||||
|
height: 100%;
|
||||||
|
background-color: var(--comfy-menu-bg);
|
||||||
|
animation-duration: 0.2s;
|
||||||
|
animation-fill-mode: both;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover::before {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
content: "";
|
||||||
|
z-index: 10;
|
||||||
|
display: block;
|
||||||
|
width: 10px;
|
||||||
|
height: 100%;
|
||||||
|
pointer-events: none;
|
||||||
|
left: -10px;
|
||||||
|
background-image: linear-gradient(to left, rgb(0 0 0 / 20%), rgb(0 0 0 / 0%));
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover-header {
|
||||||
|
height: 45px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
|
border-bottom: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover-close {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0 10px;
|
||||||
|
justify-content: center;
|
||||||
|
cursor: pointer;
|
||||||
|
opacity: 0.8;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover-close:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover-close svg {
|
||||||
|
display: block;
|
||||||
|
margin: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover-title {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
font-weight: bold;
|
||||||
|
gap: 10px;
|
||||||
|
flex: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-flyover-body {
|
||||||
|
height: calc(100% - 45px);
|
||||||
|
overflow-y: auto;
|
||||||
|
position: relative;
|
||||||
|
background-color: var(--comfy-menu-secondary-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes cn-slide-in-right {
|
||||||
|
from {
|
||||||
|
visibility: visible;
|
||||||
|
transform: translate3d(100%, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
transform: translate3d(0, 0, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-slide-in-right {
|
||||||
|
animation-name: cn-slide-in-right;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes cn-slide-out-right {
|
||||||
|
from {
|
||||||
|
transform: translate3d(0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
to {
|
||||||
|
visibility: hidden;
|
||||||
|
transform: translate3d(100%, 0, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-slide-out-right {
|
||||||
|
animation-name: cn-slide-out-right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-list {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-row:nth-child(odd) {
|
||||||
|
background-color: rgb(0 0 0 / 5%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-row:hover {
|
||||||
|
background-color: rgb(0 0 0 / 10%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-sn {
|
||||||
|
text-align: right;
|
||||||
|
min-width: 35px;
|
||||||
|
color: var(--drag-text);
|
||||||
|
flex-shrink: 0;
|
||||||
|
font-size: 12px;
|
||||||
|
padding: 8px 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-name {
|
||||||
|
cursor: pointer;
|
||||||
|
white-space: nowrap;
|
||||||
|
flex-shrink: 0;
|
||||||
|
position: relative;
|
||||||
|
padding: 8px 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-name::after {
|
||||||
|
content: attr(action);
|
||||||
|
position: absolute;
|
||||||
|
pointer-events: none;
|
||||||
|
top: 50%;
|
||||||
|
left: 100%;
|
||||||
|
transform: translate(5px, -50%);
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--drag-text);
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
border-radius: 10px;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
padding: 3px 8px;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-name.action::after {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-name:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-conflict .cn-nodes-name,
|
||||||
|
.cn-nodes-conflict .cn-icon {
|
||||||
|
color: orange;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-conflicts-list {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 5px;
|
||||||
|
align-items: center;
|
||||||
|
padding: 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-conflicts-list b {
|
||||||
|
font-weight: normal;
|
||||||
|
color: var(--descrip-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-pack {
|
||||||
|
cursor: pointer;
|
||||||
|
color: skyblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-nodes-pack:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-pack-badge {
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: normal;
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
border-radius: 10px;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
padding: 3px 8px;
|
||||||
|
color: var(--error-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview {
|
||||||
|
min-width: 300px;
|
||||||
|
max-width: 500px;
|
||||||
|
min-height: 120px;
|
||||||
|
overflow: hidden;
|
||||||
|
font-size: 12px;
|
||||||
|
pointer-events: none;
|
||||||
|
padding: 12px;
|
||||||
|
color: var(--fg-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-header {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: center;
|
||||||
|
border-bottom: 1px solid var(--comfy-input-bg);
|
||||||
|
padding: 5px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-dot {
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background-color: grey;
|
||||||
|
position: relative;
|
||||||
|
filter: drop-shadow(1px 2px 3px rgb(0 0 0 / 30%));
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-dot.cn-preview-optional::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
pointer-events: none;
|
||||||
|
top: 50%;
|
||||||
|
left: 50%;
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
border-radius: 50%;
|
||||||
|
width: 3px;
|
||||||
|
height: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-dot.cn-preview-grid {
|
||||||
|
border-radius: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-dot.cn-preview-grid::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
border-left: 1px solid var(--comfy-input-bg);
|
||||||
|
border-right: 1px solid var(--comfy-input-bg);
|
||||||
|
width: 4px;
|
||||||
|
height: 100%;
|
||||||
|
left: 2px;
|
||||||
|
top: 0;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-dot.cn-preview-grid::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
border-top: 1px solid var(--comfy-input-bg);
|
||||||
|
border-bottom: 1px solid var(--comfy-input-bg);
|
||||||
|
width: 100%;
|
||||||
|
height: 4px;
|
||||||
|
left: 0;
|
||||||
|
top: 2px;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-name {
|
||||||
|
flex: auto;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-io {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 10px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-column > div {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
height: 18px;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-input {
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-output {
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-list {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 3px;
|
||||||
|
padding: 0 10px 10px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-switch {
|
||||||
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
background: var(--bg-color);
|
||||||
|
border: 2px solid var(--border-color);
|
||||||
|
border-radius: 10px;
|
||||||
|
text-wrap: nowrap;
|
||||||
|
padding: 2px 20px;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-switch::before,
|
||||||
|
.cn-preview-switch::after {
|
||||||
|
position: absolute;
|
||||||
|
pointer-events: none;
|
||||||
|
top: 50%;
|
||||||
|
transform: translate(0, -50%);
|
||||||
|
color: var(--fg-color);
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-switch::before {
|
||||||
|
content: "◀";
|
||||||
|
left: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-switch::after {
|
||||||
|
content: "▶";
|
||||||
|
right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-value {
|
||||||
|
color: var(--descrip-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-string {
|
||||||
|
min-height: 30px;
|
||||||
|
max-height: 300px;
|
||||||
|
background: var(--bg-color);
|
||||||
|
color: var(--descrip-text);
|
||||||
|
border-radius: 3px;
|
||||||
|
padding: 3px 5px;
|
||||||
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-preview-description {
|
||||||
|
margin: 0px 10px 10px 10px;
|
||||||
|
padding: 6px;
|
||||||
|
background: var(--border-color);
|
||||||
|
color: var(--descrip-text);
|
||||||
|
border-radius: 5px;
|
||||||
|
font-style: italic;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-tag-list {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 5px;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-tag-list > div {
|
||||||
|
background-color: var(--border-color);
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-install-buttons {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 3px;
|
||||||
|
padding: 3px;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-selected-buttons {
|
||||||
|
display: flex;
|
||||||
|
gap: 5px;
|
||||||
|
align-items: center;
|
||||||
|
padding-right: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-enable {
|
||||||
|
background-color: #333399;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-disable {
|
||||||
|
background-color: #442277;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-update {
|
||||||
|
background-color: #1155AA;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-try-update {
|
||||||
|
background-color: Gray;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-try-fix {
|
||||||
|
background-color: #6495ED;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-import-failed {
|
||||||
|
background-color: #AA1111;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-install {
|
||||||
|
background-color: black;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-try-install {
|
||||||
|
background-color: Gray;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-uninstall {
|
||||||
|
background-color: #993333;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-reinstall {
|
||||||
|
background-color: #993333;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager .cn-btn-switch {
|
||||||
|
background-color: #448833;
|
||||||
|
color: white;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes cn-btn-loading-bg {
|
||||||
|
0% {
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
left: -105px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager button.cn-btn-loading {
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
border-color: rgb(0 119 207 / 80%);
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager button.cn-btn-loading::after {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
content: "";
|
||||||
|
width: 500px;
|
||||||
|
height: 100%;
|
||||||
|
background-image: repeating-linear-gradient(
|
||||||
|
-45deg,
|
||||||
|
rgb(0 119 207 / 30%),
|
||||||
|
rgb(0 119 207 / 30%) 10px,
|
||||||
|
transparent 10px,
|
||||||
|
transparent 15px
|
||||||
|
);
|
||||||
|
animation: cn-btn-loading-bg 2s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-light .cn-pack-name a {
|
||||||
|
color: blue;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-light .cm-warn-note {
|
||||||
|
background-color: #ccc !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cn-manager-light .cn-btn-install {
|
||||||
|
background-color: #333;
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
213
js/model-manager.css
Normal file
213
js/model-manager.css
Normal file
@@ -0,0 +1,213 @@
|
|||||||
|
.cmm-manager {
|
||||||
|
--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
||||||
|
z-index: 1099;
|
||||||
|
width: 80%;
|
||||||
|
height: 80%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
color: var(--fg-color);
|
||||||
|
font-family: arial, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager .cmm-flex-auto {
|
||||||
|
flex: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager button {
|
||||||
|
font-size: 16px;
|
||||||
|
color: var(--input-text);
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
border-radius: 8px;
|
||||||
|
border-color: var(--border-color);
|
||||||
|
border-style: solid;
|
||||||
|
margin: 0;
|
||||||
|
padding: 4px 8px;
|
||||||
|
min-width: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager button:disabled,
|
||||||
|
.cmm-manager input:disabled,
|
||||||
|
.cmm-manager select:disabled {
|
||||||
|
color: gray;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager button:disabled {
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager .cmm-manager-refresh {
|
||||||
|
display: none;
|
||||||
|
background-color: #000080;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager .cmm-manager-stop {
|
||||||
|
display: none;
|
||||||
|
background-color: #500000;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-header {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 5px;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-header label {
|
||||||
|
display: flex;
|
||||||
|
gap: 5px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-type,
|
||||||
|
.cmm-manager-base,
|
||||||
|
.cmm-manager-filter {
|
||||||
|
height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-keywords {
|
||||||
|
height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
padding: 0 5px 0 26px;
|
||||||
|
background-size: 16px;
|
||||||
|
background-position: 5px center;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-status {
|
||||||
|
padding-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-grid {
|
||||||
|
flex: auto;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-selection {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-footer {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-grid .tg-turbogrid {
|
||||||
|
font-family: var(--grid-font);
|
||||||
|
font-size: 15px;
|
||||||
|
background: var(--bg-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-grid .cmm-node-name a {
|
||||||
|
color: skyblue;
|
||||||
|
text-decoration: none;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-grid .cmm-node-desc a {
|
||||||
|
color: #5555FF;
|
||||||
|
font-weight: bold;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-grid .tg-cell a:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-icon-passed {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
position: absolute;
|
||||||
|
left: calc(50% - 10px);
|
||||||
|
top: calc(50% - 10px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager .cmm-btn-enable {
|
||||||
|
background-color: blue;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager .cmm-btn-disable {
|
||||||
|
background-color: MediumSlateBlue;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager .cmm-btn-install {
|
||||||
|
background-color: black;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-btn-download {
|
||||||
|
width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
position: absolute;
|
||||||
|
left: calc(50% - 10px);
|
||||||
|
top: calc(50% - 10px);
|
||||||
|
cursor: pointer;
|
||||||
|
opacity: 0.8;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-btn-download:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-light .cmm-btn-download {
|
||||||
|
color: #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes cmm-btn-loading-bg {
|
||||||
|
0% {
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
left: -105px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager button.cmm-btn-loading {
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
border-color: rgb(0 119 207 / 80%);
|
||||||
|
background-color: var(--comfy-input-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager button.cmm-btn-loading::after {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
content: "";
|
||||||
|
width: 500px;
|
||||||
|
height: 100%;
|
||||||
|
background-image: repeating-linear-gradient(
|
||||||
|
-45deg,
|
||||||
|
rgb(0 119 207 / 30%),
|
||||||
|
rgb(0 119 207 / 30%) 10px,
|
||||||
|
transparent 10px,
|
||||||
|
transparent 15px
|
||||||
|
);
|
||||||
|
animation: cmm-btn-loading-bg 2s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-light .cmm-node-name a {
|
||||||
|
color: blue;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-light .cm-warn-note {
|
||||||
|
background-color: #ccc !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cmm-manager-light .cmm-btn-install {
|
||||||
|
background-color: #333;
|
||||||
|
}
|
||||||
@@ -2,233 +2,17 @@ import { app } from "../../scripts/app.js";
|
|||||||
import { $el } from "../../scripts/ui.js";
|
import { $el } from "../../scripts/ui.js";
|
||||||
import {
|
import {
|
||||||
manager_instance, rebootAPI,
|
manager_instance, rebootAPI,
|
||||||
fetchData, md5, icons, show_message, customAlert, infoToast
|
fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
|
||||||
|
storeColumnWidth, restoreColumnWidth, loadCss
|
||||||
} from "./common.js";
|
} from "./common.js";
|
||||||
import { api } from "../../scripts/api.js";
|
import { api } from "../../scripts/api.js";
|
||||||
|
|
||||||
// https://cenfun.github.io/turbogrid/api.html
|
// https://cenfun.github.io/turbogrid/api.html
|
||||||
import TG from "./turbogrid.esm.js";
|
import TG from "./turbogrid.esm.js";
|
||||||
|
|
||||||
const pageCss = `
|
loadCss("./model-manager.css");
|
||||||
.cmm-manager {
|
|
||||||
--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
|
||||||
z-index: 1099;
|
|
||||||
width: 80%;
|
|
||||||
height: 80%;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 10px;
|
|
||||||
color: var(--fg-color);
|
|
||||||
font-family: arial, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager .cmm-flex-auto {
|
const gridId = "model";
|
||||||
flex: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager button {
|
|
||||||
font-size: 16px;
|
|
||||||
color: var(--input-text);
|
|
||||||
background-color: var(--comfy-input-bg);
|
|
||||||
border-radius: 8px;
|
|
||||||
border-color: var(--border-color);
|
|
||||||
border-style: solid;
|
|
||||||
margin: 0;
|
|
||||||
padding: 4px 8px;
|
|
||||||
min-width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager button:disabled,
|
|
||||||
.cmm-manager input:disabled,
|
|
||||||
.cmm-manager select:disabled {
|
|
||||||
color: gray;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager button:disabled {
|
|
||||||
background-color: var(--comfy-input-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager .cmm-manager-refresh {
|
|
||||||
display: none;
|
|
||||||
background-color: #000080;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager .cmm-manager-stop {
|
|
||||||
display: none;
|
|
||||||
background-color: #500000;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-header {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 5px;
|
|
||||||
align-items: center;
|
|
||||||
padding: 0 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-header label {
|
|
||||||
display: flex;
|
|
||||||
gap: 5px;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-type,
|
|
||||||
.cmm-manager-base,
|
|
||||||
.cmm-manager-filter {
|
|
||||||
height: 28px;
|
|
||||||
line-height: 28px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-keywords {
|
|
||||||
height: 28px;
|
|
||||||
line-height: 28px;
|
|
||||||
padding: 0 5px 0 26px;
|
|
||||||
background-size: 16px;
|
|
||||||
background-position: 5px center;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
background-image: url("data:image/svg+xml;charset=utf8,${encodeURIComponent(icons.search.replace("currentColor", "#888"))}");
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-status {
|
|
||||||
padding-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-grid {
|
|
||||||
flex: auto;
|
|
||||||
border: 1px solid var(--border-color);
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-selection {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 10px;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-message {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-footer {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 10px;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-grid .tg-turbogrid {
|
|
||||||
font-family: var(--grid-font);
|
|
||||||
font-size: 15px;
|
|
||||||
background: var(--bg-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-grid .cmm-node-name a {
|
|
||||||
color: skyblue;
|
|
||||||
text-decoration: none;
|
|
||||||
word-break: break-word;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-grid .cmm-node-desc a {
|
|
||||||
color: #5555FF;
|
|
||||||
font-weight: bold;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-grid .tg-cell a:hover {
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-icon-passed {
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
position: absolute;
|
|
||||||
left: calc(50% - 10px);
|
|
||||||
top: calc(50% - 10px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager .cmm-btn-enable {
|
|
||||||
background-color: blue;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager .cmm-btn-disable {
|
|
||||||
background-color: MediumSlateBlue;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager .cmm-btn-install {
|
|
||||||
background-color: black;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-btn-download {
|
|
||||||
width: 18px;
|
|
||||||
height: 18px;
|
|
||||||
position: absolute;
|
|
||||||
left: calc(50% - 10px);
|
|
||||||
top: calc(50% - 10px);
|
|
||||||
cursor: pointer;
|
|
||||||
opacity: 0.8;
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-btn-download:hover {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-light .cmm-btn-download {
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes cmm-btn-loading-bg {
|
|
||||||
0% {
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
100% {
|
|
||||||
left: -105px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager button.cmm-btn-loading {
|
|
||||||
position: relative;
|
|
||||||
overflow: hidden;
|
|
||||||
border-color: rgb(0 119 207 / 80%);
|
|
||||||
background-color: var(--comfy-input-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager button.cmm-btn-loading::after {
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
content: "";
|
|
||||||
width: 500px;
|
|
||||||
height: 100%;
|
|
||||||
background-image: repeating-linear-gradient(
|
|
||||||
-45deg,
|
|
||||||
rgb(0 119 207 / 30%),
|
|
||||||
rgb(0 119 207 / 30%) 10px,
|
|
||||||
transparent 10px,
|
|
||||||
transparent 15px
|
|
||||||
);
|
|
||||||
animation: cmm-btn-loading-bg 2s linear infinite;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-light .cmm-node-name a {
|
|
||||||
color: blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-light .cm-warn-note {
|
|
||||||
background-color: #ccc !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cmm-manager-light .cmm-btn-install {
|
|
||||||
background-color: #333;
|
|
||||||
}
|
|
||||||
|
|
||||||
`;
|
|
||||||
|
|
||||||
const pageHtml = `
|
const pageHtml = `
|
||||||
<div class="cmm-manager-header">
|
<div class="cmm-manager-header">
|
||||||
@@ -280,14 +64,6 @@ export class ModelManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
|
|
||||||
if (!document.querySelector(`style[context="${this.id}"]`)) {
|
|
||||||
const $style = document.createElement("style");
|
|
||||||
$style.setAttribute("context", this.id);
|
|
||||||
$style.innerHTML = pageCss;
|
|
||||||
document.head.appendChild($style);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.element = $el("div", {
|
this.element = $el("div", {
|
||||||
parent: document.body,
|
parent: document.body,
|
||||||
className: "comfy-modal cmm-manager"
|
className: "comfy-modal cmm-manager"
|
||||||
@@ -305,10 +81,13 @@ export class ModelManager {
|
|||||||
value: ""
|
value: ""
|
||||||
}, {
|
}, {
|
||||||
label: "Installed",
|
label: "Installed",
|
||||||
value: "True"
|
value: "installed"
|
||||||
}, {
|
}, {
|
||||||
label: "Not Installed",
|
label: "Not Installed",
|
||||||
value: "False"
|
value: "not_installed"
|
||||||
|
}, {
|
||||||
|
label: "In Workflow",
|
||||||
|
value: "in_workflow"
|
||||||
}];
|
}];
|
||||||
|
|
||||||
this.typeList = [{
|
this.typeList = [{
|
||||||
@@ -438,6 +217,10 @@ export class ModelManager {
|
|||||||
this.renderSelected();
|
this.renderSelected();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
grid.bind("onColumnWidthChanged", (e, columnItem) => {
|
||||||
|
storeColumnWidth(gridId, columnItem)
|
||||||
|
});
|
||||||
|
|
||||||
grid.bind('onClick', (e, d) => {
|
grid.bind('onClick', (e, d) => {
|
||||||
const { rowItem } = d;
|
const { rowItem } = d;
|
||||||
const target = d.e.target;
|
const target = d.e.target;
|
||||||
@@ -474,12 +257,31 @@ export class ModelManager {
|
|||||||
rowFilter: (rowItem) => {
|
rowFilter: (rowItem) => {
|
||||||
|
|
||||||
const searchableColumns = ["name", "type", "base", "description", "filename", "save_path"];
|
const searchableColumns = ["name", "type", "base", "description", "filename", "save_path"];
|
||||||
|
const models_extensions = ['.ckpt', '.pt', '.pt2', '.bin', '.pth', '.safetensors', '.pkl', '.sft'];
|
||||||
|
|
||||||
let shouldShown = grid.highlightKeywordsFilter(rowItem, searchableColumns, this.keywords);
|
let shouldShown = grid.highlightKeywordsFilter(rowItem, searchableColumns, this.keywords);
|
||||||
|
|
||||||
if (shouldShown) {
|
if (shouldShown) {
|
||||||
if(this.filter && rowItem.installed !== this.filter) {
|
if(this.filter) {
|
||||||
return false;
|
if (this.filter == "in_workflow") {
|
||||||
|
rowItem.in_workflow = null;
|
||||||
|
if (Array.isArray(app.graph._nodes)) {
|
||||||
|
app.graph._nodes.forEach((item, i) => {
|
||||||
|
if (Array.isArray(item.widgets_values)) {
|
||||||
|
item.widgets_values.forEach((_item, i) => {
|
||||||
|
if (rowItem.in_workflow === null && _item !== null && models_extensions.includes("." + _item.toString().split('.').pop())) {
|
||||||
|
let filename = _item.match(/([^\/]+)(?=\.\w+$)/)[0];
|
||||||
|
if (grid.highlightKeywordsFilter(rowItem, searchableColumns, filename)) {
|
||||||
|
rowItem.in_workflow = "True";
|
||||||
|
grid.highlightKeywordsFilter(rowItem, searchableColumns, "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ((this.filter == "installed" && rowItem.installed == "True") || (this.filter == "not_installed" && rowItem.installed == "False") || (this.filter == "in_workflow" && rowItem.in_workflow == "True"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.type && rowItem.type !== this.type) {
|
if(this.type && rowItem.type !== this.type) {
|
||||||
@@ -554,7 +356,7 @@ export class ModelManager {
|
|||||||
sortable: false,
|
sortable: false,
|
||||||
align: 'center',
|
align: 'center',
|
||||||
formatter: (url, rowItem, columnItem) => {
|
formatter: (url, rowItem, columnItem) => {
|
||||||
return `<a class="cmm-btn-download" title="Download file" href="${url}" target="_blank">${icons.download}</a>`;
|
return `<a class="cmm-btn-download" tooltip="Download file" href="${url}" target="_blank">${icons.download}</a>`;
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
id: 'size',
|
id: 'size',
|
||||||
@@ -589,6 +391,8 @@ export class ModelManager {
|
|||||||
width: 200
|
width: 200
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
restoreColumnWidth(gridId, columns);
|
||||||
|
|
||||||
this.grid.setData({
|
this.grid.setData({
|
||||||
options,
|
options,
|
||||||
rows,
|
rows,
|
||||||
@@ -640,7 +444,6 @@ export class ModelManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
btn.classList.add("cmm-btn-loading");
|
btn.classList.add("cmm-btn-loading");
|
||||||
this.showLoading();
|
|
||||||
this.showError("");
|
this.showError("");
|
||||||
|
|
||||||
let needRefresh = false;
|
let needRefresh = false;
|
||||||
@@ -671,7 +474,14 @@ export class ModelManager {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (res.status != 200) {
|
if (res.status != 200) {
|
||||||
errorMsg = `Install failed: ${item.name} ${res.error.message}`;
|
errorMsg = `'${item.name}': `;
|
||||||
|
|
||||||
|
if(res.status == 403) {
|
||||||
|
errorMsg += `This action is not allowed with this security level configuration.\n`;
|
||||||
|
} else {
|
||||||
|
errorMsg += await res.text() + '\n';
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -680,17 +490,18 @@ export class ModelManager {
|
|||||||
|
|
||||||
if(errorMsg) {
|
if(errorMsg) {
|
||||||
this.showError(errorMsg);
|
this.showError(errorMsg);
|
||||||
show_message("Installation Error:\n"+errorMsg);
|
show_message("[Installation Errors]\n"+errorMsg);
|
||||||
|
|
||||||
// reset
|
// reset
|
||||||
for (const hash of list) {
|
for(let k in target_items) {
|
||||||
const item = this.grid.getRowItemBy("hash", hash);
|
const item = target_items[k];
|
||||||
this.grid.updateCell(item, "installed");
|
this.grid.updateCell(item, "installed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
await api.fetchApi('/manager/queue/start');
|
await api.fetchApi('/manager/queue/start');
|
||||||
this.showStop();
|
this.showStop();
|
||||||
|
showTerminal();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
619
js/popover-helper.js
Normal file
619
js/popover-helper.js
Normal file
@@ -0,0 +1,619 @@
|
|||||||
|
const hasOwn = function(obj, key) {
|
||||||
|
return Object.prototype.hasOwnProperty.call(obj, key);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isNum = function(num) {
|
||||||
|
if (typeof num !== 'number' || isNaN(num)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const isInvalid = function(n) {
|
||||||
|
if (n === Number.MAX_VALUE || n === Number.MIN_VALUE || n === Number.NEGATIVE_INFINITY || n === Number.POSITIVE_INFINITY) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
if (isInvalid(num)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const toNum = (num) => {
|
||||||
|
if (typeof (num) !== 'number') {
|
||||||
|
num = parseFloat(num);
|
||||||
|
}
|
||||||
|
if (isNaN(num)) {
|
||||||
|
num = 0;
|
||||||
|
}
|
||||||
|
num = Math.round(num);
|
||||||
|
return num;
|
||||||
|
};
|
||||||
|
|
||||||
|
const clamp = function(value, min, max) {
|
||||||
|
return Math.max(min, Math.min(max, value));
|
||||||
|
};
|
||||||
|
|
||||||
|
const isWindow = (obj) => {
|
||||||
|
return Boolean(obj && obj === obj.window);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isDocument = (obj) => {
|
||||||
|
return Boolean(obj && obj.nodeType === 9);
|
||||||
|
};
|
||||||
|
|
||||||
|
const isElement = (obj) => {
|
||||||
|
return Boolean(obj && obj.nodeType === 1);
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
export const toRect = (obj) => {
|
||||||
|
if (obj) {
|
||||||
|
return {
|
||||||
|
left: toNum(obj.left || obj.x),
|
||||||
|
top: toNum(obj.top || obj.y),
|
||||||
|
width: toNum(obj.width),
|
||||||
|
height: toNum(obj.height)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
left: 0,
|
||||||
|
top: 0,
|
||||||
|
width: 0,
|
||||||
|
height: 0
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getElement = (selector) => {
|
||||||
|
if (typeof selector === 'string' && selector) {
|
||||||
|
if (selector.startsWith('#')) {
|
||||||
|
return document.getElementById(selector.slice(1));
|
||||||
|
}
|
||||||
|
return document.querySelector(selector);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isDocument(selector)) {
|
||||||
|
return selector.body;
|
||||||
|
}
|
||||||
|
if (isElement(selector)) {
|
||||||
|
return selector;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getRect = (target, fixed) => {
|
||||||
|
if (!target) {
|
||||||
|
return toRect();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isWindow(target)) {
|
||||||
|
return {
|
||||||
|
left: 0,
|
||||||
|
top: 0,
|
||||||
|
width: window.innerWidth,
|
||||||
|
height: window.innerHeight
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const elem = getElement(target);
|
||||||
|
if (!elem) {
|
||||||
|
return toRect(target);
|
||||||
|
}
|
||||||
|
|
||||||
|
const br = elem.getBoundingClientRect();
|
||||||
|
const rect = toRect(br);
|
||||||
|
|
||||||
|
// fix offset
|
||||||
|
if (!fixed) {
|
||||||
|
rect.left += window.scrollX;
|
||||||
|
rect.top += window.scrollY;
|
||||||
|
}
|
||||||
|
|
||||||
|
rect.width = elem.offsetWidth;
|
||||||
|
rect.height = elem.offsetHeight;
|
||||||
|
|
||||||
|
return rect;
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
const calculators = {
|
||||||
|
|
||||||
|
bottom: (info, containerRect, targetRect) => {
|
||||||
|
info.space = containerRect.top + containerRect.height - targetRect.top - targetRect.height - info.height;
|
||||||
|
info.top = targetRect.top + targetRect.height;
|
||||||
|
info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
|
||||||
|
},
|
||||||
|
|
||||||
|
top: (info, containerRect, targetRect) => {
|
||||||
|
info.space = targetRect.top - info.height - containerRect.top;
|
||||||
|
info.top = targetRect.top - info.height;
|
||||||
|
info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
|
||||||
|
},
|
||||||
|
|
||||||
|
right: (info, containerRect, targetRect) => {
|
||||||
|
info.space = containerRect.left + containerRect.width - targetRect.left - targetRect.width - info.width;
|
||||||
|
info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
|
||||||
|
info.left = targetRect.left + targetRect.width;
|
||||||
|
},
|
||||||
|
|
||||||
|
left: (info, containerRect, targetRect) => {
|
||||||
|
info.space = targetRect.left - info.width - containerRect.left;
|
||||||
|
info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
|
||||||
|
info.left = targetRect.left - info.width;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// with order
|
||||||
|
export const getDefaultPositions = () => {
|
||||||
|
return Object.keys(calculators);
|
||||||
|
};
|
||||||
|
|
||||||
|
const calculateSpace = (info, containerRect, targetRect) => {
|
||||||
|
const calculator = calculators[info.position];
|
||||||
|
calculator(info, containerRect, targetRect);
|
||||||
|
if (info.space >= 0) {
|
||||||
|
info.passed += 1;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
const calculateAlignOffset = (info, containerRect, targetRect, alignType, sizeType) => {
|
||||||
|
|
||||||
|
const popoverStart = info[alignType];
|
||||||
|
const popoverSize = info[sizeType];
|
||||||
|
|
||||||
|
const containerStart = containerRect[alignType];
|
||||||
|
const containerSize = containerRect[sizeType];
|
||||||
|
|
||||||
|
const targetStart = targetRect[alignType];
|
||||||
|
const targetSize = targetRect[sizeType];
|
||||||
|
|
||||||
|
const targetCenter = targetStart + targetSize * 0.5;
|
||||||
|
|
||||||
|
// size overflow
|
||||||
|
if (popoverSize > containerSize) {
|
||||||
|
const overflow = (popoverSize - containerSize) * 0.5;
|
||||||
|
info[alignType] = containerStart - overflow;
|
||||||
|
info.offset = targetCenter - containerStart + overflow;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const space1 = popoverStart - containerStart;
|
||||||
|
const space2 = (containerStart + containerSize) - (popoverStart + popoverSize);
|
||||||
|
|
||||||
|
// both side passed, default to center
|
||||||
|
if (space1 >= 0 && space2 >= 0) {
|
||||||
|
if (info.passed) {
|
||||||
|
info.passed += 2;
|
||||||
|
}
|
||||||
|
info.offset = popoverSize * 0.5;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// one side passed
|
||||||
|
if (info.passed) {
|
||||||
|
info.passed += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (space1 < 0) {
|
||||||
|
const min = containerStart;
|
||||||
|
info[alignType] = min;
|
||||||
|
info.offset = targetCenter - min;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// space2 < 0
|
||||||
|
const max = containerStart + containerSize - popoverSize;
|
||||||
|
info[alignType] = max;
|
||||||
|
info.offset = targetCenter - max;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
const calculateHV = (info, containerRect) => {
|
||||||
|
if (['top', 'bottom'].includes(info.position)) {
|
||||||
|
info.top = clamp(info.top, containerRect.top, containerRect.top + containerRect.height - info.height);
|
||||||
|
return ['left', 'width'];
|
||||||
|
}
|
||||||
|
info.left = clamp(info.left, containerRect.left, containerRect.left + containerRect.width - info.width);
|
||||||
|
return ['top', 'height'];
|
||||||
|
};
|
||||||
|
|
||||||
|
const calculateOffset = (info, containerRect, targetRect) => {
|
||||||
|
|
||||||
|
const [alignType, sizeType] = calculateHV(info, containerRect);
|
||||||
|
|
||||||
|
calculateAlignOffset(info, containerRect, targetRect, alignType, sizeType);
|
||||||
|
|
||||||
|
info.offset = clamp(info.offset, 0, info[sizeType]);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
const calculateDistance = (info, previousPositionInfo) => {
|
||||||
|
if (!previousPositionInfo) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// no change if position no change with previous
|
||||||
|
if (info.position === previousPositionInfo.position) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const ax = info.left + info.width * 0.5;
|
||||||
|
const ay = info.top + info.height * 0.5;
|
||||||
|
const bx = previousPositionInfo.left + previousPositionInfo.width * 0.5;
|
||||||
|
const by = previousPositionInfo.top + previousPositionInfo.height * 0.5;
|
||||||
|
const dx = Math.abs(ax - bx);
|
||||||
|
const dy = Math.abs(ay - by);
|
||||||
|
info.distance = Math.round(Math.sqrt(dx * dx + dy * dy));
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
const calculatePositionInfo = (info, containerRect, targetRect, previousPositionInfo) => {
|
||||||
|
calculateSpace(info, containerRect, targetRect);
|
||||||
|
calculateOffset(info, containerRect, targetRect);
|
||||||
|
calculateDistance(info, previousPositionInfo);
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
const calculateBestPosition = (containerRect, targetRect, infoMap, withOrder, previousPositionInfo) => {
|
||||||
|
|
||||||
|
// position space: +1
|
||||||
|
// align space:
|
||||||
|
// two side passed: +2
|
||||||
|
// one side passed: +1
|
||||||
|
|
||||||
|
const safePassed = 3;
|
||||||
|
|
||||||
|
if (previousPositionInfo) {
|
||||||
|
const prevInfo = infoMap[previousPositionInfo.position];
|
||||||
|
if (prevInfo) {
|
||||||
|
calculatePositionInfo(prevInfo, containerRect, targetRect);
|
||||||
|
if (prevInfo.passed >= safePassed) {
|
||||||
|
return prevInfo;
|
||||||
|
}
|
||||||
|
prevInfo.calculated = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const positionList = [];
|
||||||
|
Object.values(infoMap).forEach((info) => {
|
||||||
|
if (!info.calculated) {
|
||||||
|
calculatePositionInfo(info, containerRect, targetRect, previousPositionInfo);
|
||||||
|
}
|
||||||
|
positionList.push(info);
|
||||||
|
});
|
||||||
|
|
||||||
|
positionList.sort((a, b) => {
|
||||||
|
if (a.passed !== b.passed) {
|
||||||
|
return b.passed - a.passed;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (withOrder && a.passed >= safePassed && b.passed >= safePassed) {
|
||||||
|
return a.index - b.index;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (a.space !== b.space) {
|
||||||
|
return b.space - a.space;
|
||||||
|
}
|
||||||
|
|
||||||
|
return a.index - b.index;
|
||||||
|
});
|
||||||
|
|
||||||
|
// logTable(positionList);
|
||||||
|
|
||||||
|
return positionList[0];
|
||||||
|
};
|
||||||
|
|
||||||
|
// const logTable = (() => {
|
||||||
|
// let time_id;
|
||||||
|
// return (info) => {
|
||||||
|
// clearTimeout(time_id);
|
||||||
|
// time_id = setTimeout(() => {
|
||||||
|
// console.table(info);
|
||||||
|
// }, 10);
|
||||||
|
// };
|
||||||
|
// })();
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
const getAllowPositions = (positions, defaultAllowPositions) => {
|
||||||
|
if (!positions) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (Array.isArray(positions)) {
|
||||||
|
positions = positions.join(',');
|
||||||
|
}
|
||||||
|
positions = String(positions).split(',').map((it) => it.trim().toLowerCase()).filter((it) => it);
|
||||||
|
positions = positions.filter((it) => defaultAllowPositions.includes(it));
|
||||||
|
if (!positions.length) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
return positions;
|
||||||
|
};
|
||||||
|
|
||||||
|
const isPositionChanged = (info, previousPositionInfo) => {
|
||||||
|
if (!previousPositionInfo) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (info.left !== previousPositionInfo.left) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (info.top !== previousPositionInfo.top) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
// const log = (name, time) => {
|
||||||
|
// if (time > 0.1) {
|
||||||
|
// console.log(name, time);
|
||||||
|
// }
|
||||||
|
// };
|
||||||
|
|
||||||
|
export const getBestPosition = (containerRect, targetRect, popoverRect, positions, previousPositionInfo) => {
|
||||||
|
|
||||||
|
const defaultAllowPositions = getDefaultPositions();
|
||||||
|
let withOrder = true;
|
||||||
|
let allowPositions = getAllowPositions(positions, defaultAllowPositions);
|
||||||
|
if (!allowPositions) {
|
||||||
|
allowPositions = defaultAllowPositions;
|
||||||
|
withOrder = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// console.log('withOrder', withOrder);
|
||||||
|
|
||||||
|
// const start_time = performance.now();
|
||||||
|
|
||||||
|
const infoMap = {};
|
||||||
|
allowPositions.forEach((k, i) => {
|
||||||
|
infoMap[k] = {
|
||||||
|
position: k,
|
||||||
|
index: i,
|
||||||
|
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
width: popoverRect.width,
|
||||||
|
height: popoverRect.height,
|
||||||
|
|
||||||
|
space: 0,
|
||||||
|
|
||||||
|
offset: 0,
|
||||||
|
passed: 0,
|
||||||
|
|
||||||
|
distance: 0
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// log('infoMap', performance.now() - start_time);
|
||||||
|
|
||||||
|
|
||||||
|
const bestPosition = calculateBestPosition(containerRect, targetRect, infoMap, withOrder, previousPositionInfo);
|
||||||
|
|
||||||
|
// check left/top
|
||||||
|
bestPosition.changed = isPositionChanged(bestPosition, previousPositionInfo);
|
||||||
|
|
||||||
|
return bestPosition;
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
const getTemplatePath = (width, height, arrowOffset, arrowSize, borderRadius) => {
|
||||||
|
const p = (px, py) => {
|
||||||
|
return [px, py].join(',');
|
||||||
|
};
|
||||||
|
|
||||||
|
const px = function(num, alignEnd) {
|
||||||
|
const floor = Math.floor(num);
|
||||||
|
let n = num < floor + 0.5 ? floor + 0.5 : floor + 1.5;
|
||||||
|
if (alignEnd) {
|
||||||
|
n -= 1;
|
||||||
|
}
|
||||||
|
return n;
|
||||||
|
};
|
||||||
|
|
||||||
|
const pxe = function(num) {
|
||||||
|
return px(num, true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const ls = [];
|
||||||
|
|
||||||
|
const innerLeft = px(arrowSize);
|
||||||
|
const innerRight = pxe(width - arrowSize);
|
||||||
|
arrowOffset = clamp(arrowOffset, innerLeft, innerRight);
|
||||||
|
|
||||||
|
const innerTop = px(arrowSize);
|
||||||
|
const innerBottom = pxe(height - arrowSize);
|
||||||
|
|
||||||
|
const startPoint = p(innerLeft, innerTop + borderRadius);
|
||||||
|
const arrowPoint = p(arrowOffset, 1);
|
||||||
|
|
||||||
|
const LT = p(innerLeft, innerTop);
|
||||||
|
const RT = p(innerRight, innerTop);
|
||||||
|
|
||||||
|
const AOT = p(arrowOffset - arrowSize, innerTop);
|
||||||
|
const RRT = p(innerRight - borderRadius, innerTop);
|
||||||
|
|
||||||
|
ls.push(`M${startPoint}`);
|
||||||
|
ls.push(`V${innerBottom - borderRadius}`);
|
||||||
|
ls.push(`Q${p(innerLeft, innerBottom)} ${p(innerLeft + borderRadius, innerBottom)}`);
|
||||||
|
ls.push(`H${innerRight - borderRadius}`);
|
||||||
|
ls.push(`Q${p(innerRight, innerBottom)} ${p(innerRight, innerBottom - borderRadius)}`);
|
||||||
|
ls.push(`V${innerTop + borderRadius}`);
|
||||||
|
|
||||||
|
if (arrowOffset < innerLeft + arrowSize + borderRadius) {
|
||||||
|
ls.push(`Q${RT} ${RRT}`);
|
||||||
|
ls.push(`H${arrowOffset + arrowSize}`);
|
||||||
|
ls.push(`L${arrowPoint}`);
|
||||||
|
if (arrowOffset < innerLeft + arrowSize) {
|
||||||
|
ls.push(`L${LT}`);
|
||||||
|
ls.push(`L${startPoint}`);
|
||||||
|
} else {
|
||||||
|
ls.push(`L${AOT}`);
|
||||||
|
ls.push(`Q${LT} ${startPoint}`);
|
||||||
|
}
|
||||||
|
} else if (arrowOffset > innerRight - arrowSize - borderRadius) {
|
||||||
|
if (arrowOffset > innerRight - arrowSize) {
|
||||||
|
ls.push(`L${RT}`);
|
||||||
|
} else {
|
||||||
|
ls.push(`Q${RT} ${p(arrowOffset + arrowSize, innerTop)}`);
|
||||||
|
}
|
||||||
|
ls.push(`L${arrowPoint}`);
|
||||||
|
ls.push(`L${AOT}`);
|
||||||
|
ls.push(`H${innerLeft + borderRadius}`);
|
||||||
|
ls.push(`Q${LT} ${startPoint}`);
|
||||||
|
} else {
|
||||||
|
ls.push(`Q${RT} ${RRT}`);
|
||||||
|
ls.push(`H${arrowOffset + arrowSize}`);
|
||||||
|
ls.push(`L${arrowPoint}`);
|
||||||
|
ls.push(`L${AOT}`);
|
||||||
|
ls.push(`H${innerLeft + borderRadius}`);
|
||||||
|
ls.push(`Q${LT} ${startPoint}`);
|
||||||
|
}
|
||||||
|
return ls.join('');
|
||||||
|
};
|
||||||
|
|
||||||
|
const getPathData = function(position, width, height, arrowOffset, arrowSize, borderRadius) {
|
||||||
|
|
||||||
|
const handlers = {
|
||||||
|
|
||||||
|
bottom: () => {
|
||||||
|
const d = getTemplatePath(width, height, arrowOffset, arrowSize, borderRadius);
|
||||||
|
return {
|
||||||
|
d,
|
||||||
|
transform: ''
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
top: () => {
|
||||||
|
const d = getTemplatePath(width, height, width - arrowOffset, arrowSize, borderRadius);
|
||||||
|
return {
|
||||||
|
d,
|
||||||
|
transform: `rotate(180,${width * 0.5},${height * 0.5})`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
left: () => {
|
||||||
|
const d = getTemplatePath(height, width, arrowOffset, arrowSize, borderRadius);
|
||||||
|
const x = (width - height) * 0.5;
|
||||||
|
const y = (height - width) * 0.5;
|
||||||
|
return {
|
||||||
|
d,
|
||||||
|
transform: `translate(${x} ${y}) rotate(90,${height * 0.5},${width * 0.5})`
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
right: () => {
|
||||||
|
const d = getTemplatePath(height, width, height - arrowOffset, arrowSize, borderRadius);
|
||||||
|
const x = (width - height) * 0.5;
|
||||||
|
const y = (height - width) * 0.5;
|
||||||
|
return {
|
||||||
|
d,
|
||||||
|
transform: `translate(${x} ${y}) rotate(-90,${height * 0.5},${width * 0.5})`
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return handlers[position]();
|
||||||
|
};
|
||||||
|
|
||||||
|
// ===========================================================================================
|
||||||
|
|
||||||
|
// position style cache
|
||||||
|
const styleCache = {
|
||||||
|
// position: '',
|
||||||
|
// top: {},
|
||||||
|
// bottom: {},
|
||||||
|
// left: {},
|
||||||
|
// right: {}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getPositionStyle = (info, options = {}) => {
|
||||||
|
|
||||||
|
const o = {
|
||||||
|
bgColor: '#fff',
|
||||||
|
borderColor: '#ccc',
|
||||||
|
borderRadius: 5,
|
||||||
|
arrowSize: 10
|
||||||
|
};
|
||||||
|
Object.keys(o).forEach((k) => {
|
||||||
|
|
||||||
|
if (hasOwn(options, k)) {
|
||||||
|
const d = o[k];
|
||||||
|
const v = options[k];
|
||||||
|
|
||||||
|
if (typeof d === 'string') {
|
||||||
|
// string
|
||||||
|
if (typeof v === 'string' && v) {
|
||||||
|
o[k] = v;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// number
|
||||||
|
if (isNum(v) && v >= 0) {
|
||||||
|
o[k] = v;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const key = [
|
||||||
|
info.width,
|
||||||
|
info.height,
|
||||||
|
info.offset,
|
||||||
|
o.arrowSize,
|
||||||
|
o.borderRadius,
|
||||||
|
o.bgColor,
|
||||||
|
o.borderColor
|
||||||
|
].join('-');
|
||||||
|
|
||||||
|
const positionCache = styleCache[info.position];
|
||||||
|
if (positionCache && key === positionCache.key) {
|
||||||
|
const st = positionCache.style;
|
||||||
|
st.changed = styleCache.position !== info.position;
|
||||||
|
styleCache.position = info.position;
|
||||||
|
return st;
|
||||||
|
}
|
||||||
|
|
||||||
|
// console.log(options);
|
||||||
|
|
||||||
|
const data = getPathData(info.position, info.width, info.height, info.offset, o.arrowSize, o.borderRadius);
|
||||||
|
// console.log(data);
|
||||||
|
|
||||||
|
const viewBox = [0, 0, info.width, info.height].join(' ');
|
||||||
|
const svg = [
|
||||||
|
`<svg viewBox="${viewBox}" xmlns="http://www.w3.org/2000/svg">`,
|
||||||
|
`<path d="${data.d}" fill="${o.bgColor}" stroke="${o.borderColor}" transform="${data.transform}" />`,
|
||||||
|
'</svg>'
|
||||||
|
].join('');
|
||||||
|
|
||||||
|
// console.log(svg);
|
||||||
|
const backgroundImage = `url("data:image/svg+xml;charset=utf8,${encodeURIComponent(svg)}")`;
|
||||||
|
|
||||||
|
const background = `${backgroundImage} center no-repeat`;
|
||||||
|
|
||||||
|
const padding = `${o.arrowSize + o.borderRadius}px`;
|
||||||
|
|
||||||
|
const style = {
|
||||||
|
background,
|
||||||
|
backgroundImage,
|
||||||
|
padding,
|
||||||
|
changed: true
|
||||||
|
};
|
||||||
|
|
||||||
|
styleCache.position = info.position;
|
||||||
|
styleCache[info.position] = {
|
||||||
|
key,
|
||||||
|
style
|
||||||
|
};
|
||||||
|
|
||||||
|
return style;
|
||||||
|
};
|
||||||
@@ -3,12 +3,21 @@
|
|||||||
* - custom node pack version to all custom nodes used in the workflow
|
* - custom node pack version to all custom nodes used in the workflow
|
||||||
*
|
*
|
||||||
* Example metadata:
|
* Example metadata:
|
||||||
"extra": {
|
* "nodes": {
|
||||||
"node_versions": {
|
* "1": {
|
||||||
"comfy-core": "v0.3.8-4-g0b2eb7f",
|
* type: "CheckpointLoaderSimple",
|
||||||
"comfyui-easy-use": "1.2.5"
|
* ...
|
||||||
}
|
* properties: {
|
||||||
},
|
* cnr_id: "comfy-core",
|
||||||
|
* version: "0.3.8",
|
||||||
|
* },
|
||||||
|
* },
|
||||||
|
* }
|
||||||
|
*
|
||||||
|
* @typedef {Object} NodeInfo
|
||||||
|
* @property {string} ver - Version (git hash or semantic version)
|
||||||
|
* @property {string} cnr_id - ComfyRegistry node ID
|
||||||
|
* @property {boolean} enabled - Whether the node is enabled
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { app } from "../../scripts/app.js";
|
import { app } from "../../scripts/app.js";
|
||||||
@@ -23,7 +32,7 @@ class WorkflowMetadataExtension {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the installed nodes info
|
* Get the installed nodes info
|
||||||
* @returns {Promise<Record<string, {ver: string, cnr_id: string, enabled: boolean}>>} The mapping from node name to its info.
|
* @returns {Promise<Record<string, NodeInfo>>} The mapping from node name to its info.
|
||||||
* ver can either be a git commit hash or a semantic version such as "1.0.0"
|
* ver can either be a git commit hash or a semantic version such as "1.0.0"
|
||||||
* cnr_id is the id of the node in the ComfyRegistry
|
* cnr_id is the id of the node in the ComfyRegistry
|
||||||
* enabled is true if the node is enabled, false if it is disabled
|
* enabled is true if the node is enabled, false if it is disabled
|
||||||
@@ -33,61 +42,42 @@ class WorkflowMetadataExtension {
|
|||||||
return await res.json();
|
return await res.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the node versions for the given graph
|
|
||||||
* @param {LGraph} graph The graph to get the node versions for
|
|
||||||
* @returns {Promise<Record<string, string>>} The mapping from node name to version
|
|
||||||
*/
|
|
||||||
getGraphNodeVersions(graph) {
|
|
||||||
const nodeVersions = {};
|
|
||||||
for (const node of graph.nodes) {
|
|
||||||
const nodeData = node.constructor.nodeData;
|
|
||||||
// Frontend only nodes don't have nodeData
|
|
||||||
if (!nodeData) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const modules = nodeData.python_module.split(".");
|
|
||||||
|
|
||||||
if (modules[0] === "custom_nodes") {
|
|
||||||
const nodePackageName = modules[1];
|
|
||||||
const nodeInfo =
|
|
||||||
this.installedNodes[nodePackageName] ??
|
|
||||||
this.installedNodes[nodePackageName.toLowerCase()];
|
|
||||||
if (nodeInfo) {
|
|
||||||
nodeVersions[nodePackageName] = nodeInfo.ver;
|
|
||||||
}
|
|
||||||
} else if (["nodes", "comfy_extras"].includes(modules[0])) {
|
|
||||||
nodeVersions["comfy-core"] = this.comfyCoreVersion;
|
|
||||||
} else {
|
|
||||||
console.warn(`Unknown node source: ${nodeData.python_module}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nodeVersions;
|
|
||||||
}
|
|
||||||
|
|
||||||
async init() {
|
async init() {
|
||||||
const extension = this;
|
|
||||||
this.installedNodes = await this.getInstalledNodes();
|
this.installedNodes = await this.getInstalledNodes();
|
||||||
this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
|
this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
|
||||||
|
}
|
||||||
|
|
||||||
// Attach metadata when app.graphToPrompt is called.
|
/**
|
||||||
const originalSerialize = LGraph.prototype.serialize;
|
* Called when any node is created
|
||||||
LGraph.prototype.serialize = function () {
|
* @param {LGraphNode} node The newly created node
|
||||||
const workflow = originalSerialize.apply(this, arguments);
|
*/
|
||||||
|
nodeCreated(node) {
|
||||||
|
try {
|
||||||
|
// nodeData doesn't exist if node is missing or node is frontend only node
|
||||||
|
if (!node?.constructor?.nodeData?.python_module) return;
|
||||||
|
|
||||||
// Add metadata to the workflow
|
const nodeProperties = (node.properties ??= {});
|
||||||
if (!workflow.extra) {
|
const modules = node.constructor.nodeData.python_module.split(".");
|
||||||
workflow.extra = {};
|
const moduleType = modules[0];
|
||||||
|
|
||||||
|
if (moduleType === "custom_nodes") {
|
||||||
|
const nodePackageName = modules[1];
|
||||||
|
const { cnr_id, aux_id, ver } =
|
||||||
|
this.installedNodes[nodePackageName] ??
|
||||||
|
this.installedNodes[nodePackageName.toLowerCase()] ??
|
||||||
|
{};
|
||||||
|
|
||||||
|
if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
|
||||||
|
if (cnr_id) nodeProperties.cnr_id = cnr_id;
|
||||||
|
else nodeProperties.aux_id = aux_id;
|
||||||
|
if (ver) nodeProperties.ver = ver.trim();
|
||||||
|
} else if (["nodes", "comfy_extras", "comfy_api_nodes"].includes(moduleType)) {
|
||||||
|
nodeProperties.cnr_id = "comfy-core";
|
||||||
|
nodeProperties.ver = this.comfyCoreVersion;
|
||||||
}
|
}
|
||||||
const graph = this;
|
} catch (e) {
|
||||||
try {
|
console.error(e);
|
||||||
workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
|
}
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return workflow;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
428
model-list.json
428
model-list.json
@@ -209,28 +209,6 @@
|
|||||||
"url": "https://huggingface.co/stabilityai/stable-diffusion-x4-upscaler/resolve/main/x4-upscaler-ema.safetensors",
|
"url": "https://huggingface.co/stabilityai/stable-diffusion-x4-upscaler/resolve/main/x4-upscaler-ema.safetensors",
|
||||||
"size": "3.53GB"
|
"size": "3.53GB"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Inswapper-fp16 (face swap)",
|
|
||||||
"type": "insightface",
|
|
||||||
"base": "inswapper",
|
|
||||||
"save_path": "insightface",
|
|
||||||
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
|
|
||||||
"reference": "https://github.com/facefusion/facefusion-assets",
|
|
||||||
"filename": "inswapper_128_fp16.onnx",
|
|
||||||
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
|
|
||||||
"size": "277.7MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Inswapper (face swap)",
|
|
||||||
"type": "insightface",
|
|
||||||
"base": "inswapper",
|
|
||||||
"save_path": "insightface",
|
|
||||||
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
|
|
||||||
"reference": "https://github.com/facefusion/facefusion-assets",
|
|
||||||
"filename": "inswapper_128.onnx",
|
|
||||||
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
|
|
||||||
"size": "555.3MB"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Deepbump",
|
"name": "Deepbump",
|
||||||
"type": "deepbump",
|
"type": "deepbump",
|
||||||
@@ -771,8 +749,8 @@
|
|||||||
"save_path": "loras/HyperSD/SDXL",
|
"save_path": "loras/HyperSD/SDXL",
|
||||||
"description": "Hyper-SD LoRA (4steps) - SDXL",
|
"description": "Hyper-SD LoRA (4steps) - SDXL",
|
||||||
"reference": "https://huggingface.co/ByteDance/Hyper-SD",
|
"reference": "https://huggingface.co/ByteDance/Hyper-SD",
|
||||||
"filename": "Hyper-SD15-4steps-lora.safetensors",
|
"filename": "Hyper-SDXL-4steps-lora.safetensors",
|
||||||
"url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
|
"url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-4steps-lora.safetensors",
|
||||||
"size": "787MB"
|
"size": "787MB"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1090,18 +1068,28 @@
|
|||||||
"size": "19.1GB"
|
"size": "19.1GB"
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "comfyanonymous/clip_l",
|
"name": "Comfy-Org/clip_l",
|
||||||
"type": "clip",
|
"type": "clip",
|
||||||
"base": "clip",
|
"base": "clip",
|
||||||
"save_path": "default",
|
"save_path": "default",
|
||||||
"description": "clip_l model",
|
"description": "clip_l model (for SD1.x, SD2.x, SDXL, SD3.5, FLUX.1, HunyuanVideo, ...) ",
|
||||||
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders/tree/main",
|
"reference": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8",
|
||||||
"filename": "clip_l.safetensors",
|
"filename": "clip_l.safetensors",
|
||||||
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/clip_l.safetensors",
|
"url": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8/resolve/main/text_encoders/clip_l.safetensors",
|
||||||
"size": "246MB"
|
"size": "246MB"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/clip_g",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "clip",
|
||||||
|
"save_path": "default",
|
||||||
|
"description": "clip_g model (for SDXL, SD3.5)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8",
|
||||||
|
"filename": "clip_g.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8/resolve/main/text_encoders/clip_g.safetensors",
|
||||||
|
"size": "1.39GB"
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "v1-5-pruned-emaonly.ckpt",
|
"name": "v1-5-pruned-emaonly.ckpt",
|
||||||
@@ -3972,6 +3960,17 @@
|
|||||||
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/vae/hunyuan_video_vae_bf16.safetensors",
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/vae/hunyuan_video_vae_bf16.safetensors",
|
||||||
"size": "493MB"
|
"size": "493MB"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Hunyuan Video",
|
||||||
|
"save_path": "diffusion_models/hunyuan_video",
|
||||||
|
"description": "Huyuan Video Image2Video diffusion model. repackaged version.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"size": "25.6GB"
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "Comfy-Org/llava_llama3_fp8_scaled.safetensors",
|
"name": "Comfy-Org/llava_llama3_fp8_scaled.safetensors",
|
||||||
@@ -3995,6 +3994,17 @@
|
|||||||
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp16.safetensors",
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp16.safetensors",
|
||||||
"size": "16.1GB"
|
"size": "16.1GB"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/llava_llama3_vision.safetensors",
|
||||||
|
"type": "clip_vision",
|
||||||
|
"base": "LLaVA-Llama-3",
|
||||||
|
"save_path": "text_encoders",
|
||||||
|
"description": "llava_llama3_vision clip vison model. This is required for using Hunyuan Video Image2Video.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "llava_llama3_vision.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/clip_vision/llava_llama3_vision.safetensors",
|
||||||
|
"size": "649MB"
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "FLUX.1 [Schnell] Diffusion model",
|
"name": "FLUX.1 [Schnell] Diffusion model",
|
||||||
@@ -4559,6 +4569,17 @@
|
|||||||
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.1.safetensors",
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.1.safetensors",
|
||||||
"size": "5.72GB"
|
"size": "5.72GB"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 2B v0.9.5 Checkpoint",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltx-video-2b-v0.9.5.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.5.safetensors",
|
||||||
|
"size": "6.34GB"
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "XLabs-AI/flux-canny-controlnet-v3.safetensors",
|
"name": "XLabs-AI/flux-canny-controlnet-v3.safetensors",
|
||||||
@@ -4684,6 +4705,355 @@
|
|||||||
"filename": "customnet_inpaint_v1.pt",
|
"filename": "customnet_inpaint_v1.pt",
|
||||||
"url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_inpaint_v1.pt",
|
"url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_inpaint_v1.pt",
|
||||||
"size": "5.71GB"
|
"size": "5.71GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "deepseek-ai/Janus-Pro-1B",
|
||||||
|
"type": "Janus-Pro",
|
||||||
|
"base": "Janus-Pro",
|
||||||
|
"save_path": "Janus-Pro",
|
||||||
|
"description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
||||||
|
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
|
||||||
|
"filename": "<huggingface>",
|
||||||
|
"url": "deepseek-ai/Janus-Pro-1B",
|
||||||
|
"size": "7.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "deepseek-ai/Janus-Pro-7B",
|
||||||
|
"type": "Janus-Pro",
|
||||||
|
"base": "Janus-Pro",
|
||||||
|
"save_path": "Janus-Pro",
|
||||||
|
"description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
||||||
|
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
|
||||||
|
"filename": "<huggingface>",
|
||||||
|
"url": "deepseek-ai/Janus-Pro-7B",
|
||||||
|
"size": "14.85GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"type": "VAE",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "vae/kolors",
|
||||||
|
"description": "Kolors VAE",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||||
|
"filename": "diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"size": "167MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
|
||||||
|
"type": "VAE",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "vae/kolors",
|
||||||
|
"description": "Kolors VAE",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||||
|
"filename": "diffusion_pytorch_model.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
|
||||||
|
"size": "335MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_bf16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_e4m3fn)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (fp8_e4m3fn)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_scaled)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (fp8_scaled)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_bf16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_e4m3fn)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (fp8_e4m3fn)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_scaled)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (fp8_scaled)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 1.3B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 1.3B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_1.3B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_bf16.safetensors",
|
||||||
|
"size": "2.84GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 1.3B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 1.3B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_1.3B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_fp16.safetensors",
|
||||||
|
"size": "2.84GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_bf16.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp16.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (fp8_e4m3fn)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (fp8_e4m3fn)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"size": "14.3GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (fp8_scaled)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (fp8_scaled)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_fp8_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_scaled.safetensors",
|
||||||
|
"size": "14.3GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 VAE",
|
||||||
|
"type": "vae",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "vae",
|
||||||
|
"description": "Wan2.1 VAE model",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan_2.1_vae.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors",
|
||||||
|
"size": "254MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/clip_vision_h.safetensors",
|
||||||
|
"type": "clip_vision",
|
||||||
|
"base": "clip_vision_h",
|
||||||
|
"save_path": "clip_vision",
|
||||||
|
"description": "clip_vision_h model for Wan2.1",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "clip_vision_h.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors",
|
||||||
|
"size": "1.26GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/umt5_xxl_fp16.safetensors",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "umt5_xxl",
|
||||||
|
"save_path": "text_encoders",
|
||||||
|
"description": "umt5_xxl_fp16 text encoder for Wan2.1",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "umt5_xxl_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp16.safetensors",
|
||||||
|
"size": "11.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "umt5_xxl",
|
||||||
|
"save_path": "text_encoders",
|
||||||
|
"description": "umt5_xxl_fp8_e4m3fn_scaled text encoder for Wan2.1",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"size": "6.74GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "lllyasviel/FramePackI2V_HY",
|
||||||
|
"type": "FramePackI2V",
|
||||||
|
"base": "FramePackI2V",
|
||||||
|
"save_path": "diffusers/lllyasviel",
|
||||||
|
"description": "[SNAPSHOT] This is the f1k1_x_g9_f1k1f2k2f16k4_td FramePack for HY. [w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
||||||
|
"reference": "https://huggingface.co/lllyasviel/FramePackI2V_HY",
|
||||||
|
"filename": "<huggingface>",
|
||||||
|
"url": "lllyasviel/FramePackI2V_HY",
|
||||||
|
"size": "25.75GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "LTX-Video Spatial Upscaler v0.9.7",
|
||||||
|
"type": "upscale",
|
||||||
|
"base": "upscale",
|
||||||
|
"save_path": "default",
|
||||||
|
"description": "Spatial upscaler model for LTX-Video. This model enhances the spatial resolution of generated videos.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-spatial-upscaler-0.9.7.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-spatial-upscaler-0.9.7.safetensors",
|
||||||
|
"size": "505MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video Temporal Upscaler v0.9.7",
|
||||||
|
"type": "upscale",
|
||||||
|
"base": "upscale",
|
||||||
|
"save_path": "default",
|
||||||
|
"description": "Temporal upscaler model for LTX-Video. This model enhances the temporal resolution and smoothness of generated videos.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-temporal-upscaler-0.9.7.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-temporal-upscaler-0.9.7.safetensors",
|
||||||
|
"size": "524MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "High-resolution quality LTX-Video 13B model.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-dev.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B FP8 v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Quantized version of the LTX-Video 13B model, optimized for lower VRAM usage while maintaining high quality.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-dev-fp8.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev-fp8.safetensors",
|
||||||
|
"size": "15.7GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B Distilled v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Distilled version of the LTX-Video 13B model, providing improved efficiency while maintaining high-resolution quality.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-distilled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B Distilled FP8 v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Quantized distilled version of the LTX-Video 13B model, optimized for even lower VRAM usage while maintaining quality.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
||||||
|
"size": "15.7GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B Distilled LoRA v0.9.7",
|
||||||
|
"type": "lora",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "loras",
|
||||||
|
"description": "A LoRA adapter that transforms the standard LTX-Video 13B model into a distilled version when loaded.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
||||||
|
"size": "1.33GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Latent Bridge Matching for Image Relighting",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "LBM",
|
||||||
|
"save_path": "diffusion_models/LBM",
|
||||||
|
"description": "Latent Bridge Matching (LBM) Relighting model",
|
||||||
|
"reference": "https://huggingface.co/jasperai/LBM_relighting",
|
||||||
|
"filename": "LBM_relighting.safetensors",
|
||||||
|
"url": "https://huggingface.co/jasperai/LBM_relighting/resolve/main/model.safetensors",
|
||||||
|
"size": "5.02GB"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
95
node_db/README.md
Normal file
95
node_db/README.md
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
# ComfyUI-Manager: Node Database (node_db)
|
||||||
|
|
||||||
|
This directory contains the JSON database files that power ComfyUI-Manager's legacy node registry system. While the manager is gradually transitioning to the online Custom Node Registry (CNR), these local JSON files continue to provide important metadata about custom nodes, models, and their integrations.
|
||||||
|
|
||||||
|
## Directory Structure
|
||||||
|
|
||||||
|
The node_db directory is organized into several subdirectories, each serving a specific purpose:
|
||||||
|
|
||||||
|
- **dev/**: Development channel files with latest additions and experimental nodes
|
||||||
|
- **legacy/**: Historical/legacy nodes that may require special handling
|
||||||
|
- **new/**: New nodes that have passed initial verification but are still being evaluated
|
||||||
|
- **forked/**: Forks of existing nodes with modifications
|
||||||
|
- **tutorial/**: Example and tutorial nodes designed for learning purposes
|
||||||
|
|
||||||
|
## Core Database Files
|
||||||
|
|
||||||
|
Each subdirectory contains a standard set of JSON files:
|
||||||
|
|
||||||
|
- **custom-node-list.json**: Primary database of custom nodes with metadata
|
||||||
|
- **extension-node-map.json**: Maps between extensions and individual nodes they provide
|
||||||
|
- **model-list.json**: Catalog of models that can be downloaded through the manager
|
||||||
|
- **alter-list.json**: Alternative implementations of nodes for compatibility or functionality
|
||||||
|
- **github-stats.json**: GitHub repository statistics for node popularity metrics
|
||||||
|
|
||||||
|
## Database Schema
|
||||||
|
|
||||||
|
### custom-node-list.json
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"custom_nodes": [
|
||||||
|
{
|
||||||
|
"title": "Node display name",
|
||||||
|
"name": "Repository name",
|
||||||
|
"reference": "Original repository if forked",
|
||||||
|
"files": ["GitHub URL or other source location"],
|
||||||
|
"install_type": "git",
|
||||||
|
"description": "Description of the node's functionality",
|
||||||
|
"pip": ["optional pip dependencies"],
|
||||||
|
"js": ["optional JavaScript files"],
|
||||||
|
"tags": ["categorization tags"]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### extension-node-map.json
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"extension-id": [
|
||||||
|
["list", "of", "node", "classes"],
|
||||||
|
{
|
||||||
|
"author": "Author name",
|
||||||
|
"description": "Extension description",
|
||||||
|
"nodename_pattern": "Optional regex pattern for node name matching"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Transition to Custom Node Registry (CNR)
|
||||||
|
|
||||||
|
This local database system is being progressively replaced by the online Custom Node Registry (CNR), which provides:
|
||||||
|
- Real-time updates without manual JSON maintenance
|
||||||
|
- Improved versioning support
|
||||||
|
- Better security validation
|
||||||
|
- Enhanced metadata
|
||||||
|
|
||||||
|
The Manager supports both systems simultaneously during the transition period.
|
||||||
|
|
||||||
|
## Implementation Details
|
||||||
|
|
||||||
|
- The database follows a channel-based architecture for different sources
|
||||||
|
- Multiple database modes are supported: Channel, Local, and Remote
|
||||||
|
- The system supports differential updates to minimize bandwidth usage
|
||||||
|
- Security levels are enforced for different node installations based on source
|
||||||
|
|
||||||
|
## Usage in the Application
|
||||||
|
|
||||||
|
The Manager's backend uses these database files to:
|
||||||
|
|
||||||
|
1. Provide browsable lists of available nodes and models
|
||||||
|
2. Resolve dependencies for installation
|
||||||
|
3. Track updates and new versions
|
||||||
|
4. Map node classes to their source repositories
|
||||||
|
5. Assess risk levels for installation security
|
||||||
|
|
||||||
|
## Maintenance Scripts
|
||||||
|
|
||||||
|
Each subdirectory contains a `scan.sh` script that assists with:
|
||||||
|
- Scanning repositories for new nodes
|
||||||
|
- Updating metadata
|
||||||
|
- Validating database integrity
|
||||||
|
- Generating proper JSON structures
|
||||||
|
|
||||||
|
This database system enables a flexible, secure, and comprehensive management system for the ComfyUI ecosystem while the transition to CNR continues.
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,15 @@
|
|||||||
{
|
{
|
||||||
"custom_nodes": [
|
"custom_nodes": [
|
||||||
|
{
|
||||||
|
"author": "SanDiegoDude",
|
||||||
|
"title": "ComfyUI-HiDream-Sampler [WIP]",
|
||||||
|
"reference": "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A collection of enhanced nodes for ComfyUI that provide powerful additional functionality to your workflows.\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"author": "PramaLLC",
|
"author": "PramaLLC",
|
||||||
"title": "ComfyUI BEN - Background Erase Network",
|
"title": "ComfyUI BEN - Background Erase Network",
|
||||||
@@ -129,6 +139,16 @@
|
|||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
|
"description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Pablerdo",
|
||||||
|
"title": "ComfyUI-PSNodes",
|
||||||
|
"reference": "https://github.com/Pablerdo/ComfyUI-PSNodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Pablerdo/ComfyUI-PSNodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -11,9 +11,831 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"author": "syaofox",
|
||||||
|
"title": "ComfyUI_fnodes [REMOVED]",
|
||||||
|
"reference": "https://github.com/syaofox/ComfyUI_fnodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/syaofox/ComfyUI_fnodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI_fnodes is a collection of custom nodes designed for ComfyUI. These nodes provide additional functionality that can enhance your ComfyUI workflows.\nFile manipulation tools, Image resizing tools, IPAdapter tools, Image processing tools, Mask tools, Face analysis tools, Sampler tools, Miscellaneous tools"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Hangover3832",
|
||||||
|
"title": "ComfyUI-Hangover-Moondream [DEPRECATED]",
|
||||||
|
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Moondream",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Hangover3832/ComfyUI-Hangover-Moondream"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Moondream is a lightweight multimodal large language model.\n[w/WARN:Additional python code will be downloaded from huggingface and executed. You have to trust this creator if you want to use this node!]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Hangover3832",
|
||||||
|
"title": "Recognize Anything Model (RAM) for ComfyUI [DEPRECATED]",
|
||||||
|
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Recognize_Anything",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Hangover3832/ComfyUI-Hangover-Recognize_Anything"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This is an image recognition node for ComfyUI based on the RAM++ model from [a/xinyu1205](https://huggingface.co/xinyu1205).\nThis node outputs a string of tags with all the recognized objects and elements in the image in English or Chinese language.\nFor image tagging and captioning."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Hangover3832",
|
||||||
|
"title": "ComfyUI-Hangover-Nodes [DEPRECATED]",
|
||||||
|
"reference": "https://github.com/Hangover3832/ComfyUI-Hangover-Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Hangover3832/ComfyUI-Hangover-Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Nodes: MS kosmos-2 Interrogator, Save Image w/o Metadata, Image Scale Bounding Box. An implementation of Microsoft [a/kosmos-2](https://huggingface.co/microsoft/kosmos-2-patch14-224) image to text transformer."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "SirLatore",
|
||||||
|
"title": "ComfyUI-IPAdapterWAN [REMOVED]",
|
||||||
|
"reference": "https://github.com/SirLatore/ComfyUI-IPAdapterWAN",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/SirLatore/ComfyUI-IPAdapterWAN"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This extension adapts the [a/InstantX IP-Adapter for SD3.5-Large](https://huggingface.co/InstantX/SD3.5-Large-IP-Adapter) to work with Wan 2.1 and other UNet-based video/image models in ComfyUI.\nUnlike the original SD3 version (which depends on joint_blocks from MMDiT), this version performs sampling-time identity conditioning by dynamically injecting into attention layers — making it compatible with models like Wan 2.1, AnimateDiff, and other non-SD3 pipelines."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Jpzz",
|
||||||
|
"title": "ComfyUI-VirtualInteraction [UNSAFE/REMOVED]",
|
||||||
|
"reference": "https://github.com/Jpzz/ComfyUI-VirtualInteraction",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Jpzz/ComfyUI-VirtualInteraction"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: virtual interaction custom node when using generative movie\n[w/This nodepack contains a node which is reading arbitrary excel file.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "satche",
|
||||||
|
"title": "Prompt Factory [REMOVED]",
|
||||||
|
"reference": "https://github.com/satche/comfyui-prompt-factory",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/satche/comfyui-prompt-factory"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A modular system that adds randomness to prompt generation"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "MITCAP",
|
||||||
|
"title": "ComfyUI OpenAI DALL-E 3 Node [REMOVED]",
|
||||||
|
"reference": "https://github.com/MITCAP/OpenAI-ComfyUI",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/MITCAP/OpenAI-ComfyUI"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This project provides custom nodes for ComfyUI that integrate with OpenAI's DALL-E 3 and GPT-4o models. The nodes allow users to generate images and describe images using OpenAI's API.\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "raspie10032",
|
||||||
|
"title": "ComfyUI NAI Prompt Converter [REMOVED]",
|
||||||
|
"reference": "https://github.com/raspie10032/ComfyUI_RS_NAI_Local_Prompt_converter",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/raspie10032/ComfyUI_RS_NAI_Local_Prompt_converter"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A custom node extension for ComfyUI that enables conversion between different prompt formats: NovelAI V4, ComfyUI, and old NovelAI."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "holchan",
|
||||||
|
"title": "ComfyUI-ModelDownloader [REMOVED]",
|
||||||
|
"reference": "https://github.com/holchan/ComfyUI-ModelDownloader",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/holchan/ComfyUI-ModelDownloader"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A ComfyUI node to download models(Checkpoints and LoRA) from external links and act as an output standalone node."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Kur0butiMegane",
|
||||||
|
"title": "Comfyui-StringUtils [DEPRECATED]",
|
||||||
|
"reference": "https://github.com/Kur0butiMegane/Comfyui-StringUtils",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Kur0butiMegane/Comfyui-StringUtils"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Prompt Normalizer, String Splitter, String Line Selector, Extract Markup Value"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Apache0ne",
|
||||||
|
"title": "ComfyUI-LantentCompose [REMOVED]",
|
||||||
|
"reference": "https://github.com/Apache0ne/ComfyUI-LantentCompose",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Apache0ne/ComfyUI-LantentCompose"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Interpolate sdxl latents using slerp with and without a mask. use with unsample nodes for best effect.\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "jax-explorer",
|
||||||
|
"title": "ComfyUI-H-flow [REMOVED]",
|
||||||
|
"reference": "https://github.com/jax-explorer/ComfyUI-H-flow",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/jax-explorer/ComfyUI-H-flow"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Wan2-1 Image To Video, LLM Task, Save Image, Save Video, Show Text, FluxPro Ultra, IdeogramV2 Turbo, Runway Image To Video, Kling Image To Video, Replace Text, Join Text, Test Image, Test Text"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Apache0ne",
|
||||||
|
"title": "SambaNova [REMOVED]",
|
||||||
|
"id": "SambaNovaAPI",
|
||||||
|
"reference": "https://github.com/Apache0ne/SambaNova",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Apache0ne/SambaNova"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Super Fast LLM's llama3.1-405B,70B,8B and more"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Apache0ne",
|
||||||
|
"title": "ComfyUI-EasyUrlLoader [REMOVED]",
|
||||||
|
"id": "easy-url-loader",
|
||||||
|
"reference": "https://github.com/Apache0ne/ComfyUI-EasyUrlLoader",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Apache0ne/ComfyUI-EasyUrlLoader"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A simple YT downloader node for ComfyUI using video Urls. Can be used with VHS nodes etc."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "nxt5656",
|
||||||
|
"title": "ComfyUI-Image2OSS [REMOVED]",
|
||||||
|
"reference": "https://github.com/nxt5656/ComfyUI-Image2OSS",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/nxt5656/ComfyUI-Image2OSS"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Upload the image to Alibaba Cloud OSS."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ainewsto",
|
||||||
|
"title": "Comfyui_Comfly",
|
||||||
|
"reference": "https://github.com/ainewsto/Comfyui_Comfly",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ainewsto/Comfyui_Comfly"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Comfly_Mj, Comfly_mjstyle, Comfly_upload, Comfly_Mju, Comfly_Mjv, Comfly_kling_videoPreview\nNOTE: Comfyui_Comfly_v2 is introduced."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-to-inpaint",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-to-inpaint",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-to-inpaint"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Send preview image to inpaint workflow."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "magic-quill",
|
||||||
|
"title": "ComfyUI_MagicQuill [NOT MAINTAINED]",
|
||||||
|
"id": "MagicQuill",
|
||||||
|
"reference": "https://github.com/magic-quill/ComfyUI_MagicQuill",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/magic-quill/ComfyUI_MagicQuill"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Towards GPT-4 like large language and visual assistant.\nNOTE: The current version has not been maintained for a long time and does not work. Please use https://github.com/brantje/ComfyUI_MagicQuill instead."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-event-handler [USAFE/REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-event-handler",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-event-handler"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Javascript code will run when an event fires. [w/This node allows you to execute arbitrary JavaScript code as input for the workflow.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Moooonet",
|
||||||
|
"title": "ComfyUI-ArteMoon [REMOVED]",
|
||||||
|
"reference": "https://github.com/Moooonet/ComfyUI-ArteMoon",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Moooonet/ComfyUI-ArteMoon"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This plugin works with [a/IF_AI_Tools](https://github.com/if-ai/ComfyUI-IF_AI_tools) to build a workflow in ComfyUI that uses AI to assist in generating prompts."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ryanontheinside",
|
||||||
|
"title": "ComfyUI-MediaPipe-Vision [REMOVED]",
|
||||||
|
"reference": "https://github.com/ryanontheinside/ComfyUI-MediaPipe-Vision",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ryanontheinside/ComfyUI-MediaPipe-Vision"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A centralized wrapper of all MediaPipe vision tasks for ComfyUI."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-textarea-command [REMOVED]",
|
||||||
|
"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)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-parse-image [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-parse-image",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-parse-image"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Extract metadata from image."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-put-image [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-put-image",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-put-image"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Load image from directory."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "fredconex",
|
||||||
|
"title": "TripoSG Nodes for ComfyUI [REMOVED]",
|
||||||
|
"reference": "https://github.com/fredconex/ComfyUI-TripoSG",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/fredconex/ComfyUI-TripoSG"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Created by Alfredo Fernandes inspired by Hunyuan3D nodes by Kijai. This extension adds TripoSG 3D mesh generation capabilities to ComfyUI, allowing you to generate 3D meshes from a single image using the TripoSG model."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "fredconex",
|
||||||
|
"title": "ComfyUI-PaintTurbo [REMOVED]",
|
||||||
|
"reference": "https://github.com/fredconex/ComfyUI-PaintTurbo",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/fredconex/ComfyUI-PaintTurbo"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Hunyuan3D Texture Mesh"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "zhuanqianfish",
|
||||||
|
"title": "TaesdDecoder [REMOVED]",
|
||||||
|
"reference": "https://github.com/zhuanqianfish/TaesdDecoder",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/zhuanqianfish/TaesdDecoder"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "use TAESD decoded image.you need donwload taesd_decoder.pth and taesdxl_decoder.pth to vae_approx folder first.\n It will result in a slight loss of image quality and a significant decrease in peak video memory during decoding."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"author": "myAiLemon",
|
"author": "myAiLemon",
|
||||||
"title": "MagicGetPromptAutomatically",
|
"title": "MagicAutomaticPicture [REMOVED]",
|
||||||
|
"reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/myAiLemon/MagicAutomaticPicture"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "thisiseddy-ab",
|
||||||
|
"title": "ComfyUI-Edins-Ultimate-Pack [REMOVED]",
|
||||||
|
"reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Davros666",
|
||||||
|
"title": "safetriggers [REMOVED]",
|
||||||
|
"reference": "https://github.com/Davros666/safetriggers",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Davros666/safetriggers"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI Nodes for READING TRIGGERS, TRIGGER-WORDS, TRIGGER-PHRASES FROM LoRAs"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "cubiq",
|
||||||
|
"title": "Simple Math [REMOVED]",
|
||||||
|
"id": "simplemath",
|
||||||
|
"reference": "https://github.com/cubiq/ComfyUI_SimpleMath",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/cubiq/ComfyUI_SimpleMath"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "custom node for ComfyUI to perform simple math operations"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "lucafoscili",
|
||||||
|
"title": "LF Nodes [DEPRECATED]",
|
||||||
|
"reference": "https://github.com/lucafoscili/comfyui-lf",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/lucafoscili/comfyui-lf"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Custom nodes with a touch of extra UX, including: history for primitives, JSON manipulation, logic switches with visual feedback, LLM chat... and more!"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "AI2lab",
|
||||||
|
"title": "comfyUI-tool-2lab [REMOVED]",
|
||||||
|
"id": "tool-2lab",
|
||||||
|
"reference": "https://github.com/AI2lab/comfyUI-tool-2lab",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/AI2lab/comfyUI-tool-2lab"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "tool set for developing workflow and publish to web api server"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "AI2lab",
|
||||||
|
"title": "comfyUI-DeepSeek-2lab [REMOVED]",
|
||||||
|
"id": "deepseek",
|
||||||
|
"reference": "https://github.com/AI2lab/comfyUI-DeepSeek-2lab",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/AI2lab/comfyUI-DeepSeek-2lab"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Unofficial implementation of DeepSeek for ComfyUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "AI2lab",
|
||||||
|
"title": "comfyUI-kling-api-2lab [REMOVED]",
|
||||||
|
"reference": "https://github.com/AI2lab/comfyUI-kling-api-2lab",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/AI2lab/comfyUI-kling-api-2lab"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Unofficial implementation of KLing for ComfyUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ZhiHui6",
|
||||||
|
"title": "comfyui_zhihui_nodes [REMOVED]",
|
||||||
|
"reference": "https://github.com/ZhiHui6/comfyui_zhihui_nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ZhiHui6/comfyui_zhihui_nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Prompt Preset, Video Batch Loader, Video Combiner"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ImagineerNL",
|
||||||
|
"title": "comfyui_potrace_svg [REMOVED]",
|
||||||
|
"reference": "https://github.com/ImagineerNL/comfyui_potrace_svg",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ImagineerNL/comfyui_potrace_svg"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This project converts raster images into SVG format using the Potrace library."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "kayselmecnun",
|
||||||
|
"title": "ComfyUI-Qwen-25-VL [REMOVED]",
|
||||||
|
"reference": "https://github.com/kayselmecnun/ComfyUI-Qwen-25-VL",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/kayselmecnun/ComfyUI-Qwen-25-VL"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A custom Comfy UI node for using Qwen2.5-VL-3B/7B-Instruct models"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "IfnotFr",
|
||||||
|
"title": "⚡ ComfyUI Connect [REMOVED]",
|
||||||
|
"reference": "https://github.com/IfnotFr/ComfyUI-Connect",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/IfnotFr/ComfyUI-Connect"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ginlov",
|
||||||
|
"title": "segment_to_mask_comfyui [REMOVED]",
|
||||||
|
"reference": "https://github.com/ginlov/segment_to_mask_comfyui",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ginlov/segment_to_mask_comfyui"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Nodes:SegToMask"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "TGu-97",
|
||||||
|
"title": "TGu Utilities [REMOVED]",
|
||||||
|
"id": "tgu",
|
||||||
|
"reference": "https://github.com/TGu-97/ComfyUI-TGu-utils",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/TGu-97/ComfyUI-TGu-utils"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Nodes: MPN Switch, MPN Reroute, PN Switch. This is a set of custom nodes for ComfyUI. Mainly focus on control switches."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "IfnotFr",
|
||||||
|
"title": "ComfyUI-Connect [REMOVED]",
|
||||||
|
"reference": "https://github.com/IfnotFr/ComfyUI-Connect",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/IfnotFr/ComfyUI-Connect"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "KurtHokke",
|
||||||
|
"title": "ComfyUI_KurtHokke-Nodes [REMOVED]",
|
||||||
|
"reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI_KurtHokke-Nodes"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "SpatialDeploy",
|
||||||
|
"title": "ComfyUI-Voxels [REMOVED]",
|
||||||
|
"reference": "https://github.com/SpatialDeploy/ComfyUI-Voxels",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/SpatialDeploy/ComfyUI-Voxels"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Tools for creating voxel based videos"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-group-selection [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-group-selection",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-group-selection"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Create a new group of nodes."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "connect-from-afar [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-connect-from-afar",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-connect-from-afar"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Connect a new link from out of screen."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-local-db [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-local-db",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-local-db"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Store text to Key-Values pair json."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-model-db [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-model-db",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-model-db"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Store settings by model."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-target-search [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-target-search",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-target-search"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Move canvas to target on dragging connection."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "chrisgoringe",
|
||||||
|
"title": "Image chooser [DEPRECATED]",
|
||||||
|
"id": "image-chooser",
|
||||||
|
"reference": "https://github.com/chrisgoringe/cg-image-picker",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/chrisgoringe/cg-image-picker"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A custom node that pauses the flow while you choose which image (or latent) to pass on to the rest of the workflow."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "weilin9999",
|
||||||
|
"title": "WeiLin-ComfyUI-prompt-all-in-one [DEPRECATED]",
|
||||||
|
"id": "prompt-all-in-one",
|
||||||
|
"reference": "https://github.com/weilin9999/WeiLin-ComfyUI-prompt-all-in-one",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/weilin9999/WeiLin-ComfyUI-prompt-all-in-one"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Write prompt words like WebUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "svetozarov",
|
||||||
|
"title": "AS_GeminiCaptioning Node [REMOVED]",
|
||||||
|
"reference": "https://github.com/svetozarov/AS_GeminiCaptioning",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/svetozarov/AS_GeminiCaptioning"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A ComfyUI node that combines an image with simple text parameters to create a prompt, sends it to the Google Gemini API via the google-generativeai SDK, and returns the generated text response along with the original prompt and an execution log"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-load-image-in-seq [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-load-image-in-seq",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-load-image-in-seq"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This node is load png image sequentially with metadata. Only supported for PNG format that has been created by ComfyUI.[w/renamed from comfyui-load-image-39. You need to remove previous one and reinstall to this.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-model-metadata [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-model-metadata",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-model-metadata"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Print model metadata on note node"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "shinich39",
|
||||||
|
"title": "comfyui-view-recommendations [REMOVED]",
|
||||||
|
"reference": "https://github.com/shinich39/comfyui-view-recommendations",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/shinich39/comfyui-view-recommendations"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Load model generation data from civitai."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "jonstreeter",
|
||||||
|
"title": "Comfyui-PySceneDetect [REMOVED]",
|
||||||
|
"reference": "https://github.com/jonstreeter/Comfyui-PySceneDetect",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/jonstreeter/Comfyui-PySceneDetect"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: PySceneDetect Video Processor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "muxueChen",
|
||||||
|
"title": "ComfyUI-NTQwen25-VL [REMOVED]",
|
||||||
|
"reference": "https://github.com/muxueChen/ComfyUI-NTQwen25-VL",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/muxueChen/ComfyUI-NTQwen25-VL"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Qwen25-VL is a plugin for ComfyU"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Makki_Shizu",
|
||||||
|
"title": "ComfyUI-SaveAnimatedGIF [DEPRECATED]",
|
||||||
|
"id": "SaveAnimatedGIF",
|
||||||
|
"reference": "https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Save animated GIF format nodes in ComfyUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "l1yongch1",
|
||||||
|
"title": "ComfyUI_PhiCaption [REMOVED]",
|
||||||
|
"reference": "https://github.com/l1yongch1/ComfyUI_PhiCaption",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/l1yongch1/ComfyUI_PhiCaption"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "In addition to achieving conventional single-image, single-round reverse engineering, it can also achieve single-image multi-round and multi-image single-round reverse engineering. Moreover, the Phi model has a better understanding of prompts."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "nova-florealis",
|
||||||
|
"title": "comfyui-alien [REMOVED]",
|
||||||
|
"reference": "https://github.com/nova-florealis/comfyui-alien",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/nova-florealis/comfyui-alien"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Text to Text (LLM), Text Output, Convert to Markdown, List Display (Debug)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "PluMaZero",
|
||||||
|
"title": "ComfyUI-SpaceFlower [REMOVED]",
|
||||||
|
"reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/PluMaZero/ComfyUI-SpaceFlower"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "vahidzxc",
|
||||||
|
"title": "ComfyUI-My-Handy-Nodes [REMOVED]",
|
||||||
|
"reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES:VahCropImage"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Samulebotin",
|
||||||
|
"title": "ComfyUI-FreeVC_wrapper [REMOVED]",
|
||||||
|
"reference": "https://github.com/Samulebotin/ComfyUI-FreeVC_wrapper",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Samulebotin/ComfyUI-FreeVC_wrapper"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A voice conversion extension node for ComfyUI based on FreeVC, enabling high-quality voice conversion capabilities within the ComfyUI framework."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "GoingAI1998",
|
||||||
|
"title": "ComfyUI Web Canvas Node [REMOVED]",
|
||||||
|
"reference": "https://github.com/GoingAI1998/Comfyui_imgcanvas",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/GoingAI1998/Comfyui_imgcanvas"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI_imgcanvas At present, I have not used the useful comfyui custom node about layer mixing, and I have written a comfyui runtime automatic pop-up window for layer editing node"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "807502278",
|
||||||
|
"title": "ComfyUI_TensorRT_Merge [REMOVED]",
|
||||||
|
"reference": "https://github.com/807502278/ComfyUI_TensorRT_Merge",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/807502278/ComfyUI_TensorRT_Merge"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Non diffusion models supported by TensorRT, merged Comfyui plugin, added onnx automatic download and trt model conversion nodes."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "logtd",
|
||||||
|
"title": "ComfyUI-LTXTricks [DEPRECATED]",
|
||||||
|
"reference": "https://github.com/logtd/ComfyUI-LTXTricks",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/logtd/ComfyUI-LTXTricks"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A set of nodes that provide additional controls for the LTX Video model"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "JichaoLiang",
|
||||||
|
"title": "Immortal_comfyUI [REMOVED]",
|
||||||
|
"reference": "https://github.com/JichaoLiang/Immortal_comfyUI",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/JichaoLiang/Immortal_comfyUI"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES:ImNewNode, ImAppendNode, MergeNode, SetProperties, SaveToDirectory, batchNodes, redirectToNode, SetEvent, ..."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Rvage0815",
|
||||||
|
"title": "ComfyUI-RvTools [REMOVED]",
|
||||||
|
"reference": "https://github.com/Rvage0815/ComfyUI-RvTools",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Rvage0815/ComfyUI-RvTools"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Rvage0815",
|
||||||
|
"title": "RvTComfyUI-RvTools_v2 [REMOVED]",
|
||||||
|
"reference": "https://github.com/Rvage0815/ComfyUI-RvTools_v2",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Rvage0815/ComfyUI-RvTools_v2"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "scottmudge",
|
||||||
|
"title": "ComfyUI_BiscuitNodes [REMOVED]",
|
||||||
|
"reference": "https://github.com/scottmudge/ComfyUI_BiscuitNodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/scottmudge/ComfyUI_BiscuitNodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Load Image From Path Using File Selector"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "thanhduong0213929",
|
||||||
|
"title": "ComfyUI-DeepUnlock [REMOVED]",
|
||||||
|
"reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "pathway8-sudo",
|
||||||
|
"title": "RMBG [REMOVED]",
|
||||||
|
"reference": "https://github.com/pathway8-sudo/RMBG",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/pathway8-sudo/RMBG"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This repository provides a custom node for ComfyUI, leveraging the BriaRMBG model to remove backgrounds from images and output a transparent PNG."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "iris-Neko",
|
||||||
|
"title": "ComfyUI_ascii_art [REMOVED]",
|
||||||
|
"reference": "https://github.com/iris-Neko/ComfyUI_ascii_art",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/iris-Neko/ComfyUI_ascii_art"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI node for [a/ASCII art controlnet](https://civitai.com/models/986392)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "apesplat",
|
||||||
|
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
|
||||||
|
"id": "ezxy",
|
||||||
|
"reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/GMapeSplat/ComfyUI_ezXY"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "mie",
|
||||||
|
"title": "ComfyUI_JanusProCaption [REMOVED]",
|
||||||
|
"reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Describe image or create caption files using Janus Pro Model"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Njbx",
|
||||||
|
"title": "ComfyUI-blockswap [REMOVED]",
|
||||||
|
"reference": "https://github.com/Njbx/ComfyUI-blockswap",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Njbx/ComfyUI-blockswap"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Block Swap"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "T8star1984",
|
||||||
|
"title": "comfyui-purgevram [REMOVED]",
|
||||||
|
"reference": "https://github.com/T8star1984/comfyui-purgevram",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/T8star1984/comfyui-purgevram"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "zmwv823",
|
||||||
|
"title": "ComfyUI-VideoDiffusion [REMOVED]",
|
||||||
|
"reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/zmwv823/ComfyUI-VideoDiffusion"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "NyaamZ",
|
||||||
|
"title": "Get Booru Tag ExtendeD [REMOVED]",
|
||||||
|
"reference": "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED"
|
||||||
|
],
|
||||||
|
"description": "Get tag from Booru site.",
|
||||||
|
"install_type": "git-clone"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "lingha",
|
||||||
|
"title": "comfyui_kj [REMOVED]",
|
||||||
|
"id": "comfyui_kj",
|
||||||
|
"reference": "https://github.com/XieChengYuan/comfyui_kj",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/XieChengYuan/comfyui_kj"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "comfyui_kj, A tool that can package workflows into projects and publish them to a WeChat Mini Program named Kaji, allowing charges to be collected from users."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "myAiLemon",
|
||||||
|
"title": "MagicGetPromptAutomatically [REMOVED]",
|
||||||
"reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
|
"reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
|
||||||
"files": [
|
"files": [
|
||||||
"https://github.com/myAiLemon/MagicGetPromptAutomatically"
|
"https://github.com/myAiLemon/MagicGetPromptAutomatically"
|
||||||
|
|||||||
@@ -1,5 +1,27 @@
|
|||||||
{
|
{
|
||||||
"models": [
|
"models": [
|
||||||
|
{
|
||||||
|
"name": "Inswapper-fp16 (face swap) [REMOVED]",
|
||||||
|
"type": "insightface",
|
||||||
|
"base": "inswapper",
|
||||||
|
"save_path": "insightface",
|
||||||
|
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
|
||||||
|
"reference": "https://github.com/facefusion/facefusion-assets",
|
||||||
|
"filename": "inswapper_128_fp16.onnx",
|
||||||
|
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
|
||||||
|
"size": "277.7MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Inswapper (face swap) [REMOVED]",
|
||||||
|
"type": "insightface",
|
||||||
|
"base": "inswapper",
|
||||||
|
"save_path": "insightface",
|
||||||
|
"description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
|
||||||
|
"reference": "https://github.com/facefusion/facefusion-assets",
|
||||||
|
"filename": "inswapper_128.onnx",
|
||||||
|
"url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
|
||||||
|
"size": "555.3MB"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "pfg-novel-n10.pt",
|
"name": "pfg-novel-n10.pt",
|
||||||
"type": "PFG",
|
"type": "PFG",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,389 @@
|
|||||||
{
|
{
|
||||||
"models": [
|
"models": [
|
||||||
|
{
|
||||||
|
"name": "Latent Bridge Matching for Image Relighting",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "LBM",
|
||||||
|
"save_path": "diffusion_models/LBM",
|
||||||
|
"description": "Latent Bridge Matching (LBM) Relighting model",
|
||||||
|
"reference": "https://huggingface.co/jasperai/LBM_relighting",
|
||||||
|
"filename": "LBM_relighting.safetensors",
|
||||||
|
"url": "https://huggingface.co/jasperai/LBM_relighting/resolve/main/model.safetensors",
|
||||||
|
"size": "5.02GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B Distilled v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Distilled version of the LTX-Video 13B model, providing improved efficiency while maintaining high-resolution quality.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-distilled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B Distilled FP8 v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Quantized distilled version of the LTX-Video 13B model, optimized for even lower VRAM usage while maintaining quality.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-fp8.safetensors",
|
||||||
|
"size": "15.7GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B Distilled LoRA v0.9.7",
|
||||||
|
"type": "lora",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "loras",
|
||||||
|
"description": "A LoRA adapter that transforms the standard LTX-Video 13B model into a distilled version when loaded.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-distilled-lora128.safetensors",
|
||||||
|
"size": "1.33GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lllyasviel/FramePackI2V_HY",
|
||||||
|
"type": "FramePackI2V",
|
||||||
|
"base": "FramePackI2V",
|
||||||
|
"save_path": "diffusers/lllyasviel",
|
||||||
|
"description": "[SNAPSHOT] This is the f1k1_x_g9_f1k1f2k2f16k4_td FramePack for HY. [w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
||||||
|
"reference": "https://huggingface.co/lllyasviel/FramePackI2V_HY",
|
||||||
|
"filename": "<huggingface>",
|
||||||
|
"url": "lllyasviel/FramePackI2V_HY",
|
||||||
|
"size": "25.75GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "LTX-Video Spatial Upscaler v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Spatial upscaler model for LTX-Video. This model enhances the spatial resolution of generated videos.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-spatial-upscaler-0.9.7.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-spatial-upscaler-0.9.7.safetensors",
|
||||||
|
"size": "505MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video Temporal Upscaler v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Temporal upscaler model for LTX-Video. This model enhances the temporal resolution and smoothness of generated videos.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-temporal-upscaler-0.9.7.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-temporal-upscaler-0.9.7.safetensors",
|
||||||
|
"size": "524MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "High-resolution quality LTX-Video 13B model.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-dev.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 13B FP8 v0.9.7",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "Quantized version of the LTX-Video 13B model, optimized for lower VRAM usage while maintaining high quality.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltxv-13b-0.9.7-dev-fp8.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltxv-13b-0.9.7-dev-fp8.safetensors",
|
||||||
|
"size": "15.7GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_bf16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_e4m3fn)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (fp8_e4m3fn)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 480p 14B (fp8_scaled)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 480p 14B (fp8_scaled)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_480p_14B_fp8_scaled.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_bf16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp16.safetensors",
|
||||||
|
"size": "32.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_e4m3fn)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (fp8_e4m3fn)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 i2v 720p 14B (fp8_scaled)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for i2v 720p 14B (fp8_scaled)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_i2v_720p_14B_fp8_scaled.safetensors",
|
||||||
|
"size": "16.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/clip_vision_h.safetensors",
|
||||||
|
"type": "clip_vision",
|
||||||
|
"base": "clip_vision_h",
|
||||||
|
"save_path": "clip_vision",
|
||||||
|
"description": "clip_vision_h model for Wan2.1",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "clip_vision_h.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/clip_vision/clip_vision_h.safetensors",
|
||||||
|
"size": "1.26GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 1.3B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 1.3B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_1.3B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_bf16.safetensors",
|
||||||
|
"size": "2.84GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 1.3B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 1.3B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_1.3B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_1.3B_fp16.safetensors",
|
||||||
|
"size": "2.84GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (bf16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (bf16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_bf16.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (fp16)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (fp16)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp16.safetensors",
|
||||||
|
"size": "28.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (fp8_e4m3fn)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (fp8_e4m3fn)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_e4m3fn.safetensors",
|
||||||
|
"size": "14.3GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 t2v 14B (fp8_scaled)",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "diffusion_models/Wan2.1",
|
||||||
|
"description": "Wan2.1 difussion model for t2v 14B (fp8_scaled)",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan2.1_t2v_14B_fp8_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/diffusion_models/wan2.1_t2v_14B_fp8_scaled.safetensors",
|
||||||
|
"size": "14.3GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/Wan2.1 VAE",
|
||||||
|
"type": "vae",
|
||||||
|
"base": "Wan2.1",
|
||||||
|
"save_path": "vae",
|
||||||
|
"description": "Wan2.1 VAE model",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "wan_2.1_vae.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/vae/wan_2.1_vae.safetensors",
|
||||||
|
"size": "254MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/umt5_xxl_fp16.safetensors",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "umt5_xxl",
|
||||||
|
"save_path": "text_encoders",
|
||||||
|
"description": "umt5_xxl_fp16 text encoder for Wan2.1",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "umt5_xxl_fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp16.safetensors",
|
||||||
|
"size": "11.4GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"type": "clip",
|
||||||
|
"base": "umt5_xxl",
|
||||||
|
"save_path": "text_encoders",
|
||||||
|
"description": "umt5_xxl_fp8_e4m3fn_scaled text encoder for Wan2.1",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged",
|
||||||
|
"filename": "umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/Wan_2.1_ComfyUI_repackaged/resolve/main/split_files/text_encoders/umt5_xxl_fp8_e4m3fn_scaled.safetensors",
|
||||||
|
"size": "6.74GB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Hunyuan Video",
|
||||||
|
"save_path": "diffusion_models/hunyuan_video",
|
||||||
|
"description": "Huyuan Video Image2Video diffusion model. repackaged version.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"size": "25.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/llava_llama3_vision.safetensors",
|
||||||
|
"type": "clip_vision",
|
||||||
|
"base": "LLaVA-Llama-3",
|
||||||
|
"save_path": "text_encoders",
|
||||||
|
"description": "llava_llama3_vision clip vison model. This is required for using Hunyuan Video Image2Video.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "llava_llama3_vision.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/clip_vision/llava_llama3_vision.safetensors",
|
||||||
|
"size": "649MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 2B v0.9.5 Checkpoint",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltx-video-2b-v0.9.5.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.5.safetensors",
|
||||||
|
"size": "6.34GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"type": "VAE",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "vae/kolors",
|
||||||
|
"description": "Kolors VAE",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||||
|
"filename": "diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"size": "167MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
|
||||||
|
"type": "VAE",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "vae/kolors",
|
||||||
|
"description": "Kolors VAE",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||||
|
"filename": "diffusion_pytorch_model.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
|
||||||
|
"size": "335MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "deepseek-ai/Janus-Pro-1B",
|
||||||
|
"type": "Janus-Pro",
|
||||||
|
"base": "Janus-Pro",
|
||||||
|
"save_path": "Janus-Pro",
|
||||||
|
"description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
||||||
|
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
|
||||||
|
"filename": "<huggingface>",
|
||||||
|
"url": "deepseek-ai/Janus-Pro-1B",
|
||||||
|
"size": "7.8GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "deepseek-ai/Janus-Pro-7B",
|
||||||
|
"type": "Janus-Pro",
|
||||||
|
"base": "Janus-Pro",
|
||||||
|
"save_path": "Janus-Pro",
|
||||||
|
"description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
|
||||||
|
"reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
|
||||||
|
"filename": "<huggingface>",
|
||||||
|
"url": "deepseek-ai/Janus-Pro-7B",
|
||||||
|
"size": "14.85GB"
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "Leoxing/pia.ckpt",
|
"name": "Leoxing/pia.ckpt",
|
||||||
"type": "animatediff-pia",
|
"type": "animatediff-pia",
|
||||||
@@ -307,349 +691,6 @@
|
|||||||
"filename": "sigclip_vision_patch14_384.safetensors",
|
"filename": "sigclip_vision_patch14_384.safetensors",
|
||||||
"url": "https://huggingface.co/Comfy-Org/sigclip_vision_384/resolve/main/sigclip_vision_patch14_384.safetensors",
|
"url": "https://huggingface.co/Comfy-Org/sigclip_vision_384/resolve/main/sigclip_vision_patch14_384.safetensors",
|
||||||
"size": "857MB"
|
"size": "857MB"
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "comfyanonymous/flux_text_encoders - t5xxl (fp16)",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "t5",
|
|
||||||
"save_path": "text_encoders/t5",
|
|
||||||
"description": "Text Encoders for FLUX (fp16)",
|
|
||||||
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
|
|
||||||
"filename": "t5xxl_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp16.safetensors",
|
|
||||||
"size": "9.79GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn)",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "t5",
|
|
||||||
"save_path": "text_encoders/t5",
|
|
||||||
"description": "Text Encoders for FLUX (fp8_e4m3fn)",
|
|
||||||
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
|
|
||||||
"filename": "t5xxl_fp8_e4m3fn.safetensors",
|
|
||||||
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn.safetensors",
|
|
||||||
"size": "4.89GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "comfyanonymous/flux_text_encoders - t5xxl (fp8_e4m3fn_scaled)",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "t5",
|
|
||||||
"save_path": "text_encoders/t5",
|
|
||||||
"description": "Text Encoders for FLUX (fp16)",
|
|
||||||
"reference": "https://huggingface.co/comfyanonymous/flux_text_encoders",
|
|
||||||
"filename": "t5xxl_fp8_e4m3fn_scaled.safetensors",
|
|
||||||
"url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/t5xxl_fp8_e4m3fn_scaled.safetensors",
|
|
||||||
"size": "5.16GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "FLUX.1 [Dev] Diffusion model (scaled fp8)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "diffusion_models/FLUX1",
|
|
||||||
"description": "FLUX.1 [Dev] Diffusion model (scaled fp8)[w/Due to the large size of the model, it is recommended to download it through a browser if possible.]",
|
|
||||||
"reference": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test",
|
|
||||||
"filename": "flux_dev_fp8_scaled_diffusion_model.safetensors",
|
|
||||||
"url": "https://huggingface.co/comfyanonymous/flux_dev_scaled_fp8_test/resolve/main/flux_dev_fp8_scaled_diffusion_model.safetensors",
|
|
||||||
"size": "11.9GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "kijai/MoGe_ViT_L_fp16.safetensors",
|
|
||||||
"type": "MoGe",
|
|
||||||
"base": "MoGe",
|
|
||||||
"save_path": "MoGe",
|
|
||||||
"description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
|
|
||||||
"reference": "https://huggingface.co/Kijai/MoGe_safetensors",
|
|
||||||
"filename": "MoGe_ViT_L_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
|
|
||||||
"size": "628MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "kijai/MoGe_ViT_L_fp16.safetensors",
|
|
||||||
"type": "MoGe",
|
|
||||||
"base": "MoGe",
|
|
||||||
"save_path": "MoGe",
|
|
||||||
"description": "Safetensors versions of [a/https://github.com/microsoft/MoGe](https://github.com/microsoft/MoGe)",
|
|
||||||
"reference": "https://huggingface.co/Kijai/MoGe_safetensors",
|
|
||||||
"filename": "MoGe_ViT_L_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/MoGe_safetensors/resolve/main/MoGe_ViT_L_fp16.safetensors",
|
|
||||||
"size": "1.26GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "pulid_flux_v0.9.1.safetensors",
|
|
||||||
"type": "PuLID",
|
|
||||||
"base": "FLUX",
|
|
||||||
"save_path": "pulid",
|
|
||||||
"description": "This is required for PuLID (FLUX)",
|
|
||||||
"reference": "https://huggingface.co/guozinan/PuLID",
|
|
||||||
"filename": "pulid_flux_v0.9.1.safetensors",
|
|
||||||
"url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_flux_v0.9.1.safetensors",
|
|
||||||
"size": "1.14GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "pulid_v1.1.safetensors",
|
|
||||||
"type": "PuLID",
|
|
||||||
"base": "SDXL",
|
|
||||||
"save_path": "pulid",
|
|
||||||
"description": "This is required for PuLID (SDXL)",
|
|
||||||
"reference": "https://huggingface.co/guozinan/PuLID",
|
|
||||||
"filename": "pulid_v1.1.safetensors",
|
|
||||||
"url": "https://huggingface.co/guozinan/PuLID/resolve/main/pulid_v1.1.safetensors",
|
|
||||||
"size": "984MB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Kolors-IP-Adapter-Plus.bin (Kwai-Kolors/Kolors-IP-Adapter-Plus)",
|
|
||||||
"type": "IP-Adapter",
|
|
||||||
"base": "Kolors",
|
|
||||||
"save_path": "ipadapter",
|
|
||||||
"description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
|
|
||||||
"reference": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus",
|
|
||||||
"filename": "Kolors-IP-Adapter-Plus.bin",
|
|
||||||
"url": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus/resolve/main/ip_adapter_plus_general.bin",
|
|
||||||
"size": "1.01GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Kolors-IP-Adapter-FaceID-Plus.bin (Kwai-Kolors/Kolors-IP-Adapter-Plus)",
|
|
||||||
"type": "IP-Adapter",
|
|
||||||
"base": "Kolors",
|
|
||||||
"save_path": "ipadapter",
|
|
||||||
"description": "You can use this model in the [a/ComfyUI IPAdapter plus](https://github.com/cubiq/ComfyUI_IPAdapter_plus) extension.",
|
|
||||||
"reference": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-FaceID-Plus",
|
|
||||||
"filename": "Kolors-IP-Adapter-FaceID-Plus.bin",
|
|
||||||
"url": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-FaceID-Plus/resolve/main/ipa-faceid-plus.bin",
|
|
||||||
"size": "2.39GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "CLIPVision model (Kwai-Kolors/Kolors-IP-Adapter-Plus/clip-vit-large)",
|
|
||||||
"type": "clip_vision",
|
|
||||||
"base": "ViT-L",
|
|
||||||
"save_path": "clip_vision",
|
|
||||||
"description": "CLIPVision model (This is required in cubiq/ComfyUI_IPAdapter_plus)",
|
|
||||||
"reference": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus",
|
|
||||||
"filename": "clip-vit-large-patch14-336.bin",
|
|
||||||
"url": "https://huggingface.co/Kwai-Kolors/Kolors-IP-Adapter-Plus/resolve/main/image_encoder/pytorch_model.bin",
|
|
||||||
"size": "1.71GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "kijai/lotus depth d model v1.1 (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "lotus",
|
|
||||||
"save_path": "diffusion_models",
|
|
||||||
"description": "lotus depth d model v1.1 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
|
|
||||||
"reference": "https://huggingface.co/Kijai/lotus-comfyui",
|
|
||||||
"filename": "lotus-depth-d-v-1-1-fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-depth-d-v-1-1-fp16.safetensors",
|
|
||||||
"size": "1.74GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "kijai/lotus depth g model v1.0 (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "lotus",
|
|
||||||
"save_path": "diffusion_models",
|
|
||||||
"description": "lotus depth g model v1.0 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
|
|
||||||
"reference": "https://huggingface.co/Kijai/lotus-comfyui",
|
|
||||||
"filename": "lotus-depth-g-v1-0-fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-depth-g-v1-0-fp16.safetensors",
|
|
||||||
"size": "1.74GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "kijai/lotus depth g model v1.0",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "lotus",
|
|
||||||
"save_path": "diffusion_models",
|
|
||||||
"description": "lotus depth g model v1.0. This model can be used in ComfyUI-Lotus custom nodes.",
|
|
||||||
"reference": "https://huggingface.co/Kijai/lotus-comfyui",
|
|
||||||
"filename": "lotus-depth-g-v1-0.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-depth-g-v1-0.safetensors",
|
|
||||||
"size": "3.47GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "kijai/lotus normal d model v1.0 (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "lotus",
|
|
||||||
"save_path": "diffusion_models",
|
|
||||||
"description": "lotus normal d model v1.0 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
|
|
||||||
"reference": "https://huggingface.co/Kijai/lotus-comfyui",
|
|
||||||
"filename": "lotus-normal-d-v1-0-fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-d-v1-0-fp16.safetensors",
|
|
||||||
"size": "1.74GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "kijai/lotus normal d model v1.0",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "lotus",
|
|
||||||
"save_path": "diffusion_models",
|
|
||||||
"description": "lotus normal d model v1.0. This model can be used in ComfyUI-Lotus custom nodes.",
|
|
||||||
"reference": "https://huggingface.co/Kijai/lotus-comfyui",
|
|
||||||
"filename": "lotus-normal-d-v1-0.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-d-v1-0.safetensors",
|
|
||||||
"size": "3.47GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "kijai/lotus normal g model v1.0 (fp16)",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "lotus",
|
|
||||||
"save_path": "diffusion_models",
|
|
||||||
"description": "lotus normal g model v1.0 (fp16). This model can be used in ComfyUI-Lotus custom nodes.",
|
|
||||||
"reference": "https://huggingface.co/Kijai/lotus-comfyui",
|
|
||||||
"filename": "lotus-normal-g-v1-0-fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-g-v1-0-fp16.safetensors",
|
|
||||||
"size": "1.74GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "kijai/lotus normal g model v1.0",
|
|
||||||
"type": "diffusion_model",
|
|
||||||
"base": "lotus",
|
|
||||||
"save_path": "diffusion_models",
|
|
||||||
"description": "lotus normal g model v1.0. This model can be used in ComfyUI-Lotus custom nodes.",
|
|
||||||
"reference": "https://huggingface.co/Kijai/lotus-comfyui",
|
|
||||||
"filename": "lotus-normal-g-v1-0.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/lotus-comfyui/resolve/main/lotus-normal-g-v1-0.safetensors",
|
|
||||||
"size": "3.47GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Depth Pro model",
|
|
||||||
"type": "depth-pro",
|
|
||||||
"base": "depth-pro",
|
|
||||||
"save_path": "depth/ml-depth-pro",
|
|
||||||
"description": "Depth pro model for [a/ComfyUI-Depth-Pro](https://github.com/spacepxl/ComfyUI-Depth-Pro)",
|
|
||||||
"reference": "https://huggingface.co/spacepxl/ml-depth-pro",
|
|
||||||
"filename": "depth_pro.fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/spacepxl/ml-depth-pro/resolve/main/depth_pro.fp16.safetensors",
|
|
||||||
"size": "1.9GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "jasperai/FLUX.1-dev-Controlnet-Upscaler",
|
|
||||||
"type": "controlnet",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "controlnet/FLUX.1/jasperai-dev-Upscaler",
|
|
||||||
"description": "This is Flux.1-dev ControlNet for low resolution images developed by Jasper research team.",
|
|
||||||
"reference": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Upscaler",
|
|
||||||
"filename": "diffusion_pytorch_model.safetensors",
|
|
||||||
"url": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Upscaler/resolve/main/diffusion_pytorch_model.safetensors",
|
|
||||||
"size": "3.58GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "jasperai/FLUX.1-dev-Controlnet-Depth",
|
|
||||||
"type": "controlnet",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "controlnet/FLUX.1/jasperai-dev-Depth",
|
|
||||||
"description": "This is Flux.1-dev ControlNet for Depth map developed by Jasper research team.",
|
|
||||||
"reference": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Depth",
|
|
||||||
"filename": "diffusion_pytorch_model.safetensors",
|
|
||||||
"url": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Depth/resolve/main/diffusion_pytorch_model.safetensors",
|
|
||||||
"size": "3.58GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "jasperai/Flux.1-dev-Controlnet-Surface-Normals",
|
|
||||||
"type": "controlnet",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "controlnet/FLUX.1/jasperai-dev-Surface-Normals",
|
|
||||||
"description": "This is Flux.1-dev ControlNet for Surface Normals map developed by Jasper research team.",
|
|
||||||
"reference": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Surface-Normals",
|
|
||||||
"filename": "diffusion_pytorch_model.safetensors",
|
|
||||||
"url": "https://huggingface.co/jasperai/Flux.1-dev-Controlnet-Surface-Normals/resolve/main/diffusion_pytorch_model.safetensors",
|
|
||||||
"size": "3.58GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro (fp8_e4m3fn) by Kijai",
|
|
||||||
"type": "controlnet",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "controlnet/FLUX.1",
|
|
||||||
"description": "FLUX.1 [Dev] Union Controlnet. Supports Canny, Tile, Depth, Blur, Pose, Gray, Low Quality\nVersion quantized to fp8_e4m3fn by Kijai",
|
|
||||||
"reference": "https://huggingface.co/Kijai/flux-fp8",
|
|
||||||
"filename": "flux_shakker_labs_union_pro-fp8_e4m3fn.safetensors",
|
|
||||||
"url": "https://huggingface.co/Kijai/flux-fp8/resolve/main/flux_shakker_labs_union_pro-fp8_e4m3fn.safetensors",
|
|
||||||
"size": "3.3GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "clip",
|
|
||||||
"save_path": "text_encoders/long_clip",
|
|
||||||
"description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
|
|
||||||
"reference": "https://huggingface.co/zer0int",
|
|
||||||
"filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
|
|
||||||
"url": "https://huggingface.co/zer0int/CLIP-GmP-ViT-L-14/resolve/main/ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
|
|
||||||
"size": "931MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
|
|
||||||
"type": "clip",
|
|
||||||
"base": "clip",
|
|
||||||
"save_path": "text_encoders/long_clip",
|
|
||||||
"description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
|
|
||||||
"reference": "https://huggingface.co/zer0int",
|
|
||||||
"filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
|
|
||||||
"url": "https://huggingface.co/zer0int/CLIP-GmP-ViT-L-14/resolve/main/ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
|
|
||||||
"size": "323MB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro",
|
|
||||||
"type": "controlnet",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "controlnet/FLUX.1/Shakker-Labs-ControlNet-Union-Pro",
|
|
||||||
"description": "FLUX.1 [Dev] Union Controlnet. Supports Canny, Tile, Depth, Blur, Pose, Gray, Low Quality",
|
|
||||||
"reference": "https://huggingface.co/Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro",
|
|
||||||
"filename": "diffusion_pytorch_model.safetensors",
|
|
||||||
"url": "https://huggingface.co/Shakker-Labs/FLUX.1-dev-ControlNet-Union-Pro/resolve/main/diffusion_pytorch_model.safetensors",
|
|
||||||
"size": "6.6GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Hyper-SD LoRA (8steps) - FLUX.1 [Dev]",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "loras/HyperSD/FLUX.1",
|
|
||||||
"description": "Hyper-SD LoRA (8steps) - FLUX.1 [Dev]",
|
|
||||||
"reference": "https://huggingface.co/ByteDance/Hyper-SD",
|
|
||||||
"filename": "Hyper-FLUX.1-dev-8steps-lora.safetensors",
|
|
||||||
"url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-FLUX.1-dev-8steps-lora.safetensors",
|
|
||||||
"size": "1.39GB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Hyper-SD LoRA (16steps) - FLUX.1 [Dev]",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "FLUX.1",
|
|
||||||
"save_path": "loras/HyperSD/FLUX.1",
|
|
||||||
"description": "Hyper-SD LoRA (16steps) - FLUX.1 [Dev]",
|
|
||||||
"reference": "https://huggingface.co/ByteDance/Hyper-SD",
|
|
||||||
"filename": "Hyper-FLUX.1-dev-16steps-lora.safetensors",
|
|
||||||
"url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-FLUX.1-dev-16steps-lora.safetensors",
|
|
||||||
"size": "1.39GB"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "DMD2 LoRA (4steps)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "SDXL",
|
|
||||||
"save_path": "loras/DMD2",
|
|
||||||
"description": "DMD2 LoRA (4steps)",
|
|
||||||
"reference": "https://huggingface.co/tianweiy/DMD2",
|
|
||||||
"filename": "dmd2_sdxl_4step_lora.safetensors",
|
|
||||||
"url": "https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora.safetensors",
|
|
||||||
"size": "787MB"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DMD2 LoRA (4steps/fp16)",
|
|
||||||
"type": "lora",
|
|
||||||
"base": "SDXL",
|
|
||||||
"save_path": "loras/DMD2",
|
|
||||||
"description": "DMD2 LoRA (4steps/fp16)",
|
|
||||||
"reference": "https://huggingface.co/tianweiy/DMD2",
|
|
||||||
"filename": "dmd2_sdxl_4step_lora_fp16.safetensors",
|
|
||||||
"url": "https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora_fp16.safetensors",
|
|
||||||
"size": "394MB"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,15 @@
|
|||||||
{
|
{
|
||||||
"custom_nodes": [
|
"custom_nodes": [
|
||||||
|
{
|
||||||
|
"author": "Comfy-Org",
|
||||||
|
"title": "ComfyUI React Extension Template",
|
||||||
|
"reference": "https://github.com/Comfy-Org/ComfyUI-React-Extension-Template",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Comfy-Org/ComfyUI-React-Extension-Template"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A minimal template for creating React/TypeScript frontend extensions for ComfyUI, with complete boilerplate setup including internationalization and unit testing."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"author": "Suzie1",
|
"author": "Suzie1",
|
||||||
"title": "Guide To Making Custom Nodes in ComfyUI",
|
"title": "Guide To Making Custom Nodes in ComfyUI",
|
||||||
@@ -291,6 +301,36 @@
|
|||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
|
"description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "xhiroga",
|
||||||
|
"title": "ComfyUI-TypeScript-CustomNode",
|
||||||
|
"reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "zentrocdot",
|
||||||
|
"title": "ComfyUI-Turtle_Graphics_Demos",
|
||||||
|
"reference": "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo"
|
||||||
|
],
|
||||||
|
"description": "ComfyUI node for creating some Turtle Graphic demos.",
|
||||||
|
"install_type": "git-clone"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "cozy-comfyui",
|
||||||
|
"title": "cozy_ex_dynamic",
|
||||||
|
"reference": "https://github.com/cozy-comfyui/cozy_ex_dynamic",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/cozy-comfyui/cozy_ex_dynamic"
|
||||||
|
],
|
||||||
|
"description": "Dynamic Node examples for ComfyUI",
|
||||||
|
"install_type": "git-clone"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import atexit
|
import atexit
|
||||||
@@ -20,21 +21,27 @@ import cm_global
|
|||||||
import manager_downloader
|
import manager_downloader
|
||||||
import folder_paths
|
import folder_paths
|
||||||
|
|
||||||
import datetime
|
manager_util.add_python_path_to_env()
|
||||||
if hasattr(datetime, 'datetime'):
|
|
||||||
|
import datetime as dt
|
||||||
|
|
||||||
|
if hasattr(dt, 'datetime'):
|
||||||
|
from datetime import datetime as dt_datetime
|
||||||
|
|
||||||
def current_timestamp():
|
def current_timestamp():
|
||||||
return datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
|
return dt_datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
|
||||||
else:
|
else:
|
||||||
# NOTE: Occurs in some Mac environments.
|
# NOTE: Occurs in some Mac environments.
|
||||||
import time
|
import time
|
||||||
logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n datetime module is invalid: '{datetime.__file__}'")
|
logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n datetime module is invalid: '{dt.__file__}'")
|
||||||
|
|
||||||
def current_timestamp():
|
def current_timestamp():
|
||||||
return str(time.time()).split('.')[0]
|
return str(time.time()).split('.')[0]
|
||||||
|
|
||||||
security_check.security_check()
|
security_check.security_check()
|
||||||
|
|
||||||
cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
|
cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
|
|
||||||
|
|
||||||
def skip_pip_spam(x):
|
def skip_pip_spam(x):
|
||||||
@@ -57,22 +64,6 @@ def is_import_failed_extension(name):
|
|||||||
return name in import_failed_extensions
|
return name in import_failed_extensions
|
||||||
|
|
||||||
|
|
||||||
def check_file_logging():
|
|
||||||
global enable_file_logging
|
|
||||||
try:
|
|
||||||
import configparser
|
|
||||||
config = configparser.ConfigParser()
|
|
||||||
config.read(manager_config_path)
|
|
||||||
default_conf = config['default']
|
|
||||||
|
|
||||||
if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
|
|
||||||
enable_file_logging = False
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
check_file_logging()
|
|
||||||
|
|
||||||
comfy_path = os.environ.get('COMFYUI_PATH')
|
comfy_path = os.environ.get('COMFYUI_PATH')
|
||||||
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
||||||
|
|
||||||
@@ -97,6 +88,7 @@ comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
|||||||
custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
|
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_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
|
||||||
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
|
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
|
||||||
|
manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
|
||||||
restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
|
restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
|
||||||
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
||||||
|
|
||||||
@@ -107,26 +99,47 @@ default_conf = {}
|
|||||||
|
|
||||||
def read_config():
|
def read_config():
|
||||||
global default_conf
|
global default_conf
|
||||||
import configparser
|
try:
|
||||||
config = configparser.ConfigParser()
|
import configparser
|
||||||
config.read(manager_config_path)
|
config = configparser.ConfigParser(strict=False)
|
||||||
default_conf = config['default']
|
config.read(manager_config_path)
|
||||||
|
default_conf = config['default']
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
def read_uv_mode():
|
def read_uv_mode():
|
||||||
if 'use_uv' in default_conf:
|
if 'use_uv' in default_conf:
|
||||||
manager_util.use_uv = default_conf['use_uv']
|
manager_util.use_uv = default_conf['use_uv'].lower() == 'true'
|
||||||
|
|
||||||
|
def check_file_logging():
|
||||||
|
global enable_file_logging
|
||||||
|
if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
|
||||||
|
enable_file_logging = False
|
||||||
|
|
||||||
|
|
||||||
read_config()
|
read_config()
|
||||||
read_uv_mode()
|
read_uv_mode()
|
||||||
|
check_file_logging()
|
||||||
|
|
||||||
|
if sys.version_info < (3, 13):
|
||||||
|
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||||
|
else:
|
||||||
|
cm_global.pip_overrides = {}
|
||||||
|
|
||||||
cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
|
|
||||||
if os.path.exists(manager_pip_overrides_path):
|
if os.path.exists(manager_pip_overrides_path):
|
||||||
with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||||
cm_global.pip_overrides = json.load(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
|
if sys.version_info < (3, 13):
|
||||||
|
cm_global.pip_overrides['numpy'] = 'numpy<2'
|
||||||
|
|
||||||
|
|
||||||
|
if os.path.exists(manager_pip_blacklist_path):
|
||||||
|
with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||||
|
for x in f.readlines():
|
||||||
|
y = x.strip()
|
||||||
|
if y != '':
|
||||||
|
cm_global.pip_blacklist.add(y)
|
||||||
|
|
||||||
|
|
||||||
def remap_pip_package(pkg):
|
def remap_pip_package(pkg):
|
||||||
@@ -428,28 +441,33 @@ except Exception as e:
|
|||||||
print(f"[ComfyUI-Manager] Logging failed: {e}")
|
print(f"[ComfyUI-Manager] Logging failed: {e}")
|
||||||
|
|
||||||
|
|
||||||
try:
|
def ensure_dependencies():
|
||||||
import git # noqa: F401
|
|
||||||
import toml # noqa: F401
|
|
||||||
except ModuleNotFoundError:
|
|
||||||
my_path = os.path.dirname(__file__)
|
|
||||||
requirements_path = os.path.join(my_path, "requirements.txt")
|
|
||||||
|
|
||||||
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
|
|
||||||
try:
|
try:
|
||||||
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
|
import git # noqa: F401
|
||||||
except subprocess.CalledProcessError:
|
import toml # noqa: F401
|
||||||
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
|
import rich # noqa: F401
|
||||||
try:
|
import chardet # noqa: F401
|
||||||
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
|
except ModuleNotFoundError:
|
||||||
except subprocess.CalledProcessError:
|
my_path = os.path.dirname(__file__)
|
||||||
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
|
requirements_path = os.path.join(my_path, "requirements.txt")
|
||||||
|
|
||||||
try:
|
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
|
||||||
print("## ComfyUI-Manager: installing dependencies done.")
|
try:
|
||||||
except:
|
subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
|
||||||
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
|
except subprocess.CalledProcessError:
|
||||||
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
|
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
|
||||||
|
try:
|
||||||
|
subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
|
||||||
|
except subprocess.CalledProcessError:
|
||||||
|
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
|
||||||
|
|
||||||
|
try:
|
||||||
|
print("## ComfyUI-Manager: installing dependencies done.")
|
||||||
|
except:
|
||||||
|
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
|
||||||
|
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
|
||||||
|
|
||||||
|
ensure_dependencies()
|
||||||
|
|
||||||
|
|
||||||
print("** ComfyUI startup time:", current_timestamp())
|
print("** ComfyUI startup time:", current_timestamp())
|
||||||
@@ -497,7 +515,7 @@ check_bypass_ssl()
|
|||||||
# Perform install
|
# Perform install
|
||||||
processed_install = set()
|
processed_install = set()
|
||||||
script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
|
script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
|
||||||
|
|
||||||
|
|
||||||
def is_installed(name):
|
def is_installed(name):
|
||||||
@@ -604,17 +622,19 @@ def execute_lazy_install_script(repo_path, executable):
|
|||||||
|
|
||||||
if os.path.exists(requirements_path):
|
if os.path.exists(requirements_path):
|
||||||
print(f"Install: pip packages for '{repo_path}'")
|
print(f"Install: pip packages for '{repo_path}'")
|
||||||
with open(requirements_path, "r") as requirements_file:
|
|
||||||
for line in requirements_file:
|
|
||||||
package_name = remap_pip_package(line.strip())
|
|
||||||
if package_name and not is_installed(package_name):
|
|
||||||
if '--index-url' in package_name:
|
|
||||||
s = package_name.split('--index-url')
|
|
||||||
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
|
|
||||||
else:
|
|
||||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
|
||||||
|
|
||||||
process_wrap(install_cmd, repo_path)
|
lines = manager_util.robust_readlines(requirements_path)
|
||||||
|
for line in lines:
|
||||||
|
package_name = remap_pip_package(line.strip())
|
||||||
|
package_name = package_name.split('#')[0].strip()
|
||||||
|
if package_name and not is_installed(package_name):
|
||||||
|
if '--index-url' in package_name:
|
||||||
|
s = package_name.split('--index-url')
|
||||||
|
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
|
||||||
|
else:
|
||||||
|
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||||
|
|
||||||
|
process_wrap(install_cmd, repo_path)
|
||||||
|
|
||||||
if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
|
if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
|
||||||
processed_install.add(f'{repo_path}/install.py')
|
processed_install.add(f'{repo_path}/install.py')
|
||||||
@@ -678,19 +698,43 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
|
|||||||
file.write('\n'.join(list(extracted)))
|
file.write('\n'.join(list(extracted)))
|
||||||
|
|
||||||
|
|
||||||
def execute_migration(moves):
|
script_executed = False
|
||||||
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]}'")
|
|
||||||
|
|
||||||
|
def execute_startup_script():
|
||||||
# Check if script_list_path exists
|
global script_executed
|
||||||
if os.path.exists(script_list_path):
|
|
||||||
print("\n#######################################################################")
|
print("\n#######################################################################")
|
||||||
print("[ComfyUI-Manager] Starting dependency installation/(de)activation for the extension\n")
|
print("[ComfyUI-Manager] Starting dependency installation/(de)activation for the extension\n")
|
||||||
|
|
||||||
|
custom_nodelist_cache = None
|
||||||
|
|
||||||
|
def get_custom_node_paths():
|
||||||
|
nonlocal custom_nodelist_cache
|
||||||
|
if custom_nodelist_cache is None:
|
||||||
|
custom_nodelist_cache = set()
|
||||||
|
for base in folder_paths.get_folder_paths('custom_nodes'):
|
||||||
|
for x in os.listdir(base):
|
||||||
|
fullpath = os.path.join(base, x)
|
||||||
|
if os.path.isdir(fullpath):
|
||||||
|
custom_nodelist_cache.add(fullpath)
|
||||||
|
|
||||||
|
return custom_nodelist_cache
|
||||||
|
|
||||||
|
def execute_lazy_delete(path):
|
||||||
|
# Validate to prevent arbitrary paths from being deleted
|
||||||
|
if path not in get_custom_node_paths():
|
||||||
|
logging.error(f"## ComfyUI-Manager: The scheduled '{path}' is not a custom node path, so the deletion has been canceled.")
|
||||||
|
return
|
||||||
|
|
||||||
|
if not os.path.exists(path):
|
||||||
|
logging.info(f"## ComfyUI-Manager: SKIP-DELETE => '{path}' (already deleted)")
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
shutil.rmtree(path)
|
||||||
|
logging.info(f"## ComfyUI-Manager: DELETE => '{path}'")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"## ComfyUI-Manager: Failed to delete '{path}' ({e})")
|
||||||
|
|
||||||
executed = set()
|
executed = set()
|
||||||
# Read each line from the file and convert it to a list using eval
|
# Read each line from the file and convert it to a list using eval
|
||||||
with open(script_list_path, 'r', encoding="UTF-8", errors="ignore") as file:
|
with open(script_list_path, 'r', encoding="UTF-8", errors="ignore") as file:
|
||||||
@@ -711,8 +755,8 @@ if os.path.exists(script_list_path):
|
|||||||
execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
|
execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
|
||||||
execute_lazy_install_script(script[3], script[7])
|
execute_lazy_install_script(script[3], script[7])
|
||||||
|
|
||||||
elif script[1] == "#LAZY-MIGRATION":
|
elif script[1] == "#LAZY-DELETE-NODEPACK":
|
||||||
execute_migration(script[2])
|
execute_lazy_delete(script[2])
|
||||||
|
|
||||||
elif os.path.exists(script[0]):
|
elif os.path.exists(script[0]):
|
||||||
if script[1] == "#FORCE":
|
if script[1] == "#FORCE":
|
||||||
@@ -722,7 +766,7 @@ if os.path.exists(script_list_path):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}")
|
print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}")
|
||||||
print(f"\n## Execute install/(de)activation script for '{script[0]}'")
|
print(f"\n## Execute management script for '{script[0]}'")
|
||||||
|
|
||||||
new_env = os.environ.copy()
|
new_env = os.environ.copy()
|
||||||
if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
|
if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
|
||||||
@@ -730,31 +774,64 @@ if os.path.exists(script_list_path):
|
|||||||
exit_code = process_wrap(script[1:], script[0], env=new_env)
|
exit_code = process_wrap(script[1:], script[0], env=new_env)
|
||||||
|
|
||||||
if exit_code != 0:
|
if exit_code != 0:
|
||||||
print(f"install/(de)activation script failed: {script[0]}")
|
print(f"management script failed: {script[0]}")
|
||||||
else:
|
else:
|
||||||
print(f"\n## ComfyUI-Manager: CANCELED => {script[1:]}")
|
print(f"\n## ComfyUI-Manager: CANCELED => {script[1:]}")
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"[ERROR] Failed to execute install/(de)activation script: {line} / {e}")
|
print(f"[ERROR] Failed to execute management script: {line} / {e}")
|
||||||
|
|
||||||
# Remove the script_list_path file
|
# Remove the script_list_path file
|
||||||
if os.path.exists(script_list_path):
|
if os.path.exists(script_list_path):
|
||||||
|
script_executed = True
|
||||||
os.remove(script_list_path)
|
os.remove(script_list_path)
|
||||||
|
|
||||||
print("\n[ComfyUI-Manager] Startup script completed.")
|
print("\n[ComfyUI-Manager] Startup script completed.")
|
||||||
print("#######################################################################\n")
|
print("#######################################################################\n")
|
||||||
|
|
||||||
|
|
||||||
|
# Check if script_list_path exists
|
||||||
|
if os.path.exists(script_list_path):
|
||||||
|
execute_startup_script()
|
||||||
|
|
||||||
|
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
del processed_install
|
del processed_install
|
||||||
del pip_fixer
|
del pip_fixer
|
||||||
manager_util.clear_pip_cache()
|
manager_util.clear_pip_cache()
|
||||||
|
|
||||||
|
if script_executed:
|
||||||
|
# Restart
|
||||||
|
print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
|
||||||
|
|
||||||
|
if '__COMFY_CLI_SESSION__' in os.environ:
|
||||||
|
with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
|
||||||
|
pass
|
||||||
|
|
||||||
|
print("--------------------------------------------------------------------------\n")
|
||||||
|
exit(0)
|
||||||
|
else:
|
||||||
|
sys_argv = sys.argv.copy()
|
||||||
|
|
||||||
|
if sys_argv[0].endswith("__main__.py"): # this is a python module
|
||||||
|
module_name = os.path.basename(os.path.dirname(sys_argv[0]))
|
||||||
|
cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
|
||||||
|
elif sys.platform.startswith('win32'):
|
||||||
|
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
|
||||||
|
else:
|
||||||
|
cmds = [sys.executable] + sys_argv
|
||||||
|
|
||||||
|
print(f"Command: {cmds}", flush=True)
|
||||||
|
print("--------------------------------------------------------------------------\n")
|
||||||
|
|
||||||
|
os.execv(sys.executable, cmds)
|
||||||
|
|
||||||
|
|
||||||
def check_windows_event_loop_policy():
|
def check_windows_event_loop_policy():
|
||||||
try:
|
try:
|
||||||
import configparser
|
import configparser
|
||||||
config = configparser.ConfigParser()
|
config = configparser.ConfigParser(strict=False)
|
||||||
config.read(manager_config_path)
|
config.read(manager_config_path)
|
||||||
default_conf = config['default']
|
default_conf = config['default']
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "comfyui-manager"
|
name = "comfyui-manager"
|
||||||
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
||||||
version = "3.16"
|
version = "3.32.3"
|
||||||
license = { file = "LICENSE.txt" }
|
license = { file = "LICENSE.txt" }
|
||||||
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
|
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
|
||||||
|
|
||||||
[project.urls]
|
[project.urls]
|
||||||
Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
|
Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
|
||||||
|
|||||||
@@ -7,3 +7,5 @@ typer
|
|||||||
rich
|
rich
|
||||||
typing-extensions
|
typing-extensions
|
||||||
toml
|
toml
|
||||||
|
uv
|
||||||
|
chardet
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ python -m venv venv
|
|||||||
call venv/Scripts/activate
|
call venv/Scripts/activate
|
||||||
python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
|
python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
|
||||||
python -m pip install -r requirements.txt
|
python -m pip install -r requirements.txt
|
||||||
python -m pip install -r custom_nodes/ComfyUI-Manager/requirements.txt
|
python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
|
||||||
cd ..
|
cd ..
|
||||||
echo "cd ComfyUI" >> run_gpu.bat
|
echo "cd ComfyUI" >> run_gpu.bat
|
||||||
echo "call venv/Scripts/activate" >> run_gpu.bat
|
echo "call venv/Scripts/activate" >> run_gpu.bat
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
.\python_embeded\python.exe -s -m pip install gitpython
|
.\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')"
|
||||||
|
.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt
|
||||||
|
|||||||
Reference in New Issue
Block a user