Compare commits
81 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
982a60e85f | ||
|
|
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 |
30
README.md
30
README.md
@@ -149,7 +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_overrides.list`
|
* 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`
|
||||||
@@ -306,6 +307,10 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
* Prevent the installation of specific pip packages
|
* Prevent the installation of specific pip packages
|
||||||
* List the package names one per line in the `pip_blacklist.list` file.
|
* 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)
|
||||||
|
|
||||||
@@ -313,6 +318,29 @@ The following settings are applied based on the section marked as `is_default`.
|
|||||||
* This option can be used if performance issues occur in a Colab+GDrive environment.
|
* 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:
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,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")
|
||||||
|
|
||||||
|
|||||||
55
cm-cli.py
55
cm-cli.py
@@ -61,13 +61,17 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist
|
|||||||
|
|
||||||
|
|
||||||
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()
|
||||||
@@ -76,7 +80,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']
|
||||||
|
|
||||||
@@ -152,6 +156,11 @@ class Ctx:
|
|||||||
if y != '':
|
if y != '':
|
||||||
cm_global.pip_blacklist.add(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():
|
||||||
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
|
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
|
||||||
@@ -245,7 +254,7 @@ def fix_node(node_spec_str, is_all=False, cnt_msg=''):
|
|||||||
res = unified_manager.unified_fix(node_name, version_spec, no_deps=cmd_ctx.no_deps)
|
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 = ''):
|
||||||
@@ -638,7 +647,7 @@ def install(
|
|||||||
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)
|
||||||
pip_fixer.fix_broken()
|
pip_fixer.fix_broken()
|
||||||
|
|
||||||
@@ -676,7 +685,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()
|
||||||
|
|
||||||
@@ -702,7 +711,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(
|
||||||
...,
|
...,
|
||||||
@@ -730,7 +739,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']:
|
||||||
@@ -831,7 +840,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()
|
||||||
|
|
||||||
@@ -1038,13 +1047,17 @@ def save_snapshot(
|
|||||||
):
|
):
|
||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
|
|
||||||
|
if output is None:
|
||||||
|
print("[bold red]ERROR: missing output path[/bold red]")
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
if(not output.endswith('.json') and not output.endswith('.yaml')):
|
if(not output.endswith('.json') and not output.endswith('.yaml')):
|
||||||
print("ERROR: output path should be either '.json' or '.yaml' file.")
|
print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
|
||||||
raise typer.Exit(code=1)
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
dir_path = os.path.dirname(output)
|
dir_path = os.path.dirname(output)
|
||||||
if(dir_path != '' and not os.path.exists(dir_path)):
|
if(dir_path != '' and not os.path.exists(dir_path)):
|
||||||
print(f"ERROR: {output} path not exists.")
|
print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
|
||||||
raise typer.Exit(code=1)
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
|
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
|
||||||
@@ -1075,10 +1088,17 @@ def restore_snapshot(
|
|||||||
user_directory: str = typer.Option(
|
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')
|
||||||
@@ -1099,7 +1119,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:
|
||||||
@@ -1131,7 +1151,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}")
|
||||||
@@ -1150,7 +1170,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()
|
||||||
|
|
||||||
@@ -1194,8 +1214,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':
|
||||||
|
|||||||
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
|
||||||
|
|||||||
6778
github-stats.json
6778
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']:
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
@@ -23,6 +23,7 @@ import yaml
|
|||||||
import zipfile
|
import zipfile
|
||||||
import traceback
|
import traceback
|
||||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||||
|
import toml
|
||||||
|
|
||||||
orig_print = print
|
orig_print = print
|
||||||
|
|
||||||
@@ -42,7 +43,7 @@ import manager_downloader
|
|||||||
from node_package import InstalledNodePackage
|
from node_package import InstalledNodePackage
|
||||||
|
|
||||||
|
|
||||||
version_code = [3, 23]
|
version_code = [3, 30, 3]
|
||||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||||
|
|
||||||
|
|
||||||
@@ -74,13 +75,31 @@ def get_custom_nodes_paths():
|
|||||||
|
|
||||||
|
|
||||||
def get_comfyui_tag():
|
def get_comfyui_tag():
|
||||||
repo = git.Repo(comfy_path)
|
|
||||||
try:
|
try:
|
||||||
|
repo = git.Repo(comfy_path)
|
||||||
return repo.git.describe('--tags')
|
return repo.git.describe('--tags')
|
||||||
except:
|
except:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_current_comfyui_ver():
|
||||||
|
"""
|
||||||
|
Extract version from pyproject.toml
|
||||||
|
"""
|
||||||
|
toml_path = os.path.join(comfy_path, 'pyproject.toml')
|
||||||
|
if not os.path.exists(toml_path):
|
||||||
|
return None
|
||||||
|
else:
|
||||||
|
try:
|
||||||
|
with open(toml_path, "r", encoding="utf-8") as f:
|
||||||
|
data = toml.load(f)
|
||||||
|
|
||||||
|
project = data.get('project', {})
|
||||||
|
return project.get('version')
|
||||||
|
except:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
def get_script_env():
|
def get_script_env():
|
||||||
new_env = os.environ.copy()
|
new_env = os.environ.copy()
|
||||||
git_exe = get_config().get('git_exe')
|
git_exe = get_config().get('git_exe')
|
||||||
@@ -154,7 +173,7 @@ def check_invalid_nodes():
|
|||||||
|
|
||||||
|
|
||||||
# read env vars
|
# read env vars
|
||||||
comfy_path = os.environ.get('COMFYUI_PATH')
|
comfy_path: str = os.environ.get('COMFYUI_PATH')
|
||||||
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
||||||
|
|
||||||
if comfy_path is None:
|
if comfy_path is None:
|
||||||
@@ -505,6 +524,8 @@ class UnifiedManager:
|
|||||||
def resolve_from_path(self, fullpath):
|
def resolve_from_path(self, fullpath):
|
||||||
url = git_utils.git_url(fullpath)
|
url = git_utils.git_url(fullpath)
|
||||||
if url:
|
if url:
|
||||||
|
url = git_utils.normalize_url(url)
|
||||||
|
|
||||||
cnr = self.get_cnr_by_repo(url)
|
cnr = self.get_cnr_by_repo(url)
|
||||||
commit_hash = git_utils.get_commit_hash(fullpath)
|
commit_hash = git_utils.get_commit_hash(fullpath)
|
||||||
if cnr:
|
if cnr:
|
||||||
@@ -536,6 +557,8 @@ class UnifiedManager:
|
|||||||
|
|
||||||
if node_package.is_disabled and node_package.is_unknown:
|
if node_package.is_disabled and node_package.is_unknown:
|
||||||
url = git_utils.git_url(node_package.fullpath)
|
url = git_utils.git_url(node_package.fullpath)
|
||||||
|
if url is not None:
|
||||||
|
url = git_utils.normalize_url(url)
|
||||||
self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
|
self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
|
||||||
|
|
||||||
if node_package.is_disabled and node_package.is_nightly:
|
if node_package.is_disabled and node_package.is_nightly:
|
||||||
@@ -546,6 +569,8 @@ class UnifiedManager:
|
|||||||
|
|
||||||
if node_package.is_enabled and node_package.is_unknown:
|
if node_package.is_enabled and node_package.is_unknown:
|
||||||
url = git_utils.git_url(node_package.fullpath)
|
url = git_utils.git_url(node_package.fullpath)
|
||||||
|
if url is not None:
|
||||||
|
url = git_utils.normalize_url(url)
|
||||||
self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
|
self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
|
||||||
|
|
||||||
if node_package.is_from_cnr and node_package.is_disabled:
|
if node_package.is_from_cnr and node_package.is_disabled:
|
||||||
@@ -822,7 +847,7 @@ class UnifiedManager:
|
|||||||
else:
|
else:
|
||||||
if os.path.exists(requirements_path) and not no_deps:
|
if os.path.exists(requirements_path) and not no_deps:
|
||||||
print("Install: pip packages")
|
print("Install: pip packages")
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
|
||||||
res = True
|
res = True
|
||||||
lines = manager_util.robust_readlines(requirements_path)
|
lines = manager_util.robust_readlines(requirements_path)
|
||||||
for line in lines:
|
for line in lines:
|
||||||
@@ -991,7 +1016,7 @@ class UnifiedManager:
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def unified_enable(self, node_id, version_spec=None):
|
def unified_enable(self, node_id: str, version_spec=None):
|
||||||
"""
|
"""
|
||||||
priority if version_spec == None
|
priority if version_spec == None
|
||||||
1. CNR latest in disk
|
1. CNR latest in disk
|
||||||
@@ -1003,6 +1028,9 @@ class UnifiedManager:
|
|||||||
|
|
||||||
result = ManagedResult('enable')
|
result = ManagedResult('enable')
|
||||||
|
|
||||||
|
if 'comfyui-manager' in node_id.lower():
|
||||||
|
return result.fail(f"ignored: enabling '{node_id}'")
|
||||||
|
|
||||||
if version_spec is None:
|
if version_spec is None:
|
||||||
version_spec = self.resolve_unspecified_version(node_id, guess_mode='inactive')
|
version_spec = self.resolve_unspecified_version(node_id, guess_mode='inactive')
|
||||||
if version is None:
|
if version is None:
|
||||||
@@ -1057,8 +1085,8 @@ class UnifiedManager:
|
|||||||
|
|
||||||
# update cache
|
# update cache
|
||||||
if version_spec == 'unknown':
|
if version_spec == 'unknown':
|
||||||
|
self.unknown_active_nodes[node_id] = self.unknown_inactive_nodes[node_id][0], to_path
|
||||||
del self.unknown_inactive_nodes[node_id]
|
del self.unknown_inactive_nodes[node_id]
|
||||||
self.unknown_active_nodes[node_id] = to_path
|
|
||||||
return result.with_target(to_path)
|
return result.with_target(to_path)
|
||||||
elif version_spec == 'nightly':
|
elif version_spec == 'nightly':
|
||||||
del self.nightly_inactive_nodes[node_id]
|
del self.nightly_inactive_nodes[node_id]
|
||||||
@@ -1068,9 +1096,12 @@ class UnifiedManager:
|
|||||||
self.active_nodes[node_id] = version_spec, to_path
|
self.active_nodes[node_id] = version_spec, to_path
|
||||||
return result.with_target(to_path)
|
return result.with_target(to_path)
|
||||||
|
|
||||||
def unified_disable(self, node_id, is_unknown):
|
def unified_disable(self, node_id: str, is_unknown):
|
||||||
result = ManagedResult('disable')
|
result = ManagedResult('disable')
|
||||||
|
|
||||||
|
if 'comfyui-manager' in node_id.lower():
|
||||||
|
return result.fail(f"ignored: disabling '{node_id}'")
|
||||||
|
|
||||||
if is_unknown:
|
if is_unknown:
|
||||||
version_spec = 'unknown'
|
version_spec = 'unknown'
|
||||||
else:
|
else:
|
||||||
@@ -1126,6 +1157,9 @@ class UnifiedManager:
|
|||||||
"""
|
"""
|
||||||
result = ManagedResult('uninstall')
|
result = ManagedResult('uninstall')
|
||||||
|
|
||||||
|
if 'comfyui-manager' in node_id.lower():
|
||||||
|
return result.fail(f"ignored: uninstalling '{node_id}'")
|
||||||
|
|
||||||
if is_unknown:
|
if is_unknown:
|
||||||
# remove from actives
|
# remove from actives
|
||||||
repo_and_path = self.unknown_active_nodes.get(node_id)
|
repo_and_path = self.unknown_active_nodes.get(node_id)
|
||||||
@@ -1158,14 +1192,14 @@ class UnifiedManager:
|
|||||||
ver_and_path = self.active_nodes.get(node_id)
|
ver_and_path = self.active_nodes.get(node_id)
|
||||||
|
|
||||||
if ver_and_path is not None and os.path.exists(ver_and_path[1]):
|
if ver_and_path is not None and os.path.exists(ver_and_path[1]):
|
||||||
shutil.rmtree(ver_and_path[1])
|
try_rmtree(node_id, ver_and_path[1])
|
||||||
result.items.append(ver_and_path)
|
result.items.append(ver_and_path)
|
||||||
del self.active_nodes[node_id]
|
del self.active_nodes[node_id]
|
||||||
|
|
||||||
# remove from nightly inactives
|
# remove from nightly inactives
|
||||||
fullpath = self.nightly_inactive_nodes.get(node_id)
|
fullpath = self.nightly_inactive_nodes.get(node_id)
|
||||||
if fullpath is not None and os.path.exists(fullpath):
|
if fullpath is not None and os.path.exists(fullpath):
|
||||||
shutil.rmtree(fullpath)
|
try_rmtree(node_id, fullpath)
|
||||||
result.items.append(('nightly', fullpath))
|
result.items.append(('nightly', fullpath))
|
||||||
del self.nightly_inactive_nodes[node_id]
|
del self.nightly_inactive_nodes[node_id]
|
||||||
|
|
||||||
@@ -1173,7 +1207,7 @@ class UnifiedManager:
|
|||||||
ver_map = self.cnr_inactive_nodes.get(node_id)
|
ver_map = self.cnr_inactive_nodes.get(node_id)
|
||||||
if ver_map is not None:
|
if ver_map is not None:
|
||||||
for key, fullpath in ver_map.items():
|
for key, fullpath in ver_map.items():
|
||||||
shutil.rmtree(fullpath)
|
try_rmtree(node_id, fullpath)
|
||||||
result.items.append((key, fullpath))
|
result.items.append((key, fullpath))
|
||||||
del self.cnr_inactive_nodes[node_id]
|
del self.cnr_inactive_nodes[node_id]
|
||||||
|
|
||||||
@@ -1182,9 +1216,12 @@ class UnifiedManager:
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def cnr_install(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
|
def cnr_install(self, node_id: str, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
|
||||||
result = ManagedResult('install-cnr')
|
result = ManagedResult('install-cnr')
|
||||||
|
|
||||||
|
if 'comfyui-manager' in node_id.lower():
|
||||||
|
return result.fail(f"ignored: installing '{node_id}'")
|
||||||
|
|
||||||
node_info = cnr_utils.install_node(node_id, version_spec)
|
node_info = cnr_utils.install_node(node_id, version_spec)
|
||||||
if node_info is None or not node_info.download_url:
|
if node_info is None or not node_info.download_url:
|
||||||
return result.fail(f'not available node: {node_id}@{version_spec}')
|
return result.fail(f'not available node: {node_id}@{version_spec}')
|
||||||
@@ -1229,25 +1266,29 @@ class UnifiedManager:
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def repo_install(self, url, repo_path, instant_execution=False, no_deps=False, return_postinstall=False):
|
def repo_install(self, url: str, repo_path: str, instant_execution=False, no_deps=False, return_postinstall=False):
|
||||||
result = ManagedResult('install-git')
|
result = ManagedResult('install-git')
|
||||||
result.append(url)
|
result.append(url)
|
||||||
|
|
||||||
|
if 'comfyui-manager' in url.lower():
|
||||||
|
return result.fail(f"ignored: installing '{url}'")
|
||||||
|
|
||||||
if not is_valid_url(url):
|
if not is_valid_url(url):
|
||||||
return result.fail(f"Invalid git url: {url}")
|
return result.fail(f"Invalid git url: {url}")
|
||||||
|
|
||||||
if url.endswith("/"):
|
if url.endswith("/"):
|
||||||
url = url[:-1]
|
url = url[:-1]
|
||||||
try:
|
try:
|
||||||
print(f"Download: git clone '{url}'")
|
|
||||||
|
|
||||||
# Clone the repository from the remote URL
|
# Clone the repository from the remote URL
|
||||||
|
clone_url = git_utils.get_url_for_clone(url)
|
||||||
|
print(f"Download: git clone '{clone_url}'")
|
||||||
|
|
||||||
if not instant_execution and platform.system() == 'Windows':
|
if not instant_execution and platform.system() == 'Windows':
|
||||||
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
|
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
|
||||||
if res != 0:
|
if res != 0:
|
||||||
return result.fail(f"Failed to clone repo: {url}")
|
return result.fail(f"Failed to clone repo: {clone_url}")
|
||||||
else:
|
else:
|
||||||
repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
|
repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
|
||||||
repo.git.clear_cache()
|
repo.git.clear_cache()
|
||||||
repo.close()
|
repo.close()
|
||||||
|
|
||||||
@@ -1352,7 +1393,7 @@ class UnifiedManager:
|
|||||||
else:
|
else:
|
||||||
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')
|
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')
|
||||||
|
|
||||||
async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
|
async def install_by_id(self, node_id: str, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
|
||||||
"""
|
"""
|
||||||
priority if version_spec == None
|
priority if version_spec == None
|
||||||
1. CNR latest
|
1. CNR latest
|
||||||
@@ -1361,6 +1402,9 @@ class UnifiedManager:
|
|||||||
remark: latest version_spec is not allowed. Must be resolved before call.
|
remark: latest version_spec is not allowed. Must be resolved before call.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
if 'comfyui-manager' in node_id.lower():
|
||||||
|
return ManagedResult('skip').fail(f"ignored: installing '{node_id}'")
|
||||||
|
|
||||||
repo_url = None
|
repo_url = None
|
||||||
if version_spec is None:
|
if version_spec is None:
|
||||||
if self.is_enabled(node_id):
|
if self.is_enabled(node_id):
|
||||||
@@ -1398,7 +1442,7 @@ class UnifiedManager:
|
|||||||
res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
|
res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
|
||||||
if res.result:
|
if res.result:
|
||||||
if version_spec == 'unknown':
|
if version_spec == 'unknown':
|
||||||
self.unknown_active_nodes[node_id] = to_path
|
self.unknown_active_nodes[node_id] = repo_url, to_path
|
||||||
elif version_spec == 'nightly':
|
elif version_spec == 'nightly':
|
||||||
cnr_utils.generate_cnr_id(to_path, node_id)
|
cnr_utils.generate_cnr_id(to_path, node_id)
|
||||||
self.active_nodes[node_id] = 'nightly', to_path
|
self.active_nodes[node_id] = 'nightly', to_path
|
||||||
@@ -1465,7 +1509,7 @@ def identify_node_pack_from_path(fullpath):
|
|||||||
# cnr
|
# cnr
|
||||||
cnr = cnr_utils.read_cnr_info(fullpath)
|
cnr = cnr_utils.read_cnr_info(fullpath)
|
||||||
if cnr is not None:
|
if cnr is not None:
|
||||||
return module_name, cnr['version'], cnr['id']
|
return module_name, cnr['version'], cnr['id'], None
|
||||||
|
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
@@ -1473,10 +1517,18 @@ def identify_node_pack_from_path(fullpath):
|
|||||||
cnr_id = cnr_utils.read_cnr_id(fullpath)
|
cnr_id = cnr_utils.read_cnr_id(fullpath)
|
||||||
commit_hash = git_utils.get_commit_hash(fullpath)
|
commit_hash = git_utils.get_commit_hash(fullpath)
|
||||||
|
|
||||||
|
github_id = git_utils.normalize_to_github_id(repo_url)
|
||||||
|
if github_id is None:
|
||||||
|
try:
|
||||||
|
github_id = os.path.basename(repo_url)
|
||||||
|
except:
|
||||||
|
logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
|
||||||
|
github_id = module_name
|
||||||
|
|
||||||
if cnr_id is not None:
|
if cnr_id is not None:
|
||||||
return module_name, commit_hash, cnr_id
|
return module_name, commit_hash, cnr_id, github_id
|
||||||
else:
|
else:
|
||||||
return module_name, commit_hash, ''
|
return module_name, commit_hash, '', github_id
|
||||||
|
|
||||||
|
|
||||||
def get_installed_node_packs():
|
def get_installed_node_packs():
|
||||||
@@ -1494,7 +1546,7 @@ def get_installed_node_packs():
|
|||||||
|
|
||||||
is_disabled = not y.endswith('.disabled')
|
is_disabled = not y.endswith('.disabled')
|
||||||
|
|
||||||
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': is_disabled }
|
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': is_disabled }
|
||||||
|
|
||||||
disabled_dirs = os.path.join(x, '.disabled')
|
disabled_dirs = os.path.join(x, '.disabled')
|
||||||
if os.path.exists(disabled_dirs):
|
if os.path.exists(disabled_dirs):
|
||||||
@@ -1507,7 +1559,7 @@ def get_installed_node_packs():
|
|||||||
if info is None:
|
if info is None:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': False }
|
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': False }
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@@ -1563,7 +1615,7 @@ manager_funcs = ManagerFuncs()
|
|||||||
|
|
||||||
|
|
||||||
def write_config():
|
def write_config():
|
||||||
config = configparser.ConfigParser()
|
config = configparser.ConfigParser(strict=False)
|
||||||
|
|
||||||
config['default'] = {
|
config['default'] = {
|
||||||
'preview_method': manager_funcs.get_current_preview_method(),
|
'preview_method': manager_funcs.get_current_preview_method(),
|
||||||
@@ -1574,13 +1626,15 @@ def write_config():
|
|||||||
'bypass_ssl': get_config()['bypass_ssl'],
|
'bypass_ssl': get_config()['bypass_ssl'],
|
||||||
"file_logging": get_config()['file_logging'],
|
"file_logging": get_config()['file_logging'],
|
||||||
'component_policy': get_config()['component_policy'],
|
'component_policy': get_config()['component_policy'],
|
||||||
|
'update_policy': get_config()['update_policy'],
|
||||||
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
|
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
|
||||||
'model_download_by_agent': get_config()['model_download_by_agent'],
|
'model_download_by_agent': get_config()['model_download_by_agent'],
|
||||||
'downgrade_blacklist': get_config()['downgrade_blacklist'],
|
'downgrade_blacklist': get_config()['downgrade_blacklist'],
|
||||||
'security_level': get_config()['security_level'],
|
'security_level': get_config()['security_level'],
|
||||||
'skip_migration_check': get_config()['skip_migration_check'],
|
'skip_migration_check': get_config()['skip_migration_check'],
|
||||||
'always_lazy_install': get_config()['always_lazy_install'],
|
'always_lazy_install': get_config()['always_lazy_install'],
|
||||||
'network_mode': get_config()['network_mode']
|
'network_mode': get_config()['network_mode'],
|
||||||
|
'db_mode': get_config()['db_mode'],
|
||||||
}
|
}
|
||||||
|
|
||||||
directory = os.path.dirname(manager_config_path)
|
directory = os.path.dirname(manager_config_path)
|
||||||
@@ -1593,7 +1647,7 @@ def write_config():
|
|||||||
|
|
||||||
def read_config():
|
def read_config():
|
||||||
try:
|
try:
|
||||||
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']
|
||||||
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
|
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
|
||||||
@@ -1612,6 +1666,7 @@ def read_config():
|
|||||||
'bypass_ssl': get_bool('bypass_ssl', False),
|
'bypass_ssl': get_bool('bypass_ssl', False),
|
||||||
'file_logging': get_bool('file_logging', True),
|
'file_logging': get_bool('file_logging', True),
|
||||||
'component_policy': default_conf.get('component_policy', 'workflow').lower(),
|
'component_policy': default_conf.get('component_policy', 'workflow').lower(),
|
||||||
|
'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
|
||||||
'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
|
'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
|
||||||
'model_download_by_agent': get_bool('model_download_by_agent', False),
|
'model_download_by_agent': get_bool('model_download_by_agent', False),
|
||||||
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
|
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
|
||||||
@@ -1619,6 +1674,7 @@ def read_config():
|
|||||||
'always_lazy_install': get_bool('always_lazy_install', False),
|
'always_lazy_install': get_bool('always_lazy_install', False),
|
||||||
'network_mode': default_conf.get('network_mode', 'public').lower(),
|
'network_mode': default_conf.get('network_mode', 'public').lower(),
|
||||||
'security_level': default_conf.get('security_level', 'normal').lower(),
|
'security_level': default_conf.get('security_level', 'normal').lower(),
|
||||||
|
'db_mode': default_conf.get('db_mode', 'cache').lower(),
|
||||||
}
|
}
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -1634,6 +1690,7 @@ def read_config():
|
|||||||
'bypass_ssl': False,
|
'bypass_ssl': False,
|
||||||
'file_logging': True,
|
'file_logging': True,
|
||||||
'component_policy': 'workflow',
|
'component_policy': 'workflow',
|
||||||
|
'update_policy': 'stable-comfyui',
|
||||||
'windows_selector_event_loop_policy': False,
|
'windows_selector_event_loop_policy': False,
|
||||||
'model_download_by_agent': False,
|
'model_download_by_agent': False,
|
||||||
'downgrade_blacklist': '',
|
'downgrade_blacklist': '',
|
||||||
@@ -1641,6 +1698,7 @@ def read_config():
|
|||||||
'always_lazy_install': False,
|
'always_lazy_install': False,
|
||||||
'network_mode': 'public', # public | private | offline
|
'network_mode': 'public', # public | private | offline
|
||||||
'security_level': 'normal', # strong | normal | normal- | weak
|
'security_level': 'normal', # strong | normal | normal- | weak
|
||||||
|
'db_mode': 'cache', # local | cache | remote
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1685,31 +1743,55 @@ 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
|
||||||
|
|
||||||
|
|
||||||
|
def reserve_script(repo_path, install_cmds):
|
||||||
|
if not os.path.exists(manager_startup_script_path):
|
||||||
|
os.makedirs(manager_startup_script_path)
|
||||||
|
|
||||||
|
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
|
||||||
|
with open(script_path, "a") as file:
|
||||||
|
obj = [repo_path] + install_cmds
|
||||||
|
file.write(f"{obj}\n")
|
||||||
|
|
||||||
|
|
||||||
|
def try_rmtree(title, fullpath):
|
||||||
|
try:
|
||||||
|
shutil.rmtree(fullpath)
|
||||||
|
except Exception as e:
|
||||||
|
logging.warning(f"[ComfyUI-Manager] An error occurred while deleting '{fullpath}', so it has been scheduled for deletion upon restart.\nEXCEPTION: {e}")
|
||||||
|
reserve_script(title, ["#LAZY-DELETE-NODEPACK", fullpath])
|
||||||
|
|
||||||
|
|
||||||
def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
||||||
if not instant_execution and (
|
if not instant_execution and (
|
||||||
(len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
|
(len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
|
||||||
):
|
):
|
||||||
if not os.path.exists(manager_startup_script_path):
|
reserve_script(repo_path, install_cmd)
|
||||||
os.makedirs(manager_startup_script_path)
|
|
||||||
|
|
||||||
script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
|
|
||||||
with open(script_path, "a") as file:
|
|
||||||
obj = [repo_path] + install_cmd
|
|
||||||
file.write(f"{obj}\n")
|
|
||||||
|
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
if len(install_cmd) == 5 and install_cmd[2:4] == ['pip', 'install']:
|
if len(install_cmd) == 5 and install_cmd[2:4] == ['pip', 'install']:
|
||||||
@@ -1726,7 +1808,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
|||||||
|
|
||||||
if platform.system() != "Windows":
|
if platform.system() != "Windows":
|
||||||
try:
|
try:
|
||||||
if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
|
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
|
||||||
print("\n\n###################################################################")
|
print("\n\n###################################################################")
|
||||||
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
|
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
|
||||||
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
|
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
|
||||||
@@ -1820,7 +1902,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
|
|||||||
else:
|
else:
|
||||||
if os.path.exists(requirements_path) and not no_deps:
|
if os.path.exists(requirements_path) and not no_deps:
|
||||||
print("Install: pip packages")
|
print("Install: pip packages")
|
||||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
|
||||||
with open(requirements_path, "r") as requirements_file:
|
with open(requirements_path, "r") as requirements_file:
|
||||||
for line in requirements_file:
|
for line in requirements_file:
|
||||||
#handle comments
|
#handle comments
|
||||||
@@ -2043,12 +2125,14 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
|
|||||||
print(f"CLONE into '{repo_path}'")
|
print(f"CLONE into '{repo_path}'")
|
||||||
|
|
||||||
# Clone the repository from the remote URL
|
# Clone the repository from the remote URL
|
||||||
|
clone_url = git_utils.get_url_for_clone(url)
|
||||||
|
|
||||||
if not instant_execution and platform.system() == 'Windows':
|
if not instant_execution and platform.system() == 'Windows':
|
||||||
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
|
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
|
||||||
if res != 0:
|
if res != 0:
|
||||||
return result.fail(f"Failed to clone '{url}' into '{repo_path}'")
|
return result.fail(f"Failed to clone '{clone_url}' into '{repo_path}'")
|
||||||
else:
|
else:
|
||||||
repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
|
repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
|
||||||
repo.git.clear_cache()
|
repo.git.clear_cache()
|
||||||
repo.close()
|
repo.close()
|
||||||
|
|
||||||
@@ -2342,6 +2426,39 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def update_to_stable_comfyui(repo_path):
|
||||||
|
try:
|
||||||
|
repo = git.Repo(repo_path)
|
||||||
|
try:
|
||||||
|
repo.git.checkout(repo.heads.master)
|
||||||
|
except:
|
||||||
|
logging.error(f"[ComfyUI-Manager] Failed to checkout 'master' branch.\nrepo_path={repo_path}\nAvailable branches:")
|
||||||
|
for branch in repo.branches:
|
||||||
|
logging.error('\t'+branch.name)
|
||||||
|
return "fail", None
|
||||||
|
|
||||||
|
versions, current_tag, _ = get_comfyui_versions(repo)
|
||||||
|
|
||||||
|
if len(versions) == 0 or (len(versions) == 1 and versions[0] == 'nightly'):
|
||||||
|
logging.info("[ComfyUI-Manager] Unable to update to the stable ComfyUI version.")
|
||||||
|
return "fail", None
|
||||||
|
|
||||||
|
if versions[0] == 'nightly':
|
||||||
|
latest_tag = versions[1]
|
||||||
|
else:
|
||||||
|
latest_tag = versions[0]
|
||||||
|
|
||||||
|
if current_tag == latest_tag:
|
||||||
|
return "skip", None
|
||||||
|
else:
|
||||||
|
logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
|
||||||
|
repo.git.checkout(latest_tag)
|
||||||
|
return 'updated', latest_tag
|
||||||
|
except:
|
||||||
|
traceback.print_exc()
|
||||||
|
return "fail", None
|
||||||
|
|
||||||
|
|
||||||
def update_path(repo_path, instant_execution=False, no_deps=False):
|
def update_path(repo_path, instant_execution=False, no_deps=False):
|
||||||
if not os.path.exists(os.path.join(repo_path, '.git')):
|
if not os.path.exists(os.path.join(repo_path, '.git')):
|
||||||
return "fail"
|
return "fail"
|
||||||
@@ -2349,9 +2466,12 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
|
|||||||
# version check
|
# version check
|
||||||
repo = git.Repo(repo_path)
|
repo = git.Repo(repo_path)
|
||||||
|
|
||||||
|
is_switched = False
|
||||||
if repo.head.is_detached:
|
if repo.head.is_detached:
|
||||||
if not switch_to_default_branch(repo):
|
if not switch_to_default_branch(repo):
|
||||||
return "fail"
|
return "fail"
|
||||||
|
else:
|
||||||
|
is_switched = True
|
||||||
|
|
||||||
current_branch = repo.active_branch
|
current_branch = repo.active_branch
|
||||||
branch_name = current_branch.name
|
branch_name = current_branch.name
|
||||||
@@ -2390,6 +2510,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
|
|||||||
git_pull(repo_path)
|
git_pull(repo_path)
|
||||||
execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
|
execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
|
||||||
return "updated"
|
return "updated"
|
||||||
|
elif is_switched:
|
||||||
|
return "updated"
|
||||||
else:
|
else:
|
||||||
return "skipped"
|
return "skipped"
|
||||||
|
|
||||||
@@ -2487,14 +2609,11 @@ async def get_current_snapshot(custom_nodes_only = False):
|
|||||||
# Get ComfyUI hash
|
# Get ComfyUI hash
|
||||||
repo_path = comfy_path
|
repo_path = comfy_path
|
||||||
|
|
||||||
if not os.path.exists(os.path.join(repo_path, '.git')):
|
|
||||||
print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
|
||||||
return {}
|
|
||||||
|
|
||||||
comfyui_commit_hash = None
|
comfyui_commit_hash = None
|
||||||
if not custom_nodes_only:
|
if not custom_nodes_only:
|
||||||
repo = git.Repo(repo_path)
|
if os.path.exists(os.path.join(repo_path, '.git')):
|
||||||
comfyui_commit_hash = repo.head.commit.hexsha
|
repo = git.Repo(repo_path)
|
||||||
|
comfyui_commit_hash = repo.head.commit.hexsha
|
||||||
|
|
||||||
git_custom_nodes = {}
|
git_custom_nodes = {}
|
||||||
cnr_custom_nodes = {}
|
cnr_custom_nodes = {}
|
||||||
@@ -2700,9 +2819,6 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
|
|||||||
if ext == 'https://github.com/comfyanonymous/ComfyUI':
|
if ext == 'https://github.com/comfyanonymous/ComfyUI':
|
||||||
pass
|
pass
|
||||||
elif ext is not None:
|
elif ext is not None:
|
||||||
if 'Fooocus' in ext:
|
|
||||||
print(f">> {node_name}")
|
|
||||||
|
|
||||||
used_exts.add(ext)
|
used_exts.add(ext)
|
||||||
else:
|
else:
|
||||||
unknown_nodes.add(node_name)
|
unknown_nodes.add(node_name)
|
||||||
@@ -2973,7 +3089,18 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
print("cm-cli: unexpected [0001]")
|
print("cm-cli: unexpected [0001]")
|
||||||
|
|
||||||
# for nightly restore
|
# for nightly restore
|
||||||
git_info = info.get('git_custom_nodes')
|
_git_info = info.get('git_custom_nodes')
|
||||||
|
git_info = {}
|
||||||
|
|
||||||
|
# normalize github repo
|
||||||
|
for k, v in _git_info.items():
|
||||||
|
# robust filter out comfyui-manager while restoring snapshot
|
||||||
|
if 'comfyui-manager' in k.lower():
|
||||||
|
continue
|
||||||
|
|
||||||
|
norm_k = git_utils.normalize_url(k)
|
||||||
|
git_info[norm_k] = v
|
||||||
|
|
||||||
if git_info is not None:
|
if git_info is not None:
|
||||||
todo_disable = []
|
todo_disable = []
|
||||||
todo_enable = []
|
todo_enable = []
|
||||||
@@ -2986,20 +3113,13 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
|
|
||||||
if v[0] == 'nightly' and cnr_repo_map.get(k):
|
if v[0] == 'nightly' and cnr_repo_map.get(k):
|
||||||
repo_url = cnr_repo_map.get(k)
|
repo_url = cnr_repo_map.get(k)
|
||||||
|
normalized_url = git_utils.normalize_url(repo_url)
|
||||||
|
|
||||||
normalized_url1 = git_utils.normalize_url(repo_url)
|
if normalized_url not in git_info:
|
||||||
normalized_url2 = git_utils.normalize_url_http(repo_url)
|
|
||||||
|
|
||||||
if normalized_url1 not in git_info and normalized_url2 not in git_info:
|
|
||||||
todo_disable.append(k)
|
todo_disable.append(k)
|
||||||
else:
|
else:
|
||||||
if normalized_url1 in git_info:
|
commit_hash = git_info[normalized_url]['hash']
|
||||||
commit_hash = git_info[normalized_url1]['hash']
|
todo_checkout.append((v[1], commit_hash))
|
||||||
todo_checkout.append((v[1], commit_hash))
|
|
||||||
|
|
||||||
if normalized_url2 in git_info:
|
|
||||||
commit_hash = git_info[normalized_url2]['hash']
|
|
||||||
todo_checkout.append((v[1], commit_hash))
|
|
||||||
|
|
||||||
for k, v in unified_manager.nightly_inactive_nodes.items():
|
for k, v in unified_manager.nightly_inactive_nodes.items():
|
||||||
if 'comfyui-manager' in k:
|
if 'comfyui-manager' in k:
|
||||||
@@ -3007,18 +3127,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
|
|
||||||
if cnr_repo_map.get(k):
|
if cnr_repo_map.get(k):
|
||||||
repo_url = cnr_repo_map.get(k)
|
repo_url = cnr_repo_map.get(k)
|
||||||
normalized_url1 = git_utils.normalize_url(repo_url)
|
normalized_url = git_utils.normalize_url(repo_url)
|
||||||
normalized_url2 = git_utils.normalize_url_http(repo_url)
|
|
||||||
|
|
||||||
if normalized_url1 in git_info:
|
if normalized_url in git_info:
|
||||||
commit_hash = git_info[normalized_url1]['hash']
|
commit_hash = git_info[normalized_url]['hash']
|
||||||
todo_enable.append((k, commit_hash))
|
todo_enable.append((k, commit_hash))
|
||||||
processed_urls.append(normalized_url1)
|
processed_urls.append(normalized_url)
|
||||||
|
|
||||||
if normalized_url2 in git_info:
|
|
||||||
commit_hash = git_info[normalized_url2]['hash']
|
|
||||||
todo_enable.append((k, commit_hash))
|
|
||||||
processed_urls.append(normalized_url2)
|
|
||||||
|
|
||||||
for x in todo_disable:
|
for x in todo_disable:
|
||||||
unified_manager.unified_disable(x, False)
|
unified_manager.unified_disable(x, False)
|
||||||
@@ -3071,21 +3185,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
if repo_url is None:
|
if repo_url is None:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
normalized_url1 = git_utils.normalize_url(repo_url)
|
normalized_url = git_utils.normalize_url(repo_url)
|
||||||
normalized_url2 = git_utils.normalize_url_http(repo_url)
|
|
||||||
|
|
||||||
if normalized_url1 not in git_info and normalized_url2 not in git_info:
|
if normalized_url not in git_info:
|
||||||
todo_disable.append(k2)
|
todo_disable.append(k2)
|
||||||
else:
|
else:
|
||||||
if normalized_url1 in git_info:
|
commit_hash = git_info[normalized_url]['hash']
|
||||||
commit_hash = git_info[normalized_url1]['hash']
|
todo_checkout.append((k2, commit_hash))
|
||||||
todo_checkout.append((k2, commit_hash))
|
processed_urls.append(normalized_url)
|
||||||
processed_urls.append(normalized_url1)
|
|
||||||
|
|
||||||
if normalized_url2 in git_info:
|
|
||||||
commit_hash = git_info[normalized_url2]['hash']
|
|
||||||
todo_checkout.append((k2, commit_hash))
|
|
||||||
processed_urls.append(normalized_url2)
|
|
||||||
|
|
||||||
for k2, v2 in unified_manager.unknown_inactive_nodes.items():
|
for k2, v2 in unified_manager.unknown_inactive_nodes.items():
|
||||||
repo_url = resolve_giturl_from_path(v2[1])
|
repo_url = resolve_giturl_from_path(v2[1])
|
||||||
@@ -3093,18 +3200,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
|||||||
if repo_url is None:
|
if repo_url is None:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
normalized_url1 = git_utils.normalize_url(repo_url)
|
normalized_url = git_utils.normalize_url(repo_url)
|
||||||
normalized_url2 = git_utils.normalize_url_http(repo_url)
|
|
||||||
|
|
||||||
if normalized_url1 in git_info:
|
if normalized_url in git_info:
|
||||||
commit_hash = git_info[normalized_url1]['hash']
|
commit_hash = git_info[normalized_url]['hash']
|
||||||
todo_enable.append((k2, commit_hash))
|
todo_enable.append((k2, commit_hash))
|
||||||
processed_urls.append(normalized_url1)
|
processed_urls.append(normalized_url)
|
||||||
|
|
||||||
if normalized_url2 in git_info:
|
|
||||||
commit_hash = git_info[normalized_url2]['hash']
|
|
||||||
todo_enable.append((k2, commit_hash))
|
|
||||||
processed_urls.append(normalized_url2)
|
|
||||||
|
|
||||||
for x in todo_disable:
|
for x in todo_disable:
|
||||||
unified_manager.unified_disable(x, True)
|
unified_manager.unified_disable(x, True)
|
||||||
@@ -3190,17 +3291,26 @@ async def check_need_to_migrate():
|
|||||||
need_to_migrate = True
|
need_to_migrate = True
|
||||||
|
|
||||||
|
|
||||||
def get_comfyui_versions():
|
def get_comfyui_versions(repo=None):
|
||||||
repo = git.Repo(comfy_path)
|
if repo is None:
|
||||||
versions = [x.name for x in repo.tags if x.name.startswith('v')]
|
repo = git.Repo(comfy_path)
|
||||||
versions.reverse() # nearest tag
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
remote = get_remote_name(repo)
|
||||||
|
repo.remotes[remote].fetch()
|
||||||
|
except:
|
||||||
|
logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
|
||||||
|
|
||||||
|
versions = [x.name for x in repo.tags if x.name.startswith('v')]
|
||||||
|
|
||||||
|
# nearest tag
|
||||||
|
versions = sorted(versions, key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
|
||||||
versions = versions[:4]
|
versions = versions[:4]
|
||||||
|
|
||||||
current_tag = repo.git.describe('--tags')
|
current_tag = repo.git.describe('--tags')
|
||||||
|
|
||||||
if current_tag not in versions:
|
if current_tag not in versions:
|
||||||
versions = sorted(versions + [current_tag], reverse=True)
|
versions = sorted(versions + [current_tag], key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
|
||||||
versions = versions[:4]
|
versions = versions[:4]
|
||||||
|
|
||||||
main_branch = repo.heads.master
|
main_branch = repo.heads.master
|
||||||
@@ -3213,16 +3323,18 @@ def get_comfyui_versions():
|
|||||||
versions[0] = 'nightly'
|
versions[0] = 'nightly'
|
||||||
current_tag = 'nightly'
|
current_tag = 'nightly'
|
||||||
|
|
||||||
return versions, current_tag
|
return versions, current_tag, latest_tag
|
||||||
|
|
||||||
|
|
||||||
def switch_comfyui(tag):
|
def switch_comfyui(tag):
|
||||||
repo = git.Repo(comfy_path)
|
repo = git.Repo(comfy_path)
|
||||||
|
|
||||||
if tag == 'nightly':
|
if tag == 'nightly':
|
||||||
repo.git.checkout('main')
|
repo.git.checkout('master')
|
||||||
repo.remotes.origin.pull()
|
tracking_branch = repo.active_branch.tracking_branch()
|
||||||
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'main' version")
|
remote_name = tracking_branch.remote_name
|
||||||
|
repo.remotes[remote_name].pull()
|
||||||
|
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'master' version")
|
||||||
else:
|
else:
|
||||||
repo.git.checkout(tag)
|
repo.git.checkout(tag)
|
||||||
print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")
|
print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")
|
||||||
@@ -3237,7 +3349,7 @@ def resolve_giturl_from_path(fullpath):
|
|||||||
if not os.path.exists(git_config_path):
|
if not os.path.exists(git_config_path):
|
||||||
return "unknown"
|
return "unknown"
|
||||||
|
|
||||||
config = configparser.ConfigParser()
|
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():
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ 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)
|
||||||
|
|||||||
@@ -187,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
|
||||||
@@ -209,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
|
||||||
@@ -445,27 +450,36 @@ async def task_worker():
|
|||||||
return base_res
|
return base_res
|
||||||
|
|
||||||
base_res['msg'] = f"An error occurred while updating '{node_name}'."
|
base_res['msg'] = f"An error occurred while updating '{node_name}'."
|
||||||
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
|
logging.error(f"\nERROR: An error occurred while updating '{node_name}'. (res.result={res.result}, res.action={res.action})")
|
||||||
return base_res
|
return base_res
|
||||||
except Exception:
|
except Exception:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|
||||||
return {'msg':f"An error occurred while updating '{node_name}'."}
|
return {'msg':f"An error occurred while updating '{node_name}'."}
|
||||||
|
|
||||||
async def do_update_comfyui() -> str:
|
async def do_update_comfyui(is_stable) -> str:
|
||||||
try:
|
try:
|
||||||
repo_path = os.path.dirname(folder_paths.__file__)
|
repo_path = os.path.dirname(folder_paths.__file__)
|
||||||
res = core.update_path(repo_path)
|
latest_tag = None
|
||||||
|
if is_stable:
|
||||||
|
res, latest_tag = core.update_to_stable_comfyui(repo_path)
|
||||||
|
else:
|
||||||
|
res = core.update_path(repo_path)
|
||||||
|
|
||||||
if res == "fail":
|
if res == "fail":
|
||||||
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
logging.error("ComfyUI update failed")
|
||||||
return "The installed ComfyUI does not have a Git repository."
|
return "fail"
|
||||||
elif res == "updated":
|
elif res == "updated":
|
||||||
logging.info("ComfyUI is updated.")
|
if is_stable:
|
||||||
return "success"
|
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
|
else: # skipped
|
||||||
logging.info("ComfyUI is up-to-date.")
|
logging.info("ComfyUI is up-to-date.")
|
||||||
return "skip"
|
return "skip"
|
||||||
|
|
||||||
except Exception:
|
except Exception:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
|
||||||
@@ -597,7 +611,7 @@ async def task_worker():
|
|||||||
elif kind == 'update-main':
|
elif kind == 'update-main':
|
||||||
msg = await do_update(item)
|
msg = await do_update(item)
|
||||||
elif kind == 'update-comfyui':
|
elif kind == 'update-comfyui':
|
||||||
msg = await do_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':
|
||||||
@@ -805,7 +819,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
|
||||||
@@ -822,7 +836,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)
|
||||||
@@ -1184,7 +1198,15 @@ async def install_custom_node(request):
|
|||||||
git_url = None
|
git_url = None
|
||||||
|
|
||||||
if json_data['version'] != 'unknown':
|
if json_data['version'] != 'unknown':
|
||||||
selected_version = json_data.get('selected_version', 'latest')
|
selected_version = json_data.get('selected_version')
|
||||||
|
|
||||||
|
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}"
|
||||||
@@ -1337,14 +1359,15 @@ async def update_custom_node(request):
|
|||||||
|
|
||||||
@routes.get("/manager/queue/update_comfyui")
|
@routes.get("/manager/queue/update_comfyui")
|
||||||
async def update_comfyui(request):
|
async def update_comfyui(request):
|
||||||
task_queue.put(("update-comfyui", ('comfyui',)))
|
is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
|
||||||
|
task_queue.put(("update-comfyui", ('comfyui', is_stable)))
|
||||||
return web.Response(status=200)
|
return web.Response(status=200)
|
||||||
|
|
||||||
|
|
||||||
@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)
|
||||||
@@ -1435,7 +1458,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'])
|
||||||
@@ -1446,6 +1481,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()
|
||||||
@@ -1499,22 +1545,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
|
||||||
|
|
||||||
@@ -1549,7 +1600,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
|
||||||
@@ -1643,20 +1697,24 @@ cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
|
|||||||
async def default_cache_update():
|
async def default_cache_update():
|
||||||
channel_url = core.get_config()['channel_url']
|
channel_url = core.get_config()['channel_url']
|
||||||
async def get_cache(filename):
|
async def get_cache(filename):
|
||||||
if core.get_config()['default_cache_as_channel_url']:
|
try:
|
||||||
uri = f"{channel_url}/{filename}"
|
if core.get_config()['default_cache_as_channel_url']:
|
||||||
else:
|
uri = f"{channel_url}/{filename}"
|
||||||
uri = f"{core.DEFAULT_CHANNEL}/{filename}"
|
else:
|
||||||
|
uri = f"{core.DEFAULT_CHANNEL}/{filename}"
|
||||||
|
|
||||||
cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
|
cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
|
||||||
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
||||||
|
|
||||||
json_obj = await manager_util.get_data(uri, True)
|
json_obj = await manager_util.get_data(uri, True)
|
||||||
|
|
||||||
with manager_util.cache_lock:
|
with manager_util.cache_lock:
|
||||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||||
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error(f"[ComfyUI-Manager] Failed to perform initial fetching '{filename}': {e}")
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
if core.get_config()['network_mode'] != 'offline':
|
if core.get_config()['network_mode'] != 'offline':
|
||||||
a = get_cache("custom-node-list.json")
|
a = get_cache("custom-node-list.json")
|
||||||
|
|||||||
@@ -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,8 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
import logging
|
import logging
|
||||||
|
import platform
|
||||||
|
import shlex
|
||||||
|
|
||||||
|
|
||||||
cache_lock = threading.Lock()
|
cache_lock = threading.Lock()
|
||||||
@@ -21,6 +24,16 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also up
|
|||||||
|
|
||||||
use_uv = False
|
use_uv = False
|
||||||
|
|
||||||
|
|
||||||
|
def add_python_path_to_env():
|
||||||
|
if platform.system() != "Windows":
|
||||||
|
sep = ':'
|
||||||
|
else:
|
||||||
|
sep = ';'
|
||||||
|
|
||||||
|
os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
|
||||||
|
|
||||||
|
|
||||||
def make_pip_cmd(cmd):
|
def make_pip_cmd(cmd):
|
||||||
if use_uv:
|
if use_uv:
|
||||||
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
||||||
@@ -169,7 +182,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:
|
||||||
@@ -188,11 +201,12 @@ async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=Fals
|
|||||||
json_obj = await get_data(cache_uri, silent=silent)
|
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
|
||||||
|
|
||||||
@@ -232,7 +246,8 @@ 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 set()
|
||||||
@@ -245,6 +260,46 @@ 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.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'),
|
||||||
@@ -264,9 +319,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('+')
|
||||||
@@ -346,7 +404,7 @@ 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}"])
|
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"])
|
||||||
subprocess.check_output(cmd, universal_newlines=True)
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
||||||
@@ -361,10 +419,81 @@ class PIPFixer:
|
|||||||
if StrictVersion(np) >= StrictVersion('2'):
|
if StrictVersion(np) >= StrictVersion('2'):
|
||||||
cmd = make_pip_cmd(['install', "numpy<2"])
|
cmd = make_pip_cmd(['install', "numpy<2"])
|
||||||
subprocess.check_output(cmd , universal_newlines=True)
|
subprocess.check_output(cmd , universal_newlines=True)
|
||||||
|
|
||||||
|
logging.info("[ComfyUI-Manager] 'numpy' 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 numpy")
|
||||||
logging.error(e)
|
logging.error(e)
|
||||||
|
|
||||||
|
# fix missing frontend
|
||||||
|
try:
|
||||||
|
# NOTE: package name in requirements is 'comfyui-frontend-package'
|
||||||
|
# but, package name from `pip freeze` is 'comfyui_frontend_package'
|
||||||
|
# but, package name from `uv pip freeze` is 'comfyui-frontend-package'
|
||||||
|
#
|
||||||
|
# get_installed_packages returns normalized name (i.e. comfyui_frontend_package)
|
||||||
|
if 'comfyui_frontend_package' not in new_pip_versions:
|
||||||
|
requirements_path = os.path.join(self.comfyui_path, 'requirements.txt')
|
||||||
|
|
||||||
|
with open(requirements_path, 'r') as file:
|
||||||
|
lines = file.readlines()
|
||||||
|
|
||||||
|
front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
|
||||||
|
cmd = make_pip_cmd(['install', front_line])
|
||||||
|
subprocess.check_output(cmd , universal_newlines=True)
|
||||||
|
|
||||||
|
logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
|
||||||
|
except Exception as e:
|
||||||
|
logging.error("[ComfyUI-Manager] Failed to restore comfyui-frontend-package")
|
||||||
|
logging.error(e)
|
||||||
|
|
||||||
|
# restore based on custom list
|
||||||
|
pip_auto_fix_path = os.path.join(self.manager_files_path, "pip_auto_fix.list")
|
||||||
|
if os.path.exists(pip_auto_fix_path):
|
||||||
|
with open(pip_auto_fix_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||||
|
fixed_list = []
|
||||||
|
|
||||||
|
for x in f.readlines():
|
||||||
|
try:
|
||||||
|
parsed = parse_requirement_line(x)
|
||||||
|
need_to_reinstall = True
|
||||||
|
|
||||||
|
normalized_name = parsed['package'].lower().replace('-', '_')
|
||||||
|
if normalized_name in new_pip_versions:
|
||||||
|
if 'version' in parsed and 'operator' in parsed:
|
||||||
|
cur = StrictVersion(new_pip_versions[parsed['package']])
|
||||||
|
dest = parsed['version']
|
||||||
|
op = parsed['operator']
|
||||||
|
if cur == dest:
|
||||||
|
if op in ['==', '>=', '<=']:
|
||||||
|
need_to_reinstall = False
|
||||||
|
elif cur < dest:
|
||||||
|
if op in ['<=', '<', '~=', '!=']:
|
||||||
|
need_to_reinstall = False
|
||||||
|
elif cur > dest:
|
||||||
|
if op in ['>=', '>', '~=', '!=']:
|
||||||
|
need_to_reinstall = False
|
||||||
|
|
||||||
|
if need_to_reinstall:
|
||||||
|
cmd_args = ['install']
|
||||||
|
if 'version' in parsed and 'operator' in parsed:
|
||||||
|
cmd_args.append(parsed['package']+parsed['operator']+parsed['version'].version_string)
|
||||||
|
|
||||||
|
if 'index_url' in parsed:
|
||||||
|
cmd_args.append('--index-url')
|
||||||
|
cmd_args.append(parsed['index_url'])
|
||||||
|
|
||||||
|
cmd = make_pip_cmd(cmd_args)
|
||||||
|
subprocess.check_output(cmd, universal_newlines=True)
|
||||||
|
|
||||||
|
fixed_list.append(parsed['package'])
|
||||||
|
except Exception as e:
|
||||||
|
traceback.print_exc()
|
||||||
|
logging.error(f"[ComfyUI-Manager] Failed to restore '{x}'")
|
||||||
|
logging.error(e)
|
||||||
|
|
||||||
|
if len(fixed_list) > 0:
|
||||||
|
logging.info(f"[ComfyUI-Manager] dependencies in pip_auto_fix.json were fixed: {fixed_list}")
|
||||||
|
|
||||||
def sanitize(data):
|
def sanitize(data):
|
||||||
return data.replace("<", "<").replace(">", ">")
|
return data.replace("<", "<").replace(">", ">")
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ 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 {
|
||||||
@@ -42,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;
|
||||||
@@ -139,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);
|
||||||
@@ -225,12 +227,12 @@ 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 restart_stop_button = null;
|
||||||
|
var update_policy_combo = null;
|
||||||
|
|
||||||
let share_option = 'all';
|
let share_option = 'all';
|
||||||
var is_updating_all = false;
|
var is_updating = false;
|
||||||
|
|
||||||
|
|
||||||
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
|
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
|
||||||
@@ -477,6 +479,8 @@ async function updateComfyUI() {
|
|||||||
const response = await api.fetchApi('/manager/queue/update_comfyui');
|
const response = await api.fetchApi('/manager/queue/update_comfyui');
|
||||||
|
|
||||||
showTerminal();
|
showTerminal();
|
||||||
|
|
||||||
|
is_updating = true;
|
||||||
await api.fetchApi('/manager/queue/start');
|
await api.fetchApi('/manager/queue/start');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -605,8 +609,14 @@ function showVersionSelectorDialog(versions, current, onSelect) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function switchComfyUI() {
|
async function switchComfyUI() {
|
||||||
|
switch_comfyui_button.disabled = true;
|
||||||
|
switch_comfyui_button.style.backgroundColor = "gray";
|
||||||
|
|
||||||
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
||||||
|
|
||||||
|
switch_comfyui_button.disabled = false;
|
||||||
|
switch_comfyui_button.style.backgroundColor = "";
|
||||||
|
|
||||||
if(res.status == 200) {
|
if(res.status == 200) {
|
||||||
let obj = await res.json();
|
let obj = await res.json();
|
||||||
|
|
||||||
@@ -619,6 +629,15 @@ async function switchComfyUI() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
|
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
|
||||||
|
if(selected_version == 'nightly') {
|
||||||
|
update_policy_combo.value = 'nightly-comfyui';
|
||||||
|
api.fetchApi('/manager/policy/update?value=nightly-comfyui');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
update_policy_combo.value = 'stable-comfyui';
|
||||||
|
api.fetchApi('/manager/policy/update?value=stable-comfyui');
|
||||||
|
}
|
||||||
|
|
||||||
let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
||||||
if (response.status == 200) {
|
if (response.status == 200) {
|
||||||
infoToast(`ComfyUI version is switched to ${selected_version}`);
|
infoToast(`ComfyUI version is switched to ${selected_version}`);
|
||||||
@@ -633,57 +652,6 @@ async function switchComfyUI() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async function fetchUpdates(update_check_checkbox) {
|
|
||||||
let prev_text = fetch_updates_button.innerText;
|
|
||||||
fetch_updates_button.innerText = "Fetching updates...";
|
|
||||||
fetch_updates_button.disabled = true;
|
|
||||||
fetch_updates_button.style.backgroundColor = "gray";
|
|
||||||
|
|
||||||
try {
|
|
||||||
var mode = manager_instance.datasrc_combo.value;
|
|
||||||
|
|
||||||
const response = await api.fetchApi(`/customnode/fetch_updates?mode=${mode}`);
|
|
||||||
|
|
||||||
if (response.status != 200 && response.status != 201) {
|
|
||||||
show_message('Failed to fetch updates.');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.status == 201) {
|
|
||||||
show_message("There is an updated extension available.<BR><BR><P><B>NOTE:<BR>Fetch Updates is not an update.<BR>Please update from <button id='cm-install-customnodes-button'>Install Custom Nodes</button> </B></P>");
|
|
||||||
|
|
||||||
const button = document.getElementById('cm-install-customnodes-button');
|
|
||||||
button.addEventListener("click",
|
|
||||||
async function() {
|
|
||||||
app.ui.dialog.close();
|
|
||||||
|
|
||||||
if(!CustomNodesManager.instance) {
|
|
||||||
CustomNodesManager.instance = new CustomNodesManager(app, self);
|
|
||||||
}
|
|
||||||
await CustomNodesManager.instance.show(CustomNodesManager.ShowMode.UPDATE);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
update_check_checkbox.checked = false;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
show_message('All extensions are already up-to-date with the latest versions.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (exception) {
|
|
||||||
show_message(`Failed to update custom nodes / ${exception}`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
fetch_updates_button.disabled = false;
|
|
||||||
fetch_updates_button.innerText = prev_text;
|
|
||||||
fetch_updates_button.style.backgroundColor = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function onQueueStatus(event) {
|
async function onQueueStatus(event) {
|
||||||
const isElectron = 'electronAPI' in window;
|
const isElectron = 'electronAPI' in window;
|
||||||
|
|
||||||
@@ -694,11 +662,11 @@ async function onQueueStatus(event) {
|
|||||||
else if(event.detail.status == 'done') {
|
else if(event.detail.status == 'done') {
|
||||||
reset_action_buttons();
|
reset_action_buttons();
|
||||||
|
|
||||||
if(!is_updating_all) {
|
if(!is_updating) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
is_updating_all = false;
|
is_updating = false;
|
||||||
|
|
||||||
let success_list = [];
|
let success_list = [];
|
||||||
let failed_list = [];
|
let failed_list = [];
|
||||||
@@ -721,19 +689,25 @@ async function onQueueStatus(event) {
|
|||||||
|
|
||||||
let msg = "";
|
let msg = "";
|
||||||
|
|
||||||
if(success_list.length == 0 && comfyui_state != 'success') {
|
if(success_list.length == 0 && comfyui_state.startsWith('skip')) {
|
||||||
if(failed_list.length == 0) {
|
if(failed_list.length == 0) {
|
||||||
msg += "All custom nodes are already up to date.";
|
msg += "You are already up to date.";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
|
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') {
|
if(comfyui_state == 'success-nightly') {
|
||||||
msg += "ComfyUI is updated.<BR><BR>";
|
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') {
|
else if(comfyui_state == 'skip') {
|
||||||
msg += "ComfyUI is already up-to-date.<BR><BR>"
|
msg += "ComfyUI is already up to date.<BR><BR>"
|
||||||
}
|
}
|
||||||
else if(comfyui_state != null) {
|
else if(comfyui_state != null) {
|
||||||
msg += "Failed to update ComfyUI.<BR><BR>"
|
msg += "Failed to update ComfyUI.<BR><BR>"
|
||||||
@@ -790,8 +764,7 @@ async function onQueueStatus(event) {
|
|||||||
api.addEventListener("cm-queue-status", onQueueStatus);
|
api.addEventListener("cm-queue-status", onQueueStatus);
|
||||||
|
|
||||||
|
|
||||||
async function updateAll(update_comfyui, manager_dialog) {
|
async function updateAll(update_comfyui) {
|
||||||
let prev_text = update_all_button.innerText;
|
|
||||||
update_all_button.innerText = "Updating...";
|
update_all_button.innerText = "Updating...";
|
||||||
|
|
||||||
set_inprogress_mode();
|
set_inprogress_mode();
|
||||||
@@ -811,7 +784,7 @@ async function updateAll(update_comfyui, manager_dialog) {
|
|||||||
customAlert('Another task is already in progress. Please stop the ongoing task first.');
|
customAlert('Another task is already in progress. Please stop the ongoing task first.');
|
||||||
}
|
}
|
||||||
else if(response.status == 200) {
|
else if(response.status == 200) {
|
||||||
is_updating_all = true;
|
is_updating = true;
|
||||||
await api.fetchApi('/manager/queue/start');
|
await api.fetchApi('/manager/queue/start');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -874,14 +847,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
() => switchComfyUI()
|
() => switchComfyUI()
|
||||||
});
|
});
|
||||||
|
|
||||||
fetch_updates_button =
|
|
||||||
$el("button.cm-button", {
|
|
||||||
type: "button",
|
|
||||||
textContent: "Fetch Updates",
|
|
||||||
onclick:
|
|
||||||
() => fetchUpdates(this.update_check_checkbox)
|
|
||||||
});
|
|
||||||
|
|
||||||
restart_stop_button =
|
restart_stop_button =
|
||||||
$el("button.cm-button-red", {
|
$el("button.cm-button-red", {
|
||||||
type: "button",
|
type: "button",
|
||||||
@@ -895,7 +860,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
type: "button",
|
type: "button",
|
||||||
textContent: "Update All Custom Nodes",
|
textContent: "Update All Custom Nodes",
|
||||||
onclick:
|
onclick:
|
||||||
() => updateAll(false, self)
|
() => updateAll(false)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -904,7 +869,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
type: "button",
|
type: "button",
|
||||||
textContent: "Update All",
|
textContent: "Update All",
|
||||||
onclick:
|
onclick:
|
||||||
() => updateAll(true, self)
|
() => updateAll(true)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -934,7 +899,19 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
$el("button.cm-button", {
|
||||||
|
type: "button",
|
||||||
|
textContent: "Custom Nodes In Workflow",
|
||||||
|
onclick:
|
||||||
|
() => {
|
||||||
|
if(!CustomNodesManager.instance) {
|
||||||
|
CustomNodesManager.instance = new CustomNodesManager(app, self);
|
||||||
|
}
|
||||||
|
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
|
||||||
|
$el("br", {}, []),
|
||||||
$el("button.cm-button", {
|
$el("button.cm-button", {
|
||||||
type: "button",
|
type: "button",
|
||||||
textContent: "Model Manager",
|
textContent: "Model Manager",
|
||||||
@@ -963,7 +940,7 @@ 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", {}, []),
|
||||||
restart_stop_button,
|
restart_stop_button,
|
||||||
@@ -995,13 +972,9 @@ class ManagerMenuDialog extends ComfyDialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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");
|
||||||
@@ -1011,6 +984,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.");
|
||||||
@@ -1073,25 +1054,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 => {
|
||||||
@@ -1111,14 +1073,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", {}, []),
|
||||||
@@ -1145,11 +1144,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(); }
|
|
||||||
})
|
})
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
@@ -1278,7 +1272,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",
|
||||||
@@ -1420,13 +1414,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'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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; });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -363,6 +363,7 @@ const pageHtml = `
|
|||||||
<button class="cn-manager-restart">Restart</button>
|
<button class="cn-manager-restart">Restart</button>
|
||||||
<button class="cn-manager-stop">Stop</button>
|
<button class="cn-manager-stop">Stop</button>
|
||||||
<div class="cn-flex-auto"></div>
|
<div class="cn-flex-auto"></div>
|
||||||
|
<button class="cn-manager-used-in-workflow">Used In Workflow</button>
|
||||||
<button class="cn-manager-check-update">Check Update</button>
|
<button class="cn-manager-check-update">Check Update</button>
|
||||||
<button class="cn-manager-check-missing">Check Missing</button>
|
<button class="cn-manager-check-missing">Check Missing</button>
|
||||||
<button class="cn-manager-install-url">Install via Git URL</button>
|
<button class="cn-manager-install-url">Install via Git URL</button>
|
||||||
@@ -374,7 +375,8 @@ const ShowMode = {
|
|||||||
UPDATE: "Update",
|
UPDATE: "Update",
|
||||||
MISSING: "Missing",
|
MISSING: "Missing",
|
||||||
FAVORITES: "Favorites",
|
FAVORITES: "Favorites",
|
||||||
ALTERNATIVES: "Alternatives"
|
ALTERNATIVES: "Alternatives",
|
||||||
|
IN_WORKFLOW: "In Workflow",
|
||||||
};
|
};
|
||||||
|
|
||||||
export class CustomNodesManager {
|
export class CustomNodesManager {
|
||||||
@@ -586,6 +588,10 @@ export class CustomNodesManager {
|
|||||||
label: "Update",
|
label: "Update",
|
||||||
value: ShowMode.UPDATE,
|
value: ShowMode.UPDATE,
|
||||||
hasData: false
|
hasData: false
|
||||||
|
}, {
|
||||||
|
label: "In Workflow",
|
||||||
|
value: ShowMode.IN_WORKFLOW,
|
||||||
|
hasData: false
|
||||||
}, {
|
}, {
|
||||||
label: "Missing",
|
label: "Missing",
|
||||||
value: ShowMode.MISSING,
|
value: ShowMode.MISSING,
|
||||||
@@ -670,7 +676,7 @@ export class CustomNodesManager {
|
|||||||
"invalid-installation": ["reinstall"],
|
"invalid-installation": ["reinstall"],
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!manager_instance.update_check_checkbox.checked) {
|
if (!installGroups.updatable) {
|
||||||
installGroups.enabled = installGroups.enabled.filter(it => it !== "try-update");
|
installGroups.enabled = installGroups.enabled.filter(it => it !== "try-update");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -726,7 +732,7 @@ export class CustomNodesManager {
|
|||||||
const value = e.target.value
|
const value = e.target.value
|
||||||
this.filter = value;
|
this.filter = value;
|
||||||
const item = this.getFilterItem(value);
|
const item = this.getFilterItem(value);
|
||||||
if (item && !item.hasData) {
|
if (item && (!item.hasData)) {
|
||||||
this.loadData(value);
|
this.loadData(value);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -779,6 +785,14 @@ export class CustomNodesManager {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
".cn-manager-used-in-workflow": {
|
||||||
|
click: (e) => {
|
||||||
|
e.target.classList.add("cn-btn-loading");
|
||||||
|
this.setFilter(ShowMode.IN_WORKFLOW);
|
||||||
|
this.loadData(ShowMode.IN_WORKFLOW);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
".cn-manager-check-update": {
|
".cn-manager-check-update": {
|
||||||
click: (e) => {
|
click: (e) => {
|
||||||
e.target.classList.add("cn-btn-loading");
|
e.target.classList.add("cn-btn-loading");
|
||||||
@@ -1529,7 +1543,128 @@ export class CustomNodesManager {
|
|||||||
return extension_mappings;
|
return extension_mappings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getNodesInWorkflow() {
|
||||||
|
let usedGroupNodes = new Set();
|
||||||
|
let allUsedNodes = {};
|
||||||
|
|
||||||
|
for(let k in app.graph._nodes) {
|
||||||
|
let node = app.graph._nodes[k];
|
||||||
|
|
||||||
|
if(node.type.startsWith('workflow>')) {
|
||||||
|
usedGroupNodes.add(node.type.slice(9));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
allUsedNodes[node.type] = node;
|
||||||
|
}
|
||||||
|
|
||||||
|
for(let k of usedGroupNodes) {
|
||||||
|
let subnodes = app.graph.extra.groupNodes[k]?.nodes;
|
||||||
|
|
||||||
|
if(subnodes) {
|
||||||
|
for(let k2 in subnodes) {
|
||||||
|
let node = subnodes[k2];
|
||||||
|
allUsedNodes[node.type] = node;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return allUsedNodes;
|
||||||
|
}
|
||||||
|
|
||||||
async getMissingNodes() {
|
async getMissingNodes() {
|
||||||
|
let unresolved_missing_nodes = new Set();
|
||||||
|
let hashMap = {};
|
||||||
|
let allUsedNodes = this.getNodesInWorkflow();
|
||||||
|
|
||||||
|
const registered_nodes = new Set();
|
||||||
|
for (let i in LiteGraph.registered_node_types) {
|
||||||
|
registered_nodes.add(LiteGraph.registered_node_types[i].type);
|
||||||
|
}
|
||||||
|
|
||||||
|
let unresolved_aux_ids = {};
|
||||||
|
let outdated_comfyui = false;
|
||||||
|
let unresolved_cnr_list = [];
|
||||||
|
|
||||||
|
for(let k in allUsedNodes) {
|
||||||
|
let node = allUsedNodes[k];
|
||||||
|
|
||||||
|
if(!registered_nodes.has(node.type)) {
|
||||||
|
// missing node
|
||||||
|
if(node.properties.cnr_id) {
|
||||||
|
if(node.properties.cnr_id == 'comfy-core') {
|
||||||
|
outdated_comfyui = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
let item = this.custom_nodes[node.properties.cnr_id];
|
||||||
|
if(item) {
|
||||||
|
hashMap[item.hash] = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
console.log(`CM: cannot find '${node.properties.cnr_id}' from cnr list.`);
|
||||||
|
unresolved_aux_ids[node.properties.cnr_id] = node.type;
|
||||||
|
unresolved_cnr_list.push(node.properties.cnr_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(node.properties.aux_id) {
|
||||||
|
unresolved_aux_ids[node.properties.aux_id] = node.type;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
unresolved_missing_nodes.add(node.type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(unresolved_cnr_list.length > 0) {
|
||||||
|
let error_msg = "Failed to find the following ComfyRegistry list.\nThe cache may be outdated, or the nodes may have been removed from ComfyRegistry.<HR>";
|
||||||
|
for(let i in unresolved_cnr_list) {
|
||||||
|
error_msg += '<li>'+unresolved_cnr_list[i]+'</li>';
|
||||||
|
}
|
||||||
|
|
||||||
|
show_message(error_msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(outdated_comfyui) {
|
||||||
|
customAlert('ComfyUI is outdated, so some built-in nodes cannot be used.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if(Object.keys(unresolved_aux_ids).length > 0) {
|
||||||
|
// building aux_id to nodepack map
|
||||||
|
let aux_id_to_pack = {};
|
||||||
|
for(let k in this.custom_nodes) {
|
||||||
|
let nodepack = this.custom_nodes[k];
|
||||||
|
let aux_id;
|
||||||
|
if(nodepack.repository?.startsWith('https://github.com')) {
|
||||||
|
aux_id = nodepack.repository.split('/').slice(-2).join('/');
|
||||||
|
aux_id_to_pack[aux_id] = nodepack;
|
||||||
|
}
|
||||||
|
else if(nodepack.repository) {
|
||||||
|
aux_id = nodepack.repository.split('/').slice(-1);
|
||||||
|
aux_id_to_pack[aux_id] = nodepack;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolving aux_id
|
||||||
|
for(let k in unresolved_aux_ids) {
|
||||||
|
let nodepack = aux_id_to_pack[k];
|
||||||
|
if(nodepack) {
|
||||||
|
hashMap[nodepack.hash] = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
unresolved_missing_nodes.add(unresolved_aux_ids[k]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(unresolved_missing_nodes.size > 0) {
|
||||||
|
await this.getMissingNodesLegacy(hashMap, unresolved_missing_nodes);
|
||||||
|
}
|
||||||
|
|
||||||
|
return hashMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getMissingNodesLegacy(hashMap, missing_nodes) {
|
||||||
const mode = manager_instance.datasrc_combo.value;
|
const mode = manager_instance.datasrc_combo.value;
|
||||||
this.showStatus(`Loading missing nodes (${mode}) ...`);
|
this.showStatus(`Loading missing nodes (${mode}) ...`);
|
||||||
const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
|
const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
|
||||||
@@ -1568,50 +1703,29 @@ export class CustomNodesManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const registered_nodes = new Set();
|
let unresolved_missing_nodes = new Set();
|
||||||
for (let i in LiteGraph.registered_node_types) {
|
for (let node_type of missing_nodes) {
|
||||||
registered_nodes.add(LiteGraph.registered_node_types[i].type);
|
const packs = name_to_packs[node_type.trim()];
|
||||||
}
|
if(packs)
|
||||||
|
packs.forEach(url => {
|
||||||
const missing_nodes = new Set();
|
unresolved_missing_nodes.add(url);
|
||||||
const workflow = app.graph.serialize();
|
});
|
||||||
const group_nodes = workflow.extra && workflow.extra.groupNodes ? workflow.extra.groupNodes : [];
|
else {
|
||||||
let nodes = workflow.nodes;
|
for(let j in regex_to_pack) {
|
||||||
|
if(regex_to_pack[j].regex.test(node_type)) {
|
||||||
for (let i in group_nodes) {
|
unresolved_missing_nodes.add(regex_to_pack[j].url);
|
||||||
let group_node = group_nodes[i];
|
|
||||||
nodes = nodes.concat(group_node.nodes);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let i in nodes) {
|
|
||||||
const node_type = nodes[i].type;
|
|
||||||
if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (!registered_nodes.has(node_type)) {
|
|
||||||
const packs = name_to_packs[node_type.trim()];
|
|
||||||
if(packs)
|
|
||||||
packs.forEach(url => {
|
|
||||||
missing_nodes.add(url);
|
|
||||||
});
|
|
||||||
else {
|
|
||||||
for(let j in regex_to_pack) {
|
|
||||||
if(regex_to_pack[j].regex.test(node_type)) {
|
|
||||||
missing_nodes.add(regex_to_pack[j].url);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const hashMap = {};
|
|
||||||
for(let k in this.custom_nodes) {
|
for(let k in this.custom_nodes) {
|
||||||
let item = this.custom_nodes[k];
|
let item = this.custom_nodes[k];
|
||||||
|
|
||||||
if(missing_nodes.has(item.id)) {
|
if(unresolved_missing_nodes.has(item.id)) {
|
||||||
hashMap[item.hash] = true;
|
hashMap[item.hash] = true;
|
||||||
}
|
}
|
||||||
else if (item.files?.some(file => missing_nodes.has(file))) {
|
else if (item.files?.some(file => unresolved_missing_nodes.has(file))) {
|
||||||
hashMap[item.hash] = true;
|
hashMap[item.hash] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1630,6 +1744,41 @@ export class CustomNodesManager {
|
|||||||
return hashMap;
|
return hashMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getNodepackInWorkflow() {
|
||||||
|
let allUsedNodes = this.getNodesInWorkflow();
|
||||||
|
|
||||||
|
// building aux_id to nodepack map
|
||||||
|
let aux_id_to_pack = {};
|
||||||
|
for(let k in this.custom_nodes) {
|
||||||
|
let nodepack = this.custom_nodes[k];
|
||||||
|
let aux_id;
|
||||||
|
if(nodepack.repository?.startsWith('https://github.com')) {
|
||||||
|
aux_id = nodepack.repository.split('/').slice(-2).join('/');
|
||||||
|
aux_id_to_pack[aux_id] = nodepack;
|
||||||
|
}
|
||||||
|
else if(nodepack.repository) {
|
||||||
|
aux_id = nodepack.repository.split('/').slice(-1);
|
||||||
|
aux_id_to_pack[aux_id] = nodepack;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const hashMap = {};
|
||||||
|
for(let k in allUsedNodes) {
|
||||||
|
var item;
|
||||||
|
if(allUsedNodes[k].properties.cnr_id) {
|
||||||
|
item = this.custom_nodes[allUsedNodes[k].properties.cnr_id];
|
||||||
|
}
|
||||||
|
else if(allUsedNodes[k].properties.aux_id) {
|
||||||
|
item = aux_id_to_pack[allUsedNodes[k].properties.aux_id];
|
||||||
|
}
|
||||||
|
|
||||||
|
if(item)
|
||||||
|
hashMap[item.hash] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return hashMap;
|
||||||
|
}
|
||||||
|
|
||||||
async getAlternatives() {
|
async getAlternatives() {
|
||||||
const mode = manager_instance.datasrc_combo.value;
|
const mode = manager_instance.datasrc_combo.value;
|
||||||
this.showStatus(`Loading alternatives (${mode}) ...`);
|
this.showStatus(`Loading alternatives (${mode}) ...`);
|
||||||
@@ -1678,11 +1827,16 @@ export class CustomNodesManager {
|
|||||||
this.showStatus(`Loading custom nodes (${mode}) ...`);
|
this.showStatus(`Loading custom nodes (${mode}) ...`);
|
||||||
|
|
||||||
const skip_update = this.show_mode === ShowMode.UPDATE ? "" : "&skip_update=true";
|
const skip_update = this.show_mode === ShowMode.UPDATE ? "" : "&skip_update=true";
|
||||||
|
|
||||||
|
if(this.show_mode === ShowMode.UPDATE) {
|
||||||
|
infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
|
||||||
|
}
|
||||||
|
|
||||||
const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
|
const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
this.showError("Failed to get custom node list.");
|
this.showError("Failed to get custom node list.");
|
||||||
this.hideLoading();
|
this.hideLoading();
|
||||||
return
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { channel, node_packs } = res.data;
|
const { channel, node_packs } = res.data;
|
||||||
@@ -1725,9 +1879,14 @@ export class CustomNodesManager {
|
|||||||
hashMap = await this.getAlternatives();
|
hashMap = await this.getAlternatives();
|
||||||
} else if(this.show_mode == ShowMode.FAVORITES) {
|
} else if(this.show_mode == ShowMode.FAVORITES) {
|
||||||
hashMap = await this.getFavorites();
|
hashMap = await this.getFavorites();
|
||||||
|
} else if(this.show_mode == ShowMode.IN_WORKFLOW) {
|
||||||
|
hashMap = await this.getNodepackInWorkflow();
|
||||||
}
|
}
|
||||||
filterItem.hashMap = hashMap;
|
filterItem.hashMap = hashMap;
|
||||||
filterItem.hasData = true;
|
|
||||||
|
if(this.show_mode != ShowMode.IN_WORKFLOW) {
|
||||||
|
filterItem.hasData = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(let k in node_packs) {
|
for(let k in node_packs) {
|
||||||
@@ -1779,7 +1938,6 @@ export class CustomNodesManager {
|
|||||||
case "disabled":
|
case "disabled":
|
||||||
filterTypes.add("installed");
|
filterTypes.add("installed");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "not-installed":
|
case "not-installed":
|
||||||
filterTypes.add("not-installed");
|
filterTypes.add("not-installed");
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
} else if (["nodes", "comfy_extras"].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;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1068,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",
|
||||||
@@ -3950,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",
|
||||||
@@ -3973,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",
|
||||||
@@ -4537,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",
|
||||||
@@ -4685,6 +4728,28 @@
|
|||||||
"filename": "<huggingface>",
|
"filename": "<huggingface>",
|
||||||
"url": "deepseek-ai/Janus-Pro-7B",
|
"url": "deepseek-ai/Janus-Pro-7B",
|
||||||
"size": "14.85GB"
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,437 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"author": "longzoho",
|
||||||
|
"title": "ComfyUI-Qdrant-Saver",
|
||||||
|
"reference": "https://github.com/longzoho/ComfyUI-Qdrant-Saver",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/longzoho/ComfyUI-Qdrant-Saver"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: QDrant Saver Node"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "nova-florealis",
|
||||||
|
"title": "comfyui-alien",
|
||||||
|
"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": "RUFFY-369",
|
||||||
|
"title": "ComfyUI-FeatureBank",
|
||||||
|
"reference": "https://github.com/RUFFY-369/ComfyUI-FeatureBank",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/RUFFY-369/ComfyUI-FeatureBank"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: FeatureBankAttentionProcessor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Pablerdo",
|
||||||
|
"title": "ComfyUI-Sa2VAWrapper",
|
||||||
|
"reference": "https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Wrapper for the Sa2VA model"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "S4MUEL-404",
|
||||||
|
"title": "ComfyUI-Folder-Images-Preview [UNSAFE]",
|
||||||
|
"reference": "https://github.com/S4MUEL-404/ComfyUI-Folder-Images-Preview",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/S4MUEL-404/ComfyUI-Folder-Images-Preview"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A ComfyUI nodes , Generate a picture and quickly preview the pictures in the folder and the picture file name\n[w/This custom node has a path traversal vulnerability.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "aria1th",
|
||||||
|
"title": "ComfyUI-camietagger-onnx",
|
||||||
|
"reference": "https://github.com/aria1th/ComfyUI-camietagger-onnx",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/aria1th/ComfyUI-camietagger-onnx"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Camie Tagger"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "zjkhurry",
|
||||||
|
"title": "comfyui_MetalFX [WIP]",
|
||||||
|
"reference": "https://github.com/zjkhurry/comfyui_MetalFX",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/zjkhurry/comfyui_MetalFX"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A custom node for ComfyUI that enables high-quality image and video upscaling using Apple MetalFX technology.\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "IfnotFr",
|
||||||
|
"title": "ComfyUI-Connect [WIP]",
|
||||||
|
"reference": "https://github.com/IfnotFr/ComfyUI-Connect",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/IfnotFr/ComfyUI-Connect"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "RoyKillington",
|
||||||
|
"title": "Miscomfy Nodes [WIP]",
|
||||||
|
"reference": "https://github.com/RoyKillington/miscomfy-nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/RoyKillington/miscomfy-nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A repo of custom nodes for ComfyUI, from interacting with certain APIs to whatever other miscellanea I end up making"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "xmarked-ai",
|
||||||
|
"title": "ComfyUI_misc",
|
||||||
|
"reference": "https://github.com/xmarked-ai/ComfyUI_misc",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/xmarked-ai/ComfyUI_misc"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Ace IntegerX, Ace FloatX, Ace Color FixX, White Balance X, Depth Displace X, Empty Latent X, KSampler Combo X, ..."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Elypha",
|
||||||
|
"title": "ComfyUI-Prompt-Helper [WIP]",
|
||||||
|
"reference": "https://github.com/Elypha/ComfyUI-Prompt-Helper",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Elypha/ComfyUI-Prompt-Helper"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Concat conditions and prompts for ComfyUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "StoryWalker",
|
||||||
|
"title": "comfyui_flux_collection_advanced [WIP]",
|
||||||
|
"reference": "https://github.com/StoryWalker/comfyui_flux_collection_advanced",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/StoryWalker/comfyui_flux_collection_advanced"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This is a collection focused in give a little more flexibility in the use of Flux models."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "KurtHokke",
|
||||||
|
"title": "ComfyUI_KurtHokke-Nodes",
|
||||||
|
"reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI_KurtHokke-Nodes"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "OSAnimate",
|
||||||
|
"title": "ComfyUI-SpriteSheetMaker [WIP]",
|
||||||
|
"reference": "https://github.com/OSAnimate/ComfyUI-SpriteSheetMaker",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/OSAnimate/ComfyUI-SpriteSheetMaker"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "The sprite sheet maker node is a simple way to create sprite sheets and image grids.\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "BuffMcBigHuge",
|
||||||
|
"title": "ComfyUI-Buff-Nodes [WIP]",
|
||||||
|
"reference": "https://github.com/BuffMcBigHuge/ComfyUI-Buff-Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/BuffMcBigHuge/ComfyUI-Buff-Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Assorted Nodes by BuffMcBigHuge"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ritikvirus",
|
||||||
|
"title": "ComfyUI Terminal Command Node [UNSAFE]",
|
||||||
|
"reference": "https://github.com/ritikvirus/comfyui-terminal-modal-node",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ritikvirus/comfyui-terminal-modal-node"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This repository provides a custom ComfyUI node that lets you execute arbitrary terminal commands directly from the ComfyUI interface. [w/This extension allows remote command execution.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "pixuai",
|
||||||
|
"title": "ComfyUI-PixuAI",
|
||||||
|
"reference": "https://github.com/pixuai/ComfyUI-PixuAI",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/pixuai/ComfyUI-PixuAI"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A collection of ComfyUI nodes designed to streamline prompt creation, organization, and discovery - making your workflows faster and more intuitive."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "techidsk",
|
||||||
|
"title": "comfyui_molook_nodes [WIP]",
|
||||||
|
"reference": "https://github.com/techidsk/comfyui_molook_nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/techidsk/comfyui_molook_nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Some extra nodes"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Northerner1",
|
||||||
|
"title": "ComfyUI_North_Noise [WIP]",
|
||||||
|
"reference": "https://github.com/Northerner1/ComfyUI_North_Noise",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Northerner1/ComfyUI_North_Noise"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: North Noise"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ManuShamil",
|
||||||
|
"title": "ComfyUI_BodyEstimation_Nodes",
|
||||||
|
"reference": "https://github.com/ManuShamil/ComfyUI_BodyEstimation_Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ManuShamil/ComfyUI_BodyEstimation_Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: CogitareLabsPoseIDExtractor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "MockbaTheBorg",
|
||||||
|
"title": "ComfyUI-Mockba",
|
||||||
|
"reference": "https://github.com/MockbaTheBorg/ComfyUI-Mockba",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/MockbaTheBorg/ComfyUI-Mockba"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Image Batch/Flip/Rotate/Subtract/Dither, Barcode, Select, ..."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "jcomeme",
|
||||||
|
"title": "AsunaroTools",
|
||||||
|
"reference": "https://github.com/jcomeme/ComfyUI-AsunaroTools",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/jcomeme/ComfyUI-AsunaroTools"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A collection of custom nodes for ComfyUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ZHO-ZHO-ZHO",
|
||||||
|
"title": "ComfyUI Wan2.1 [WIP]",
|
||||||
|
"reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "It’s estimated that ComfyUI itself will support it soon, so go ahead and give it a try!"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "kijai",
|
||||||
|
"title": "ComfyUI-WanVideoWrapper [WIP]",
|
||||||
|
"reference": "https://github.com/kijai/ComfyUI-WanVideoWrapper",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/kijai/ComfyUI-WanVideoWrapper"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI diffusers wrapper nodes for WanVideo"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "ltdrdata",
|
||||||
|
"title": "comfyui-unsafe-torch [UNSAFE]",
|
||||||
|
"reference": "https://github.com/ltdrdata/comfyui-unsafe-torch",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/ltdrdata/comfyui-unsafe-torch"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "disable torch.load's `weigths_only`"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "IfnotFr",
|
||||||
|
"title": "⚡ ComfyUI Connect [WIP]",
|
||||||
|
"reference": "https://github.com/IfnotFr/ComfyUI-Connect",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/IfnotFr/ComfyUI-Connect"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "muvich3n",
|
||||||
|
"title": "ComfyUI-Crop-Border",
|
||||||
|
"reference": "https://github.com/muvich3n/ComfyUI-Crop-Border",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/muvich3n/ComfyUI-Crop-Border"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Crop Image Borders"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "masmullin2000",
|
||||||
|
"title": "ComfyUI-MMYolo",
|
||||||
|
"reference": "https://github.com/masmullin2000/ComfyUI-MMYolo",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/masmullin2000/ComfyUI-MMYolo"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A comfy node to find faces and output a mask"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Yeonri",
|
||||||
|
"title": "ComfyUI_LLM_Are_You_Listening [WIP]",
|
||||||
|
"reference": "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: AYL_Node, AYL_GGUF_Node, AYL_API_Node\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "altkeyproject",
|
||||||
|
"title": "Dream Painter [WIP]",
|
||||||
|
"reference": "https://github.com/alt-key-project/comfyui-dream-painter",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/alt-key-project/comfyui-dream-painter"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Provide utilities for 2D image generation and processing."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "kimara-ai",
|
||||||
|
"title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
|
||||||
|
"reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "krisshen2021",
|
||||||
|
"title": "comfyui_OpenRouterNodes [WIP]",
|
||||||
|
"reference": "https://github.com/krisshen2021/comfyui_OpenRouterNodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/krisshen2021/comfyui_OpenRouterNodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "LLM custom nodes for comfyui\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Velour-Fog",
|
||||||
|
"title": "comfy-latent-nodes [UNSAFE]",
|
||||||
|
"reference": "https://github.com/Velour-Fog/comfy-latent-nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Velour-Fog/comfy-latent-nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "ComfyUI nodes to save and load a latent to a specified directory. Saves time for doing operations on a latent such as upscaling without having to re-trigger the creation of the original latent.[w/This node can write files to an arbitrary path.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "jgbyte",
|
||||||
|
"title": "ComfyUI-RandomCube [WIP]",
|
||||||
|
"reference": "https://github.com/jgbyte/ComfyUI-RandomCube",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/jgbyte/ComfyUI-RandomCube"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: RandomCubeGrid"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "thot-experiment",
|
||||||
|
"title": "comfy-live-preview [WIP]",
|
||||||
|
"reference": "https://github.com/thot-experiment/comfy-live-preview",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/thot-experiment/comfy-live-preview"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "external live preview plugin for ComfyUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "AhBumm",
|
||||||
|
"title": "ComfyUI-Upscayl",
|
||||||
|
"reference": "https://github.com/AhBumm/ComfyUI-Upscayl",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/AhBumm/ComfyUI-Upscayl"
|
||||||
|
],
|
||||||
|
"nodename_pattern": "\\(BillBum\\)$",
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: Upscayl Upscaler"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "NEZHA625",
|
||||||
|
"title": "ComfyUI-tools-by-dong [UNSAFE]",
|
||||||
|
"reference": "https://github.com/NEZHA625/ComfyUI-tools-by-dong",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/NEZHA625/ComfyUI-tools-by-dong"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "NODES: HuggingFaceUploadNode, ImageDownloader, LoraIterator, FileMoveNode, InputDetectionNode, ...\nNOTE: The files in the repo are not organized.[w/This node pack includes nodes that can modify arbitrary files.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "if-ai",
|
||||||
|
"title": "ComfyUI-IF_Zonos [WIP]",
|
||||||
|
"reference": "https://github.com/if-ai/ComfyUI-IF_Zonos",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/if-ai/ComfyUI-IF_Zonos"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Zonos for ComfyUI"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "grinlau18",
|
||||||
|
"title": "Xiser_Nodes [WIP]",
|
||||||
|
"reference": "https://github.com/grinlau18/ComfyUI_XISER_Nodes",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/grinlau18/ComfyUI_XISER_Nodes"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "LAOGOU-666",
|
||||||
|
"title": "Comfyui_StartPatch [UNSAFE]",
|
||||||
|
"reference": "https://github.com/LAOGOU-666/Comfyui_StartPatch",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/LAOGOU-666/Comfyui_StartPatch"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "This patch plugin optimizes the node information processing mechanism of the ComfyUI server, significantly improving server performance and response speed. It greatly reduces the browser page initialization waiting time. [w/Since this patch modifies key functions of ComfyUI, it is highly likely to cause compatibility issues.]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "badmike",
|
||||||
|
"title": "Prompt Factory [CONFLICT]",
|
||||||
|
"reference": "https://github.com/badmike/comfyui-prompt-factory",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/badmike/comfyui-prompt-factory"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "A modular system that adds randomness to prompt generation [w/This node pack is causing a name conflict with https://github.com/satche/comfyui-prompt-factory]"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "owengillett",
|
||||||
|
"title": "ComfyUI-tilefusion",
|
||||||
|
"reference": "https://github.com/owengillett/ComfyUI-tilefusion",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/owengillett/ComfyUI-tilefusion"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "Helper nodes for generating seamless tiles."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"author": "Scaryplasmon",
|
||||||
|
"title": "ComfTrellis [WIP]",
|
||||||
|
"reference": "https://github.com/Scaryplasmon/ComfTrellis",
|
||||||
|
"files": [
|
||||||
|
"https://github.com/Scaryplasmon/ComfTrellis"
|
||||||
|
],
|
||||||
|
"install_type": "git-clone",
|
||||||
|
"description": "1 click install to run Trellis in ComfyUI\nNOTE: The files in the repo are not organized."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"author": "fangziheng2321",
|
"author": "fangziheng2321",
|
||||||
"title": "comfyuinode_chopmask [WIP]",
|
"title": "comfyuinode_chopmask [WIP]",
|
||||||
@@ -23,16 +453,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "a custom comfyui node for '/fooocusinpaint_upload'\nNOTE: The files in the repo are not organized."
|
"description": "a custom comfyui node for '/fooocusinpaint_upload'\nNOTE: The files in the repo are not organized."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "RodrigoSKohl",
|
|
||||||
"title": "Interior Design for Comfyui [WIP]",
|
|
||||||
"reference": "https://github.com/RodrigoSKohl/StableDesign-for-ComfyUI",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/RodrigoSKohl/StableDesign-for-ComfyUI"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This node is based on MykolaL/StableDesign"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "D1-3105",
|
"author": "D1-3105",
|
||||||
"title": "ComfyUI-VideoStream",
|
"title": "ComfyUI-VideoStream",
|
||||||
@@ -83,16 +503,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
|
"description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "dasilva333",
|
|
||||||
"title": "ComfyUI_MarkdownImage [WIP]",
|
|
||||||
"reference": "https://github.com/dasilva333/ComfyUI_MarkdownImage",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/dasilva333/ComfyUI_MarkdownImage"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Create an image using html and markdown in ComfyUI\nNOTE: The files in the repo are not organized."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "franky519",
|
"author": "franky519",
|
||||||
"title": "comfyui-redux-style",
|
"title": "comfyui-redux-style",
|
||||||
@@ -143,16 +553,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES: Load TIFF"
|
"description": "NODES: Load TIFF"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "greengerong",
|
|
||||||
"title": "ComfyUI-Lumina-Video [WIP]",
|
|
||||||
"reference": "https://github.com/greengerong/ComfyUI-Lumina-Video",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/greengerong/ComfyUI-Lumina-Video"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "This is a video generation plugin implementation for ComfyUI based on the Lumina Video model."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "tc888",
|
"author": "tc888",
|
||||||
"title": "ComfyUI_Save_Flux_Image",
|
"title": "ComfyUI_Save_Flux_Image",
|
||||||
@@ -366,13 +766,13 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "HuangYuChuh",
|
"author": "HuangYuChuh",
|
||||||
"title": "ComfyUI-DeepSeek_Toolkit [WIP]",
|
"title": "ComfyUI-DeepSeek-Toolkit [WIP]",
|
||||||
"reference": "https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit",
|
"reference": "https://github.com/HuangYuChuh/ComfyUI-DeepSeek-Toolkit",
|
||||||
"files": [
|
"files": [
|
||||||
"https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit"
|
"https://github.com/HuangYuChuh/ComfyUI-DeepSeek-Toolkit"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "ComfyUI-DeepSeek_Toolkit is a deep learning toolkit for ComfyUI that integrates the DeepSeek Janus model, offering functionalities for image generation and image understanding.\nNOTE: The files in the repo are not organized."
|
"description": "ComfyUI-DeepSeek-Toolkit is a deep learning toolkit for ComfyUI that integrates the DeepSeek Janus model, offering functionalities for image generation and image understanding.\nNOTE: The files in the repo are not organized."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "comfyuiblog",
|
"author": "comfyuiblog",
|
||||||
@@ -504,16 +904,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "nodes for deepseek api\nNOTE: The files in the repo are not organized."
|
"description": "nodes for deepseek api\nNOTE: The files in the repo are not organized."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "807502278",
|
|
||||||
"title": "ComfyUI_TensorRT_Merge [WIP]",
|
|
||||||
"reference": "https://github.com/807502278/ComfyUI_TensorRT_Merge",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/807502278/ComfyUI_TensorRT_Merge"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Non diffusion models supported by TensorRT, merged Comfyui plugin, added onnx automatic download and trt model conversion nodes."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "IfnotFr",
|
"author": "IfnotFr",
|
||||||
"title": "ComfyUI-Ifnot-Pack",
|
"title": "ComfyUI-Ifnot-Pack",
|
||||||
@@ -782,7 +1172,7 @@
|
|||||||
"https://github.com/yanhuifair/ComfyUI-FairLab"
|
"https://github.com/yanhuifair/ComfyUI-FairLab"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize"
|
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize, ..."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "nomcycle",
|
"author": "nomcycle",
|
||||||
@@ -1015,16 +1405,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES: File Mv, File Path, File Dir.\n[w/This is dangerous as it provides the ability to manipulate arbitrary user files.]"
|
"description": "NODES: File Mv, File Path, File Dir.\n[w/This is dangerous as it provides the ability to manipulate arbitrary user files.]"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "scottmudge",
|
|
||||||
"title": "ComfyUI_BiscuitNodes",
|
|
||||||
"reference": "https://github.com/scottmudge/ComfyUI_BiscuitNodes",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/scottmudge/ComfyUI_BiscuitNodes"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Load Image From Path Using File Selector"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "JissiChoi",
|
"author": "JissiChoi",
|
||||||
"title": "ComfyUI-Jissi-List [WIP]",
|
"title": "ComfyUI-Jissi-List [WIP]",
|
||||||
@@ -1681,16 +2061,6 @@
|
|||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
|
"description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "attashe",
|
|
||||||
"title": "ComfyUI-FluxRegionAttention [WIP]",
|
|
||||||
"reference": "https://github.com/attashe/ComfyUI-FluxRegionAttention",
|
|
||||||
"files": [
|
|
||||||
"https://github.com/attashe/ComfyUI-FluxRegionAttention"
|
|
||||||
],
|
|
||||||
"install_type": "git-clone",
|
|
||||||
"description": "Implement Region Attention for Flux model"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "aria1th",
|
"author": "aria1th",
|
||||||
"title": "ComfyUI-SkipCFGSigmas",
|
"title": "ComfyUI-SkipCFGSigmas",
|
||||||
@@ -1699,7 +2069,7 @@
|
|||||||
"https://github.com/aria1th/ComfyUI-SkipCFGSigmas"
|
"https://github.com/aria1th/ComfyUI-SkipCFGSigmas"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES:CFGControl_SKIPCFG"
|
"description": "NODES: CFGControl_SKIPCFG"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "Clelstyn",
|
"author": "Clelstyn",
|
||||||
@@ -1749,7 +2119,7 @@
|
|||||||
"https://github.com/oshtz/ComfyUI-oshtz-nodes"
|
"https://github.com/oshtz/ComfyUI-oshtz-nodes"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node"
|
"description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node\nNOTE: The files in the repo are not organized."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "m-ai-studio",
|
"author": "m-ai-studio",
|
||||||
@@ -1919,7 +2289,7 @@
|
|||||||
"https://github.com/fablestudio/ComfyUI-Showrunner-Utils"
|
"https://github.com/fablestudio/ComfyUI-Showrunner-Utils"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "NODES:Align Face, Generate Timestamp"
|
"description": "NODES: Align Face, Generate Timestamp, GetMostCommonColors, Alpha Crop and Position Image, Shrink Image"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "monate0615",
|
"author": "monate0615",
|
||||||
@@ -2587,13 +2957,14 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "chrisdreid",
|
"author": "chrisdreid",
|
||||||
"title": "ComfyUI_EnvAutopsyAPI [UNSAFE]",
|
"title": "ComfyUI_EnvAutopsyAPI Debugger [UNSAFE]",
|
||||||
|
"id": "chrisdreid",
|
||||||
"reference": "https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI",
|
"reference": "https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI",
|
||||||
"files": [
|
"files": [
|
||||||
"https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI"
|
"https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI"
|
||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "ComfyUI_EnvAutopsyAPI is a powerful debugging tool designed for ComfyUI that provides in-depth analysis of your environment and dependencies through an API interface. This tool allows you to inspect environment variables, pip packages, and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server. MUST READ [a/THIS](https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI#%EF%B8%8F-warning-security-risk-%EF%B8%8F) before install.]"
|
"description": "A powerful debugging tool designed to provide in-depth analysis of your environment and dependencies by exposing API endpoints. This tool allows you to inspect environment variables, pip packages, python info and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server]"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "Futureversecom",
|
"author": "Futureversecom",
|
||||||
@@ -2708,16 +3079,6 @@
|
|||||||
"install_type":"git-clone",
|
"install_type":"git-clone",
|
||||||
"description":"The ComfyUI code is under review in the official repository. Meanwhile, a temporary version is available below for immediate community use. We welcome users to try our workflow and appreciate any inquiries or suggestions."
|
"description":"The ComfyUI code is under review in the official repository. Meanwhile, a temporary version is available below for immediate community use. We welcome users to try our workflow and appreciate any inquiries or suggestions."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"author": "JichaoLiang",
|
|
||||||
"title": "Immortal_comfyUI",
|
|
||||||
"reference": "https://github.com/JichaoLiang/Immortal_comfyUI",
|
|
||||||
"files":[
|
|
||||||
"https://github.com/JichaoLiang/Immortal_comfyUI"
|
|
||||||
],
|
|
||||||
"install_type":"git-clone",
|
|
||||||
"description":"Nodes: NewNode, AppendNode, MergeNode, SetProperties, SaveToDirectory, ..."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"author": "melMass",
|
"author": "melMass",
|
||||||
"title": "ComfyUI-Lygia",
|
"title": "ComfyUI-Lygia",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -129,6 +129,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,6 +11,116 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"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",
|
"author": "apesplat",
|
||||||
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
|
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
|
||||||
@@ -85,7 +195,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"author": "myAiLemon",
|
"author": "myAiLemon",
|
||||||
"title": "MagicGetPromptAutomatically",
|
"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"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,62 @@
|
|||||||
{
|
{
|
||||||
"models": [
|
"models": [
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"type": "diffusion_model",
|
||||||
|
"base": "Hunyuan Video",
|
||||||
|
"save_path": "diffusion_models/hunyuan_video",
|
||||||
|
"description": "Huyuan Video Image2Video diffusion model. repackaged version.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_image_to_video_720p_bf16.safetensors",
|
||||||
|
"size": "25.6GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Comfy-Org/llava_llama3_vision.safetensors",
|
||||||
|
"type": "clip_vision",
|
||||||
|
"base": "LLaVA-Llama-3",
|
||||||
|
"save_path": "text_encoders",
|
||||||
|
"description": "llava_llama3_vision clip vison model. This is required for using Hunyuan Video Image2Video.",
|
||||||
|
"reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
|
||||||
|
"filename": "llava_llama3_vision.safetensors",
|
||||||
|
"url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/clip_vision/llava_llama3_vision.safetensors",
|
||||||
|
"size": "649MB"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "LTX-Video 2B v0.9.5 Checkpoint",
|
||||||
|
"type": "checkpoint",
|
||||||
|
"base": "LTX-Video",
|
||||||
|
"save_path": "checkpoints/LTXV",
|
||||||
|
"description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
|
||||||
|
"reference": "https://huggingface.co/Lightricks/LTX-Video",
|
||||||
|
"filename": "ltx-video-2b-v0.9.5.safetensors",
|
||||||
|
"url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.5.safetensors",
|
||||||
|
"size": "6.34GB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"type": "VAE",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "vae/kolors",
|
||||||
|
"description": "Kolors VAE",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||||
|
"filename": "diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||||
|
"size": "167MB"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
|
||||||
|
"type": "VAE",
|
||||||
|
"base": "Kolors",
|
||||||
|
"save_path": "vae/kolors",
|
||||||
|
"description": "Kolors VAE",
|
||||||
|
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||||
|
"filename": "diffusion_pytorch_model.safetensors",
|
||||||
|
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
|
||||||
|
"size": "335MB"
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "deepseek-ai/Janus-Pro-1B",
|
"name": "deepseek-ai/Janus-Pro-1B",
|
||||||
"type": "Janus-Pro",
|
"type": "Janus-Pro",
|
||||||
|
|||||||
@@ -301,6 +301,16 @@
|
|||||||
],
|
],
|
||||||
"install_type": "git-clone",
|
"install_type": "git-clone",
|
||||||
"description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import atexit
|
import atexit
|
||||||
@@ -34,6 +35,8 @@ else:
|
|||||||
|
|
||||||
security_check.security_check()
|
security_check.security_check()
|
||||||
|
|
||||||
|
manager_util.add_python_path_to_env()
|
||||||
|
|
||||||
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
|
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
|
|
||||||
@@ -95,7 +98,7 @@ def read_config():
|
|||||||
global default_conf
|
global default_conf
|
||||||
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']
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -504,7 +507,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):
|
||||||
@@ -693,13 +696,44 @@ def execute_migration(moves):
|
|||||||
shutil.move(x[0], x[1])
|
shutil.move(x[0], x[1])
|
||||||
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
|
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
|
||||||
|
|
||||||
|
|
||||||
script_executed = False
|
script_executed = False
|
||||||
|
|
||||||
# Check if script_list_path exists
|
def execute_startup_script():
|
||||||
if os.path.exists(script_list_path):
|
global script_executed
|
||||||
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:
|
||||||
@@ -723,6 +757,9 @@ if os.path.exists(script_list_path):
|
|||||||
elif script[1] == "#LAZY-MIGRATION":
|
elif script[1] == "#LAZY-MIGRATION":
|
||||||
execute_migration(script[2])
|
execute_migration(script[2])
|
||||||
|
|
||||||
|
elif script[1] == "#LAZY-DELETE-NODEPACK":
|
||||||
|
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":
|
||||||
del script[1]
|
del script[1]
|
||||||
@@ -731,7 +768,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:
|
||||||
@@ -739,12 +776,12 @@ 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):
|
||||||
@@ -754,6 +791,12 @@ if os.path.exists(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
|
||||||
@@ -773,7 +816,10 @@ if script_executed:
|
|||||||
else:
|
else:
|
||||||
sys_argv = sys.argv.copy()
|
sys_argv = sys.argv.copy()
|
||||||
|
|
||||||
if sys.platform.startswith('win32'):
|
if sys_argv[0].endswith("__main__.py"): # this is a python module
|
||||||
|
module_name = os.path.basename(os.path.dirname(sys_argv[0]))
|
||||||
|
cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
|
||||||
|
elif sys.platform.startswith('win32'):
|
||||||
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
|
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
|
||||||
else:
|
else:
|
||||||
cmds = [sys.executable] + sys_argv
|
cmds = [sys.executable] + sys_argv
|
||||||
@@ -787,7 +833,7 @@ if script_executed:
|
|||||||
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.23"
|
version = "3.30.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"
|
||||||
|
|||||||
Reference in New Issue
Block a user