Compare commits

...

5 Commits
3.23 ... 3.25

Author SHA1 Message Date
Dr.Lt.Data
5dd8ea8aab feat: update policy for updating ComfyUI
https://github.com/ltdrdata/ComfyUI-Manager/issues/1552

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

fixed: invalid identifying of nightly node packs which has `git@github.com:...` url
fixed: switch comfyui should be based on `master` branch instead of `main` branch
fixed: switch_to_default_branch - more robust switching
refactor: endpoints for policies
2025-02-19 21:34:13 +09:00
Dr.Lt.Data
41172be796 modified: don't show outdated ComfyUI message if desktop mode
modified: use __COMFYUI_DESKTOP_VERSION__ in notice board if desktop mode
2025-02-19 07:41:54 +09:00
Dr.Lt.Data
ad1b4a9a86 feat: reverse proxy
https://github.com/ltdrdata/ComfyUI-Manager/pull/795/files
2025-02-18 23:41:44 +09:00
Dr.Lt.Data
e0e3ec02b3 update DB 2025-02-18 21:08:19 +09:00
Dr.Lt.Data
a6cc392473 fix typo 2025-02-17 22:34:16 +09:00
17 changed files with 3102 additions and 2747 deletions

View File

@@ -149,7 +149,7 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini` * Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini` * Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json` * Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.list` * Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots` * Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts` * Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components` * Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
@@ -313,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. * This option can be used if performance issues occur in a Colab+GDrive environment.
## Environment Variables
The following features can be configured using environment variables:
* **COMFYUI_PATH**: The installation path of ComfyUI
* **GITHUB_ENDPOINT**: Reverse proxy configuration for environments with limited access to GitHub
* **HF_ENDPOINT**: Reverse proxy configuration for environments with limited access to Hugging Face
### Example 1:
Redirecting `https://github.com/ltdrdata/ComfyUI-Impact-Pack` to `https://mirror.ghproxy.com/https://github.com/ltdrdata/ComfyUI-Impact-Pack`
```
GITHUB_ENDPOINT=https://mirror.ghproxy.com/https://github.com
```
#### Example 2:
Changing `https://huggingface.co/path/to/somewhere` to `https://some-hf-mirror.com/path/to/somewhere`
```
HF_ENDPOINT=https://some-hf-mirror.com
```
## Scanner ## Scanner
When you run the `scan.sh` script: When you run the `scan.sh` script:

View File

@@ -21014,6 +21014,26 @@
"install_type": "git-clone", "install_type": "git-clone",
"description": "This repository explains how to accelerate image generation in ComfyUI using Pruna, an inference optimization engine that makes AI models faster, smaller, cheaper, and greener. ComfyUI is a popular node-based GUI for image generation models, for which we provide a custom compilation node that accelerates Stable Diffusion (SD) and Flux inference, while preserving output quality." "description": "This repository explains how to accelerate image generation in ComfyUI using Pruna, an inference optimization engine that makes AI models faster, smaller, cheaper, and greener. ComfyUI is a popular node-based GUI for image generation models, for which we provide a custom compilation node that accelerates Stable Diffusion (SD) and Flux inference, while preserving output quality."
}, },
{
"author": "Hellfiredragon",
"title": "comfyui-image-manipulation",
"reference": "https://github.com/Hellfiredragon/comfyui-image-manipulation",
"files": [
"https://github.com/Hellfiredragon/comfyui-image-manipulation"
],
"install_type": "git-clone",
"description": "Custom nodes to manipulate images in ComfyUI"
},
{
"author": "lunarring",
"title": "bitalino_comfy",
"reference": "https://github.com/lunarring/bitalino_comfy",
"files": [
"https://github.com/lunarring/bitalino_comfy"
],
"install_type": "git-clone",
"description": "A package implementing a Bitalino device ComfyUI custom node."
},

View File

@@ -1350,7 +1350,6 @@
"BillBum_Modified_RegText_Node", "BillBum_Modified_RegText_Node",
"BillBum_Modified_SD3_API_Node", "BillBum_Modified_SD3_API_Node",
"BillBum_Modified_Structured_LLM_Node(Imperfect)", "BillBum_Modified_Structured_LLM_Node(Imperfect)",
"BillBum_Modified_Together_API_Node",
"BillBum_Modified_VisionLM_API_Node", "BillBum_Modified_VisionLM_API_Node",
"BillBum_Modified_img2b64_url_Node", "BillBum_Modified_img2b64_url_Node",
"BillBum_NonSysPrompt_VLM_API_Node", "BillBum_NonSysPrompt_VLM_API_Node",
@@ -1379,6 +1378,7 @@
"https://github.com/AkashKarnatak/ComfyUI_faishme": [ "https://github.com/AkashKarnatak/ComfyUI_faishme": [
[ [
"Faishme Debug", "Faishme Debug",
"Faishme Load Image from Glob",
"Faishme Mannequin to Model Loader", "Faishme Mannequin to Model Loader",
"Faishme Moondream", "Faishme Moondream",
"Load Fashion Model" "Load Fashion Model"
@@ -1522,6 +1522,12 @@
"TICK (JOV) \u23f1", "TICK (JOV) \u23f1",
"TRANSFORM (JOV) \ud83c\udfdd\ufe0f", "TRANSFORM (JOV) \ud83c\udfdd\ufe0f",
"VALUE (JOV) \ud83e\uddec", "VALUE (JOV) \ud83e\uddec",
"VECTOR2 (JOV)",
"VECTOR2INT (JOV)",
"VECTOR3 (JOV)",
"VECTOR3INT (JOV)",
"VECTOR4 (JOV)",
"VECTOR4INT (JOV)",
"WAVE GEN (JOV) \ud83c\udf0a" "WAVE GEN (JOV) \ud83c\udf0a"
], ],
{ {
@@ -3001,7 +3007,6 @@
], ],
"https://github.com/Dobidop/ComfyStereo": [ "https://github.com/Dobidop/ComfyStereo": [
[ [
"LazyStereo",
"StereoImageNode" "StereoImageNode"
], ],
{ {
@@ -3076,8 +3081,6 @@
"https://github.com/DraconicDragon/ComfyUI-Venice-API": [ "https://github.com/DraconicDragon/ComfyUI-Venice-API": [
[ [
"CharCountTextBox", "CharCountTextBox",
"FluxPro11_TOGETHER",
"FluxPro_TOGETHER",
"GenerateImage_VENICE", "GenerateImage_VENICE",
"GenerateText_VENICE", "GenerateText_VENICE",
"UpscaleImage_VENICE", "UpscaleImage_VENICE",
@@ -4320,6 +4323,15 @@
"title_aux": "Hunyuan Video Resolutions" "title_aux": "Hunyuan Video Resolutions"
} }
], ],
"https://github.com/Hellfiredragon/comfyui-image-manipulation": [
[
"AlphaApplyMaskToImage",
"CreateMaskFromColorsNode"
],
{
"title_aux": "comfyui-image-manipulation"
}
],
"https://github.com/HelloVision/ComfyUI_HelloMeme": [ "https://github.com/HelloVision/ComfyUI_HelloMeme": [
[ [
"CropPortrait", "CropPortrait",
@@ -5214,10 +5226,9 @@
], ],
"https://github.com/KoreTeknology/ComfyUI-Universal-Styler": [ "https://github.com/KoreTeknology/ComfyUI-Universal-Styler": [
[ [
"Load Nai Styles Complex CSV", "\ud83d\udee1\ufe0f Load Scripts from Database",
"ShowText|pysssss", "\ud83d\udee1\ufe0f Save Script to Database (In progress)",
"Universal_Styler_Node", "\ud83d\udee1\ufe0f Set Main Channel"
"concat"
], ],
{ {
"title_aux": "ComfyUI Universal Styler" "title_aux": "ComfyUI Universal Styler"
@@ -6292,6 +6303,8 @@
"iToolsLineLoader", "iToolsLineLoader",
"iToolsLoadImagePlus", "iToolsLoadImagePlus",
"iToolsLoadImages", "iToolsLoadImages",
"iToolsLoadRandomImage",
"iToolsPreviewText",
"iToolsPromptLoader", "iToolsPromptLoader",
"iToolsPromptSaver", "iToolsPromptSaver",
"iToolsPromptStyler", "iToolsPromptStyler",
@@ -6470,9 +6483,12 @@
], ],
"https://github.com/MushroomFleet/DJZ-KokoroTTS": [ "https://github.com/MushroomFleet/DJZ-KokoroTTS": [
[ [
"KokoroTTS_LoadVoice_v1",
"KokoroTTS_SaveVoice_v1",
"KokoroTTS_v1", "KokoroTTS_v1",
"KokoroTTS_v2", "KokoroTTS_v2",
"KokoroTTS_v3" "KokoroTTS_v3",
"KokoroTTS_v4"
], ],
{ {
"title_aux": "KokoroTTS Node" "title_aux": "KokoroTTS Node"
@@ -7524,6 +7540,7 @@
"MaskBatchComposite(FaceParsing)", "MaskBatchComposite(FaceParsing)",
"MaskBlackOut(FaceParsing)", "MaskBlackOut(FaceParsing)",
"MaskBorderDissolve(FaceParsing)", "MaskBorderDissolve(FaceParsing)",
"MaskBorderDissolveAdvanced(FaceParsing)",
"MaskComposite(FaceParsing)", "MaskComposite(FaceParsing)",
"MaskCropWithBBox(FaceParsing)", "MaskCropWithBBox(FaceParsing)",
"MaskInsertWithBBox(FaceParsing)", "MaskInsertWithBBox(FaceParsing)",
@@ -8607,6 +8624,7 @@
"SDVN Dic Convert", "SDVN Dic Convert",
"SDVN Easy IPAdapter weight", "SDVN Easy IPAdapter weight",
"SDVN Exif check", "SDVN Exif check",
"SDVN Fill Square",
"SDVN Filter List", "SDVN Filter List",
"SDVN Flip Image", "SDVN Flip Image",
"SDVN Google Imagen", "SDVN Google Imagen",
@@ -9781,7 +9799,9 @@
"VrchDelayOSCControlNode", "VrchDelayOSCControlNode",
"VrchFloatKeyControlNode", "VrchFloatKeyControlNode",
"VrchFloatOSCControlNode", "VrchFloatOSCControlNode",
"VrchImageChannelLoaderNode",
"VrchImageFlipBookWebViewerNode", "VrchImageFlipBookWebViewerNode",
"VrchImagePreviewBackgroundNode",
"VrchImageSaverNode", "VrchImageSaverNode",
"VrchImageSwitchOSCControlNode", "VrchImageSwitchOSCControlNode",
"VrchImageWebViewerNode", "VrchImageWebViewerNode",
@@ -28058,7 +28078,9 @@
"https://github.com/yichengup/ComfyUI-VideoBlender": [ "https://github.com/yichengup/ComfyUI-VideoBlender": [
[ [
"VideoBlendLayer", "VideoBlendLayer",
"VideoBlendStack" "VideoBlendStack",
"VideoBlendStackAdvanced",
"VideoPreprocess"
], ],
{ {
"title_aux": "ComfyUI-VideoBlender" "title_aux": "ComfyUI-VideoBlender"

View File

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

View File

File diff suppressed because it is too large Load Diff

View File

@@ -2,6 +2,9 @@ import os
import configparser import configparser
GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
def is_git_repo(path: str) -> bool: def is_git_repo(path: str) -> bool:
""" Check if the path is a git repository. """ """ Check if the path is a git repository. """
# NOTE: Checking it through `git.Repo` must be avoided. # NOTE: Checking it through `git.Repo` must be avoided.
@@ -46,16 +49,28 @@ def git_url(fullpath):
return None return None
def normalize_url(url) -> str: def normalize_url(url) -> str:
url = url.replace("git@github.com:", "https://github.com/") if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
if url.endswith('.git'): author = os.path.basename(os.path.dirname(url))
url = url[:-4]
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]
url = f"https://github.com/{author}/{repo_name}"
return url 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 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

View File

@@ -42,7 +42,7 @@ import manager_downloader
from node_package import InstalledNodePackage from node_package import InstalledNodePackage
version_code = [3, 23] version_code = [3, 25]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -505,6 +505,8 @@ class UnifiedManager:
def resolve_from_path(self, fullpath): def resolve_from_path(self, fullpath):
url = git_utils.git_url(fullpath) url = git_utils.git_url(fullpath)
if url: if url:
url = git_utils.normalize_url(url)
cnr = self.get_cnr_by_repo(url) cnr = self.get_cnr_by_repo(url)
commit_hash = git_utils.get_commit_hash(fullpath) commit_hash = git_utils.get_commit_hash(fullpath)
if cnr: if cnr:
@@ -536,6 +538,8 @@ class UnifiedManager:
if node_package.is_disabled and node_package.is_unknown: if node_package.is_disabled and node_package.is_unknown:
url = git_utils.git_url(node_package.fullpath) url = git_utils.git_url(node_package.fullpath)
if url is not None:
url = git_utils.normalize_url(url)
self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath) self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
if node_package.is_disabled and node_package.is_nightly: if node_package.is_disabled and node_package.is_nightly:
@@ -546,6 +550,8 @@ class UnifiedManager:
if node_package.is_enabled and node_package.is_unknown: if node_package.is_enabled and node_package.is_unknown:
url = git_utils.git_url(node_package.fullpath) url = git_utils.git_url(node_package.fullpath)
if url is not None:
url = git_utils.normalize_url(url)
self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath) self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
if node_package.is_from_cnr and node_package.is_disabled: if node_package.is_from_cnr and node_package.is_disabled:
@@ -1057,8 +1063,8 @@ class UnifiedManager:
# update cache # update cache
if version_spec == 'unknown': if version_spec == 'unknown':
self.unknown_active_nodes[node_id] = self.unknown_inactive_nodes[node_id][0], to_path
del self.unknown_inactive_nodes[node_id] del self.unknown_inactive_nodes[node_id]
self.unknown_active_nodes[node_id] = to_path
return result.with_target(to_path) return result.with_target(to_path)
elif version_spec == 'nightly': elif version_spec == 'nightly':
del self.nightly_inactive_nodes[node_id] del self.nightly_inactive_nodes[node_id]
@@ -1239,15 +1245,16 @@ class UnifiedManager:
if url.endswith("/"): if url.endswith("/"):
url = url[:-1] url = url[:-1]
try: try:
print(f"Download: git clone '{url}'")
# Clone the repository from the remote URL # Clone the repository from the remote URL
clone_url = git_utils.get_url_for_clone(url)
print(f"Download: git clone '{clone_url}'")
if not instant_execution and platform.system() == 'Windows': if not instant_execution and platform.system() == 'Windows':
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path()) res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
if res != 0: if res != 0:
return result.fail(f"Failed to clone repo: {url}") return result.fail(f"Failed to clone repo: {clone_url}")
else: else:
repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress()) repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
repo.git.clear_cache() repo.git.clear_cache()
repo.close() repo.close()
@@ -1398,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) res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
if res.result: if res.result:
if version_spec == 'unknown': if version_spec == 'unknown':
self.unknown_active_nodes[node_id] = to_path self.unknown_active_nodes[node_id] = repo_url, to_path
elif version_spec == 'nightly': elif version_spec == 'nightly':
cnr_utils.generate_cnr_id(to_path, node_id) cnr_utils.generate_cnr_id(to_path, node_id)
self.active_nodes[node_id] = 'nightly', to_path self.active_nodes[node_id] = 'nightly', to_path
@@ -1574,6 +1581,7 @@ def write_config():
'bypass_ssl': get_config()['bypass_ssl'], 'bypass_ssl': get_config()['bypass_ssl'],
"file_logging": get_config()['file_logging'], "file_logging": get_config()['file_logging'],
'component_policy': get_config()['component_policy'], 'component_policy': get_config()['component_policy'],
'update_policy': get_config()['update_policy'],
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'], 'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
'model_download_by_agent': get_config()['model_download_by_agent'], 'model_download_by_agent': get_config()['model_download_by_agent'],
'downgrade_blacklist': get_config()['downgrade_blacklist'], 'downgrade_blacklist': get_config()['downgrade_blacklist'],
@@ -1612,6 +1620,7 @@ def read_config():
'bypass_ssl': get_bool('bypass_ssl', False), 'bypass_ssl': get_bool('bypass_ssl', False),
'file_logging': get_bool('file_logging', True), 'file_logging': get_bool('file_logging', True),
'component_policy': default_conf.get('component_policy', 'workflow').lower(), 'component_policy': default_conf.get('component_policy', 'workflow').lower(),
'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False), 'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
'model_download_by_agent': get_bool('model_download_by_agent', False), 'model_download_by_agent': get_bool('model_download_by_agent', False),
'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(), 'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
@@ -1634,6 +1643,7 @@ def read_config():
'bypass_ssl': False, 'bypass_ssl': False,
'file_logging': True, 'file_logging': True,
'component_policy': 'workflow', 'component_policy': 'workflow',
'update_policy': 'stable-comfyui',
'windows_selector_event_loop_policy': False, 'windows_selector_event_loop_policy': False,
'model_download_by_agent': False, 'model_download_by_agent': False,
'downgrade_blacklist': '', 'downgrade_blacklist': '',
@@ -1685,14 +1695,27 @@ def switch_to_default_branch(repo):
repo.git.checkout(default_branch) repo.git.checkout(default_branch)
return True return True
except: except:
# try checkout master
# try checkout main if failed
try: try:
repo.git.checkout(repo.heads.master) repo.git.checkout(repo.heads.master)
return True
except: except:
try: try:
if remote_name is not None: if remote_name is not None:
repo.git.checkout('-b', 'master', f'{remote_name}/master') repo.git.checkout('-b', 'master', f'{remote_name}/master')
return True
except: except:
pass try:
repo.git.checkout(repo.heads.main)
return True
except:
try:
if remote_name is not None:
repo.git.checkout('-b', 'main', f'{remote_name}/main')
return True
except:
pass
print("[ComfyUI Manager] Failed to switch to the default branch") print("[ComfyUI Manager] Failed to switch to the default branch")
return False return False
@@ -1726,7 +1749,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
if platform.system() != "Windows": if platform.system() != "Windows":
try: try:
if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date(): if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
print("\n\n###################################################################") print("\n\n###################################################################")
print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.") print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.") print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
@@ -2043,12 +2066,14 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
print(f"CLONE into '{repo_path}'") print(f"CLONE into '{repo_path}'")
# Clone the repository from the remote URL # Clone the repository from the remote URL
clone_url = git_utils.get_url_for_clone(url)
if not instant_execution and platform.system() == 'Windows': if not instant_execution and platform.system() == 'Windows':
res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path()) res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
if res != 0: if res != 0:
return result.fail(f"Failed to clone '{url}' into '{repo_path}'") return result.fail(f"Failed to clone '{clone_url}' into '{repo_path}'")
else: else:
repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress()) repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
repo.git.clear_cache() repo.git.clear_cache()
repo.close() repo.close()
@@ -2342,6 +2367,32 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
return True return True
def update_to_stable_comfyui(repo_path):
try:
repo = git.Repo(repo_path)
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): def update_path(repo_path, instant_execution=False, no_deps=False):
if not os.path.exists(os.path.join(repo_path, '.git')): if not os.path.exists(os.path.join(repo_path, '.git')):
return "fail" return "fail"
@@ -2349,9 +2400,12 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
# version check # version check
repo = git.Repo(repo_path) repo = git.Repo(repo_path)
is_switched = False
if repo.head.is_detached: if repo.head.is_detached:
if not switch_to_default_branch(repo): if not switch_to_default_branch(repo):
return "fail" return "fail"
else:
is_switched = True
current_branch = repo.active_branch current_branch = repo.active_branch
branch_name = current_branch.name branch_name = current_branch.name
@@ -2390,6 +2444,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
git_pull(repo_path) git_pull(repo_path)
execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps) execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
return "updated" return "updated"
elif is_switched:
return "updated"
else: else:
return "skipped" return "skipped"
@@ -2700,9 +2756,6 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
if ext == 'https://github.com/comfyanonymous/ComfyUI': if ext == 'https://github.com/comfyanonymous/ComfyUI':
pass pass
elif ext is not None: elif ext is not None:
if 'Fooocus' in ext:
print(f">> {node_name}")
used_exts.add(ext) used_exts.add(ext)
else: else:
unknown_nodes.add(node_name) unknown_nodes.add(node_name)
@@ -2973,7 +3026,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
print("cm-cli: unexpected [0001]") print("cm-cli: unexpected [0001]")
# for nightly restore # for nightly restore
git_info = info.get('git_custom_nodes') _git_info = info.get('git_custom_nodes')
git_info = {}
# normalize github repo
for k, v in _git_info.items():
norm_k = git_utils.normalize_url(k)
git_info[norm_k] = v
if git_info is not None: if git_info is not None:
todo_disable = [] todo_disable = []
todo_enable = [] todo_enable = []
@@ -2986,20 +3046,13 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if v[0] == 'nightly' and cnr_repo_map.get(k): if v[0] == 'nightly' and cnr_repo_map.get(k):
repo_url = cnr_repo_map.get(k) repo_url = cnr_repo_map.get(k)
normalized_url = git_utils.normalize_url(repo_url)
normalized_url1 = git_utils.normalize_url(repo_url) if normalized_url not in git_info:
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url1 not in git_info and normalized_url2 not in git_info:
todo_disable.append(k) todo_disable.append(k)
else: else:
if normalized_url1 in git_info: commit_hash = git_info[normalized_url]['hash']
commit_hash = git_info[normalized_url1]['hash'] todo_checkout.append((v[1], commit_hash))
todo_checkout.append((v[1], commit_hash))
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_checkout.append((v[1], commit_hash))
for k, v in unified_manager.nightly_inactive_nodes.items(): for k, v in unified_manager.nightly_inactive_nodes.items():
if 'comfyui-manager' in k: if 'comfyui-manager' in k:
@@ -3007,18 +3060,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if cnr_repo_map.get(k): if cnr_repo_map.get(k):
repo_url = cnr_repo_map.get(k) repo_url = cnr_repo_map.get(k)
normalized_url1 = git_utils.normalize_url(repo_url) normalized_url = git_utils.normalize_url(repo_url)
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url1 in git_info: if normalized_url in git_info:
commit_hash = git_info[normalized_url1]['hash'] commit_hash = git_info[normalized_url]['hash']
todo_enable.append((k, commit_hash)) todo_enable.append((k, commit_hash))
processed_urls.append(normalized_url1) processed_urls.append(normalized_url)
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_enable.append((k, commit_hash))
processed_urls.append(normalized_url2)
for x in todo_disable: for x in todo_disable:
unified_manager.unified_disable(x, False) unified_manager.unified_disable(x, False)
@@ -3071,21 +3118,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if repo_url is None: if repo_url is None:
continue continue
normalized_url1 = git_utils.normalize_url(repo_url) normalized_url = git_utils.normalize_url(repo_url)
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url1 not in git_info and normalized_url2 not in git_info: if normalized_url not in git_info:
todo_disable.append(k2) todo_disable.append(k2)
else: else:
if normalized_url1 in git_info: commit_hash = git_info[normalized_url]['hash']
commit_hash = git_info[normalized_url1]['hash'] todo_checkout.append((k2, commit_hash))
todo_checkout.append((k2, commit_hash)) processed_urls.append(normalized_url)
processed_urls.append(normalized_url1)
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_checkout.append((k2, commit_hash))
processed_urls.append(normalized_url2)
for k2, v2 in unified_manager.unknown_inactive_nodes.items(): for k2, v2 in unified_manager.unknown_inactive_nodes.items():
repo_url = resolve_giturl_from_path(v2[1]) repo_url = resolve_giturl_from_path(v2[1])
@@ -3093,18 +3133,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
if repo_url is None: if repo_url is None:
continue continue
normalized_url1 = git_utils.normalize_url(repo_url) normalized_url = git_utils.normalize_url(repo_url)
normalized_url2 = git_utils.normalize_url_http(repo_url)
if normalized_url1 in git_info: if normalized_url in git_info:
commit_hash = git_info[normalized_url1]['hash'] commit_hash = git_info[normalized_url]['hash']
todo_enable.append((k2, commit_hash)) todo_enable.append((k2, commit_hash))
processed_urls.append(normalized_url1) processed_urls.append(normalized_url)
if normalized_url2 in git_info:
commit_hash = git_info[normalized_url2]['hash']
todo_enable.append((k2, commit_hash))
processed_urls.append(normalized_url2)
for x in todo_disable: for x in todo_disable:
unified_manager.unified_disable(x, True) unified_manager.unified_disable(x, True)
@@ -3190,17 +3224,26 @@ async def check_need_to_migrate():
need_to_migrate = True need_to_migrate = True
def get_comfyui_versions(): def get_comfyui_versions(repo=None):
repo = git.Repo(comfy_path) if repo is None:
versions = [x.name for x in repo.tags if x.name.startswith('v')] repo = git.Repo(comfy_path)
versions.reverse() # nearest tag
try:
remote = get_remote_name(repo)
repo.remotes[remote].fetch()
except:
logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
versions = [x.name for x in repo.tags if x.name.startswith('v')]
# nearest tag
versions = sorted(versions, key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
versions = versions[:4] versions = versions[:4]
current_tag = repo.git.describe('--tags') current_tag = repo.git.describe('--tags')
if current_tag not in versions: if current_tag not in versions:
versions = sorted(versions + [current_tag], reverse=True) versions = sorted(versions + [current_tag], key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
versions = versions[:4] versions = versions[:4]
main_branch = repo.heads.master main_branch = repo.heads.master
@@ -3213,16 +3256,16 @@ def get_comfyui_versions():
versions[0] = 'nightly' versions[0] = 'nightly'
current_tag = 'nightly' current_tag = 'nightly'
return versions, current_tag return versions, current_tag, latest_tag
def switch_comfyui(tag): def switch_comfyui(tag):
repo = git.Repo(comfy_path) repo = git.Repo(comfy_path)
if tag == 'nightly': if tag == 'nightly':
repo.git.checkout('main') repo.git.checkout('master')
repo.remotes.origin.pull() repo.remotes.origin.pull()
print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'main' version") print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'master' version")
else: else:
repo.git.checkout(tag) repo.git.checkout(tag)
print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'") print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")

View File

@@ -11,6 +11,7 @@ from tqdm.auto import tqdm
aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER') aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
HF_ENDPOINT = os.getenv('HF_ENDPOINT') HF_ENDPOINT = os.getenv('HF_ENDPOINT')
if aria2 is not None: if aria2 is not None:
secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET') secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
url = urlparse(aria2) url = urlparse(aria2)

View File

@@ -187,6 +187,8 @@ set_preview_method(core.get_config()['preview_method'])
def set_component_policy(mode): def set_component_policy(mode):
core.get_config()['component_policy'] = mode core.get_config()['component_policy'] = mode
def set_update_policy(mode):
core.get_config()['update_policy'] = mode
def print_comfyui_version(): def print_comfyui_version():
global comfy_ui_hash global comfy_ui_hash
@@ -209,7 +211,7 @@ def print_comfyui_version():
comfyui_tag = core.get_comfyui_tag() comfyui_tag = core.get_comfyui_tag()
try: try:
if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date(): if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n") logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
except: except:
pass pass
@@ -452,20 +454,29 @@ async def task_worker():
return {'msg':f"An error occurred while updating '{node_name}'."} return {'msg':f"An error occurred while updating '{node_name}'."}
async def do_update_comfyui() -> str: async def do_update_comfyui(is_stable) -> str:
try: try:
repo_path = os.path.dirname(folder_paths.__file__) repo_path = os.path.dirname(folder_paths.__file__)
res = core.update_path(repo_path) latest_tag = None
if is_stable:
res, latest_tag = core.update_to_stable_comfyui(repo_path)
else:
res = core.update_path(repo_path)
if res == "fail": if res == "fail":
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.") logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
return "The installed ComfyUI does not have a Git repository." return "The installed ComfyUI does not have a Git repository."
elif res == "updated": elif res == "updated":
logging.info("ComfyUI is updated.") if is_stable:
return "success" logging.info("ComfyUI is updated to latest stable version.")
return "success-stable-"+latest_tag
else:
logging.info("ComfyUI is updated to latest nightly version.")
return "success-nightly"
else: # skipped else: # skipped
logging.info("ComfyUI is up-to-date.") logging.info("ComfyUI is up-to-date.")
return "skip" return "skip"
except Exception: except Exception:
traceback.print_exc() traceback.print_exc()
@@ -597,7 +608,7 @@ async def task_worker():
elif kind == 'update-main': elif kind == 'update-main':
msg = await do_update(item) msg = await do_update(item)
elif kind == 'update-comfyui': elif kind == 'update-comfyui':
msg = await do_update_comfyui() msg = await do_update_comfyui(item[1])
elif kind == 'fix': elif kind == 'fix':
msg = await do_fix(item) msg = await do_fix(item)
elif kind == 'uninstall': elif kind == 'uninstall':
@@ -1337,14 +1348,15 @@ async def update_custom_node(request):
@routes.get("/manager/queue/update_comfyui") @routes.get("/manager/queue/update_comfyui")
async def update_comfyui(request): async def update_comfyui(request):
task_queue.put(("update-comfyui", ('comfyui',))) is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
task_queue.put(("update-comfyui", ('comfyui', is_stable)))
return web.Response(status=200) return web.Response(status=200)
@routes.get("/comfyui_manager/comfyui_versions") @routes.get("/comfyui_manager/comfyui_versions")
async def comfyui_versions(request): async def comfyui_versions(request):
try: try:
res, current = core.get_comfyui_versions() res, current, latest = core.get_comfyui_versions()
return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json') return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
except Exception as e: except Exception as e:
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr) logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
@@ -1435,7 +1447,7 @@ async def preview_method(request):
return web.Response(status=200) return web.Response(status=200)
@routes.get("/manager/component/policy") @routes.get("/manager/policy/component")
async def component_policy(request): async def component_policy(request):
if "value" in request.rel_url.query: if "value" in request.rel_url.query:
set_component_policy(request.rel_url.query['value']) set_component_policy(request.rel_url.query['value'])
@@ -1446,6 +1458,17 @@ async def component_policy(request):
return web.Response(status=200) return web.Response(status=200)
@routes.get("/manager/policy/update")
async def update_policy(request):
if "value" in request.rel_url.query:
set_update_policy(request.rel_url.query['value'])
core.write_config()
else:
return web.Response(text=core.get_config()['update_policy'], status=200)
return web.Response(status=200)
@routes.get("/manager/channel_url_list") @routes.get("/manager/channel_url_list")
async def channel_url_list(request): async def channel_url_list(request):
channels = core.get_channel_dict() channels = core.get_channel_dict()
@@ -1501,7 +1524,11 @@ async def get_notice(request):
markdown_content = match.group(1) markdown_content = match.group(1)
version_tag = core.get_comfyui_tag() version_tag = core.get_comfyui_tag()
if version_tag is None: 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: else:
markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>" markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})") f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})")

View File

@@ -230,7 +230,7 @@ var update_all_button = null;
var restart_stop_button = null; var restart_stop_button = null;
let share_option = 'all'; let share_option = 'all';
var is_updating_all = false; var is_updating = false;
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -477,6 +477,8 @@ async function updateComfyUI() {
const response = await api.fetchApi('/manager/queue/update_comfyui'); const response = await api.fetchApi('/manager/queue/update_comfyui');
showTerminal(); showTerminal();
is_updating = true;
await api.fetchApi('/manager/queue/start'); await api.fetchApi('/manager/queue/start');
} }
@@ -605,8 +607,14 @@ function showVersionSelectorDialog(versions, current, onSelect) {
} }
async function switchComfyUI() { async function switchComfyUI() {
switch_comfyui_button.disabled = true;
switch_comfyui_button.style.backgroundColor = "gray";
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" }); let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
switch_comfyui_button.disabled = false;
switch_comfyui_button.style.backgroundColor = "";
if(res.status == 200) { if(res.status == 200) {
let obj = await res.json(); let obj = await res.json();
@@ -694,11 +702,11 @@ async function onQueueStatus(event) {
else if(event.detail.status == 'done') { else if(event.detail.status == 'done') {
reset_action_buttons(); reset_action_buttons();
if(!is_updating_all) { if(!is_updating) {
return; return;
} }
is_updating_all = false; is_updating = false;
let success_list = []; let success_list = [];
let failed_list = []; let failed_list = [];
@@ -721,19 +729,25 @@ async function onQueueStatus(event) {
let msg = ""; let msg = "";
if(success_list.length == 0 && comfyui_state != 'success') { if(success_list.length == 0 && !comfyui_state.startsWith('success')) {
if(failed_list.length == 0) { if(failed_list.length == 0) {
msg += "All custom nodes are already up to date."; msg += "You are already up to date.";
} }
} }
else { else {
msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>"; msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
if(comfyui_state == 'success') { if(comfyui_state == 'success-nightly') {
msg += "ComfyUI is updated.<BR><BR>"; msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
infoToast("ComfyUI has been updated to the latest nightly version.");
}
else if(comfyui_state.startsWith('success-stable')) {
const ver = comfyui_state.split("-").pop();
msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
infoToast(`ComfyUI has been updated to ${ver}`);
} }
else if(comfyui_state == 'skip') { else if(comfyui_state == 'skip') {
msg += "ComfyUI is already up-to-date.<BR><BR>" msg += "ComfyUI is already up to date.<BR><BR>"
} }
else if(comfyui_state != null) { else if(comfyui_state != null) {
msg += "Failed to update ComfyUI.<BR><BR>" msg += "Failed to update ComfyUI.<BR><BR>"
@@ -811,7 +825,7 @@ async function updateAll(update_comfyui, manager_dialog) {
customAlert('Another task is already in progress. Please stop the ongoing task first.'); customAlert('Another task is already in progress. Please stop the ongoing task first.');
} }
else if(response.status == 200) { else if(response.status == 200) {
is_updating_all = true; is_updating = true;
await api.fetchApi('/manager/queue/start'); await api.fetchApi('/manager/queue/start');
} }
} }
@@ -995,6 +1009,8 @@ class ManagerMenuDialog extends ComfyDialog {
} }
createControlsLeft() { createControlsLeft() {
const isElectron = 'electronAPI' in window;
let self = this; let self = this;
this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[]) this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
@@ -1073,25 +1089,6 @@ class ManagerMenuDialog extends ComfyDialog {
share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, [])); share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
} }
// default ui state
let component_policy_combo = document.createElement("select");
component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
component_policy_combo.className = "cm-menu-combo";
component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
api.fetchApi('/manager/component/policy')
.then(response => response.text())
.then(data => {
component_policy_combo.value = data;
set_component_policy(data);
});
component_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
set_component_policy(event.target.value);
});
api.fetchApi('/manager/share_option') api.fetchApi('/manager/share_option')
.then(response => response.text()) .then(response => response.text())
.then(data => { .then(data => {
@@ -1111,6 +1108,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);
});
let 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: Stable ComfyUI' }, []));
update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: Nightly ComfyUI' }, []));
api.fetchApi('/manager/policy/update')
.then(response => response.text())
.then(data => {
update_policy_combo.value = data;
});
update_policy_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
});
return [ return [
$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]), $el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
$el("br", {}, []), $el("br", {}, []),
@@ -1119,6 +1153,7 @@ class ManagerMenuDialog extends ComfyDialog {
preview_combo, preview_combo,
share_combo, share_combo,
component_policy_combo, component_policy_combo,
update_policy_combo,
$el("br", {}, []), $el("br", {}, []),
$el("br", {}, []), $el("br", {}, []),
@@ -1145,11 +1180,6 @@ class ManagerMenuDialog extends ComfyDialog {
install_pip(url, self); install_pip(url, self);
} }
} }
}),
$el("button.cm-experimental-button", {
type: "button",
textContent: "Unload models",
onclick: () => { free_models(); }
}) })
]), ]),
]; ];

View File

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

View File

@@ -13,6 +13,67 @@
{
"author": "if-ai",
"title": "ComfyUI-IF_Zonos [WIP]",
"reference": "https://github.com/if-ai/ComfyUI-IF_Zonos",
"files": [
"https://github.com/if-ai/ComfyUI-IF_Zonos"
],
"install_type": "git-clone",
"description": "Zonos for ComfyUI"
},
{
"author": "grinlau18",
"title": "Xiser_Nodes [WIP]",
"reference": "https://github.com/grinlau18/ComfyUI_XISER_Nodes",
"files": [
"https://github.com/grinlau18/ComfyUI_XISER_Nodes"
],
"install_type": "git-clone",
"description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
},
{
"author": "LAOGOU-666",
"title": "Comfyui_StartPatch [UNSAFE]",
"reference": "https://github.com/LAOGOU-666/Comfyui_StartPatch",
"files": [
"https://github.com/LAOGOU-666/Comfyui_StartPatch"
],
"install_type": "git-clone",
"description": "This patch plugin optimizes the node information processing mechanism of the ComfyUI server, significantly improving server performance and response speed. It greatly reduces the browser page initialization waiting time. [w/Since this patch modifies key functions of ComfyUI, it is highly likely to cause compatibility issues.]"
},
{
"author": "badmike",
"title": "Prompt Factory [CONFLICT]",
"reference": "https://github.com/badmike/comfyui-prompt-factory",
"files": [
"https://github.com/badmike/comfyui-prompt-factory"
],
"install_type": "git-clone",
"description": "A modular system that adds randomness to prompt generation [w/This node pack is causing a name conflict with https://github.com/satche/comfyui-prompt-factory]"
},
{
"author": "owengillett",
"title": "ComfyUI-tilefusion",
"reference": "https://github.com/owengillett/ComfyUI-tilefusion",
"files": [
"https://github.com/owengillett/ComfyUI-tilefusion"
],
"install_type": "git-clone",
"description": "Helper nodes for generating seamless tiles."
},
{
"author": "Scaryplasmon",
"title": "ComfTrellis [WIP]",
"reference": "https://github.com/Scaryplasmon/ComfTrellis",
"files": [
"https://github.com/Scaryplasmon/ComfTrellis"
],
"install_type": "git-clone",
"description": "1 click install to run Trellis in ComfyUI\nNOTE: The files in the repo are not organized."
},
{ {
"author": "fangziheng2321", "author": "fangziheng2321",
"title": "comfyuinode_chopmask [WIP]", "title": "comfyuinode_chopmask [WIP]",

View File

@@ -741,7 +741,6 @@
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [ "https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [
[ [
"GetBooruPost", "GetBooruPost",
"TagEncode",
"TagWikiFetch" "TagWikiFetch"
], ],
{ {
@@ -1496,6 +1495,18 @@
"title_aux": "ComfyUI_Save2Discord" "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": [ "https://github.com/SeedV/ComfyUI-SeedV-Nodes": [
[ [
"ALL_Model_UnLoader(SEEDV)", "ALL_Model_UnLoader(SEEDV)",
@@ -3055,6 +3066,16 @@
"title_aux": "ComfyUI_Grim" "title_aux": "ComfyUI_Grim"
} }
], ],
"https://github.com/grinlau18/ComfyUI_XISER_Nodes": [
[
"XIS_Float_Slider",
"XIS_INT_Slider",
"XIS_PromptsWithSwitches"
],
{
"title_aux": "Xiser_Nodes [WIP]"
}
],
"https://github.com/haodman/ComfyUI_Rain": [ "https://github.com/haodman/ComfyUI_Rain": [
[ [
"Rain_ImageSize", "Rain_ImageSize",
@@ -3285,6 +3306,14 @@
"title_aux": "comfyui-hydit" "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": [ "https://github.com/ilovejohnwhite/Tracer": [
[ [
"BillyGoatNode", "BillyGoatNode",
@@ -3536,6 +3565,8 @@
], ],
"https://github.com/kandy/ComfyUI-KAndy": [ "https://github.com/kandy/ComfyUI-KAndy": [
[ [
"KAndyBatch2Index",
"KAndyBatchIndex",
"KAndyCivitImagesAPI", "KAndyCivitImagesAPI",
"KAndyCivitPromptAPI", "KAndyCivitPromptAPI",
"KAndyImageSave", "KAndyImageSave",
@@ -4502,6 +4533,15 @@
"title_aux": "comfyui-keshigom_custom" "title_aux": "comfyui-keshigom_custom"
} }
], ],
"https://github.com/owengillett/ComfyUI-tilefusion": [
[
"RepeatVideo",
"VideoGridCombine"
],
{
"title_aux": "ComfyUI-tilefusion"
}
],
"https://github.com/oyvindg/ComfyUI-TrollSuite": [ "https://github.com/oyvindg/ComfyUI-TrollSuite": [
[ [
"BinaryImageMask", "BinaryImageMask",

View File

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,26 @@
{
"author": "lunarring",
"title": "bitalino_comfy",
"reference": "https://github.com/lunarring/bitalino_comfy",
"files": [
"https://github.com/lunarring/bitalino_comfy"
],
"install_type": "git-clone",
"description": "A package implementing a Bitalino device ComfyUI custom node."
},
{
"author": "Hellfiredragon",
"title": "comfyui-image-manipulation",
"reference": "https://github.com/Hellfiredragon/comfyui-image-manipulation",
"files": [
"https://github.com/Hellfiredragon/comfyui-image-manipulation"
],
"install_type": "git-clone",
"description": "Custom nodes to manipulate images in ComfyUI"
},
{ {
"author": "Mohammadreza Mohseni", "author": "Mohammadreza Mohseni",
"title": "ComfyUI Mohseni Kit", "title": "ComfyUI Mohseni Kit",
@@ -673,27 +692,6 @@
], ],
"install_type": "git-clone", "install_type": "git-clone",
"description": "A custom ComfyUI node for interactive 360° panorama image previews. Panoramic 360 images are also sometimes known as VR photography (virtual reality), HDRI environments (ex: skyboxes), image spheres, spherical images, 360 pano, and 360 degree photos." "description": "A custom ComfyUI node for interactive 360° panorama image previews. Panoramic 360 images are also sometimes known as VR photography (virtual reality), HDRI environments (ex: skyboxes), image spheres, spherical images, 360 pano, and 360 degree photos."
},
{
"author": "amorano",
"title": "Jovi_MIDI",
"id": "jovi_midi",
"reference": "https://github.com/Amorano/Jovi_MIDI",
"files": [
"https://github.com/Amorano/Jovi_MIDI"
],
"install_type": "git-clone",
"description": "Read and Process data from MIDI devices inside of ComfyUI."
},
{
"author": "nkchocoai",
"title": "ComfyUI-DanbooruPromptQuiz",
"reference": "https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz",
"files": [
"https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz"
],
"install_type": "git-clone",
"description": "This node is for playing the game of guessing prompts by looking at images generated from prompts output by TIPO, Tagger, etc.."
} }
] ]
} }

View File

@@ -1350,7 +1350,6 @@
"BillBum_Modified_RegText_Node", "BillBum_Modified_RegText_Node",
"BillBum_Modified_SD3_API_Node", "BillBum_Modified_SD3_API_Node",
"BillBum_Modified_Structured_LLM_Node(Imperfect)", "BillBum_Modified_Structured_LLM_Node(Imperfect)",
"BillBum_Modified_Together_API_Node",
"BillBum_Modified_VisionLM_API_Node", "BillBum_Modified_VisionLM_API_Node",
"BillBum_Modified_img2b64_url_Node", "BillBum_Modified_img2b64_url_Node",
"BillBum_NonSysPrompt_VLM_API_Node", "BillBum_NonSysPrompt_VLM_API_Node",
@@ -1379,6 +1378,7 @@
"https://github.com/AkashKarnatak/ComfyUI_faishme": [ "https://github.com/AkashKarnatak/ComfyUI_faishme": [
[ [
"Faishme Debug", "Faishme Debug",
"Faishme Load Image from Glob",
"Faishme Mannequin to Model Loader", "Faishme Mannequin to Model Loader",
"Faishme Moondream", "Faishme Moondream",
"Load Fashion Model" "Load Fashion Model"
@@ -1522,6 +1522,12 @@
"TICK (JOV) \u23f1", "TICK (JOV) \u23f1",
"TRANSFORM (JOV) \ud83c\udfdd\ufe0f", "TRANSFORM (JOV) \ud83c\udfdd\ufe0f",
"VALUE (JOV) \ud83e\uddec", "VALUE (JOV) \ud83e\uddec",
"VECTOR2 (JOV)",
"VECTOR2INT (JOV)",
"VECTOR3 (JOV)",
"VECTOR3INT (JOV)",
"VECTOR4 (JOV)",
"VECTOR4INT (JOV)",
"WAVE GEN (JOV) \ud83c\udf0a" "WAVE GEN (JOV) \ud83c\udf0a"
], ],
{ {
@@ -3001,7 +3007,6 @@
], ],
"https://github.com/Dobidop/ComfyStereo": [ "https://github.com/Dobidop/ComfyStereo": [
[ [
"LazyStereo",
"StereoImageNode" "StereoImageNode"
], ],
{ {
@@ -3076,8 +3081,6 @@
"https://github.com/DraconicDragon/ComfyUI-Venice-API": [ "https://github.com/DraconicDragon/ComfyUI-Venice-API": [
[ [
"CharCountTextBox", "CharCountTextBox",
"FluxPro11_TOGETHER",
"FluxPro_TOGETHER",
"GenerateImage_VENICE", "GenerateImage_VENICE",
"GenerateText_VENICE", "GenerateText_VENICE",
"UpscaleImage_VENICE", "UpscaleImage_VENICE",
@@ -4320,6 +4323,15 @@
"title_aux": "Hunyuan Video Resolutions" "title_aux": "Hunyuan Video Resolutions"
} }
], ],
"https://github.com/Hellfiredragon/comfyui-image-manipulation": [
[
"AlphaApplyMaskToImage",
"CreateMaskFromColorsNode"
],
{
"title_aux": "comfyui-image-manipulation"
}
],
"https://github.com/HelloVision/ComfyUI_HelloMeme": [ "https://github.com/HelloVision/ComfyUI_HelloMeme": [
[ [
"CropPortrait", "CropPortrait",
@@ -5214,10 +5226,9 @@
], ],
"https://github.com/KoreTeknology/ComfyUI-Universal-Styler": [ "https://github.com/KoreTeknology/ComfyUI-Universal-Styler": [
[ [
"Load Nai Styles Complex CSV", "\ud83d\udee1\ufe0f Load Scripts from Database",
"ShowText|pysssss", "\ud83d\udee1\ufe0f Save Script to Database (In progress)",
"Universal_Styler_Node", "\ud83d\udee1\ufe0f Set Main Channel"
"concat"
], ],
{ {
"title_aux": "ComfyUI Universal Styler" "title_aux": "ComfyUI Universal Styler"
@@ -6292,6 +6303,8 @@
"iToolsLineLoader", "iToolsLineLoader",
"iToolsLoadImagePlus", "iToolsLoadImagePlus",
"iToolsLoadImages", "iToolsLoadImages",
"iToolsLoadRandomImage",
"iToolsPreviewText",
"iToolsPromptLoader", "iToolsPromptLoader",
"iToolsPromptSaver", "iToolsPromptSaver",
"iToolsPromptStyler", "iToolsPromptStyler",
@@ -6470,9 +6483,12 @@
], ],
"https://github.com/MushroomFleet/DJZ-KokoroTTS": [ "https://github.com/MushroomFleet/DJZ-KokoroTTS": [
[ [
"KokoroTTS_LoadVoice_v1",
"KokoroTTS_SaveVoice_v1",
"KokoroTTS_v1", "KokoroTTS_v1",
"KokoroTTS_v2", "KokoroTTS_v2",
"KokoroTTS_v3" "KokoroTTS_v3",
"KokoroTTS_v4"
], ],
{ {
"title_aux": "KokoroTTS Node" "title_aux": "KokoroTTS Node"
@@ -7524,6 +7540,7 @@
"MaskBatchComposite(FaceParsing)", "MaskBatchComposite(FaceParsing)",
"MaskBlackOut(FaceParsing)", "MaskBlackOut(FaceParsing)",
"MaskBorderDissolve(FaceParsing)", "MaskBorderDissolve(FaceParsing)",
"MaskBorderDissolveAdvanced(FaceParsing)",
"MaskComposite(FaceParsing)", "MaskComposite(FaceParsing)",
"MaskCropWithBBox(FaceParsing)", "MaskCropWithBBox(FaceParsing)",
"MaskInsertWithBBox(FaceParsing)", "MaskInsertWithBBox(FaceParsing)",
@@ -8607,6 +8624,7 @@
"SDVN Dic Convert", "SDVN Dic Convert",
"SDVN Easy IPAdapter weight", "SDVN Easy IPAdapter weight",
"SDVN Exif check", "SDVN Exif check",
"SDVN Fill Square",
"SDVN Filter List", "SDVN Filter List",
"SDVN Flip Image", "SDVN Flip Image",
"SDVN Google Imagen", "SDVN Google Imagen",
@@ -9781,7 +9799,9 @@
"VrchDelayOSCControlNode", "VrchDelayOSCControlNode",
"VrchFloatKeyControlNode", "VrchFloatKeyControlNode",
"VrchFloatOSCControlNode", "VrchFloatOSCControlNode",
"VrchImageChannelLoaderNode",
"VrchImageFlipBookWebViewerNode", "VrchImageFlipBookWebViewerNode",
"VrchImagePreviewBackgroundNode",
"VrchImageSaverNode", "VrchImageSaverNode",
"VrchImageSwitchOSCControlNode", "VrchImageSwitchOSCControlNode",
"VrchImageWebViewerNode", "VrchImageWebViewerNode",
@@ -28058,7 +28078,9 @@
"https://github.com/yichengup/ComfyUI-VideoBlender": [ "https://github.com/yichengup/ComfyUI-VideoBlender": [
[ [
"VideoBlendLayer", "VideoBlendLayer",
"VideoBlendStack" "VideoBlendStack",
"VideoBlendStackAdvanced",
"VideoPreprocess"
], ],
{ {
"title_aux": "ComfyUI-VideoBlender" "title_aux": "ComfyUI-VideoBlender"

View File

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