Compare commits
59 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4fd17b0bf5 | ||
|
|
76d2206058 | ||
|
|
51e8b608dc | ||
|
|
a68330fb8f | ||
|
|
2449ad5c69 | ||
|
|
064c812df3 | ||
|
|
48d5ec9e66 | ||
|
|
914419fd1e | ||
|
|
f005fc8ca0 | ||
|
|
43b7960de2 | ||
|
|
2ed1e58032 | ||
|
|
c63b212700 | ||
|
|
e9df78c0e7 | ||
|
|
b0daf81185 | ||
|
|
cee4fdcbb0 | ||
|
|
df3cdfccb0 | ||
|
|
894042cd0e | ||
|
|
8123287952 | ||
|
|
bc677705d8 | ||
|
|
5dd8ea8aab | ||
|
|
41172be796 | ||
|
|
ad1b4a9a86 | ||
|
|
e0e3ec02b3 | ||
|
|
a6cc392473 | ||
|
|
36f48b8656 | ||
|
|
3d883ca37d | ||
|
|
34ed81ca64 | ||
|
|
a9e0880572 | ||
|
|
9500e1c3c4 | ||
|
|
d81aa9cbbc | ||
|
|
21d4b25c2d | ||
|
|
0080783a11 | ||
|
|
2c3f44a3f8 | ||
|
|
3ddf414097 | ||
|
|
59fb63f1f7 | ||
|
|
fa1b514440 | ||
|
|
1579c58876 | ||
|
|
153d044331 | ||
|
|
f2496f7054 | ||
|
|
99022f4f3d | ||
|
|
60a5e4f261 | ||
|
|
661586d3b6 | ||
|
|
abc26cf906 | ||
|
|
12351bada7 | ||
|
|
a6816d53d7 | ||
|
|
3b0709f5f2 | ||
|
|
d7af7e2917 | ||
|
|
6516e62d33 | ||
|
|
6b832edd2f | ||
|
|
eebace1652 | ||
|
|
6ff6e05408 | ||
|
|
aaf569ca8c | ||
|
|
31eef6222e | ||
|
|
9963afa558 | ||
|
|
5b2e2fcf9d | ||
|
|
cc746e59a1 | ||
|
|
2cdb1c519d | ||
|
|
426074ded9 | ||
|
|
772a096615 |
38
README.md
38
README.md
@@ -149,6 +149,7 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
|
||||
* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
|
||||
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
|
||||
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
|
||||
* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
|
||||
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
|
||||
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
|
||||
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
|
||||
@@ -262,10 +263,17 @@ The following settings are applied based on the section marked as `is_default`.
|
||||
windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
|
||||
model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
|
||||
downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
|
||||
security_level = <Set the security level.>
|
||||
security_level = <Set the security level => strong|normal|normal-|weak>
|
||||
always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
|
||||
network_mode = <Set the network mode => public|private|offline>
|
||||
```
|
||||
|
||||
* network_mode:
|
||||
- public: An environment that uses a typical public network.
|
||||
- private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
|
||||
- offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
|
||||
|
||||
|
||||
## Additional Feature
|
||||
* Logging to file feature
|
||||
* This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
|
||||
@@ -294,7 +302,10 @@ The following settings are applied based on the section marked as `is_default`.
|
||||
* Custom pip mapping
|
||||
* When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
|
||||
* Please refer to the `pip_overrides.json.template` file.
|
||||
|
||||
|
||||
* Prevent the installation of specific pip packages
|
||||
* List the package names one per line in the `pip_blacklist.list` file.
|
||||
|
||||
* Use `aria2` as downloader
|
||||
* [howto](docs/en/use_aria2.md)
|
||||
|
||||
@@ -302,6 +313,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.
|
||||
|
||||
|
||||
## 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
|
||||
When you run the `scan.sh` script:
|
||||
|
||||
|
||||
41
cm-cli.py
41
cm-cli.py
@@ -32,6 +32,7 @@ if comfy_path is None:
|
||||
print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
|
||||
comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
|
||||
|
||||
# This should be placed here
|
||||
sys.path.append(comfy_path)
|
||||
|
||||
import utils.extra_config
|
||||
@@ -42,7 +43,7 @@ import cnr_utils
|
||||
|
||||
comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
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_overrides = {'numpy': 'numpy<2'}
|
||||
|
||||
@@ -51,6 +52,14 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides
|
||||
cm_global.pip_overrides = json.load(json_file)
|
||||
|
||||
|
||||
if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list")):
|
||||
with open(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list"), 'r', encoding="UTF-8", errors="ignore") as f:
|
||||
for x in f.readlines():
|
||||
y = x.strip()
|
||||
if y != '':
|
||||
cm_global.pip_blacklist.add(y)
|
||||
|
||||
|
||||
def check_comfyui_hash():
|
||||
repo = git.Repo(comfy_path)
|
||||
core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
|
||||
@@ -67,7 +76,7 @@ core.check_invalid_nodes()
|
||||
def read_downgrade_blacklist():
|
||||
try:
|
||||
import configparser
|
||||
config = configparser.ConfigParser()
|
||||
config = configparser.ConfigParser(strict=False)
|
||||
config.read(core.manager_config.path)
|
||||
default_conf = config['default']
|
||||
|
||||
@@ -136,6 +145,13 @@ class Ctx:
|
||||
cm_global.pip_overrides = json.load(json_file)
|
||||
cm_global.pip_overrides = {'numpy': 'numpy<2'}
|
||||
|
||||
if os.path.exists(core.manager_pip_blacklist_path):
|
||||
with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||
for x in f.readlines():
|
||||
y = x.strip()
|
||||
if y != '':
|
||||
cm_global.pip_blacklist.add(y)
|
||||
|
||||
@staticmethod
|
||||
def get_startup_scripts_path():
|
||||
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
|
||||
@@ -1012,17 +1028,32 @@ def save_snapshot(
|
||||
user_directory: str = typer.Option(
|
||||
None,
|
||||
help="user directory"
|
||||
)
|
||||
),
|
||||
full_snapshot: Annotated[
|
||||
bool,
|
||||
typer.Option(
|
||||
show_default=False, help="If the snapshot should include custom node, ComfyUI version and pip versions (default), or only custom node details"
|
||||
),
|
||||
] = True,
|
||||
):
|
||||
cmd_ctx.set_user_directory(user_directory)
|
||||
|
||||
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output))
|
||||
if(not output.endswith('.json') and not output.endswith('.yaml')):
|
||||
print("ERROR: output path should be either '.json' or '.yaml' file.")
|
||||
raise typer.Exit(code=1)
|
||||
|
||||
dir_path = os.path.dirname(output)
|
||||
if(dir_path != '' and not os.path.exists(dir_path)):
|
||||
print(f"ERROR: {output} path not exists.")
|
||||
raise typer.Exit(code=1)
|
||||
|
||||
path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
|
||||
print(f"Current snapshot is saved as `{path}`")
|
||||
|
||||
|
||||
@app.command("restore-snapshot", help="Restore snapshot from snapshot file")
|
||||
def restore_snapshot(
|
||||
snapshot_name: str,
|
||||
snapshot_name: str,
|
||||
pip_non_url: Optional[bool] = typer.Option(
|
||||
default=None,
|
||||
show_default=False,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
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)
|
||||
return True
|
||||
except:
|
||||
# try checkout master
|
||||
# try checkout main if failed
|
||||
try:
|
||||
repo.git.checkout(repo.heads.master)
|
||||
return True
|
||||
except:
|
||||
try:
|
||||
if remote_name is not None:
|
||||
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
||||
return True
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
repo.git.checkout(repo.heads.main)
|
||||
return True
|
||||
except:
|
||||
try:
|
||||
if remote_name is not None:
|
||||
repo.git.checkout('-b', 'main', f'{remote_name}/main')
|
||||
return True
|
||||
except:
|
||||
pass
|
||||
|
||||
print("[ComfyUI Manager] Failed to switch to the default branch")
|
||||
return False
|
||||
@@ -389,12 +402,13 @@ def apply_snapshot(path):
|
||||
git_custom_node_infos = info['git_custom_nodes']
|
||||
file_custom_node_infos = info['file_custom_nodes']
|
||||
|
||||
checkout_comfyui_hash(comfyui_hash)
|
||||
if comfyui_hash:
|
||||
checkout_comfyui_hash(comfyui_hash)
|
||||
checkout_custom_node_hash(git_custom_node_infos)
|
||||
invalidate_custom_node_file(file_custom_node_infos)
|
||||
|
||||
print("APPLY SNAPSHOT: True")
|
||||
if 'pips' in info:
|
||||
if 'pips' in info and info['pips']:
|
||||
return info['pips']
|
||||
else:
|
||||
return None
|
||||
|
||||
7259
github-stats.json
7259
github-stats.json
File diff suppressed because it is too large
Load Diff
@@ -173,7 +173,10 @@ def read_cnr_info(fullpath):
|
||||
|
||||
project = data.get('project', {})
|
||||
name = project.get('name').strip().lower()
|
||||
version = project.get('version')
|
||||
|
||||
# normalize version
|
||||
# for example: 2.5 -> 2.5.0
|
||||
version = str(manager_util.StrictVersion(project.get('version')))
|
||||
|
||||
urls = project.get('urls', {})
|
||||
repository = urls.get('Repository')
|
||||
|
||||
@@ -2,6 +2,9 @@ import os
|
||||
import configparser
|
||||
|
||||
|
||||
GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
|
||||
|
||||
|
||||
def is_git_repo(path: str) -> bool:
|
||||
""" Check if the path is a git repository. """
|
||||
# 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):
|
||||
return None
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
# Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
|
||||
config = configparser.ConfigParser(strict=False)
|
||||
config.read(git_config_path)
|
||||
|
||||
for k, v in config.items():
|
||||
@@ -46,16 +50,36 @@ def git_url(fullpath):
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def normalize_url(url) -> str:
|
||||
url = url.replace("git@github.com:", "https://github.com/")
|
||||
if url.endswith('.git'):
|
||||
url = url[:-4]
|
||||
github_id = normalize_to_github_id(url)
|
||||
if github_id is not None:
|
||||
url = f"https://github.com/{github_id}"
|
||||
|
||||
return url
|
||||
|
||||
def normalize_url_http(url) -> str:
|
||||
url = url.replace("https://github.com/", "git@github.com:")
|
||||
if url.endswith('.git'):
|
||||
url = url[:-4]
|
||||
|
||||
return url
|
||||
def normalize_to_github_id(url) -> str:
|
||||
if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
|
||||
author = os.path.basename(os.path.dirname(url))
|
||||
|
||||
if author.startswith('git@github.com:'):
|
||||
author = author.split(':')[1]
|
||||
|
||||
repo_name = os.path.basename(url)
|
||||
if repo_name.endswith('.git'):
|
||||
repo_name = repo_name[:-4]
|
||||
|
||||
return f"{author}/{repo_name}"
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def get_url_for_clone(url):
|
||||
url = normalize_url(url)
|
||||
|
||||
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
|
||||
|
||||
@@ -42,7 +42,7 @@ import manager_downloader
|
||||
from node_package import InstalledNodePackage
|
||||
|
||||
|
||||
version_code = [3, 18, 1]
|
||||
version_code = [3, 26]
|
||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||
|
||||
|
||||
@@ -177,6 +177,7 @@ manager_channel_list_path = None
|
||||
manager_startup_script_path:str = None
|
||||
manager_snapshot_path = None
|
||||
manager_pip_overrides_path = None
|
||||
manager_pip_blacklist_path = None
|
||||
manager_components_path = None
|
||||
|
||||
def update_user_directory(user_dir):
|
||||
@@ -186,6 +187,7 @@ def update_user_directory(user_dir):
|
||||
global manager_startup_script_path
|
||||
global manager_snapshot_path
|
||||
global manager_pip_overrides_path
|
||||
global manager_pip_blacklist_path
|
||||
global manager_components_path
|
||||
|
||||
manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
|
||||
@@ -203,6 +205,7 @@ def update_user_directory(user_dir):
|
||||
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
||||
manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
|
||||
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
|
||||
manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
|
||||
manager_components_path = os.path.join(manager_files_path, "components")
|
||||
manager_util.cache_dir = os.path.join(manager_files_path, "cache")
|
||||
|
||||
@@ -345,6 +348,7 @@ class ManagedResult:
|
||||
self.msg = None
|
||||
self.target = None
|
||||
self.postinstall = lambda: True
|
||||
self.ver = None
|
||||
|
||||
def append(self, item):
|
||||
self.items.append(item)
|
||||
@@ -366,6 +370,10 @@ class ManagedResult:
|
||||
self.postinstall = postinstall
|
||||
return self
|
||||
|
||||
def with_ver(self, ver):
|
||||
self.ver = ver
|
||||
return self
|
||||
|
||||
|
||||
class UnifiedManager:
|
||||
def __init__(self):
|
||||
@@ -497,6 +505,8 @@ class UnifiedManager:
|
||||
def resolve_from_path(self, fullpath):
|
||||
url = git_utils.git_url(fullpath)
|
||||
if url:
|
||||
url = git_utils.normalize_url(url)
|
||||
|
||||
cnr = self.get_cnr_by_repo(url)
|
||||
commit_hash = git_utils.get_commit_hash(fullpath)
|
||||
if cnr:
|
||||
@@ -513,7 +523,10 @@ class UnifiedManager:
|
||||
if info:
|
||||
cnr = self.cnr_map.get(info['id'])
|
||||
if cnr:
|
||||
return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']}
|
||||
# normalize version
|
||||
# for example: 2.5 -> 2.5.0
|
||||
ver = str(manager_util.StrictVersion(info['version']))
|
||||
return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
|
||||
else:
|
||||
return None
|
||||
else:
|
||||
@@ -525,6 +538,8 @@ class UnifiedManager:
|
||||
|
||||
if node_package.is_disabled and node_package.is_unknown:
|
||||
url = git_utils.git_url(node_package.fullpath)
|
||||
if url is not None:
|
||||
url = git_utils.normalize_url(url)
|
||||
self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
|
||||
|
||||
if node_package.is_disabled and node_package.is_nightly:
|
||||
@@ -535,6 +550,8 @@ class UnifiedManager:
|
||||
|
||||
if node_package.is_enabled and node_package.is_unknown:
|
||||
url = git_utils.git_url(node_package.fullpath)
|
||||
if url is not None:
|
||||
url = git_utils.normalize_url(url)
|
||||
self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
|
||||
|
||||
if node_package.is_from_cnr and node_package.is_disabled:
|
||||
@@ -695,6 +712,9 @@ class UnifiedManager:
|
||||
self.unknown_active_nodes = {} # node_id -> repo url * fullpath
|
||||
self.active_nodes = {} # node_id -> node_version * fullpath
|
||||
|
||||
if get_config()['network_mode'] != 'public':
|
||||
dont_wait = True
|
||||
|
||||
# reload 'cnr_map' and 'repo_cnr_map'
|
||||
cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
|
||||
|
||||
@@ -783,6 +803,7 @@ class UnifiedManager:
|
||||
node_id = v['id']
|
||||
else:
|
||||
node_id = v['files'][0].split('/')[-1]
|
||||
v['repository'] = v['files'][0]
|
||||
res[node_id] = v
|
||||
elif len(v['files']) > 1:
|
||||
res[v['files'][0]] = v # A custom node composed of multiple url is treated as a single repository with one representative path
|
||||
@@ -809,14 +830,14 @@ class UnifiedManager:
|
||||
print("Install: pip packages")
|
||||
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
|
||||
res = True
|
||||
with open(requirements_path, "r") as requirements_file:
|
||||
for line in requirements_file:
|
||||
package_name = remap_pip_package(line.strip())
|
||||
if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
|
||||
self.processed_install.add(package_name)
|
||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||
if package_name.strip() != "" and not package_name.startswith('#'):
|
||||
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
|
||||
lines = manager_util.robust_readlines(requirements_path)
|
||||
for line in lines:
|
||||
package_name = remap_pip_package(line.strip())
|
||||
if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
|
||||
self.processed_install.add(package_name)
|
||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||
if package_name.strip() != "" and not package_name.startswith('#'):
|
||||
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
|
||||
|
||||
pip_fixer.fix_broken()
|
||||
return res
|
||||
@@ -1042,8 +1063,8 @@ class UnifiedManager:
|
||||
|
||||
# update cache
|
||||
if version_spec == 'unknown':
|
||||
self.unknown_active_nodes[node_id] = self.unknown_inactive_nodes[node_id][0], to_path
|
||||
del self.unknown_inactive_nodes[node_id]
|
||||
self.unknown_active_nodes[node_id] = to_path
|
||||
return result.with_target(to_path)
|
||||
elif version_spec == 'nightly':
|
||||
del self.nightly_inactive_nodes[node_id]
|
||||
@@ -1224,15 +1245,16 @@ class UnifiedManager:
|
||||
if url.endswith("/"):
|
||||
url = url[:-1]
|
||||
try:
|
||||
print(f"Download: git clone '{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':
|
||||
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:
|
||||
return result.fail(f"Failed to clone repo: {url}")
|
||||
return result.fail(f"Failed to clone repo: {clone_url}")
|
||||
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.close()
|
||||
|
||||
@@ -1246,7 +1268,8 @@ class UnifiedManager:
|
||||
return result.fail(f"Failed to execute install script: {url}")
|
||||
|
||||
except Exception as e:
|
||||
return result.fail(f"Install(git-clone) error: {url} / {e}")
|
||||
traceback.print_exc()
|
||||
return result.fail(f"Install(git-clone) error[2]: {url} / {e}")
|
||||
|
||||
print("Installation was successful.")
|
||||
return result
|
||||
@@ -1327,14 +1350,14 @@ class UnifiedManager:
|
||||
version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
|
||||
|
||||
if version_spec is None:
|
||||
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}')
|
||||
return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}').with_ver(version_spec)
|
||||
|
||||
if version_spec == 'nightly':
|
||||
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly')
|
||||
return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly').with_ver('nightly')
|
||||
elif version_spec == 'unknown':
|
||||
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown')
|
||||
return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown').with_ver('unknown')
|
||||
else:
|
||||
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
|
||||
return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')
|
||||
|
||||
async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
|
||||
"""
|
||||
@@ -1382,7 +1405,7 @@ class UnifiedManager:
|
||||
res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
|
||||
if res.result:
|
||||
if version_spec == 'unknown':
|
||||
self.unknown_active_nodes[node_id] = to_path
|
||||
self.unknown_active_nodes[node_id] = repo_url, to_path
|
||||
elif version_spec == 'nightly':
|
||||
cnr_utils.generate_cnr_id(to_path, node_id)
|
||||
self.active_nodes[node_id] = 'nightly', to_path
|
||||
@@ -1449,7 +1472,7 @@ def identify_node_pack_from_path(fullpath):
|
||||
# cnr
|
||||
cnr = cnr_utils.read_cnr_info(fullpath)
|
||||
if cnr is not None:
|
||||
return module_name, cnr['version'], cnr['id']
|
||||
return module_name, cnr['version'], cnr['id'], None
|
||||
|
||||
return None
|
||||
else:
|
||||
@@ -1457,10 +1480,18 @@ def identify_node_pack_from_path(fullpath):
|
||||
cnr_id = cnr_utils.read_cnr_id(fullpath)
|
||||
commit_hash = git_utils.get_commit_hash(fullpath)
|
||||
|
||||
github_id = git_utils.normalize_to_github_id(repo_url)
|
||||
if github_id is None:
|
||||
try:
|
||||
github_id = os.path.basename(repo_url)
|
||||
except:
|
||||
logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
|
||||
github_id = module_name
|
||||
|
||||
if cnr_id is not None:
|
||||
return module_name, commit_hash, cnr_id
|
||||
return module_name, commit_hash, cnr_id, github_id
|
||||
else:
|
||||
return module_name, commit_hash, ''
|
||||
return module_name, commit_hash, '', github_id
|
||||
|
||||
|
||||
def get_installed_node_packs():
|
||||
@@ -1478,7 +1509,7 @@ def get_installed_node_packs():
|
||||
|
||||
is_disabled = not y.endswith('.disabled')
|
||||
|
||||
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': is_disabled }
|
||||
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': is_disabled }
|
||||
|
||||
disabled_dirs = os.path.join(x, '.disabled')
|
||||
if os.path.exists(disabled_dirs):
|
||||
@@ -1491,7 +1522,7 @@ def get_installed_node_packs():
|
||||
if info is None:
|
||||
continue
|
||||
|
||||
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': False }
|
||||
res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': False }
|
||||
|
||||
return res
|
||||
|
||||
@@ -1547,7 +1578,8 @@ manager_funcs = ManagerFuncs()
|
||||
|
||||
|
||||
def write_config():
|
||||
config = configparser.ConfigParser()
|
||||
config = configparser.ConfigParser(strict=False)
|
||||
|
||||
config['default'] = {
|
||||
'preview_method': manager_funcs.get_current_preview_method(),
|
||||
'git_exe': get_config()['git_exe'],
|
||||
@@ -1557,12 +1589,14 @@ def write_config():
|
||||
'bypass_ssl': get_config()['bypass_ssl'],
|
||||
"file_logging": get_config()['file_logging'],
|
||||
'component_policy': get_config()['component_policy'],
|
||||
'update_policy': get_config()['update_policy'],
|
||||
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
|
||||
'model_download_by_agent': get_config()['model_download_by_agent'],
|
||||
'downgrade_blacklist': get_config()['downgrade_blacklist'],
|
||||
'security_level': get_config()['security_level'],
|
||||
'skip_migration_check': get_config()['skip_migration_check'],
|
||||
'always_lazy_install': get_config()['always_lazy_install']
|
||||
'always_lazy_install': get_config()['always_lazy_install'],
|
||||
'network_mode': get_config()['network_mode']
|
||||
}
|
||||
|
||||
directory = os.path.dirname(manager_config_path)
|
||||
@@ -1575,38 +1609,33 @@ def write_config():
|
||||
|
||||
def read_config():
|
||||
try:
|
||||
config = configparser.ConfigParser()
|
||||
config = configparser.ConfigParser(strict=False)
|
||||
config.read(manager_config_path)
|
||||
default_conf = config['default']
|
||||
|
||||
# policy migration: disable_unsecure_features -> security_level
|
||||
if 'disable_unsecure_features' in default_conf:
|
||||
if default_conf['disable_unsecure_features'].lower() == 'true':
|
||||
security_level = 'strong'
|
||||
else:
|
||||
security_level = 'normal'
|
||||
else:
|
||||
security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
|
||||
|
||||
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
|
||||
|
||||
def get_bool(key, default_value):
|
||||
return default_conf[key].lower() == 'true' if key in default_conf else False
|
||||
|
||||
return {
|
||||
'http_channel_enabled': default_conf['http_channel_enabled'].lower() == 'true' if 'http_channel_enabled' in default_conf else False,
|
||||
'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
|
||||
'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
|
||||
'use_uv': default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False,
|
||||
'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL,
|
||||
'default_cache_as_channel_url': default_conf['default_cache_as_channel_url'].lower() == 'true' if 'default_cache_as_channel_url' in default_conf else False,
|
||||
'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
|
||||
'bypass_ssl': default_conf['bypass_ssl'].lower() == 'true' if 'bypass_ssl' in default_conf else False,
|
||||
'file_logging': default_conf['file_logging'].lower() == 'true' if 'file_logging' in default_conf else True,
|
||||
'component_policy': default_conf['component_policy'] if 'component_policy' in default_conf else 'workflow',
|
||||
'windows_selector_event_loop_policy': default_conf['windows_selector_event_loop_policy'].lower() == 'true' if 'windows_selector_event_loop_policy' in default_conf else False,
|
||||
'model_download_by_agent': default_conf['model_download_by_agent'].lower() == 'true' if 'model_download_by_agent' in default_conf else False,
|
||||
'downgrade_blacklist': default_conf['downgrade_blacklist'] if 'downgrade_blacklist' in default_conf else '',
|
||||
'skip_migration_check': default_conf['skip_migration_check'].lower() == 'true' if 'skip_migration_check' in default_conf else False,
|
||||
'always_lazy_install': default_conf['always_lazy_install'].lower() == 'true' if 'always_lazy_install' in default_conf else False,
|
||||
'security_level': security_level,
|
||||
'http_channel_enabled': get_bool('http_channel_enabled', False),
|
||||
'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
|
||||
'git_exe': default_conf.get('git_exe', ''),
|
||||
'use_uv': get_bool('use_uv', False),
|
||||
'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
|
||||
'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
|
||||
'share_option': default_conf.get('share_option', 'all').lower(),
|
||||
'bypass_ssl': get_bool('bypass_ssl', False),
|
||||
'file_logging': get_bool('file_logging', True),
|
||||
'component_policy': default_conf.get('component_policy', 'workflow').lower(),
|
||||
'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
|
||||
'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
|
||||
'model_download_by_agent': get_bool('model_download_by_agent', False),
|
||||
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
|
||||
'skip_migration_check': get_bool('skip_migration_check', False),
|
||||
'always_lazy_install': get_bool('always_lazy_install', False),
|
||||
'network_mode': default_conf.get('network_mode', 'public').lower(),
|
||||
'security_level': default_conf.get('security_level', 'normal').lower(),
|
||||
}
|
||||
|
||||
except Exception:
|
||||
@@ -1622,12 +1651,14 @@ def read_config():
|
||||
'bypass_ssl': False,
|
||||
'file_logging': True,
|
||||
'component_policy': 'workflow',
|
||||
'update_policy': 'stable-comfyui',
|
||||
'windows_selector_event_loop_policy': False,
|
||||
'model_download_by_agent': False,
|
||||
'downgrade_blacklist': '',
|
||||
'skip_migration_check': False,
|
||||
'always_lazy_install': False,
|
||||
'security_level': 'normal',
|
||||
'network_mode': 'public', # public | private | offline
|
||||
'security_level': 'normal', # strong | normal | normal- | weak
|
||||
}
|
||||
|
||||
|
||||
@@ -1672,14 +1703,27 @@ def switch_to_default_branch(repo):
|
||||
repo.git.checkout(default_branch)
|
||||
return True
|
||||
except:
|
||||
# try checkout master
|
||||
# try checkout main if failed
|
||||
try:
|
||||
repo.git.checkout(repo.heads.master)
|
||||
return True
|
||||
except:
|
||||
try:
|
||||
if remote_name is not None:
|
||||
repo.git.checkout('-b', 'master', f'{remote_name}/master')
|
||||
return True
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
repo.git.checkout(repo.heads.main)
|
||||
return True
|
||||
except:
|
||||
try:
|
||||
if remote_name is not None:
|
||||
repo.git.checkout('-b', 'main', f'{remote_name}/main')
|
||||
return True
|
||||
except:
|
||||
pass
|
||||
|
||||
print("[ComfyUI Manager] Failed to switch to the default branch")
|
||||
return False
|
||||
@@ -1713,7 +1757,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
||||
|
||||
if platform.system() != "Windows":
|
||||
try:
|
||||
if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
|
||||
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
|
||||
print("\n\n###################################################################")
|
||||
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
|
||||
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
|
||||
@@ -2030,12 +2074,14 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
|
||||
print(f"CLONE into '{repo_path}'")
|
||||
|
||||
# Clone the repository from the remote URL
|
||||
clone_url = git_utils.get_url_for_clone(url)
|
||||
|
||||
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:
|
||||
return result.fail(f"Failed to clone '{url}' into '{repo_path}'")
|
||||
return result.fail(f"Failed to clone '{clone_url}' into '{repo_path}'")
|
||||
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.close()
|
||||
|
||||
@@ -2045,8 +2091,8 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
|
||||
|
||||
except Exception as e:
|
||||
traceback.print_exc()
|
||||
print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
|
||||
return result.fail(f"Install(git-clone) error: {url} / {e}")
|
||||
print(f"Install(git-clone) error[1]: {url} / {e}", file=sys.stderr)
|
||||
return result.fail(f"Install(git-clone)[1] error: {url} / {e}")
|
||||
|
||||
|
||||
def git_pull(path):
|
||||
@@ -2085,9 +2131,10 @@ async def get_data_by_mode(mode, filename, channel_url=None):
|
||||
channel_url = get_channel_dict()[channel_url]
|
||||
|
||||
try:
|
||||
local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
|
||||
|
||||
if mode == "local":
|
||||
uri = os.path.join(manager_util.comfyui_manager_path, filename)
|
||||
json_obj = await manager_util.get_data(uri)
|
||||
json_obj = await manager_util.get_data(local_uri)
|
||||
else:
|
||||
if channel_url is None:
|
||||
uri = get_config()['channel_url'] + '/' + filename
|
||||
@@ -2097,13 +2144,25 @@ async def get_data_by_mode(mode, filename, channel_url=None):
|
||||
cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
|
||||
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
||||
|
||||
if mode == "cache" and manager_util.is_file_created_within_one_day(cache_uri):
|
||||
json_obj = await manager_util.get_data(cache_uri)
|
||||
if get_config()['network_mode'] == 'offline':
|
||||
# offline network mode
|
||||
if os.path.exists(cache_uri):
|
||||
json_obj = await manager_util.get_data(cache_uri)
|
||||
else:
|
||||
local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
|
||||
if os.path.exists(local_uri):
|
||||
json_obj = await manager_util.get_data(local_uri)
|
||||
else:
|
||||
json_obj = {} # fallback
|
||||
else:
|
||||
json_obj = await manager_util.get_data(uri)
|
||||
with manager_util.cache_lock:
|
||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||
# public network mode
|
||||
if mode == "cache" and manager_util.is_file_created_within_one_day(cache_uri):
|
||||
json_obj = await manager_util.get_data(cache_uri)
|
||||
else:
|
||||
json_obj = await manager_util.get_data(uri)
|
||||
with manager_util.cache_lock:
|
||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||
except Exception as e:
|
||||
print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
|
||||
uri = os.path.join(manager_util.comfyui_manager_path, filename)
|
||||
@@ -2132,7 +2191,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
|
||||
print(f"Fix(git-clone) error: {url} / {e}", file=sys.stderr)
|
||||
return False
|
||||
|
||||
print(f"Attempt to fixing '{files}' is done.")
|
||||
@@ -2316,6 +2375,32 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
|
||||
return True
|
||||
|
||||
|
||||
def update_to_stable_comfyui(repo_path):
|
||||
try:
|
||||
repo = git.Repo(repo_path)
|
||||
repo.git.checkout(repo.heads.master)
|
||||
versions, current_tag, _ = get_comfyui_versions(repo)
|
||||
|
||||
if len(versions) == 0 or (len(versions) == 1 and versions[0] == 'nightly'):
|
||||
logging.info("[ComfyUI-Manager] Unable to update to the stable ComfyUI version.")
|
||||
return "fail", None
|
||||
|
||||
if versions[0] == 'nightly':
|
||||
latest_tag = versions[1]
|
||||
else:
|
||||
latest_tag = versions[0]
|
||||
|
||||
if current_tag == latest_tag:
|
||||
return "skip", None
|
||||
else:
|
||||
logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
|
||||
repo.git.checkout(latest_tag)
|
||||
return 'updated', latest_tag
|
||||
except:
|
||||
traceback.print_exc()
|
||||
return "fail", None
|
||||
|
||||
|
||||
def update_path(repo_path, instant_execution=False, no_deps=False):
|
||||
if not os.path.exists(os.path.join(repo_path, '.git')):
|
||||
return "fail"
|
||||
@@ -2323,9 +2408,12 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
|
||||
# version check
|
||||
repo = git.Repo(repo_path)
|
||||
|
||||
is_switched = False
|
||||
if repo.head.is_detached:
|
||||
if not switch_to_default_branch(repo):
|
||||
return "fail"
|
||||
else:
|
||||
is_switched = True
|
||||
|
||||
current_branch = repo.active_branch
|
||||
branch_name = current_branch.name
|
||||
@@ -2364,6 +2452,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
|
||||
git_pull(repo_path)
|
||||
execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
|
||||
return "updated"
|
||||
elif is_switched:
|
||||
return "updated"
|
||||
else:
|
||||
return "skipped"
|
||||
|
||||
@@ -2454,7 +2544,7 @@ def get_installed_pip_packages():
|
||||
return res
|
||||
|
||||
|
||||
async def get_current_snapshot():
|
||||
async def get_current_snapshot(custom_nodes_only = False):
|
||||
await unified_manager.reload('cache')
|
||||
await unified_manager.get_custom_nodes('default', 'cache')
|
||||
|
||||
@@ -2465,8 +2555,10 @@ async def get_current_snapshot():
|
||||
print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
||||
return {}
|
||||
|
||||
repo = git.Repo(repo_path)
|
||||
comfyui_commit_hash = repo.head.commit.hexsha
|
||||
comfyui_commit_hash = None
|
||||
if not custom_nodes_only:
|
||||
repo = git.Repo(repo_path)
|
||||
comfyui_commit_hash = repo.head.commit.hexsha
|
||||
|
||||
git_custom_nodes = {}
|
||||
cnr_custom_nodes = {}
|
||||
@@ -2532,7 +2624,7 @@ async def get_current_snapshot():
|
||||
|
||||
file_custom_nodes.append(item)
|
||||
|
||||
pip_packages = get_installed_pip_packages()
|
||||
pip_packages = None if custom_nodes_only else get_installed_pip_packages()
|
||||
|
||||
return {
|
||||
'comfyui': comfyui_commit_hash,
|
||||
@@ -2543,7 +2635,7 @@ async def get_current_snapshot():
|
||||
}
|
||||
|
||||
|
||||
async def save_snapshot_with_postfix(postfix, path=None):
|
||||
async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = False):
|
||||
if path is None:
|
||||
now = datetime.now()
|
||||
|
||||
@@ -2555,7 +2647,7 @@ async def save_snapshot_with_postfix(postfix, path=None):
|
||||
file_name = path.replace('\\', '/').split('/')[-1]
|
||||
file_name = file_name.split('.')[-2]
|
||||
|
||||
snapshot = await get_current_snapshot()
|
||||
snapshot = await get_current_snapshot(custom_nodes_only)
|
||||
if path.endswith('.json'):
|
||||
with open(path, "w") as json_file:
|
||||
json.dump(snapshot, json_file, indent=4)
|
||||
@@ -2672,9 +2764,6 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
|
||||
if ext == 'https://github.com/comfyanonymous/ComfyUI':
|
||||
pass
|
||||
elif ext is not None:
|
||||
if 'Fooocus' in ext:
|
||||
print(f">> {node_name}")
|
||||
|
||||
used_exts.add(ext)
|
||||
else:
|
||||
unknown_nodes.add(node_name)
|
||||
@@ -2945,7 +3034,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
||||
print("cm-cli: unexpected [0001]")
|
||||
|
||||
# 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():
|
||||
norm_k = git_utils.normalize_url(k)
|
||||
git_info[norm_k] = v
|
||||
|
||||
if git_info is not None:
|
||||
todo_disable = []
|
||||
todo_enable = []
|
||||
@@ -2958,20 +3054,13 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
||||
|
||||
if v[0] == 'nightly' and 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)
|
||||
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(k)
|
||||
else:
|
||||
if normalized_url1 in git_info:
|
||||
commit_hash = git_info[normalized_url1]['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))
|
||||
commit_hash = git_info[normalized_url]['hash']
|
||||
todo_checkout.append((v[1], commit_hash))
|
||||
|
||||
for k, v in unified_manager.nightly_inactive_nodes.items():
|
||||
if 'comfyui-manager' in k:
|
||||
@@ -2979,18 +3068,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
||||
|
||||
if cnr_repo_map.get(k):
|
||||
repo_url = cnr_repo_map.get(k)
|
||||
normalized_url1 = git_utils.normalize_url(repo_url)
|
||||
normalized_url2 = git_utils.normalize_url_http(repo_url)
|
||||
normalized_url = git_utils.normalize_url(repo_url)
|
||||
|
||||
if normalized_url1 in git_info:
|
||||
commit_hash = git_info[normalized_url1]['hash']
|
||||
if normalized_url in git_info:
|
||||
commit_hash = git_info[normalized_url]['hash']
|
||||
todo_enable.append((k, commit_hash))
|
||||
processed_urls.append(normalized_url1)
|
||||
|
||||
if normalized_url2 in git_info:
|
||||
commit_hash = git_info[normalized_url2]['hash']
|
||||
todo_enable.append((k, commit_hash))
|
||||
processed_urls.append(normalized_url2)
|
||||
processed_urls.append(normalized_url)
|
||||
|
||||
for x in todo_disable:
|
||||
unified_manager.unified_disable(x, False)
|
||||
@@ -3043,21 +3126,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
||||
if repo_url is None:
|
||||
continue
|
||||
|
||||
normalized_url1 = git_utils.normalize_url(repo_url)
|
||||
normalized_url2 = git_utils.normalize_url_http(repo_url)
|
||||
normalized_url = git_utils.normalize_url(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)
|
||||
else:
|
||||
if normalized_url1 in git_info:
|
||||
commit_hash = git_info[normalized_url1]['hash']
|
||||
todo_checkout.append((k2, commit_hash))
|
||||
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)
|
||||
commit_hash = git_info[normalized_url]['hash']
|
||||
todo_checkout.append((k2, commit_hash))
|
||||
processed_urls.append(normalized_url)
|
||||
|
||||
for k2, v2 in unified_manager.unknown_inactive_nodes.items():
|
||||
repo_url = resolve_giturl_from_path(v2[1])
|
||||
@@ -3065,18 +3141,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
|
||||
if repo_url is None:
|
||||
continue
|
||||
|
||||
normalized_url1 = git_utils.normalize_url(repo_url)
|
||||
normalized_url2 = git_utils.normalize_url_http(repo_url)
|
||||
normalized_url = git_utils.normalize_url(repo_url)
|
||||
|
||||
if normalized_url1 in git_info:
|
||||
commit_hash = git_info[normalized_url1]['hash']
|
||||
if normalized_url in git_info:
|
||||
commit_hash = git_info[normalized_url]['hash']
|
||||
todo_enable.append((k2, commit_hash))
|
||||
processed_urls.append(normalized_url1)
|
||||
|
||||
if normalized_url2 in git_info:
|
||||
commit_hash = git_info[normalized_url2]['hash']
|
||||
todo_enable.append((k2, commit_hash))
|
||||
processed_urls.append(normalized_url2)
|
||||
processed_urls.append(normalized_url)
|
||||
|
||||
for x in todo_disable:
|
||||
unified_manager.unified_disable(x, True)
|
||||
@@ -3162,17 +3232,26 @@ async def check_need_to_migrate():
|
||||
need_to_migrate = True
|
||||
|
||||
|
||||
def get_comfyui_versions():
|
||||
repo = git.Repo(comfy_path)
|
||||
versions = [x.name for x in repo.tags if x.name.startswith('v')]
|
||||
versions.reverse() # nearest tag
|
||||
def get_comfyui_versions(repo=None):
|
||||
if repo is None:
|
||||
repo = git.Repo(comfy_path)
|
||||
|
||||
try:
|
||||
remote = get_remote_name(repo)
|
||||
repo.remotes[remote].fetch()
|
||||
except:
|
||||
logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
|
||||
|
||||
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]
|
||||
|
||||
current_tag = repo.git.describe('--tags')
|
||||
|
||||
if current_tag not in versions:
|
||||
versions = sorted(versions + [current_tag], reverse=True)
|
||||
versions = sorted(versions + [current_tag], key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
|
||||
versions = versions[:4]
|
||||
|
||||
main_branch = repo.heads.master
|
||||
@@ -3185,16 +3264,18 @@ def get_comfyui_versions():
|
||||
versions[0] = 'nightly'
|
||||
current_tag = 'nightly'
|
||||
|
||||
return versions, current_tag
|
||||
return versions, current_tag, latest_tag
|
||||
|
||||
|
||||
def switch_comfyui(tag):
|
||||
repo = git.Repo(comfy_path)
|
||||
|
||||
if tag == 'nightly':
|
||||
repo.git.checkout('main')
|
||||
repo.remotes.origin.pull()
|
||||
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'main' version")
|
||||
repo.git.checkout('master')
|
||||
tracking_branch = repo.active_branch.tracking_branch()
|
||||
remote_name = tracking_branch.remote_name
|
||||
repo.remotes[remote_name].pull()
|
||||
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'master' version")
|
||||
else:
|
||||
repo.git.checkout(tag)
|
||||
print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")
|
||||
@@ -3209,7 +3290,7 @@ def resolve_giturl_from_path(fullpath):
|
||||
if not os.path.exists(git_config_path):
|
||||
return "unknown"
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
config = configparser.ConfigParser(strict=False)
|
||||
config.read(git_config_path)
|
||||
|
||||
for k, v in config.items():
|
||||
|
||||
@@ -11,6 +11,7 @@ from tqdm.auto import tqdm
|
||||
aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
|
||||
HF_ENDPOINT = os.getenv('HF_ENDPOINT')
|
||||
|
||||
|
||||
if aria2 is not None:
|
||||
secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
|
||||
url = urlparse(aria2)
|
||||
|
||||
@@ -25,6 +25,7 @@ import manager_downloader
|
||||
|
||||
|
||||
logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
|
||||
logging.info("[ComfyUI-Manager] network_mode: " + core.get_config()['network_mode'])
|
||||
|
||||
comfy_ui_hash = "-"
|
||||
comfyui_tag = None
|
||||
@@ -54,8 +55,14 @@ def handle_stream(stream, prefix):
|
||||
from comfy.cli_args import args
|
||||
import latent_preview
|
||||
|
||||
def is_loopback(address):
|
||||
import ipaddress
|
||||
try:
|
||||
return ipaddress.ip_address(address).is_loopback
|
||||
except ValueError:
|
||||
return False
|
||||
|
||||
is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
|
||||
is_local_mode = is_loopback(args.listen)
|
||||
|
||||
|
||||
model_dir_name_map = {
|
||||
@@ -84,11 +91,11 @@ def is_allowed_security_level(level):
|
||||
return False
|
||||
elif level == 'high':
|
||||
if is_local_mode:
|
||||
return core.get_config()['security_level'].lower() in ['weak', 'normal-']
|
||||
return core.get_config()['security_level'] in ['weak', 'normal-']
|
||||
else:
|
||||
return core.get_config()['security_level'].lower() == 'weak'
|
||||
return core.get_config()['security_level'] == 'weak'
|
||||
elif level == 'middle':
|
||||
return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
|
||||
return core.get_config()['security_level'] in ['weak', 'normal', 'normal-']
|
||||
else:
|
||||
return True
|
||||
|
||||
@@ -171,7 +178,7 @@ def set_preview_method(method):
|
||||
else:
|
||||
args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
|
||||
|
||||
core.get_config()['preview_method'] = args.preview_method
|
||||
core.get_config()['preview_method'] = method
|
||||
|
||||
|
||||
set_preview_method(core.get_config()['preview_method'])
|
||||
@@ -180,6 +187,8 @@ set_preview_method(core.get_config()['preview_method'])
|
||||
def set_component_policy(mode):
|
||||
core.get_config()['component_policy'] = mode
|
||||
|
||||
def set_update_policy(mode):
|
||||
core.get_config()['update_policy'] = mode
|
||||
|
||||
def print_comfyui_version():
|
||||
global comfy_ui_hash
|
||||
@@ -202,7 +211,7 @@ def print_comfyui_version():
|
||||
comfyui_tag = core.get_comfyui_tag()
|
||||
|
||||
try:
|
||||
if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
|
||||
if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
|
||||
logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
|
||||
except:
|
||||
pass
|
||||
@@ -409,22 +418,69 @@ async def task_worker():
|
||||
traceback.print_exc()
|
||||
return f"Installation failed:\n{node_spec_str}"
|
||||
|
||||
async def do_update(item) -> str:
|
||||
async def do_update(item):
|
||||
ui_id, node_name, node_ver = item
|
||||
|
||||
try:
|
||||
res = core.unified_manager.unified_update(node_name, node_ver)
|
||||
|
||||
if res.ver == 'unknown':
|
||||
url = core.unified_manager.unknown_active_nodes[node_name][0]
|
||||
title = os.path.basename(url)
|
||||
else:
|
||||
url = core.unified_manager.cnr_map[node_name].get('repository')
|
||||
title = core.unified_manager.cnr_map[node_name]['name']
|
||||
|
||||
manager_util.clear_pip_cache()
|
||||
|
||||
if res.result:
|
||||
return 'success'
|
||||
if url is not None:
|
||||
base_res = {'url': url, 'title': title}
|
||||
else:
|
||||
base_res = {'title': title}
|
||||
|
||||
if res.result:
|
||||
if res.action == 'skip':
|
||||
base_res['msg'] = 'skip'
|
||||
return base_res
|
||||
else:
|
||||
base_res['msg'] = 'success'
|
||||
return base_res
|
||||
|
||||
base_res['msg'] = f"An error occurred while updating '{node_name}'."
|
||||
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
|
||||
return base_res
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
return f"An error occurred while updating '{node_name}'."
|
||||
return {'msg':f"An error occurred while updating '{node_name}'."}
|
||||
|
||||
async def do_update_comfyui(is_stable) -> str:
|
||||
try:
|
||||
repo_path = os.path.dirname(folder_paths.__file__)
|
||||
latest_tag = None
|
||||
if is_stable:
|
||||
res, latest_tag = core.update_to_stable_comfyui(repo_path)
|
||||
else:
|
||||
res = core.update_path(repo_path)
|
||||
|
||||
if res == "fail":
|
||||
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
||||
return "The installed ComfyUI does not have a Git repository."
|
||||
elif res == "updated":
|
||||
if is_stable:
|
||||
logging.info("ComfyUI is updated to latest stable version.")
|
||||
return "success-stable-"+latest_tag
|
||||
else:
|
||||
logging.info("ComfyUI is updated to latest nightly version.")
|
||||
return "success-nightly"
|
||||
else: # skipped
|
||||
logging.info("ComfyUI is up-to-date.")
|
||||
return "skip"
|
||||
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
return "An error occurred while updating 'comfyui'."
|
||||
|
||||
async def do_fix(item) -> str:
|
||||
ui_id, node_name, node_ver = item
|
||||
@@ -549,6 +605,10 @@ async def task_worker():
|
||||
msg = await do_install_model(item)
|
||||
elif kind == 'update':
|
||||
msg = await do_update(item)
|
||||
elif kind == 'update-main':
|
||||
msg = await do_update(item)
|
||||
elif kind == 'update-comfyui':
|
||||
msg = await do_update_comfyui(item[1])
|
||||
elif kind == 'fix':
|
||||
msg = await do_fix(item)
|
||||
elif kind == 'uninstall':
|
||||
@@ -568,6 +628,15 @@ async def task_worker():
|
||||
if kind == 'install-model':
|
||||
model_result[ui_id] = msg
|
||||
ui_target = "model_manager"
|
||||
elif kind == 'update-main':
|
||||
nodepack_result[ui_id] = msg
|
||||
ui_target = "main"
|
||||
elif kind == 'update-comfyui':
|
||||
nodepack_result['comfyui'] = msg
|
||||
ui_target = "main"
|
||||
elif kind == 'update':
|
||||
nodepack_result[ui_id] = msg['msg']
|
||||
ui_target = "nodepack_manager"
|
||||
else:
|
||||
nodepack_result[ui_id] = msg
|
||||
ui_target = "nodepack_manager"
|
||||
@@ -642,49 +711,46 @@ async def fetch_updates(request):
|
||||
return web.Response(status=400)
|
||||
|
||||
|
||||
@routes.get("/customnode/update_all")
|
||||
@routes.get("/manager/queue/update_all")
|
||||
async def update_all(request):
|
||||
if not is_allowed_security_level('middle'):
|
||||
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
||||
return web.Response(status=403)
|
||||
|
||||
try:
|
||||
await core.save_snapshot_with_postfix('autosave')
|
||||
with task_worker_lock:
|
||||
is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
|
||||
if is_processing:
|
||||
return web.Response(status=401)
|
||||
|
||||
await core.save_snapshot_with_postfix('autosave')
|
||||
|
||||
if request.rel_url.query["mode"] == "local":
|
||||
channel = 'local'
|
||||
else:
|
||||
channel = core.get_config()['channel_url']
|
||||
if request.rel_url.query["mode"] == "local":
|
||||
channel = 'local'
|
||||
else:
|
||||
channel = core.get_config()['channel_url']
|
||||
|
||||
await core.unified_manager.reload(request.rel_url.query["mode"])
|
||||
await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
|
||||
await core.unified_manager.reload(request.rel_url.query["mode"])
|
||||
await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
|
||||
|
||||
updated_cnr = []
|
||||
for k, v in core.unified_manager.active_nodes.items():
|
||||
if v[0] != 'nightly':
|
||||
res = core.unified_manager.unified_update(k, v[0])
|
||||
if res.action == 'switch-cnr' and res:
|
||||
updated_cnr.append(k)
|
||||
for k, v in core.unified_manager.active_nodes.items():
|
||||
if k == 'comfyui-manager':
|
||||
# skip updating comfyui-manager if desktop version
|
||||
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
|
||||
continue
|
||||
|
||||
res = core.unified_manager.fetch_or_pull_git_repo(is_pull=True)
|
||||
update_item = k, k, v[0]
|
||||
task_queue.put(("update-main", update_item))
|
||||
|
||||
res['updated'] += updated_cnr
|
||||
for k, v in core.unified_manager.unknown_active_nodes.items():
|
||||
if k == 'comfyui-manager':
|
||||
# skip updating comfyui-manager if desktop version
|
||||
if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
|
||||
continue
|
||||
|
||||
for x in res['failed']:
|
||||
logging.error(f"PULL FAILED: {x}")
|
||||
update_item = k, k, 'unknown'
|
||||
task_queue.put(("update-main", update_item))
|
||||
|
||||
if len(res['updated']) == 0 and len(res['failed']) == 0:
|
||||
status = 200
|
||||
else:
|
||||
status = 201
|
||||
|
||||
logging.info("\nDone.")
|
||||
return web.json_response(res, status=status, content_type='application/json')
|
||||
except:
|
||||
traceback.print_exc()
|
||||
return web.Response(status=400)
|
||||
finally:
|
||||
manager_util.clear_pip_cache()
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
def convert_markdown_to_html(input_text):
|
||||
@@ -1280,32 +1346,17 @@ async def update_custom_node(request):
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/comfyui_manager/update_comfyui")
|
||||
@routes.get("/manager/queue/update_comfyui")
|
||||
async def update_comfyui(request):
|
||||
logging.info("Update ComfyUI")
|
||||
|
||||
try:
|
||||
repo_path = os.path.dirname(folder_paths.__file__)
|
||||
res = core.update_path(repo_path)
|
||||
if res == "fail":
|
||||
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
||||
return web.Response(status=400)
|
||||
elif res == "updated":
|
||||
logging.info("ComfyUI is updated.")
|
||||
return web.Response(status=201)
|
||||
else: # skipped
|
||||
logging.info("ComfyUI is up-to-date.")
|
||||
return web.Response(status=200)
|
||||
except Exception as e:
|
||||
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
|
||||
|
||||
return web.Response(status=400)
|
||||
is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
|
||||
task_queue.put(("update-comfyui", ('comfyui', is_stable)))
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/comfyui_manager/comfyui_versions")
|
||||
async def comfyui_versions(request):
|
||||
try:
|
||||
res, current = core.get_comfyui_versions()
|
||||
res, current, latest = core.get_comfyui_versions()
|
||||
return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
|
||||
except Exception as e:
|
||||
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
|
||||
@@ -1396,7 +1447,7 @@ async def preview_method(request):
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/component/policy")
|
||||
@routes.get("/manager/policy/component")
|
||||
async def component_policy(request):
|
||||
if "value" in request.rel_url.query:
|
||||
set_component_policy(request.rel_url.query['value'])
|
||||
@@ -1407,6 +1458,17 @@ async def component_policy(request):
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/policy/update")
|
||||
async def update_policy(request):
|
||||
if "value" in request.rel_url.query:
|
||||
set_update_policy(request.rel_url.query['value'])
|
||||
core.write_config()
|
||||
else:
|
||||
return web.Response(text=core.get_config()['update_policy'], status=200)
|
||||
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/channel_url_list")
|
||||
async def channel_url_list(request):
|
||||
channels = core.get_channel_dict()
|
||||
@@ -1462,7 +1524,11 @@ async def get_notice(request):
|
||||
markdown_content = match.group(1)
|
||||
version_tag = core.get_comfyui_tag()
|
||||
if version_tag is None:
|
||||
markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
|
||||
version_tag = os.environ.get('__COMFYUI_DESKTOP_VERSION__')
|
||||
if version_tag is not None:
|
||||
markdown_content += f"<HR>ComfyUI: {version_tag} [Desktop]"
|
||||
else:
|
||||
markdown_content += f"<HR>ComfyUI: {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()})")
|
||||
@@ -1619,17 +1685,21 @@ async def default_cache_update():
|
||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||
logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
|
||||
|
||||
a = get_cache("custom-node-list.json")
|
||||
b = get_cache("extension-node-map.json")
|
||||
c = get_cache("model-list.json")
|
||||
d = get_cache("alter-list.json")
|
||||
e = get_cache("github-stats.json")
|
||||
if core.get_config()['network_mode'] != 'offline':
|
||||
a = get_cache("custom-node-list.json")
|
||||
b = get_cache("extension-node-map.json")
|
||||
c = get_cache("model-list.json")
|
||||
d = get_cache("alter-list.json")
|
||||
e = get_cache("github-stats.json")
|
||||
|
||||
await asyncio.gather(a, b, c, d, e)
|
||||
await asyncio.gather(a, b, c, d, e)
|
||||
|
||||
# load at least once
|
||||
await core.unified_manager.reload('remote', dont_wait=False)
|
||||
await core.unified_manager.get_custom_nodes(channel_url, 'remote')
|
||||
if core.get_config()['network_mode'] == 'private':
|
||||
logging.info("[ComfyUI-Manager] The private comfyregistry is not yet supported in `network_mode=private`.")
|
||||
else:
|
||||
# load at least once
|
||||
await core.unified_manager.reload('remote', dont_wait=False)
|
||||
await core.unified_manager.get_custom_nodes(channel_url, 'remote')
|
||||
|
||||
logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
|
||||
|
||||
|
||||
@@ -373,3 +373,23 @@ def sanitize(data):
|
||||
def sanitize_filename(input_string):
|
||||
result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
|
||||
return result_string
|
||||
|
||||
|
||||
def robust_readlines(fullpath):
|
||||
import chardet
|
||||
try:
|
||||
with open(fullpath, "r") as f:
|
||||
return f.readlines()
|
||||
except:
|
||||
encoding = None
|
||||
with open(fullpath, "rb") as f:
|
||||
raw_data = f.read()
|
||||
result = chardet.detect(raw_data)
|
||||
encoding = result['encoding']
|
||||
|
||||
if encoding is not None:
|
||||
with open(fullpath, "r", encoding=encoding) as f:
|
||||
return f.readlines()
|
||||
|
||||
print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
|
||||
return []
|
||||
|
||||
@@ -13,12 +13,16 @@ import {
|
||||
import { OpenArtShareDialog } from "./comfyui-share-openart.js";
|
||||
import {
|
||||
free_models, install_pip, install_via_git_url, manager_instance,
|
||||
rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.js";
|
||||
rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt,
|
||||
infoToast, showTerminal, setNeedRestart
|
||||
} from "./common.js";
|
||||
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
|
||||
import { CustomNodesManager } from "./custom-nodes-manager.js";
|
||||
import { ModelManager } from "./model-manager.js";
|
||||
import { SnapshotManager } from "./snapshot.js";
|
||||
|
||||
let manager_version = await getVersion();
|
||||
|
||||
var docStyle = document.createElement('style');
|
||||
docStyle.innerHTML = `
|
||||
.comfy-toast {
|
||||
@@ -40,7 +44,7 @@ docStyle.innerHTML = `
|
||||
|
||||
#cm-manager-dialog {
|
||||
width: 1000px;
|
||||
height: 450px;
|
||||
height: 455px;
|
||||
box-sizing: content-box;
|
||||
z-index: 1000;
|
||||
overflow-y: auto;
|
||||
@@ -137,7 +141,7 @@ docStyle.innerHTML = `
|
||||
|
||||
.cm-notice-board {
|
||||
width: 290px;
|
||||
height: 210px;
|
||||
height: 230px;
|
||||
overflow: auto;
|
||||
color: var(--input-text);
|
||||
border: 1px solid var(--descrip-text);
|
||||
@@ -225,7 +229,12 @@ var update_comfyui_button = null;
|
||||
var switch_comfyui_button = null;
|
||||
var fetch_updates_button = null;
|
||||
var update_all_button = null;
|
||||
var restart_stop_button = null;
|
||||
var update_policy_combo = null;
|
||||
|
||||
let share_option = 'all';
|
||||
var is_updating = false;
|
||||
|
||||
|
||||
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
|
||||
const style = `
|
||||
@@ -424,102 +433,56 @@ async function init_notice(notice) {
|
||||
|
||||
await init_share_option();
|
||||
|
||||
async function fetchNicknames() {
|
||||
const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
|
||||
const mappings = await response1.json();
|
||||
|
||||
let result = {};
|
||||
let nickname_patterns = [];
|
||||
async function set_inprogress_mode() {
|
||||
update_comfyui_button.disabled = true;
|
||||
update_comfyui_button.style.backgroundColor = "gray";
|
||||
|
||||
for (let i in mappings) {
|
||||
let item = mappings[i];
|
||||
var nickname;
|
||||
if (item[1].nickname) {
|
||||
nickname = item[1].nickname;
|
||||
}
|
||||
else if (item[1].title) {
|
||||
nickname = item[1].title;
|
||||
}
|
||||
else {
|
||||
nickname = item[1].title_aux;
|
||||
}
|
||||
update_all_button.disabled = true;
|
||||
update_all_button.style.backgroundColor = "gray";
|
||||
|
||||
for (let j in item[0]) {
|
||||
result[item[0][j]] = nickname;
|
||||
}
|
||||
switch_comfyui_button.disabled = true;
|
||||
switch_comfyui_button.style.backgroundColor = "gray";
|
||||
|
||||
if(item[1].nodename_pattern) {
|
||||
nickname_patterns.push([item[1].nodename_pattern, nickname]);
|
||||
}
|
||||
}
|
||||
|
||||
return [result, nickname_patterns];
|
||||
restart_stop_button.innerText = 'Stop';
|
||||
}
|
||||
|
||||
const [nicknames, nickname_patterns] = await fetchNicknames();
|
||||
|
||||
function getNickname(node, nodename) {
|
||||
if(node.nickname) {
|
||||
return node.nickname;
|
||||
async function reset_action_buttons() {
|
||||
const isElectron = 'electronAPI' in window;
|
||||
|
||||
if(isElectron) {
|
||||
update_all_button.innerText = "Update All Custom Nodes";
|
||||
}
|
||||
else {
|
||||
if (nicknames[nodename]) {
|
||||
node.nickname = nicknames[nodename];
|
||||
}
|
||||
else if(node.getInnerNodes) {
|
||||
let pure_name = getPureName(node);
|
||||
let groupNode = app.graph.extra?.groupNodes?.[pure_name];
|
||||
if(groupNode) {
|
||||
let packname = groupNode.packname;
|
||||
node.nickname = packname;
|
||||
}
|
||||
return node.nickname;
|
||||
}
|
||||
else {
|
||||
for(let i in nickname_patterns) {
|
||||
let item = nickname_patterns[i];
|
||||
if(nodename.match(item[0])) {
|
||||
node.nickname = item[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return node.nickname;
|
||||
update_all_button.innerText = "Update All";
|
||||
}
|
||||
|
||||
update_comfyui_button.innerText = "Update ComfyUI";
|
||||
switch_comfyui_button.innerText = "Switch ComfyUI";
|
||||
restart_stop_button.innerText = 'Restart';
|
||||
|
||||
update_comfyui_button.disabled = false;
|
||||
update_all_button.disabled = false;
|
||||
switch_comfyui_button.disabled = false;
|
||||
|
||||
update_comfyui_button.style.backgroundColor = "";
|
||||
update_all_button.style.backgroundColor = "";
|
||||
switch_comfyui_button.style.backgroundColor = "";
|
||||
}
|
||||
|
||||
async function updateComfyUI() {
|
||||
let prev_text = update_comfyui_button.innerText;
|
||||
update_comfyui_button.innerText = "Updating ComfyUI...";
|
||||
update_comfyui_button.disabled = true;
|
||||
update_comfyui_button.style.backgroundColor = "gray";
|
||||
|
||||
try {
|
||||
const response = await api.fetchApi('/comfyui_manager/update_comfyui');
|
||||
set_inprogress_mode();
|
||||
|
||||
if (response.status == 400) {
|
||||
show_message('Failed to update ComfyUI.');
|
||||
return false;
|
||||
}
|
||||
const response = await api.fetchApi('/manager/queue/update_comfyui');
|
||||
|
||||
if (response.status == 201) {
|
||||
show_message('ComfyUI has been successfully updated.');
|
||||
}
|
||||
else {
|
||||
show_message('ComfyUI is already up to date with the latest version.');
|
||||
}
|
||||
showTerminal();
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (exception) {
|
||||
show_message(`Failed to update ComfyUI / ${exception}`);
|
||||
return false;
|
||||
}
|
||||
finally {
|
||||
update_comfyui_button.disabled = false;
|
||||
update_comfyui_button.innerText = prev_text;
|
||||
update_comfyui_button.style.backgroundColor = "";
|
||||
}
|
||||
is_updating = true;
|
||||
await api.fetchApi('/manager/queue/start');
|
||||
}
|
||||
|
||||
function showVersionSelectorDialog(versions, current, onSelect) {
|
||||
@@ -647,26 +610,47 @@ function showVersionSelectorDialog(versions, current, onSelect) {
|
||||
}
|
||||
|
||||
async function switchComfyUI() {
|
||||
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
||||
switch_comfyui_button.disabled = true;
|
||||
switch_comfyui_button.style.backgroundColor = "gray";
|
||||
|
||||
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
|
||||
|
||||
if(res.status == 200) {
|
||||
let obj = await res.json();
|
||||
switch_comfyui_button.disabled = false;
|
||||
switch_comfyui_button.style.backgroundColor = "";
|
||||
|
||||
let versions = [];
|
||||
let default_version;
|
||||
if(res.status == 200) {
|
||||
let obj = await res.json();
|
||||
|
||||
for(let v of obj.versions) {
|
||||
default_version = v;
|
||||
versions.push(v);
|
||||
}
|
||||
let versions = [];
|
||||
let default_version;
|
||||
|
||||
showVersionSelectorDialog(versions, obj.current, (selected_version) => {
|
||||
api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
||||
});
|
||||
}
|
||||
else {
|
||||
show_message('Failed to fetch ComfyUI versions.');
|
||||
}
|
||||
for(let v of obj.versions) {
|
||||
default_version = v;
|
||||
versions.push(v);
|
||||
}
|
||||
|
||||
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
|
||||
if(selected_version == 'nightly') {
|
||||
update_policy_combo.value = 'nightly-comfyui';
|
||||
api.fetchApi('/manager/policy/update?value=nightly-comfyui');
|
||||
}
|
||||
else {
|
||||
update_policy_combo.value = 'stable-comfyui';
|
||||
api.fetchApi('/manager/policy/update?value=stable-comfyui');
|
||||
}
|
||||
|
||||
let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
|
||||
if (response.status == 200) {
|
||||
infoToast(`ComfyUI version is switched to ${selected_version}`);
|
||||
}
|
||||
else {
|
||||
customAlert('Failed to switch ComfyUI version.');
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
customAlert('Failed to fetch ComfyUI versions.');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -720,70 +704,141 @@ async function fetchUpdates(update_check_checkbox) {
|
||||
}
|
||||
}
|
||||
|
||||
async function updateAll(update_check_checkbox, manager_dialog) {
|
||||
let prev_text = update_all_button.innerText;
|
||||
update_all_button.innerText = "Updating all...(ComfyUI)";
|
||||
update_all_button.disabled = true;
|
||||
update_all_button.style.backgroundColor = "gray";
|
||||
async function onQueueStatus(event) {
|
||||
const isElectron = 'electronAPI' in window;
|
||||
|
||||
try {
|
||||
var mode = manager_instance.datasrc_combo.value;
|
||||
if(event.detail.status == 'in_progress') {
|
||||
set_inprogress_mode();
|
||||
update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
|
||||
}
|
||||
else if(event.detail.status == 'done') {
|
||||
reset_action_buttons();
|
||||
|
||||
update_all_button.innerText = "Updating all...";
|
||||
const response1 = await api.fetchApi('/comfyui_manager/update_comfyui');
|
||||
const response2 = await api.fetchApi(`/customnode/update_all?mode=${mode}`);
|
||||
|
||||
if (response2.status == 403) {
|
||||
show_message('This action is not allowed with this security level configuration.');
|
||||
return false;
|
||||
if(!is_updating) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (response1.status == 400 || response2.status == 400) {
|
||||
show_message('Failed to update ComfyUI or several extensions.<BR><BR>See terminal log.<BR>');
|
||||
return false;
|
||||
is_updating = false;
|
||||
|
||||
let success_list = [];
|
||||
let failed_list = [];
|
||||
let comfyui_state = null;
|
||||
|
||||
for(let k in event.detail.nodepack_result){
|
||||
let v = event.detail.nodepack_result[k];
|
||||
|
||||
if(k == 'comfyui') {
|
||||
comfyui_state = v;
|
||||
continue;
|
||||
}
|
||||
|
||||
if(v.msg == 'success') {
|
||||
success_list.push(k);
|
||||
}
|
||||
else if(v.msg != 'skip')
|
||||
failed_list.push(k);
|
||||
}
|
||||
|
||||
if(response1.status == 201 || response2.status == 201) {
|
||||
const update_info = await response2.json();
|
||||
|
||||
let failed_list = "";
|
||||
if(update_info.failed.length > 0) {
|
||||
failed_list = "<BR>FAILED: "+update_info.failed.join(", ");
|
||||
let msg = "";
|
||||
|
||||
if(success_list.length == 0 && !comfyui_state.startsWith('success')) {
|
||||
if(failed_list.length == 0) {
|
||||
msg += "You are already up to date.";
|
||||
}
|
||||
|
||||
let updated_list = "";
|
||||
if(update_info.updated.length > 0) {
|
||||
updated_list = "<BR>UPDATED: "+update_info.updated.join(", ");
|
||||
}
|
||||
|
||||
show_message(
|
||||
"ComfyUI and all extensions have been updated to the latest version.<BR>To apply the updated custom node, please <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI. And refresh browser.<BR>"
|
||||
+failed_list
|
||||
+updated_list
|
||||
);
|
||||
|
||||
const rebootButton = document.getElementById('cm-reboot-button5');
|
||||
rebootButton.addEventListener("click",
|
||||
function() {
|
||||
if(rebootAPI()) {
|
||||
manager_dialog.close();
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
show_message('ComfyUI and all extensions are already up-to-date with the latest versions.');
|
||||
msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
|
||||
|
||||
if(comfyui_state == 'success-nightly') {
|
||||
msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
|
||||
infoToast("ComfyUI has been updated to the latest nightly version.");
|
||||
}
|
||||
else if(comfyui_state.startsWith('success-stable')) {
|
||||
const ver = comfyui_state.split("-").pop();
|
||||
msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
|
||||
infoToast(`ComfyUI has been updated to ${ver}`);
|
||||
}
|
||||
else if(comfyui_state == 'skip') {
|
||||
msg += "ComfyUI is already up to date.<BR><BR>"
|
||||
}
|
||||
else if(comfyui_state != null) {
|
||||
msg += "Failed to update ComfyUI.<BR><BR>"
|
||||
}
|
||||
|
||||
if(success_list.length > 0) {
|
||||
msg += "The following custom nodes have been updated:<ul>";
|
||||
for(let x in success_list) {
|
||||
let k = success_list[x];
|
||||
let url = event.detail.nodepack_result[k].url;
|
||||
let title = event.detail.nodepack_result[k].title;
|
||||
if(url) {
|
||||
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
|
||||
}
|
||||
else {
|
||||
msg += `<li>${k}</li>`;
|
||||
}
|
||||
}
|
||||
msg += "</ul>";
|
||||
}
|
||||
|
||||
setNeedRestart(true);
|
||||
}
|
||||
|
||||
if(failed_list.length > 0) {
|
||||
msg += '<br>The update for the following custom nodes has failed:<ul>';
|
||||
for(let x in failed_list) {
|
||||
let k = failed_list[x];
|
||||
let url = event.detail.nodepack_result[k].url;
|
||||
let title = event.detail.nodepack_result[k].title;
|
||||
if(url) {
|
||||
msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
|
||||
}
|
||||
else {
|
||||
msg += `<li>${k}</li>`;
|
||||
}
|
||||
}
|
||||
|
||||
msg += '</ul>'
|
||||
}
|
||||
|
||||
return true;
|
||||
show_message(msg);
|
||||
|
||||
const rebootButton = document.getElementById('cm-reboot-button5');
|
||||
rebootButton?.addEventListener("click",
|
||||
function() {
|
||||
if(rebootAPI()) {
|
||||
manager_dialog.close();
|
||||
}
|
||||
});
|
||||
}
|
||||
catch (exception) {
|
||||
show_message(`Failed to update ComfyUI or several extensions / ${exception}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
api.addEventListener("cm-queue-status", onQueueStatus);
|
||||
|
||||
|
||||
async function updateAll(update_comfyui, manager_dialog) {
|
||||
let prev_text = update_all_button.innerText;
|
||||
update_all_button.innerText = "Updating...";
|
||||
|
||||
set_inprogress_mode();
|
||||
|
||||
var mode = manager_instance.datasrc_combo.value;
|
||||
|
||||
showTerminal();
|
||||
|
||||
if(update_comfyui) {
|
||||
update_all_button.innerText = "Updating ComfyUI...";
|
||||
await api.fetchApi('/manager/queue/update_comfyui');
|
||||
}
|
||||
finally {
|
||||
update_all_button.disabled = false;
|
||||
update_all_button.innerText = prev_text;
|
||||
update_all_button.style.backgroundColor = "";
|
||||
|
||||
const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
|
||||
|
||||
if (response.status == 401) {
|
||||
customAlert('Another task is already in progress. Please stop the ongoing task first.');
|
||||
}
|
||||
else if(response.status == 200) {
|
||||
is_updating = true;
|
||||
await api.fetchApi('/manager/queue/start');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -807,12 +862,22 @@ const isOutputNode = (node) => {
|
||||
return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
|
||||
}
|
||||
|
||||
function restartOrStop() {
|
||||
if(restart_stop_button.innerText == 'Restart'){
|
||||
rebootAPI();
|
||||
}
|
||||
else {
|
||||
api.fetchApi('/manager/queue/reset');
|
||||
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
||||
}
|
||||
}
|
||||
|
||||
// -----------
|
||||
class ManagerMenuDialog extends ComfyDialog {
|
||||
createControlsMid() {
|
||||
let self = this;
|
||||
const isElectron = 'electronAPI' in window;
|
||||
|
||||
const isElectron = 'electronAPI' in window;
|
||||
|
||||
update_comfyui_button =
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
@@ -843,14 +908,32 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
() => fetchUpdates(this.update_check_checkbox)
|
||||
});
|
||||
|
||||
update_all_button =
|
||||
$el("button.cm-button", {
|
||||
restart_stop_button =
|
||||
$el("button.cm-button-red", {
|
||||
type: "button",
|
||||
textContent: "Update All",
|
||||
onclick:
|
||||
() => updateAll(this.update_check_checkbox, self)
|
||||
textContent: "Restart",
|
||||
onclick: () => restartOrStop()
|
||||
});
|
||||
|
||||
if(isElectron) {
|
||||
update_all_button =
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
textContent: "Update All Custom Nodes",
|
||||
onclick:
|
||||
() => updateAll(false, self)
|
||||
});
|
||||
}
|
||||
else {
|
||||
update_all_button =
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
textContent: "Update All",
|
||||
onclick:
|
||||
() => updateAll(true, self)
|
||||
});
|
||||
}
|
||||
|
||||
const res =
|
||||
[
|
||||
$el("button.cm-button", {
|
||||
@@ -877,7 +960,19 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
}
|
||||
}),
|
||||
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
textContent: "Custom Nodes In Workflow",
|
||||
onclick:
|
||||
() => {
|
||||
if(!CustomNodesManager.instance) {
|
||||
CustomNodesManager.instance = new CustomNodesManager(app, self);
|
||||
}
|
||||
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
|
||||
}
|
||||
}),
|
||||
|
||||
$el("br", {}, []),
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
textContent: "Model Manager",
|
||||
@@ -906,14 +1001,10 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
update_all_button,
|
||||
update_comfyui_button,
|
||||
switch_comfyui_button,
|
||||
fetch_updates_button,
|
||||
// fetch_updates_button,
|
||||
|
||||
$el("br", {}, []),
|
||||
$el("button.cm-button-red", {
|
||||
type: "button",
|
||||
textContent: "Restart",
|
||||
onclick: () => rebootAPI()
|
||||
}),
|
||||
restart_stop_button,
|
||||
];
|
||||
|
||||
let migration_btn =
|
||||
@@ -942,6 +1033,8 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
}
|
||||
|
||||
createControlsLeft() {
|
||||
const isElectron = 'electronAPI' in window;
|
||||
|
||||
let self = this;
|
||||
|
||||
this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
|
||||
@@ -1020,25 +1113,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
|
||||
}
|
||||
|
||||
// default ui state
|
||||
let component_policy_combo = document.createElement("select");
|
||||
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
|
||||
component_policy_combo.className = "cm-menu-combo";
|
||||
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
|
||||
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
|
||||
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
|
||||
api.fetchApi('/manager/component/policy')
|
||||
.then(response => response.text())
|
||||
.then(data => {
|
||||
component_policy_combo.value = data;
|
||||
set_component_policy(data);
|
||||
});
|
||||
|
||||
component_policy_combo.addEventListener('change', function (event) {
|
||||
api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
|
||||
set_component_policy(event.target.value);
|
||||
});
|
||||
|
||||
api.fetchApi('/manager/share_option')
|
||||
.then(response => response.text())
|
||||
.then(data => {
|
||||
@@ -1058,6 +1132,43 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
}
|
||||
});
|
||||
|
||||
let component_policy_combo = document.createElement("select");
|
||||
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
|
||||
component_policy_combo.className = "cm-menu-combo";
|
||||
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
|
||||
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
|
||||
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
|
||||
api.fetchApi('/manager/policy/component')
|
||||
.then(response => response.text())
|
||||
.then(data => {
|
||||
component_policy_combo.value = data;
|
||||
set_component_policy(data);
|
||||
});
|
||||
|
||||
component_policy_combo.addEventListener('change', function (event) {
|
||||
api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
|
||||
set_component_policy(event.target.value);
|
||||
});
|
||||
|
||||
update_policy_combo = document.createElement("select");
|
||||
|
||||
if(isElectron)
|
||||
update_policy_combo.style.display = 'none';
|
||||
|
||||
update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
|
||||
update_policy_combo.className = "cm-menu-combo";
|
||||
update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
|
||||
update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
|
||||
api.fetchApi('/manager/policy/update')
|
||||
.then(response => response.text())
|
||||
.then(data => {
|
||||
update_policy_combo.value = data;
|
||||
});
|
||||
|
||||
update_policy_combo.addEventListener('change', function (event) {
|
||||
api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
|
||||
});
|
||||
|
||||
return [
|
||||
$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
|
||||
$el("br", {}, []),
|
||||
@@ -1066,6 +1177,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
preview_combo,
|
||||
share_combo,
|
||||
component_policy_combo,
|
||||
update_policy_combo,
|
||||
$el("br", {}, []),
|
||||
|
||||
$el("br", {}, []),
|
||||
@@ -1092,11 +1204,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
install_pip(url, self);
|
||||
}
|
||||
}
|
||||
}),
|
||||
$el("button.cm-experimental-button", {
|
||||
type: "button",
|
||||
textContent: "Unload models",
|
||||
onclick: () => { free_models(); }
|
||||
})
|
||||
]),
|
||||
];
|
||||
@@ -1225,7 +1332,7 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
$el("div.comfy-modal-content",
|
||||
[
|
||||
$el("tr.cm-title", {}, [
|
||||
$el("font", {size:6, color:"white"}, [`ComfyUI Manager Menu`])]
|
||||
$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
|
||||
),
|
||||
$el("br", {}, []),
|
||||
$el("div.cm-menu-container",
|
||||
@@ -1367,13 +1474,12 @@ async function getVersion() {
|
||||
return await version.text();
|
||||
}
|
||||
|
||||
|
||||
app.registerExtension({
|
||||
name: "Comfy.ManagerMenu",
|
||||
|
||||
aboutPageBadges: [
|
||||
{
|
||||
label: `ComfyUI-Manager ${await getVersion()}`,
|
||||
label: `ComfyUI-Manager ${manager_version}`,
|
||||
url: 'https://github.com/ltdrdata/ComfyUI-Manager',
|
||||
icon: 'pi pi-th-large'
|
||||
}
|
||||
|
||||
73
js/common.js
73
js/common.js
@@ -431,4 +431,75 @@ export function showTerminal() {
|
||||
catch(exception) {
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let need_restart = false;
|
||||
|
||||
export function setNeedRestart(value) {
|
||||
need_restart = value;
|
||||
}
|
||||
|
||||
async function onReconnected(event) {
|
||||
if(need_restart) {
|
||||
setNeedRestart(false);
|
||||
|
||||
const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
|
||||
if (!confirmed) {
|
||||
return;
|
||||
}
|
||||
|
||||
window.location.reload(true);
|
||||
}
|
||||
}
|
||||
|
||||
api.addEventListener('reconnected', onReconnected);
|
||||
|
||||
const storeId = "comfyui-manager-grid";
|
||||
let timeId;
|
||||
export function storeColumnWidth(gridId, columnItem) {
|
||||
clearTimeout(timeId);
|
||||
timeId = setTimeout(() => {
|
||||
let data = {};
|
||||
const dataStr = localStorage.getItem(storeId);
|
||||
if (dataStr) {
|
||||
try {
|
||||
data = JSON.parse(dataStr);
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
if (!data[gridId]) {
|
||||
data[gridId] = {};
|
||||
}
|
||||
|
||||
data[gridId][columnItem.id] = columnItem.width;
|
||||
|
||||
localStorage.setItem(storeId, JSON.stringify(data));
|
||||
|
||||
}, 200)
|
||||
}
|
||||
|
||||
export function restoreColumnWidth(gridId, columns) {
|
||||
const dataStr = localStorage.getItem(storeId);
|
||||
if (!dataStr) {
|
||||
return;
|
||||
}
|
||||
let data;
|
||||
try {
|
||||
data = JSON.parse(dataStr);
|
||||
} catch (e) {}
|
||||
if(!data) {
|
||||
return;
|
||||
}
|
||||
const widthMap = data[gridId];
|
||||
if (!widthMap) {
|
||||
return;
|
||||
}
|
||||
|
||||
columns.forEach(columnItem => {
|
||||
const w = widthMap[columnItem.id];
|
||||
if (w) {
|
||||
columnItem.width = w;
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@@ -709,7 +709,7 @@ app.handleFile = handleFile;
|
||||
|
||||
let current_component_policy = 'workflow';
|
||||
try {
|
||||
api.fetchApi('/manager/component/policy')
|
||||
api.fetchApi('/manager/policy/component')
|
||||
.then(response => response.text())
|
||||
.then(data => { current_component_policy = data; });
|
||||
}
|
||||
|
||||
@@ -5,12 +5,15 @@ import { api } from "../../scripts/api.js";
|
||||
import {
|
||||
manager_instance, rebootAPI, install_via_git_url,
|
||||
fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
|
||||
sanitizeHTML, infoToast, showTerminal
|
||||
sanitizeHTML, infoToast, showTerminal, setNeedRestart,
|
||||
storeColumnWidth, restoreColumnWidth
|
||||
} from "./common.js";
|
||||
|
||||
// https://cenfun.github.io/turbogrid/api.html
|
||||
import TG from "./turbogrid.esm.js";
|
||||
|
||||
const gridId = "node";
|
||||
|
||||
const pageCss = `
|
||||
.cn-manager {
|
||||
--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
||||
@@ -360,6 +363,7 @@ const pageHtml = `
|
||||
<button class="cn-manager-restart">Restart</button>
|
||||
<button class="cn-manager-stop">Stop</button>
|
||||
<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-missing">Check Missing</button>
|
||||
<button class="cn-manager-install-url">Install via Git URL</button>
|
||||
@@ -371,7 +375,8 @@ const ShowMode = {
|
||||
UPDATE: "Update",
|
||||
MISSING: "Missing",
|
||||
FAVORITES: "Favorites",
|
||||
ALTERNATIVES: "Alternatives"
|
||||
ALTERNATIVES: "Alternatives",
|
||||
IN_WORKFLOW: "In Workflow",
|
||||
};
|
||||
|
||||
export class CustomNodesManager {
|
||||
@@ -401,7 +406,6 @@ export class CustomNodesManager {
|
||||
this.init();
|
||||
|
||||
api.addEventListener("cm-queue-status", this.onQueueStatus);
|
||||
api.addEventListener('reconnected', this.onReconnected);
|
||||
}
|
||||
|
||||
init() {
|
||||
@@ -584,6 +588,10 @@ export class CustomNodesManager {
|
||||
label: "Update",
|
||||
value: ShowMode.UPDATE,
|
||||
hasData: false
|
||||
}, {
|
||||
label: "In Workflow",
|
||||
value: ShowMode.IN_WORKFLOW,
|
||||
hasData: false
|
||||
}, {
|
||||
label: "Missing",
|
||||
value: ShowMode.MISSING,
|
||||
@@ -724,7 +732,7 @@ export class CustomNodesManager {
|
||||
const value = e.target.value
|
||||
this.filter = value;
|
||||
const item = this.getFilterItem(value);
|
||||
if (item && !item.hasData) {
|
||||
if (item && (!item.hasData)) {
|
||||
this.loadData(value);
|
||||
return;
|
||||
}
|
||||
@@ -777,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": {
|
||||
click: (e) => {
|
||||
e.target.classList.add("cn-btn-loading");
|
||||
@@ -833,6 +849,10 @@ export class CustomNodesManager {
|
||||
this.renderSelected();
|
||||
});
|
||||
|
||||
grid.bind("onColumnWidthChanged", (e, columnItem) => {
|
||||
storeColumnWidth(gridId, columnItem)
|
||||
});
|
||||
|
||||
grid.bind('onClick', (e, d) => {
|
||||
const btn = this.getButton(d.e.target);
|
||||
if (btn) {
|
||||
@@ -1160,6 +1180,8 @@ export class CustomNodesManager {
|
||||
return 0;
|
||||
});
|
||||
|
||||
restoreColumnWidth(gridId, columns);
|
||||
|
||||
this.grid.setData({
|
||||
options: options,
|
||||
rows: rows_values,
|
||||
@@ -1403,21 +1425,6 @@ export class CustomNodesManager {
|
||||
}
|
||||
}
|
||||
|
||||
async onReconnected(event) {
|
||||
let self = CustomNodesManager.instance;
|
||||
|
||||
if(self.need_restart) {
|
||||
self.need_restart = false;
|
||||
|
||||
const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
|
||||
if (!confirmed) {
|
||||
return;
|
||||
}
|
||||
|
||||
window.location.reload(true);
|
||||
}
|
||||
}
|
||||
|
||||
async onQueueStatus(event) {
|
||||
let self = CustomNodesManager.instance;
|
||||
if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
|
||||
@@ -1457,7 +1464,7 @@ export class CustomNodesManager {
|
||||
for(let hash in result){
|
||||
let v = result[hash];
|
||||
|
||||
if(v != 'success')
|
||||
if(v != 'success' && v != 'skip')
|
||||
errorMsg += v+'\n';
|
||||
}
|
||||
|
||||
@@ -1536,7 +1543,110 @@ export class CustomNodesManager {
|
||||
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() {
|
||||
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;
|
||||
|
||||
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];
|
||||
hashMap[item.hash] = true;
|
||||
}
|
||||
else if(node.properties.aux_id) {
|
||||
unresolved_aux_ids[node.properties.aux_id] = node.type;
|
||||
}
|
||||
else {
|
||||
unresolved_missing_nodes.add(node.type);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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, registered_nodes);
|
||||
}
|
||||
|
||||
return hashMap;
|
||||
}
|
||||
|
||||
async getMissingNodesLegacy(hashMap, missing_nodes, registered_nodes) {
|
||||
const mode = manager_instance.datasrc_combo.value;
|
||||
this.showStatus(`Loading missing nodes (${mode}) ...`);
|
||||
const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
|
||||
@@ -1575,23 +1685,8 @@ export class CustomNodesManager {
|
||||
}
|
||||
}
|
||||
|
||||
const registered_nodes = new Set();
|
||||
for (let i in LiteGraph.registered_node_types) {
|
||||
registered_nodes.add(LiteGraph.registered_node_types[i].type);
|
||||
}
|
||||
|
||||
const missing_nodes = new Set();
|
||||
const workflow = app.graph.serialize();
|
||||
const group_nodes = workflow.extra && workflow.extra.groupNodes ? workflow.extra.groupNodes : [];
|
||||
let nodes = workflow.nodes;
|
||||
|
||||
for (let i in group_nodes) {
|
||||
let group_node = group_nodes[i];
|
||||
nodes = nodes.concat(group_node.nodes);
|
||||
}
|
||||
|
||||
for (let i in nodes) {
|
||||
const node_type = nodes[i].type;
|
||||
let unresolved_missing_nodes = new Set();
|
||||
for (let node_type of missing_nodes) {
|
||||
if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
|
||||
continue;
|
||||
|
||||
@@ -1599,26 +1694,25 @@ export class CustomNodesManager {
|
||||
const packs = name_to_packs[node_type.trim()];
|
||||
if(packs)
|
||||
packs.forEach(url => {
|
||||
missing_nodes.add(url);
|
||||
unresolved_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);
|
||||
unresolved_missing_nodes.add(regex_to_pack[j].url);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const hashMap = {};
|
||||
for(let k in this.custom_nodes) {
|
||||
let item = this.custom_nodes[k];
|
||||
|
||||
if(missing_nodes.has(item.id)) {
|
||||
if(unresolved_missing_nodes.has(item.id)) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -1637,6 +1731,41 @@ export class CustomNodesManager {
|
||||
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() {
|
||||
const mode = manager_instance.datasrc_combo.value;
|
||||
this.showStatus(`Loading alternatives (${mode}) ...`);
|
||||
@@ -1672,6 +1801,8 @@ export class CustomNodesManager {
|
||||
}
|
||||
|
||||
async loadData(show_mode = ShowMode.NORMAL) {
|
||||
const isElectron = 'electronAPI' in window;
|
||||
|
||||
this.show_mode = show_mode;
|
||||
console.log("Show mode:", show_mode);
|
||||
|
||||
@@ -1691,6 +1822,11 @@ export class CustomNodesManager {
|
||||
}
|
||||
|
||||
const { channel, node_packs } = res.data;
|
||||
|
||||
if(isElectron) {
|
||||
delete node_packs['comfyui-manager'];
|
||||
}
|
||||
|
||||
this.channel = channel;
|
||||
this.mode = mode;
|
||||
this.custom_nodes = node_packs;
|
||||
@@ -1725,9 +1861,14 @@ export class CustomNodesManager {
|
||||
hashMap = await this.getAlternatives();
|
||||
} else if(this.show_mode == ShowMode.FAVORITES) {
|
||||
hashMap = await this.getFavorites();
|
||||
} else if(this.show_mode == ShowMode.IN_WORKFLOW) {
|
||||
hashMap = await this.getNodepackInWorkflow();
|
||||
}
|
||||
filterItem.hashMap = hashMap;
|
||||
filterItem.hasData = true;
|
||||
|
||||
if(this.show_mode != ShowMode.IN_WORKFLOW) {
|
||||
filterItem.hasData = true;
|
||||
}
|
||||
}
|
||||
|
||||
for(let k in node_packs) {
|
||||
@@ -1779,7 +1920,6 @@ export class CustomNodesManager {
|
||||
case "disabled":
|
||||
filterTypes.add("installed");
|
||||
break;
|
||||
|
||||
case "not-installed":
|
||||
filterTypes.add("not-installed");
|
||||
break;
|
||||
@@ -1891,7 +2031,7 @@ export class CustomNodesManager {
|
||||
|
||||
showRestart() {
|
||||
this.element.querySelector(".cn-manager-restart").style.display = "block";
|
||||
this.need_restart = true;
|
||||
setNeedRestart(true);
|
||||
}
|
||||
|
||||
showStop() {
|
||||
|
||||
@@ -2,13 +2,16 @@ import { app } from "../../scripts/app.js";
|
||||
import { $el } from "../../scripts/ui.js";
|
||||
import {
|
||||
manager_instance, rebootAPI,
|
||||
fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal
|
||||
fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
|
||||
storeColumnWidth, restoreColumnWidth
|
||||
} from "./common.js";
|
||||
import { api } from "../../scripts/api.js";
|
||||
|
||||
// https://cenfun.github.io/turbogrid/api.html
|
||||
import TG from "./turbogrid.esm.js";
|
||||
|
||||
const gridId = "model";
|
||||
|
||||
const pageCss = `
|
||||
.cmm-manager {
|
||||
--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
|
||||
@@ -438,6 +441,10 @@ export class ModelManager {
|
||||
this.renderSelected();
|
||||
});
|
||||
|
||||
grid.bind("onColumnWidthChanged", (e, columnItem) => {
|
||||
storeColumnWidth(gridId, columnItem)
|
||||
});
|
||||
|
||||
grid.bind('onClick', (e, d) => {
|
||||
const { rowItem } = d;
|
||||
const target = d.e.target;
|
||||
@@ -589,6 +596,8 @@ export class ModelManager {
|
||||
width: 200
|
||||
}];
|
||||
|
||||
restoreColumnWidth(gridId, columns);
|
||||
|
||||
this.grid.setData({
|
||||
options,
|
||||
rows,
|
||||
|
||||
@@ -3,12 +3,21 @@
|
||||
* - custom node pack version to all custom nodes used in the workflow
|
||||
*
|
||||
* Example metadata:
|
||||
"extra": {
|
||||
"node_versions": {
|
||||
"comfy-core": "v0.3.8-4-g0b2eb7f",
|
||||
"comfyui-easy-use": "1.2.5"
|
||||
}
|
||||
},
|
||||
* "nodes": {
|
||||
* "1": {
|
||||
* type: "CheckpointLoaderSimple",
|
||||
* ...
|
||||
* properties: {
|
||||
* cnr_id: "comfy-core",
|
||||
* version: "0.3.8",
|
||||
* },
|
||||
* },
|
||||
* }
|
||||
*
|
||||
* @typedef {Object} NodeInfo
|
||||
* @property {string} ver - Version (git hash or semantic version)
|
||||
* @property {string} cnr_id - ComfyRegistry node ID
|
||||
* @property {boolean} enabled - Whether the node is enabled
|
||||
*/
|
||||
|
||||
import { app } from "../../scripts/app.js";
|
||||
@@ -23,7 +32,7 @@ class WorkflowMetadataExtension {
|
||||
|
||||
/**
|
||||
* Get the installed nodes info
|
||||
* @returns {Promise<Record<string, {ver: string, cnr_id: string, enabled: boolean}>>} The mapping from node name to its info.
|
||||
* @returns {Promise<Record<string, NodeInfo>>} The mapping from node name to its info.
|
||||
* ver can either be a git commit hash or a semantic version such as "1.0.0"
|
||||
* cnr_id is the id of the node in the ComfyRegistry
|
||||
* enabled is true if the node is enabled, false if it is disabled
|
||||
@@ -33,61 +42,42 @@ class WorkflowMetadataExtension {
|
||||
return await res.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the node versions for the given graph
|
||||
* @param {LGraph} graph The graph to get the node versions for
|
||||
* @returns {Promise<Record<string, string>>} The mapping from node name to version
|
||||
*/
|
||||
getGraphNodeVersions(graph) {
|
||||
const nodeVersions = {};
|
||||
for (const node of graph.nodes) {
|
||||
const nodeData = node.constructor.nodeData;
|
||||
// Frontend only nodes don't have nodeData
|
||||
if (!nodeData) {
|
||||
continue;
|
||||
}
|
||||
const modules = nodeData.python_module.split(".");
|
||||
|
||||
if (modules[0] === "custom_nodes") {
|
||||
const nodePackageName = modules[1];
|
||||
const nodeInfo =
|
||||
this.installedNodes[nodePackageName] ??
|
||||
this.installedNodes[nodePackageName.toLowerCase()];
|
||||
if (nodeInfo) {
|
||||
nodeVersions[nodePackageName] = nodeInfo.ver;
|
||||
}
|
||||
} else if (["nodes", "comfy_extras"].includes(modules[0])) {
|
||||
nodeVersions["comfy-core"] = this.comfyCoreVersion;
|
||||
} else {
|
||||
console.warn(`Unknown node source: ${nodeData.python_module}`);
|
||||
}
|
||||
}
|
||||
return nodeVersions;
|
||||
}
|
||||
|
||||
async init() {
|
||||
const extension = this;
|
||||
this.installedNodes = await this.getInstalledNodes();
|
||||
this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
|
||||
}
|
||||
|
||||
// Attach metadata when app.graphToPrompt is called.
|
||||
const originalSerialize = LGraph.prototype.serialize;
|
||||
LGraph.prototype.serialize = function () {
|
||||
const workflow = originalSerialize.apply(this, arguments);
|
||||
/**
|
||||
* Called when any node is created
|
||||
* @param {LGraphNode} node The newly created node
|
||||
*/
|
||||
nodeCreated(node) {
|
||||
try {
|
||||
// nodeData doesn't exist if node is missing or node is frontend only node
|
||||
if (!node?.constructor?.nodeData?.python_module) return;
|
||||
|
||||
// Add metadata to the workflow
|
||||
if (!workflow.extra) {
|
||||
workflow.extra = {};
|
||||
const nodeProperties = (node.properties ??= {});
|
||||
const modules = node.constructor.nodeData.python_module.split(".");
|
||||
const moduleType = modules[0];
|
||||
|
||||
if (moduleType === "custom_nodes") {
|
||||
const nodePackageName = modules[1];
|
||||
const { cnr_id, aux_id, ver } =
|
||||
this.installedNodes[nodePackageName] ??
|
||||
this.installedNodes[nodePackageName.toLowerCase()] ??
|
||||
{};
|
||||
|
||||
if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
|
||||
if (cnr_id) nodeProperties.cnr_id = cnr_id;
|
||||
else nodeProperties.aux_id = aux_id;
|
||||
if (ver) nodeProperties.ver = ver;
|
||||
} else if (["nodes", "comfy_extras"].includes(moduleType)) {
|
||||
nodeProperties.cnr_id = "comfy-core";
|
||||
nodeProperties.ver = this.comfyCoreVersion;
|
||||
}
|
||||
const graph = this;
|
||||
try {
|
||||
workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
|
||||
return workflow;
|
||||
};
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4685,6 +4685,28 @@
|
||||
"filename": "<huggingface>",
|
||||
"url": "deepseek-ai/Janus-Pro-7B",
|
||||
"size": "14.85GB"
|
||||
},
|
||||
{
|
||||
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||
"type": "VAE",
|
||||
"base": "Kolors",
|
||||
"save_path": "vae/kolors",
|
||||
"description": "Kolors VAE",
|
||||
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||
"filename": "diffusion_pytorch_model.fp16.safetensors",
|
||||
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||
"size": "167MB"
|
||||
},
|
||||
{
|
||||
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
|
||||
"type": "VAE",
|
||||
"base": "Kolors",
|
||||
"save_path": "vae/kolors",
|
||||
"description": "Kolors VAE",
|
||||
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||
"filename": "diffusion_pytorch_model.safetensors",
|
||||
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
|
||||
"size": "335MB"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -12,6 +12,309 @@
|
||||
|
||||
|
||||
|
||||
|
||||
{
|
||||
"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": "RiceRound",
|
||||
"title": "RiceRound Cloud Node [UNSAFE]",
|
||||
"id": "riceround",
|
||||
"reference": "https://github.com/RiceRound/ComfyUI_RiceRound",
|
||||
"files": [
|
||||
"https://github.com/RiceRound/ComfyUI_RiceRound"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This is an imaginative project that allows for one-click deployment, providing both an online page and a ComfyUI cloud node.[w/This custom node is vulnerable because it can dynamically download and execute nodes.]"
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"title": "comfyuinode_chopmask [WIP]",
|
||||
"reference": "https://github.com/fangziheng2321/comfyuinode_chopmask",
|
||||
"files": [
|
||||
"https://github.com/fangziheng2321/comfyuinode_chopmask"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "a custom comfyui node for '/fooocusinpaint_upload'\nNOTE: The files in the repo are not organized."
|
||||
},
|
||||
{
|
||||
"author": "D1-3105",
|
||||
"title": "ComfyUI-VideoStream",
|
||||
"reference": "https://github.com/D1-3105/ComfyUI-VideoStream",
|
||||
"files": [
|
||||
"https://github.com/D1-3105/ComfyUI-VideoStream"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: FloWWeaverExportSingleFrameGRPC"
|
||||
},
|
||||
{
|
||||
"author": "gmorks",
|
||||
"title": "ComfyUI Animagine prompt [WIP]",
|
||||
"reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
|
||||
"files": [
|
||||
"https://github.com/gmorks/ComfyUI-Animagine-Prompt"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model\nNOTE: The files in the repo are not organized."
|
||||
},
|
||||
{
|
||||
"author": "wirytiox",
|
||||
"title": "ComfyUI-Qwen [CONFLICT]",
|
||||
"reference": "https://github.com/mr-krak3n/ComfyUI-Qwen",
|
||||
"files": [
|
||||
"https://github.com/mr-krak3n/ComfyUI-Qwen"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This repository contains custom nodes for ComfyUI, designed to facilitate working with language models such as Qwen2.5 and DeepSeek. [w/This node pack is causing a name conflict with https://github.com/ZHO-ZHO-ZHO/ComfyUI-Qwen]"
|
||||
},
|
||||
{
|
||||
"author": "hiusdev",
|
||||
"title": "ComfyUI_Lah_Toffee",
|
||||
"reference": "https://github.com/hiusdev/ComfyUI_Lah_Toffee",
|
||||
"files": [
|
||||
"https://github.com/hiusdev/ComfyUI_Lah_Toffee"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: Lah LoadVideoRandom"
|
||||
},
|
||||
{
|
||||
"author": "hdfhssg",
|
||||
"title": "ComfyUI_pxtool [WIP]",
|
||||
"reference": "https://github.com/hdfhssg/ComfyUI_pxtool",
|
||||
"files": [
|
||||
"https://github.com/hdfhssg/ComfyUI_pxtool"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
|
||||
},
|
||||
{
|
||||
"author": "franky519",
|
||||
"title": "comfyui-redux-style",
|
||||
"reference": "https://github.com/franky519/comfyui-redux-style",
|
||||
"files": [
|
||||
"https://github.com/franky519/comfyui-redux-style"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: Style Model Grid, Style Model Apply, Style Model Advanced"
|
||||
},
|
||||
{
|
||||
"author": "rishipandey125",
|
||||
"title": "ComfyUI-FramePacking [WIP]",
|
||||
"reference": "https://github.com/rishipandey125/ComfyUI-FramePacking",
|
||||
"files": [
|
||||
"https://github.com/rishipandey125/ComfyUI-FramePacking"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: Add Grid Boundaries, Pack Frames, Unpack Frames, Resize Frame"
|
||||
},
|
||||
{
|
||||
"author": "Northerner1",
|
||||
"title": "ComfyUI_North_Noise [WIP]",
|
||||
"reference": "https://github.com/Northerner1/ComfyUI_North_Noise",
|
||||
"files": [
|
||||
"https://github.com/Northerner1/ComfyUI_North_Noise"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: Unsampler"
|
||||
},
|
||||
{
|
||||
"author": "kimara-ai",
|
||||
"title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
|
||||
"reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
|
||||
"files": [
|
||||
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
|
||||
},
|
||||
{
|
||||
"author": "tc8M4lF3s88",
|
||||
"title": "comfy-tif-support",
|
||||
"reference": "https://github.com/M4lF3s/comfy-tif-support",
|
||||
"files": [
|
||||
"https://github.com/M4lF3s/comfy-tif-support"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: Load TIFF"
|
||||
},
|
||||
{
|
||||
"author": "tc888",
|
||||
"title": "ComfyUI_Save_Flux_Image",
|
||||
@@ -493,16 +796,6 @@
|
||||
"install_type": "git-clone",
|
||||
"description": "Tools for creating voxel based videos"
|
||||
},
|
||||
{
|
||||
"author": "Njbx",
|
||||
"title": "ComfyUI-blockswap",
|
||||
"reference": "https://github.com/Njbx/ComfyUI-blockswap",
|
||||
"files": [
|
||||
"https://github.com/Njbx/ComfyUI-blockswap"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: Block Swap"
|
||||
},
|
||||
{
|
||||
"author": "PATATAJEC",
|
||||
"title": "Patatajec-Nodes [WIP]",
|
||||
@@ -651,7 +944,7 @@
|
||||
"https://github.com/yanhuifair/ComfyUI-FairLab"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize"
|
||||
"description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize, ..."
|
||||
},
|
||||
{
|
||||
"author": "nomcycle",
|
||||
@@ -731,7 +1024,7 @@
|
||||
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "for now: just custom node(s) to fetch tags from a given danbooru (soon e621 too) post link\ncurrently only supports danbooru-style urls + api response formats\nthis repo is a rewrite of: [a/https://github.com/yffyhk/comfyui_auto_danbooru](https://github.com/yffyhk/comfyui_auto_danbooru)"
|
||||
"description": "WIP. Nodes: Fetch e621/danbooru image and/or tags etc from a given URL; Get the Wiki entry for a tag through a button press."
|
||||
},
|
||||
{
|
||||
"author": "Grey3016",
|
||||
@@ -1530,16 +1823,6 @@
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES:Mask Size Calculator (MagicAI), Universal Mask Converter (MagicAI), Python Execution (MagicAI), Extract JSON From Text Node(MagicAI)\n[w/This extension allows the execution of arbitrary Python code from a workflow.]"
|
||||
},
|
||||
{
|
||||
"author": "T8star1984",
|
||||
"title": "comfyui-purgevram",
|
||||
"reference": "https://github.com/T8star1984/comfyui-purgevram",
|
||||
"files": [
|
||||
"https://github.com/T8star1984/comfyui-purgevram"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
|
||||
},
|
||||
{
|
||||
"author": "Laser-one",
|
||||
"title": "ComfyUI-align-pose",
|
||||
@@ -1560,16 +1843,6 @@
|
||||
"install_type": "git-clone",
|
||||
"description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
|
||||
},
|
||||
{
|
||||
"author": "attashe",
|
||||
"title": "ComfyUI-FluxRegionAttention [WIP]",
|
||||
"reference": "https://github.com/attashe/ComfyUI-FluxRegionAttention",
|
||||
"files": [
|
||||
"https://github.com/attashe/ComfyUI-FluxRegionAttention"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Implement Region Attention for Flux model"
|
||||
},
|
||||
{
|
||||
"author": "aria1th",
|
||||
"title": "ComfyUI-SkipCFGSigmas",
|
||||
@@ -1748,7 +2021,7 @@
|
||||
"https://github.com/rouxianmantou/comfyui-rxmt-nodes"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES:Check Value Type"
|
||||
"description": "NODES:Check Value Type, Why Prompt Text"
|
||||
},
|
||||
{
|
||||
"author": "SirVeggie",
|
||||
|
||||
@@ -178,10 +178,19 @@
|
||||
"https://github.com/807502278/ComfyUI_TensorRT_Merge": [
|
||||
[
|
||||
"BiRefNet2_tensort",
|
||||
"BiRefNet_TRT",
|
||||
"Building_TRT",
|
||||
"Custom_Building_TRT",
|
||||
"DepthAnything_Tensorrt",
|
||||
"Dwpose_Tensorrt",
|
||||
"building_tensorrt_engine",
|
||||
"load_BiRefNet2_General",
|
||||
"load_dwpos_model"
|
||||
"FaceRestoreTensorrt",
|
||||
"RifeTensorrt",
|
||||
"UpscalerTensorrt",
|
||||
"YoloNasPoseTensorrt",
|
||||
"load_BiRefNet2_tensort",
|
||||
"load_BiRefNet_TRT",
|
||||
"load_DepthAnything_Tensorrt",
|
||||
"load_Dwpos_Tensorrt"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_TensorRT_Merge [WIP]"
|
||||
@@ -361,6 +370,15 @@
|
||||
"title_aux": "comfyui-textools [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/AhBumm/ComfyUI-Upscayl": [
|
||||
[
|
||||
"Upscayl Upscaler"
|
||||
],
|
||||
{
|
||||
"nodename_pattern": "\\(BillBum\\)$",
|
||||
"title_aux": "ComfyUI-Upscayl"
|
||||
}
|
||||
],
|
||||
"https://github.com/AlexXi19/ComfyUI-OpenAINode": [
|
||||
[
|
||||
"ImageWithPrompt",
|
||||
@@ -631,8 +649,10 @@
|
||||
"DevToolsNodeWithUnionInput",
|
||||
"DevToolsObjectPatchNode",
|
||||
"DevToolsRemoteWidgetNode",
|
||||
"DevToolsRemoteWidgetNodeWithControlAfterRefresh",
|
||||
"DevToolsRemoteWidgetNodeWithParams",
|
||||
"DevToolsRemoteWidgetNodeWithRefresh",
|
||||
"DevToolsRemoteWidgetNodeWithRefreshButton",
|
||||
"DevToolsSimpleSlider"
|
||||
],
|
||||
{
|
||||
@@ -647,6 +667,14 @@
|
||||
"title_aux": "ComfyUI OpenAI Nodes"
|
||||
}
|
||||
],
|
||||
"https://github.com/D1-3105/ComfyUI-VideoStream": [
|
||||
[
|
||||
"FloWWeaverExportSingleFrameGRPC"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-VideoStream"
|
||||
}
|
||||
],
|
||||
"https://github.com/DataCTE/ComfyUI-DataVoid-nodes": [
|
||||
[
|
||||
"IPAAdapterFaceIDBatch",
|
||||
@@ -722,7 +750,6 @@
|
||||
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [
|
||||
[
|
||||
"GetBooruPost",
|
||||
"TagEncode",
|
||||
"TagWikiFetch"
|
||||
],
|
||||
{
|
||||
@@ -929,9 +956,11 @@
|
||||
"DeepSeekImageGeneration",
|
||||
"DeepSeekImageUnderstanding",
|
||||
"DeepSeekModelLoader",
|
||||
"GoogleDriveUpload",
|
||||
"ImagePreprocessor",
|
||||
"LLM_Loader",
|
||||
"OpenAICompatibleLoader"
|
||||
"OpenAICompatibleLoader",
|
||||
"VideoFileUploader"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]"
|
||||
@@ -1000,6 +1029,7 @@
|
||||
"ImNodeTitleOverride",
|
||||
"ImSetActionKeywordMapping",
|
||||
"MergeNode",
|
||||
"Molmo7BDbnbBatch",
|
||||
"MuteNode",
|
||||
"NewNode",
|
||||
"Node2String",
|
||||
@@ -1249,6 +1279,15 @@
|
||||
"title_aux": "ComfyUI Nodes for Inference.Core"
|
||||
}
|
||||
],
|
||||
"https://github.com/M4lF3s/comfy-tif-support": [
|
||||
[
|
||||
"Load TIFF",
|
||||
"Save TIFF"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfy-tif-support"
|
||||
}
|
||||
],
|
||||
"https://github.com/Matrix-King-Studio/ComfyUI-MoviePy": [
|
||||
[
|
||||
"AudioDurationNode",
|
||||
@@ -1296,12 +1335,44 @@
|
||||
"title_aux": "ComfyUI-APG_ImYourCFGNow"
|
||||
}
|
||||
],
|
||||
"https://github.com/Njbx/ComfyUI-blockswap": [
|
||||
"https://github.com/NEZHA625/ComfyUI-tools-by-dong": [
|
||||
[
|
||||
"BlockSwap"
|
||||
"A1111_FLUX_DATA_NODE",
|
||||
"CategorizeNode",
|
||||
"FileMoveNode",
|
||||
"FolderIteratorNODE",
|
||||
"Get_cookies_Node",
|
||||
"Get_json_value_Node",
|
||||
"HashCalculationsNode",
|
||||
"HuggingFaceUploadNode",
|
||||
"Image2GIFNode",
|
||||
"ImageDownloader",
|
||||
"InputDetectionNode",
|
||||
"LLM_Node",
|
||||
"LibLib_upload_Node",
|
||||
"LogicToolsNode",
|
||||
"LoraIterator",
|
||||
"RandomNumbersNode",
|
||||
"RenameNode",
|
||||
"ResolutionNode",
|
||||
"SaveTXTNode",
|
||||
"SetAppidNode",
|
||||
"TextToJsonNode",
|
||||
"TranslateAPINode",
|
||||
"ZIPwith7zNode",
|
||||
"path_join_Node",
|
||||
"set_api_Node"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-blockswap"
|
||||
"title_aux": "ComfyUI-tools-by-dong [UNSAFE]"
|
||||
}
|
||||
],
|
||||
"https://github.com/Northerner1/ComfyUI_North_Noise": [
|
||||
[
|
||||
"North_Unsampler"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_North_Noise [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/PATATAJEC/Patatajec-Nodes": [
|
||||
@@ -1395,6 +1466,41 @@
|
||||
"title_aux": "comfyui-promptbymood [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/RiceRound/ComfyUI_RiceRound": [
|
||||
[
|
||||
"RiceRoundAdvancedChoiceNode",
|
||||
"RiceRoundBooleanNode",
|
||||
"RiceRoundDecryptNode",
|
||||
"RiceRoundDownloadImageAndMaskNode",
|
||||
"RiceRoundDownloadImageNode",
|
||||
"RiceRoundDownloadMaskNode",
|
||||
"RiceRoundEncryptNode",
|
||||
"RiceRoundFloatNode",
|
||||
"RiceRoundImageBridgeNode",
|
||||
"RiceRoundImageNode",
|
||||
"RiceRoundImageUrlNode",
|
||||
"RiceRoundInputTextNode",
|
||||
"RiceRoundIntNode",
|
||||
"RiceRoundMaskBridgeNode",
|
||||
"RiceRoundOutputBooleanNode",
|
||||
"RiceRoundOutputFloatNode",
|
||||
"RiceRoundOutputImageBridgeNode",
|
||||
"RiceRoundOutputImageNode",
|
||||
"RiceRoundOutputIntNode",
|
||||
"RiceRoundOutputMaskBridgeNode",
|
||||
"RiceRoundOutputTextNode",
|
||||
"RiceRoundRandomSeedNode",
|
||||
"RiceRoundSimpleChoiceNode",
|
||||
"RiceRoundSimpleImageNode",
|
||||
"RiceRoundStrToBooleanNode",
|
||||
"RiceRoundStrToFloatNode",
|
||||
"RiceRoundStrToIntNode",
|
||||
"RiceRoundUploadImageNode"
|
||||
],
|
||||
{
|
||||
"title_aux": "RiceRound Cloud Node [UNSAFE]"
|
||||
}
|
||||
],
|
||||
"https://github.com/RicherdLee/comfyui-oss-image-save": [
|
||||
[
|
||||
"SaveImageOSS"
|
||||
@@ -1405,8 +1511,12 @@
|
||||
],
|
||||
"https://github.com/RobeSantoro/ComfyUI-RobeNodes": [
|
||||
[
|
||||
"Boolean Primitive \ud83d\udc24",
|
||||
"Image Input Switch \ud83d\udc24",
|
||||
"List Image Path \ud83d\udc24",
|
||||
"List Video Path \ud83d\udc24"
|
||||
"List Model Path \ud83d\udc24",
|
||||
"List Video Path \ud83d\udc24",
|
||||
"Peaks Weights Generator \ud83d\udc24"
|
||||
],
|
||||
{
|
||||
"title_aux": "Comfy UI Robe Nodes [UNSAFE]"
|
||||
@@ -1456,8 +1566,21 @@
|
||||
"title_aux": "ComfyUI_Save2Discord"
|
||||
}
|
||||
],
|
||||
"https://github.com/Scaryplasmon/ComfTrellis": [
|
||||
[
|
||||
"LoadTrellisModel",
|
||||
"RembgSquare",
|
||||
"SaveGLBFile",
|
||||
"TrellisGrid",
|
||||
"TrellisInference"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfTrellis [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/SeedV/ComfyUI-SeedV-Nodes": [
|
||||
[
|
||||
"ALL_Model_UnLoader(SEEDV)",
|
||||
"AdvancedScript",
|
||||
"CheckpointLoaderSimpleShared //SeedV",
|
||||
"ControlNetLoaderAdvancedShared",
|
||||
@@ -1487,6 +1610,7 @@
|
||||
"https://github.com/Shinsplat/ComfyUI-Shinsplat": [
|
||||
[
|
||||
"Clip Text Encode (Shinsplat)",
|
||||
"Clip Text Encode ALT (Shinsplat)",
|
||||
"Clip Text Encode SD3 (Shinsplat)",
|
||||
"Clip Text Encode SDXL (Shinsplat)",
|
||||
"Clip Text Encode T5 (Shinsplat)",
|
||||
@@ -1504,6 +1628,7 @@
|
||||
"Test Node (Shinsplat)",
|
||||
"Text To Tokens (Shinsplat)",
|
||||
"Text To Tokens SD3 (Shinsplat)",
|
||||
"Upscale WEBP (Shinsplat)",
|
||||
"Variables (Shinsplat)"
|
||||
],
|
||||
{
|
||||
@@ -1621,14 +1746,6 @@
|
||||
"title_aux": "Comfyui_leffa"
|
||||
}
|
||||
],
|
||||
"https://github.com/T8star1984/comfyui-purgevram": [
|
||||
[
|
||||
"PurgeVRAM"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfyui-purgevram"
|
||||
}
|
||||
],
|
||||
"https://github.com/TSFSean/ComfyUI-TSFNodes": [
|
||||
[
|
||||
"GyroOSC"
|
||||
@@ -1668,6 +1785,15 @@
|
||||
"title_aux": "plugin-utils-nodes"
|
||||
}
|
||||
],
|
||||
"https://github.com/Velour-Fog/comfy-latent-nodes": [
|
||||
[
|
||||
"CustomLoadLatent",
|
||||
"CustomSaveLatent"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfy-latent-nodes [UNSAFE]"
|
||||
}
|
||||
],
|
||||
"https://github.com/Video3DGenResearch/comfyui-batch-input-node": [
|
||||
[
|
||||
"BatchImageAndPrompt",
|
||||
@@ -1721,6 +1847,16 @@
|
||||
"title_aux": "visuallabs_comfyui_nodes"
|
||||
}
|
||||
],
|
||||
"https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening": [
|
||||
[
|
||||
"AYL_API_Node",
|
||||
"AYL_GGUF_Node",
|
||||
"AYL_Node"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_LLM_Are_You_Listening [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/ZHO-ZHO-ZHO/ComfyUI-AuraSR-ZHO": [
|
||||
[
|
||||
"AuraSR_Lterative_Zho",
|
||||
@@ -1826,6 +1962,39 @@
|
||||
"title_aux": "alexisrolland/ComfyUI-AuraSR"
|
||||
}
|
||||
],
|
||||
"https://github.com/alt-key-project/comfyui-dream-painter": [
|
||||
[
|
||||
"Bitmap AND [DPaint]",
|
||||
"Bitmap Crop Center [DPaint]",
|
||||
"Bitmap Dimensions [DPaint]",
|
||||
"Bitmap Edge Detect [DPaint]",
|
||||
"Bitmap Expand Canvas [DPaint]",
|
||||
"Bitmap Invert [DPaint]",
|
||||
"Bitmap OR [DPaint]",
|
||||
"Bitmap Resize [DPaint]",
|
||||
"Bitmap Rotate [DPaint]",
|
||||
"Bitmap To Image & Mask [DPaint]",
|
||||
"Bitmap XOR [DPaint]",
|
||||
"Draw Shape As Bitmap [DPaint]",
|
||||
"Image To Bitmap [DPaint]",
|
||||
"Random Number Generator [DPaint]",
|
||||
"Shape Center & Fit [DPaint]",
|
||||
"Shape Combiner [DPaint]",
|
||||
"Shape Copycat Tool [DPaint]",
|
||||
"Shape Find Bounds [DPaint]",
|
||||
"Shape Flip [DPaint]",
|
||||
"Shape Grid [DPaint]",
|
||||
"Shape Resize [DPaint]",
|
||||
"Shape Rotate [DPaint]",
|
||||
"Shape of Circular Rays [DPaint]",
|
||||
"Shape of N-Polygon [DPaint]",
|
||||
"Shape of Rectangle [DPaint]",
|
||||
"Shape of Star [DPaint]"
|
||||
],
|
||||
{
|
||||
"title_aux": "Dream Painter [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/alt-key-project/comfyui-dream-video-batches": [
|
||||
[
|
||||
"Blended Transition [DVB]",
|
||||
@@ -1918,20 +2087,6 @@
|
||||
"title_aux": "comfyui_segformer_b2_sleeves"
|
||||
}
|
||||
],
|
||||
"https://github.com/attashe/ComfyUI-FluxRegionAttention": [
|
||||
[
|
||||
"BBoxToMaskNode",
|
||||
"BoundingBoxNode",
|
||||
"CLIPDebug",
|
||||
"FluxRegionBBOX",
|
||||
"FluxRegionMask",
|
||||
"RegionAttention",
|
||||
"VisualizeBBoxesNode"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-FluxRegionAttention [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/backearth1/Comfyui-MiniMax-Video": [
|
||||
[
|
||||
"ImageToPrompt",
|
||||
@@ -2332,6 +2487,7 @@
|
||||
"CLIPTextEncodeControlnet",
|
||||
"CLIPTextEncodeFlux",
|
||||
"CLIPTextEncodeHunyuanDiT",
|
||||
"CLIPTextEncodeLumina2",
|
||||
"CLIPTextEncodePixArtAlpha",
|
||||
"CLIPTextEncodeSD3",
|
||||
"CLIPTextEncodeSDXL",
|
||||
@@ -2440,6 +2596,7 @@
|
||||
"LoadAudio",
|
||||
"LoadImage",
|
||||
"LoadImageMask",
|
||||
"LoadImageOutput",
|
||||
"LoadLatent",
|
||||
"LoraLoader",
|
||||
"LoraLoaderModelOnly",
|
||||
@@ -2447,6 +2604,7 @@
|
||||
"Mahiro",
|
||||
"MaskComposite",
|
||||
"MaskToImage",
|
||||
"ModelComputeDtype",
|
||||
"ModelMergeAdd",
|
||||
"ModelMergeAuraflow",
|
||||
"ModelMergeBlocks",
|
||||
@@ -2487,6 +2645,7 @@
|
||||
"RandomNoise",
|
||||
"RebatchImages",
|
||||
"RebatchLatents",
|
||||
"RenormCFG",
|
||||
"RepeatImageBatch",
|
||||
"RepeatLatentBatch",
|
||||
"RescaleCFG",
|
||||
@@ -2512,6 +2671,7 @@
|
||||
"SaveImage",
|
||||
"SaveImageWebsocket",
|
||||
"SaveLatent",
|
||||
"SaveWEBM",
|
||||
"SelfAttentionGuidance",
|
||||
"SetFirstSigma",
|
||||
"SetLatentNoiseMask",
|
||||
@@ -2864,6 +3024,14 @@
|
||||
"title_aux": "ComfyUI-Showrunner-Utils"
|
||||
}
|
||||
],
|
||||
"https://github.com/fangziheng2321/comfyuinode_chopmask": [
|
||||
[
|
||||
"cus_chopmask"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfyuinode_chopmask [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/flowtyone/comfyui-flowty-lcm": [
|
||||
[
|
||||
"LCMSampler"
|
||||
@@ -2891,6 +3059,17 @@
|
||||
"title_aux": "comfyui-cem-tools"
|
||||
}
|
||||
],
|
||||
"https://github.com/franky519/comfyui-redux-style": [
|
||||
[
|
||||
"StyleModelAdvanced",
|
||||
"StyleModelApplySimple",
|
||||
"StyleModelConditioner",
|
||||
"StyleModelGridVisualizer"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfyui-redux-style"
|
||||
}
|
||||
],
|
||||
"https://github.com/fritzprix/ComfyUI-LLM-Utils": [
|
||||
[
|
||||
"WeightedDict",
|
||||
@@ -2936,6 +3115,16 @@
|
||||
"title_aux": "comfyui_median_filter"
|
||||
}
|
||||
],
|
||||
"https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
|
||||
[
|
||||
"AnimaginePrompt",
|
||||
"MultilineTextInput",
|
||||
"TextFileLoader"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI Animagine prompt [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/go-package-lab/ComfyUI-Tools-Video-Combine": [
|
||||
[
|
||||
"Tools:CopyFile",
|
||||
@@ -2971,6 +3160,17 @@
|
||||
"title_aux": "ComfyUI_Grim"
|
||||
}
|
||||
],
|
||||
"https://github.com/grinlau18/ComfyUI_XISER_Nodes": [
|
||||
[
|
||||
"XIS_Float_Slider",
|
||||
"XIS_INT_Slider",
|
||||
"XIS_PromptsWithSwitches",
|
||||
"XIS_ResizeImageOrMask"
|
||||
],
|
||||
{
|
||||
"title_aux": "Xiser_Nodes [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/haodman/ComfyUI_Rain": [
|
||||
[
|
||||
"Rain_ImageSize",
|
||||
@@ -3009,6 +3209,7 @@
|
||||
[
|
||||
"ACE_AnyInputSwitchBool",
|
||||
"ACE_AnyInputToAny",
|
||||
"ACE_AudioCrop",
|
||||
"ACE_AudioLoad",
|
||||
"ACE_AudioPlay",
|
||||
"ACE_AudioSave",
|
||||
@@ -3019,6 +3220,7 @@
|
||||
"ACE_ImageFaceCrop",
|
||||
"ACE_ImageGetSize",
|
||||
"ACE_ImageLoadFromCloud",
|
||||
"ACE_ImageMakeSlieshow",
|
||||
"ACE_ImagePixelate",
|
||||
"ACE_ImageQA",
|
||||
"ACE_ImageRemoveBackground",
|
||||
@@ -3037,6 +3239,7 @@
|
||||
"ACE_TextSelector",
|
||||
"ACE_TextToResolution",
|
||||
"ACE_TextTranslate",
|
||||
"ACE_VideoConcat",
|
||||
"ACE_VideoLoad",
|
||||
"ACE_VideoPreview"
|
||||
],
|
||||
@@ -3044,6 +3247,31 @@
|
||||
"title_aux": "ComfyUI AceNodes [UNSAFE]"
|
||||
}
|
||||
],
|
||||
"https://github.com/hdfhssg/ComfyUI_pxtool": [
|
||||
[
|
||||
"ArtistLoader",
|
||||
"CivitaiHelper",
|
||||
"DanbooruCharacterTag",
|
||||
"E621CharacterTag",
|
||||
"NegativeTag",
|
||||
"PX_Seed",
|
||||
"QualityTag",
|
||||
"RandomArtists",
|
||||
"RandomArtistsAdvanced",
|
||||
"RandomTag"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_pxtool [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/hiusdev/ComfyUI_Lah_Toffee": [
|
||||
[
|
||||
"LoadVideoRandom"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_Lah_Toffee"
|
||||
}
|
||||
],
|
||||
"https://github.com/horidream/ComfyUI-Horidream": [
|
||||
[
|
||||
"PassThroughWithSound"
|
||||
@@ -3176,6 +3404,14 @@
|
||||
"title_aux": "comfyui-hydit"
|
||||
}
|
||||
],
|
||||
"https://github.com/if-ai/ComfyUI-IF_Zonos": [
|
||||
[
|
||||
"IF_ZonosTTS"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-IF_Zonos [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/ilovejohnwhite/Tracer": [
|
||||
[
|
||||
"BillyGoatNode",
|
||||
@@ -3253,6 +3489,14 @@
|
||||
"title_aux": "ComfyUI-ComfyFluxSize [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/jgbyte/ComfyUI-RandomCube": [
|
||||
[
|
||||
"RandomCubeGrid"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-RandomCube [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/jimmm-ai/TimeUi-a-ComfyUi-Timeline-Node": [
|
||||
[
|
||||
"jimmm.ai.TimelineUI"
|
||||
@@ -3360,6 +3604,7 @@
|
||||
],
|
||||
"https://github.com/jonnydolake/ComfyUI-AIR-Nodes": [
|
||||
[
|
||||
"ExtractBlackLines",
|
||||
"ForceMinimumBatchSize",
|
||||
"ImageCompositeChained",
|
||||
"LineDetection",
|
||||
@@ -3427,6 +3672,8 @@
|
||||
],
|
||||
"https://github.com/kandy/ComfyUI-KAndy": [
|
||||
[
|
||||
"KAndyBatch2Index",
|
||||
"KAndyBatchIndex",
|
||||
"KAndyCivitImagesAPI",
|
||||
"KAndyCivitPromptAPI",
|
||||
"KAndyImageSave",
|
||||
@@ -3532,6 +3779,7 @@
|
||||
"DownloadAndLoadHy3DDelightModel",
|
||||
"DownloadAndLoadHy3DPaintModel",
|
||||
"Hy3DApplyTexture",
|
||||
"Hy3DBPT",
|
||||
"Hy3DBakeFromMultiview",
|
||||
"Hy3DCameraConfig",
|
||||
"Hy3DDelightImage",
|
||||
@@ -3655,6 +3903,14 @@
|
||||
"title_aux": "Advanced Watermarking Tools [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL": [
|
||||
[
|
||||
"KimaraAIImageFromURL"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-Kimara-AI-Image-From-URL [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/kk8bit/KayTool": [
|
||||
[
|
||||
"Abc_Math",
|
||||
@@ -3663,7 +3919,8 @@
|
||||
"Custom_Save_Image",
|
||||
"Display_Any",
|
||||
"Image_Size_Extractor",
|
||||
"Strong_Prompt"
|
||||
"Strong_Prompt",
|
||||
"Tencent_Translater"
|
||||
],
|
||||
{
|
||||
"title_aux": "KayTool"
|
||||
@@ -3696,6 +3953,17 @@
|
||||
"title_aux": "ComfyUI Flow Control [UNSTABLE]"
|
||||
}
|
||||
],
|
||||
"https://github.com/krisshen2021/comfyui_OpenRouterNodes": [
|
||||
[
|
||||
"OpenRouterOAINode_Infer",
|
||||
"OpenRouterOAINode_Models",
|
||||
"OpenRouterOAINode_hunyuanPrompt",
|
||||
"OpenRouterOAINode_txt2imgPrompt"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfyui_OpenRouterNodes [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/kuschanow/ComfyUI-SD-Slicer": [
|
||||
[
|
||||
"SdSlicer"
|
||||
@@ -3867,6 +4135,9 @@
|
||||
"HYCreateRegionalCond",
|
||||
"HYFetaEnhance",
|
||||
"HYFlowEditGuider",
|
||||
"HYFlowEditGuiderAdv",
|
||||
"HYFlowEditGuiderCFG",
|
||||
"HYFlowEditGuiderCFGAdv",
|
||||
"HYFlowEditSampler",
|
||||
"HYForwardODESampler",
|
||||
"HYInverseModelSamplingPred",
|
||||
@@ -3959,7 +4230,11 @@
|
||||
],
|
||||
"https://github.com/lum3on/comfyui_LLM_Polymath": [
|
||||
[
|
||||
"polymath_chat"
|
||||
"Helper",
|
||||
"UCEEraserNode",
|
||||
"polymath_SaveAbsolute",
|
||||
"polymath_chat",
|
||||
"polymath_scraper"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfyui_LLM_Polymath [WIP]"
|
||||
@@ -4029,6 +4304,14 @@
|
||||
"title_aux": "ComfyUI mashb1t nodes"
|
||||
}
|
||||
],
|
||||
"https://github.com/masmullin2000/ComfyUI-MMYolo": [
|
||||
[
|
||||
"MMFace_Finder"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-MMYolo"
|
||||
}
|
||||
],
|
||||
"https://github.com/mehbebe/ComfyLoraGallery": [
|
||||
[
|
||||
"LoraGallery"
|
||||
@@ -4166,6 +4449,16 @@
|
||||
"title_aux": "ComfyUI-Simple-Image-Tools [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/mr-krak3n/ComfyUI-Qwen": [
|
||||
[
|
||||
"DeepSeekResponseParser",
|
||||
"QwenLoader",
|
||||
"QwenSampler"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-Qwen [CONFLICT]"
|
||||
}
|
||||
],
|
||||
"https://github.com/mut-ex/comfyui-gligengui-node": [
|
||||
[
|
||||
"GLIGEN_GUI"
|
||||
@@ -4182,6 +4475,14 @@
|
||||
"title_aux": "ComfyUI-Claude-I2T"
|
||||
}
|
||||
],
|
||||
"https://github.com/muvich3n/ComfyUI-Crop-Border": [
|
||||
[
|
||||
"CropImageBorder"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-Crop-Border"
|
||||
}
|
||||
],
|
||||
"https://github.com/myAiLemon/MagicAutomaticPicture": [
|
||||
[
|
||||
"EditableStringNode",
|
||||
@@ -4358,7 +4659,8 @@
|
||||
],
|
||||
"https://github.com/osuiso-depot/comfyui-keshigom_custom": [
|
||||
[
|
||||
"KANI_Checkpoint_Loader_Simple",
|
||||
"KANI_Checkpoint_Loader_From_String",
|
||||
"KANI_MathExpression",
|
||||
"KANI_Multiplexer",
|
||||
"KANI_ShowAnything",
|
||||
"KANI_TextFind",
|
||||
@@ -4372,6 +4674,14 @@
|
||||
"title_aux": "comfyui-keshigom_custom"
|
||||
}
|
||||
],
|
||||
"https://github.com/owengillett/ComfyUI-tilefusion": [
|
||||
[
|
||||
"VideoGridCombine"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-tilefusion"
|
||||
}
|
||||
],
|
||||
"https://github.com/oyvindg/ComfyUI-TrollSuite": [
|
||||
[
|
||||
"BinaryImageMask",
|
||||
@@ -4556,6 +4866,17 @@
|
||||
"title_aux": "ComfyUI-ODE"
|
||||
}
|
||||
],
|
||||
"https://github.com/rishipandey125/ComfyUI-FramePacking": [
|
||||
[
|
||||
"Add Grid Boundaries",
|
||||
"Pack Frames",
|
||||
"Resize Frame",
|
||||
"Unpack Frames"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-FramePacking [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/risunobushi/ComfyUI_FocusMask": [
|
||||
[
|
||||
"FocusMaskExtractor",
|
||||
@@ -4575,7 +4896,8 @@
|
||||
],
|
||||
"https://github.com/rouxianmantou/comfyui-rxmt-nodes": [
|
||||
[
|
||||
"CheckValueTypeNode"
|
||||
"CheckValueTypeNode",
|
||||
"WhyPromptTextNode"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfyui-rxmt-nodes"
|
||||
@@ -5128,6 +5450,7 @@
|
||||
[
|
||||
"CLIPTranslatedNode",
|
||||
"DownloadImageNode",
|
||||
"FillAlphaNode",
|
||||
"FixUTF8StringNode",
|
||||
"ImageResizeNode",
|
||||
"ImageToVideoNode",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -129,6 +129,16 @@
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
|
||||
},
|
||||
{
|
||||
"author": "Pablerdo",
|
||||
"title": "ComfyUI-PSNodes",
|
||||
"reference": "https://github.com/Pablerdo/ComfyUI-PSNodes",
|
||||
"files": [
|
||||
"https://github.com/Pablerdo/ComfyUI-PSNodes"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -10,6 +10,78 @@
|
||||
},
|
||||
|
||||
|
||||
|
||||
{
|
||||
"author": "thanhduong0213929",
|
||||
"title": "ComfyUI-DeepUnlock [REMOVED]",
|
||||
"reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
|
||||
"files": [
|
||||
"https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
|
||||
},
|
||||
{
|
||||
"author": "pathway8-sudo",
|
||||
"title": "RMBG [REMOVED]",
|
||||
"reference": "https://github.com/pathway8-sudo/RMBG",
|
||||
"files": [
|
||||
"https://github.com/pathway8-sudo/RMBG"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This repository provides a custom node for ComfyUI, leveraging the BriaRMBG model to remove backgrounds from images and output a transparent PNG."
|
||||
},
|
||||
{
|
||||
"author": "iris-Neko",
|
||||
"title": "ComfyUI_ascii_art [REMOVED]",
|
||||
"reference": "https://github.com/iris-Neko/ComfyUI_ascii_art",
|
||||
"files": [
|
||||
"https://github.com/iris-Neko/ComfyUI_ascii_art"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "ComfyUI node for [a/ASCII art controlnet](https://civitai.com/models/986392)"
|
||||
},
|
||||
{
|
||||
"author": "apesplat",
|
||||
"title": "ezXY scripts and nodes [NOT MAINTAINED]",
|
||||
"id": "ezxy",
|
||||
"reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
|
||||
"files": [
|
||||
"https://github.com/GMapeSplat/ComfyUI_ezXY"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
|
||||
},
|
||||
{
|
||||
"author": "mie",
|
||||
"title": "ComfyUI_JanusProCaption [REMOVED]",
|
||||
"reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
|
||||
"files": [
|
||||
"https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Describe image or create caption files using Janus Pro Model"
|
||||
},
|
||||
{
|
||||
"author": "Njbx",
|
||||
"title": "ComfyUI-blockswap [REMOVED]",
|
||||
"reference": "https://github.com/Njbx/ComfyUI-blockswap",
|
||||
"files": [
|
||||
"https://github.com/Njbx/ComfyUI-blockswap"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: Block Swap"
|
||||
},
|
||||
{
|
||||
"author": "T8star1984",
|
||||
"title": "comfyui-purgevram [REMOVED]",
|
||||
"reference": "https://github.com/T8star1984/comfyui-purgevram",
|
||||
"files": [
|
||||
"https://github.com/T8star1984/comfyui-purgevram"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
|
||||
},
|
||||
{
|
||||
"author": "zmwv823",
|
||||
"title": "ComfyUI-VideoDiffusion [REMOVED]",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,28 @@
|
||||
{
|
||||
"models": [
|
||||
{
|
||||
"name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||
"type": "VAE",
|
||||
"base": "Kolors",
|
||||
"save_path": "vae/kolors",
|
||||
"description": "Kolors VAE",
|
||||
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||
"filename": "diffusion_pytorch_model.fp16.safetensors",
|
||||
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
|
||||
"size": "167MB"
|
||||
},
|
||||
{
|
||||
"name": "kolors/vae/diffusion_pytorch_model.safetensors",
|
||||
"type": "VAE",
|
||||
"base": "Kolors",
|
||||
"save_path": "vae/kolors",
|
||||
"description": "Kolors VAE",
|
||||
"reference": "https://huggingface.co/Kwai-Kolors/Kolors",
|
||||
"filename": "diffusion_pytorch_model.safetensors",
|
||||
"url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
|
||||
"size": "335MB"
|
||||
},
|
||||
|
||||
{
|
||||
"name": "deepseek-ai/Janus-Pro-1B",
|
||||
"type": "Janus-Pro",
|
||||
|
||||
@@ -291,6 +291,26 @@
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
|
||||
},
|
||||
{
|
||||
"author": "xhiroga",
|
||||
"title": "ComfyUI-TypeScript-CustomNode",
|
||||
"reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
|
||||
"files": [
|
||||
"https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
|
||||
},
|
||||
{
|
||||
"author": "zentrocdot",
|
||||
"title": "ComfyUI-Turtle_Graphics_Demos",
|
||||
"reference": "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo",
|
||||
"files": [
|
||||
"https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo"
|
||||
],
|
||||
"description": "ComfyUI node for creating some Turtle Graphic demos.",
|
||||
"install_type": "git-clone"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -34,7 +34,7 @@ else:
|
||||
|
||||
security_check.security_check()
|
||||
|
||||
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']
|
||||
|
||||
|
||||
@@ -82,6 +82,7 @@ comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
|
||||
custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
|
||||
manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
|
||||
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
|
||||
manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
|
||||
restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
|
||||
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
||||
|
||||
@@ -94,7 +95,7 @@ def read_config():
|
||||
global default_conf
|
||||
try:
|
||||
import configparser
|
||||
config = configparser.ConfigParser()
|
||||
config = configparser.ConfigParser(strict=False)
|
||||
config.read(manager_config_path)
|
||||
default_conf = config['default']
|
||||
except Exception:
|
||||
@@ -122,6 +123,14 @@ if os.path.exists(manager_pip_overrides_path):
|
||||
cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40' # for security
|
||||
|
||||
|
||||
if os.path.exists(manager_pip_blacklist_path):
|
||||
with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
|
||||
for x in f.readlines():
|
||||
y = x.strip()
|
||||
if y != '':
|
||||
cm_global.pip_blacklist.add(y)
|
||||
|
||||
|
||||
def remap_pip_package(pkg):
|
||||
if pkg in cm_global.pip_overrides:
|
||||
res = cm_global.pip_overrides[pkg]
|
||||
@@ -421,29 +430,33 @@ except Exception as e:
|
||||
print(f"[ComfyUI-Manager] Logging failed: {e}")
|
||||
|
||||
|
||||
try:
|
||||
import git # noqa: F401
|
||||
import toml # noqa: F401
|
||||
import rich # noqa: F401
|
||||
except ModuleNotFoundError:
|
||||
my_path = os.path.dirname(__file__)
|
||||
requirements_path = os.path.join(my_path, "requirements.txt")
|
||||
|
||||
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
|
||||
def ensure_dependencies():
|
||||
try:
|
||||
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
|
||||
except subprocess.CalledProcessError:
|
||||
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
|
||||
try:
|
||||
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
|
||||
except subprocess.CalledProcessError:
|
||||
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
|
||||
import git # noqa: F401
|
||||
import toml # noqa: F401
|
||||
import rich # noqa: F401
|
||||
import chardet # noqa: F401
|
||||
except ModuleNotFoundError:
|
||||
my_path = os.path.dirname(__file__)
|
||||
requirements_path = os.path.join(my_path, "requirements.txt")
|
||||
|
||||
try:
|
||||
print("## ComfyUI-Manager: installing dependencies done.")
|
||||
except:
|
||||
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
|
||||
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
|
||||
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
|
||||
try:
|
||||
subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
|
||||
except subprocess.CalledProcessError:
|
||||
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
|
||||
try:
|
||||
subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
|
||||
except subprocess.CalledProcessError:
|
||||
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
|
||||
|
||||
try:
|
||||
print("## ComfyUI-Manager: installing dependencies done.")
|
||||
except:
|
||||
# maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
|
||||
print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
|
||||
|
||||
ensure_dependencies()
|
||||
|
||||
|
||||
print("** ComfyUI startup time:", current_timestamp())
|
||||
@@ -598,17 +611,18 @@ def execute_lazy_install_script(repo_path, executable):
|
||||
|
||||
if os.path.exists(requirements_path):
|
||||
print(f"Install: pip packages for '{repo_path}'")
|
||||
with open(requirements_path, "r") as requirements_file:
|
||||
for line in requirements_file:
|
||||
package_name = remap_pip_package(line.strip())
|
||||
if package_name and not is_installed(package_name):
|
||||
if '--index-url' in package_name:
|
||||
s = package_name.split('--index-url')
|
||||
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
|
||||
else:
|
||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||
|
||||
process_wrap(install_cmd, repo_path)
|
||||
lines = manager_util.robust_readlines(requirements_path)
|
||||
for line in lines:
|
||||
package_name = remap_pip_package(line.strip())
|
||||
if package_name and not is_installed(package_name):
|
||||
if '--index-url' in package_name:
|
||||
s = package_name.split('--index-url')
|
||||
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
|
||||
else:
|
||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||
|
||||
process_wrap(install_cmd, repo_path)
|
||||
|
||||
if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
|
||||
processed_install.add(f'{repo_path}/install.py')
|
||||
@@ -679,6 +693,7 @@ def execute_migration(moves):
|
||||
shutil.move(x[0], x[1])
|
||||
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
|
||||
|
||||
script_executed = False
|
||||
|
||||
# Check if script_list_path exists
|
||||
if os.path.exists(script_list_path):
|
||||
@@ -733,6 +748,7 @@ if os.path.exists(script_list_path):
|
||||
|
||||
# Remove the script_list_path file
|
||||
if os.path.exists(script_list_path):
|
||||
script_executed = True
|
||||
os.remove(script_list_path)
|
||||
|
||||
print("\n[ComfyUI-Manager] Startup script completed.")
|
||||
@@ -744,11 +760,34 @@ del processed_install
|
||||
del pip_fixer
|
||||
manager_util.clear_pip_cache()
|
||||
|
||||
if script_executed:
|
||||
# Restart
|
||||
print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
|
||||
|
||||
if '__COMFY_CLI_SESSION__' in os.environ:
|
||||
with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
|
||||
pass
|
||||
|
||||
print("--------------------------------------------------------------------------\n")
|
||||
exit(0)
|
||||
else:
|
||||
sys_argv = sys.argv.copy()
|
||||
|
||||
if sys.platform.startswith('win32'):
|
||||
cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
|
||||
else:
|
||||
cmds = [sys.executable] + sys_argv
|
||||
|
||||
print(f"Command: {cmds}", flush=True)
|
||||
print("--------------------------------------------------------------------------\n")
|
||||
|
||||
os.execv(sys.executable, cmds)
|
||||
|
||||
|
||||
def check_windows_event_loop_policy():
|
||||
try:
|
||||
import configparser
|
||||
config = configparser.ConfigParser()
|
||||
config = configparser.ConfigParser(strict=False)
|
||||
config.read(manager_config_path)
|
||||
default_conf = config['default']
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
[project]
|
||||
name = "comfyui-manager"
|
||||
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
||||
version = "3.18.1"
|
||||
version = "3.26"
|
||||
license = { file = "LICENSE.txt" }
|
||||
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
|
||||
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
|
||||
|
||||
[project.urls]
|
||||
Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
|
||||
|
||||
@@ -8,3 +8,4 @@ rich
|
||||
typing-extensions
|
||||
toml
|
||||
uv
|
||||
chardet
|
||||
|
||||
@@ -6,7 +6,7 @@ python -m venv venv
|
||||
call venv/Scripts/activate
|
||||
python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
|
||||
python -m pip install -r requirements.txt
|
||||
python -m pip install -r custom_nodes/ComfyUI-Manager/requirements.txt
|
||||
python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
|
||||
cd ..
|
||||
echo "cd ComfyUI" >> run_gpu.bat
|
||||
echo "call venv/Scripts/activate" >> run_gpu.bat
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
.\python_embeded\python.exe -s -m pip install gitpython
|
||||
.\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
|
||||
.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt
|
||||
|
||||
Reference in New Issue
Block a user