Compare commits

..

9 Commits

Author SHA1 Message Date
Dr.Lt.Data
338d7abfa8 more detailed message 2025-03-03 01:04:39 +09:00
Dr.Lt.Data
f8e5f5bcbb print dbg message 2025-02-14 07:36:02 +09:00
Dr.Lt.Data
6516e62d33 version marker 2025-02-14 07:29:48 +09:00
CenFun
6b832edd2f store user's column width (#1541)
* Resolving conflicts

* ruff --fix
2025-02-14 07:29:11 +09:00
Robin Huang
eebace1652 Add support for custom node only snapshots (#4) (#1542)
* Add support for custom node only snapshots (#4)

* Fix ruff lint.

---------

Co-authored-by: pythongosssss <125205205+pythongosssss@users.noreply.github.com>
2025-02-14 07:26:35 +09:00
Dr.Lt.Data
6ff6e05408 improve: update all - background updating
modified: update all - don't update ComfyUI
2025-02-13 22:34:36 +09:00
Dr.Lt.Data
aaf569ca8c update DB 2025-02-13 21:28:39 +09:00
benjamin-bertram
31eef6222e Add LLM-Polymath (#1534)
* Add LLM-Polymath

* Update custom-node-list.json

---------

Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>
2025-02-13 21:06:30 +09:00
Dr.Lt.Data
9963afa558 modified: remove comfyui-manager from list if desktop mode 2025-02-13 08:46:18 +09:00
21 changed files with 3612 additions and 3104 deletions

View File

@@ -3,6 +3,8 @@ import sys
cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
print("[DBG] point14")
if not os.path.exists(cli_mode_flag):
sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
import manager_server # noqa: F401

View File

@@ -1012,17 +1012,22 @@ 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))
path = 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,

View File

@@ -20596,16 +20596,6 @@
"install_type": "git-clone",
"description": "A modular system that adds randomness to prompt generation"
},
{
"author": "hdfhssg",
"title": "ComfyUI_pxtool",
"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)"
},
{
"author": "martin-rizzo",
"title": "ComfyUI-TinyBreaker",
@@ -20831,6 +20821,70 @@
"install_type": "git-clone",
"description": "Offering a series of utility nodes designed to simplify workflows and enhance efficiency"
},
{
"author": "mie",
"title": "ComfyUI_JanusProCaption",
"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": "lum3on",
"title": "LLM Polymath Chat Node",
"id": "polymath",
"reference": "https://github.com/lum3on/comfyui_LLM_Polymath",
"files": [
"https://github.com/lum3on/comfyui_LLM_Polymath"
],
"install_type": "git-clone",
"description": "Advanced LLM driven node with many custom instructions, including node finder, expert prompter and json converter."
},
{
"author": "austinbrown34",
"title": "ComfyUI-IO-Helpers",
"reference": "https://github.com/austinbrown34/ComfyUI-IO-Helpers",
"files": [
"https://github.com/austinbrown34/ComfyUI-IO-Helpers"
],
"install_type": "git-clone",
"description": "A custom nodes package for ComfyUI that enhances workflow flexibility by providing specialized nodes for saving and loading intermediate data (encoded prompts and sampled latents) in multiple formats. This package leverages helper classes for file I/O, supports gzip compression for efficient storage, and integrates progress feedback via a progress bar to improve user experience during long operations."
},
{
"author": "HowToSD",
"title": "ComfyUI-Data-Analysis",
"reference": "https://github.com/HowToSD/ComfyUI-Data-Analysis",
"files": [
"https://github.com/HowToSD/ComfyUI-Data-Analysis"
],
"install_type": "git-clone",
"description": "Data analysis custom modules for ComfyUI - Use Pandas & Matplotlib from within ComfyUI"
},
{
"author": "dasilva333",
"title": "ComfyUI_ContrastingColor",
"reference": "https://github.com/dasilva333/ComfyUI_ContrastingColor",
"files": [
"https://github.com/dasilva333/ComfyUI_ContrastingColor"
],
"install_type": "git-clone",
"description": "This node calculates a contrasting complementary color based on an input RGB color. The goal is to ensure visibility and contrast when overlaying text, UI elements, or graphical components against a given background color."
},
{
"author": "moon7star9",
"title": "ComfyUI_BiRefNet_Universal",
"reference": "https://github.com/moon7star9/ComfyUI_BiRefNet_Universal",
"files": [
"https://github.com/moon7star9/ComfyUI_BiRefNet_Universal"
],
"install_type": "git-clone",
"description": "A comprehensive node package that seamlessly integrates all BiRefNet series models into ComfyUI"
},

View File

@@ -2389,6 +2389,7 @@
"ClownSamplerAdvanced",
"ClownsharKSampler",
"ClownsharKSamplerAutomation",
"ClownsharKSamplerAutomation_Advanced",
"ClownsharKSamplerAutomation_Beta",
"ClownsharKSamplerGuide",
"ClownsharKSamplerGuide_Beta",
@@ -2405,6 +2406,7 @@
"ConditioningToBase64",
"ConditioningTruncate",
"ConditioningZeroAndTruncate",
"Constant Scheduler",
"EmptyLatentImage64",
"EmptyLatentImageCustom",
"Film Grain",
@@ -2439,6 +2441,7 @@
"Legacy_ClownsharKSampler",
"Legacy_ClownsharKSamplerGuides",
"Legacy_SharkSampler",
"Linear Quadratic Advanced",
"MaskToggle",
"ModelSamplingAdvanced",
"ModelSamplingAdvancedResolution",
@@ -5070,6 +5073,7 @@
"Simple Extract Lora From Text",
"Simple Image Saver (as Forge)",
"Simple Load Image With Metadata",
"Simple Load Images from Dir",
"Simple Load Line From Text File",
"Simple Lora Loader"
],
@@ -8532,6 +8536,7 @@
"SDVN Easy IPAdapter weight",
"SDVN Exif check",
"SDVN Filter List",
"SDVN Flip Image",
"SDVN Google Imagen",
"SDVN IC-Light v2",
"SDVN Image Adjust",
@@ -9673,6 +9678,7 @@
],
"https://github.com/Visionatrix/ComfyUI-Visionatrix": [
[
"StyleAlignedBatchAlign",
"VixCheckboxLogic",
"VixDynamicLoraDefinition",
"VixUiAspectRatioSelector",
@@ -11640,6 +11646,17 @@
"title_aux": "Save Image Extended for ComfyUI"
}
],
"https://github.com/austinbrown34/ComfyUI-IO-Helpers": [
[
"Encoded Prompt from File",
"Encoded Prompt to File",
"Sampled Latents from File",
"Sampled Latents to File"
],
{
"title_aux": "ComfyUI-IO-Helpers"
}
],
"https://github.com/avatechai/avatar-graph-comfyui": [
[
"ApplyMeshTransformAsShapeKey",
@@ -12580,6 +12597,7 @@
[
"ClipLoaderGGUF",
"DualClipLoaderGGUF",
"GGUFRun",
"GGUFSave",
"GGUFUndo",
"LoaderGGUF",
@@ -13416,6 +13434,7 @@
"LayerUtility: NumberCalculatorV2",
"LayerUtility: PrintInfo",
"LayerUtility: PurgeVRAM",
"LayerUtility: PurgeVRAM V2",
"LayerUtility: QueueStop",
"LayerUtility: RGB Value",
"LayerUtility: RandomGenerator",
@@ -13477,6 +13496,7 @@
"LayerMask: TransparentBackgroundUltra",
"LayerMask: YoloV8Detect",
"LayerUtility: AddBlindWaterMark",
"LayerUtility: Collage",
"LayerUtility: CreateQRCode",
"LayerUtility: DecodeQRCode",
"LayerUtility: DeepSeekAPI",
@@ -14876,6 +14896,14 @@
"title_aux": "ComfyUI-LoadFiles"
}
],
"https://github.com/dasilva333/ComfyUI_ContrastingColor": [
[
"ContrastingComplementaryColor|pysssss"
],
{
"title_aux": "ComfyUI_ContrastingColor"
}
],
"https://github.com/dave-palt/comfyui_DSP_imagehelpers": [
[
"dsp-imagehelpers-concat"
@@ -15404,9 +15432,12 @@
"Qwen2AudioInstruct",
"StringToDict",
"SwitchDuo",
"TextBoxStyle",
"TextLineSelect",
"TextLinesToList",
"TextPlusPlus"
"TextMargins",
"TextPlusPlus",
"TextShadow"
],
{
"title_aux": "comfyui-dreambait-nodes"
@@ -17162,21 +17193,6 @@
"title_aux": "ComfyUI-ToolBox"
}
],
"https://github.com/hdfhssg/ComfyUI_pxtool": [
[
"CivitaiHelper",
"DanbooruCharacterTag",
"E621CharacterTag",
"NegativeTag",
"QualityTag",
"RandomArtists",
"RandomArtistsAdvanced",
"RandomTag"
],
{
"title_aux": "ComfyUI_pxtool"
}
],
"https://github.com/heshengtao/comfyui_LLM_party": [
[
"About_us",
@@ -17861,7 +17877,8 @@
[
"PROMPT_ENHANCER",
"PROMPT_ENHANCER_CHAIN_CONTROL",
"PROMPT_ENHANCER_CHAIN_RANDOM"
"PROMPT_ENHANCER_CHAIN_RANDOM",
"PROMPT_ENHANCER_REPROMPT"
],
{
"title_aux": "comfyui-prompt-enhancer"
@@ -18876,6 +18893,15 @@
"title_aux": "ComfyUI LayerDivider"
}
],
"https://github.com/juehackr/comfyui_fk_server": [
[
"FK_Node",
"FK_ShowBaseNode"
],
{
"title_aux": "comfyui_fk_server"
}
],
"https://github.com/jurdnisglobby/ComfyUI-Jurdns-Groq-Node": [
[
"JurdnsGroqAPIPromptEnhancer"
@@ -19679,6 +19705,7 @@
"InjectNoiseToLatent",
"InsertImageBatchByIndexes",
"InsertImagesToBatchIndexed",
"InsertLatentToIndexed",
"InterpolateCoords",
"Intrinsic_lora_sampling",
"JoinStringMulti",
@@ -19710,6 +19737,7 @@
"SV3D_BatchSchedule",
"SaveImageKJ",
"SaveImageWithAlpha",
"SaveStringKJ",
"ScaleBatchPromptSchedule",
"Screencap_mss",
"SeparateMasks",
@@ -21727,6 +21755,15 @@
"title_aux": "ComfyUI-CatvtonFluxWrapper"
}
],
"https://github.com/lum3on/comfyui_LLM_Polymath": [
[
"polymath_chat",
"polymath_scraper"
],
{
"title_aux": "LLM Polymath Chat Node"
}
],
"https://github.com/lumalabs/ComfyUI-LumaAI-API": [
[
"CharacterReference",
@@ -22465,6 +22502,15 @@
"title_aux": "Preset Dimensions"
}
],
"https://github.com/moon7star9/ComfyUI_BiRefNet_Universal": [
[
"BiRefNet_Loader",
"BiRefNet_Remove_Background"
],
{
"title_aux": "ComfyUI_BiRefNet_Universal"
}
],
"https://github.com/morino-kumasan/comfyui-toml-prompt": [
[
"IntSelector",
@@ -24486,22 +24532,26 @@
"https://github.com/ryanontheinside/ComfyUI_RealtimeNodes": [
[
"DTypeConverter",
"DeltaControl",
"FPSMonitor",
"FastWebcamCapture",
"FloatControl",
"FloatSequence",
"HandMaskNode",
"HandTrackingNode",
"IntControl",
"IntSequence",
"IntegerMotionController",
"IntervalControl",
"LazyCondition",
"LoadImageFromPath_",
"MotionController",
"MultilineText",
"QuickShapeMask",
"ROINode",
"RepulsiveMaskNode",
"ResizeMaskNode",
"SimilarityFilter",
"StateResetNode",
"StateTestNode",
"StringControl",
"StringSequence",
"TextRenderer",
@@ -25328,7 +25378,9 @@
"SmartFormatString",
"SmartFormatString10",
"SmartHVLoraSelect",
"SmartHVLoraStack"
"SmartHVLoraStack",
"SmartRemoveComments",
"SmartSaveText"
],
{
"title_aux": "ComfyUI Smart Helper Nodes"
@@ -27866,7 +27918,9 @@
"MaskSmartValleySplit",
"MaskSplitFilter",
"MaskTopNFilter",
"TextBeforeKeyword"
"TextBeforeKeyword",
"YC Extract Number",
"YC Text Index Switch"
],
{
"title_aux": "ComfyUI-YCNodes"
@@ -28504,6 +28558,7 @@
"https://github.com/zentrocdot/ComfyUI-Simple_Image_To_Prompt": [
[
"\ud83d\udc41\ufe0f Image To Prompt",
"\ud83d\udc41\ufe0f Image To Prompt (NO UPDATE)",
"\ud83e\uddf3 Show Data"
],
{

View File

@@ -389,12 +389,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

View File

File diff suppressed because it is too large Load Diff

View File

@@ -42,7 +42,7 @@ import manager_downloader
from node_package import InstalledNodePackage
version_code = [3, 19]
version_code = [3, 21]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -2478,7 +2478,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')
@@ -2489,8 +2489,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 = {}
@@ -2556,7 +2558,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,
@@ -2567,7 +2569,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()
@@ -2579,7 +2581,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)

View File

@@ -419,7 +419,10 @@ async def task_worker():
manager_util.clear_pip_cache()
if res.result:
return 'success'
if res.action == 'skip':
return 'skip'
else:
return 'success'
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
except Exception:
@@ -427,6 +430,25 @@ async def task_worker():
return f"An error occurred while updating '{node_name}'."
async def do_update_comfyui() -> str:
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 "The installed ComfyUI does not have a Git repository."
elif res == "updated":
logging.info("ComfyUI is updated.")
return "success"
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
@@ -550,6 +572,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()
elif kind == 'fix':
msg = await do_fix(item)
elif kind == 'uninstall':
@@ -569,6 +595,11 @@ 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':
ui_target = "main"
else:
nodepack_result[ui_id] = msg
ui_target = "nodepack_manager"
@@ -643,49 +674,37 @@ 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 x in res['failed']:
logging.error(f"PULL FAILED: {x}")
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):
@@ -1281,26 +1300,10 @@ 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)
task_queue.put(("update-comfyui", ('comfyui',)))
return web.Response(status=200)
@routes.get("/comfyui_manager/comfyui_versions")

View File

@@ -269,18 +269,27 @@ class PIPFixer:
self.prev_pip_versions = { **prev_pip_versions }
def torch_rollback(self):
print("[DBG] point(torch_rollback) 1")
spec = self.prev_pip_versions['torch'].split('+')
print("[DBG] point(torch_rollback) 2")
if len(spec) > 0:
platform = spec[1]
else:
print("[DBG] point(torch_rollback) 3")
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
subprocess.check_output(cmd, universal_newlines=True)
print("[DBG] point(torch_rollback) 4")
logging.error(cmd)
print("[DBG] point(torch_rollback) 5")
return
print("[DBG] point(torch_rollback) 6")
torch_ver = StrictVersion(spec[0])
print("[DBG] point(torch_rollback) 7")
torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
print("[DBG] point(torch_rollback) 8")
torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
print("[DBG] point(torch_rollback) 9")
if torch_torchvision_torchaudio_ver is None:
cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
@@ -292,46 +301,64 @@ class PIPFixer:
'--index-url', f"https://download.pytorch.org/whl/{platform}"])
logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
print("[DBG] point(torch_rollback) 10")
subprocess.check_output(cmd, universal_newlines=True)
print("[DBG] point(torch_rollback) 11")
def fix_broken(self):
print("[DBG] point9-1")
new_pip_versions = get_installed_packages(True)
print("[DBG] point9-2")
# remove `comfy` python package
try:
print("[DBG] point9-3")
if 'comfy' in new_pip_versions:
print("[DBG] point9-3-1")
cmd = make_pip_cmd(['uninstall', 'comfy'])
subprocess.check_output(cmd, universal_newlines=True)
logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
print("[DBG] point9-4")
except Exception as e:
print("[DBG] point9-5")
logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
logging.error(e)
# fix torch - reinstall torch packages if version is changed
print("[DBG] point9-6")
try:
print("[DBG] point9-7")
if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions:
print("[DBG] point9-8")
logging.error("[ComfyUI-Manager] PyTorch is not installed")
elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
print("[DBG] point9-9")
self.torch_rollback()
print("[DBG] point9-10")
except Exception as e:
print("[DBG] point9-11")
logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
logging.error(e)
# fix opencv
try:
print("[DBG] point9-12")
ocp = new_pip_versions.get('opencv-contrib-python')
ocph = new_pip_versions.get('opencv-contrib-python-headless')
op = new_pip_versions.get('opencv-python')
oph = new_pip_versions.get('opencv-python-headless')
print("[DBG] point9-13")
versions = [ocp, ocph, op, oph]
versions = [StrictVersion(x) for x in versions if x is not None]
versions.sort(reverse=True)
print("[DBG] point9-14")
if len(versions) > 0:
print("[DBG] point9-15")
# upgrade to maximum version
targets = []
cur = versions[0]
@@ -344,27 +371,40 @@ class PIPFixer:
if oph is not None and StrictVersion(oph) != cur:
targets.append('opencv-python-headless')
print("[DBG] point9-16")
if len(targets) > 0:
print("[DBG] point9-17")
for x in targets:
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
subprocess.check_output(cmd, universal_newlines=True)
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
print("[DBG] point9-18")
except Exception as e:
print("[DBG] point9-19")
logging.error("[ComfyUI-Manager] Failed to restore opencv")
logging.error(e)
print("[DBG] point9-20")
# fix numpy
try:
print("[DBG] point9-21")
np = new_pip_versions.get('numpy')
print("[DBG] point9-22")
if np is not None:
print("[DBG] point9-23")
if StrictVersion(np) >= StrictVersion('2'):
print("[DBG] point9-24")
cmd = make_pip_cmd(['install', "numpy<2"])
subprocess.check_output(cmd , universal_newlines=True)
print("[DBG] point9-25")
except Exception as e:
print("[DBG] point9-26")
logging.error("[ComfyUI-Manager] Failed to restore numpy")
logging.error(e)
print("[DBG] point9-28")
def sanitize(data):
return data.replace("<", "&lt;").replace(">", "&gt;")

View File

@@ -13,7 +13,9 @@ 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";
@@ -225,7 +227,11 @@ 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;
let share_option = 'all';
var is_updating_all = false;
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
const style = `
@@ -424,102 +430,54 @@ 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.');
}
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 = "";
}
showTerminal();
await api.fetchApi('/manager/queue/start');
}
function showVersionSelectorDialog(versions, current, onSelect) {
@@ -647,26 +605,32 @@ function showVersionSelectorDialog(versions, current, onSelect) {
}
async function switchComfyUI() {
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
if(res.status == 200) {
let obj = await res.json();
if(res.status == 200) {
let obj = await res.json();
let versions = [];
let default_version;
let versions = [];
let default_version;
for(let v of obj.versions) {
default_version = v;
versions.push(v);
}
for(let v of obj.versions) {
default_version = v;
versions.push(v);
}
showVersionSelectorDialog(versions, obj.current, (selected_version) => {
api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
});
}
else {
show_message('Failed to fetch ComfyUI versions.');
}
showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
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 +684,100 @@ 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_all) {
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;
let success_list = [];
let failed_list = [];
for(let k in event.detail.nodepack_result){
let v = event.detail.nodepack_result[k];
if(v == 'success')
success_list.push(k);
else if(v == 'skip') {
// do nothing
}
else
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) {
if(failed_list.length == 0) {
msg += "All custom nodes 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>";
msg += "The following custom nodes have been updated:<ul>";
for(let x in success_list) {
msg += '<li>'+success_list[x]+'</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) {
msg += '<li>'+failed_list[x]+'</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_all = true;
await api.fetchApi('/manager/queue/start');
}
}
@@ -807,12 +801,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 +847,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", {
@@ -909,11 +931,7 @@ class ManagerMenuDialog extends ComfyDialog {
fetch_updates_button,
$el("br", {}, []),
$el("button.cm-button-red", {
type: "button",
textContent: "Restart",
onclick: () => rebootAPI()
}),
restart_stop_button,
];
let migration_btn =

View File

@@ -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;
}
});
}

View File

@@ -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";
@@ -401,7 +404,6 @@ export class CustomNodesManager {
this.init();
api.addEventListener("cm-queue-status", this.onQueueStatus);
api.addEventListener('reconnected', this.onReconnected);
}
init() {
@@ -833,6 +835,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 +1166,8 @@ export class CustomNodesManager {
return 0;
});
restoreColumnWidth(gridId, columns);
this.grid.setData({
options: options,
rows: rows_values,
@@ -1403,21 +1411,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 +1450,7 @@ export class CustomNodesManager {
for(let hash in result){
let v = result[hash];
if(v != 'success')
if(v != 'success' && v != 'skip')
errorMsg += v+'\n';
}
@@ -1672,6 +1665,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 +1686,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;
@@ -1891,7 +1891,7 @@ export class CustomNodesManager {
showRestart() {
this.element.querySelector(".cn-manager-restart").style.display = "block";
this.need_restart = true;
setNeedRestart(true);
}
showStop() {

View File

@@ -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,

View File

@@ -12,6 +12,37 @@
{
"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": "dasilva333",
"title": "ComfyUI_MarkdownImage [WIP]",
"reference": "https://github.com/dasilva333/ComfyUI_MarkdownImage",
"files": [
"https://github.com/dasilva333/ComfyUI_MarkdownImage"
],
"install_type": "git-clone",
"description": "Create an image using html and markdown in ComfyUI\nNOTE: The files in the repo are not organized."
},
{
"author": "franky519",
"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]",
@@ -543,16 +574,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]",

View File

@@ -178,10 +178,17 @@
"https://github.com/807502278/ComfyUI_TensorRT_Merge": [
[
"BiRefNet2_tensort",
"BiRefNet_ModelLoader_TRT",
"BiRefNet_TRT",
"Building_TRT",
"Custom_Building_TRT",
"DepthAnything_Tensorrt",
"Dwpose_Tensorrt",
"building_tensorrt_engine",
"load_BiRefNet2_General",
"FaceRestoreTensorrt",
"RifeTensorrt",
"UpscalerTensorrt",
"YoloNasPoseTensorrt",
"load_BiRefNet2_tensort",
"load_DepthAnything_Tensorrt",
"load_Dwpos_Tensorrt"
],
@@ -1255,7 +1262,8 @@
],
"https://github.com/M4lF3s/comfy-tif-support": [
[
"Load TIFF"
"Load TIFF",
"Save TIFF"
],
{
"title_aux": "comfy-tif-support"
@@ -1308,14 +1316,6 @@
"title_aux": "ComfyUI-APG_ImYourCFGNow"
}
],
"https://github.com/Njbx/ComfyUI-blockswap": [
[
"BlockSwap"
],
{
"title_aux": "ComfyUI-blockswap"
}
],
"https://github.com/Northerner1/ComfyUI_North_Noise": [
[
"North_Unsampler"
@@ -1426,6 +1426,7 @@
"https://github.com/RobeSantoro/ComfyUI-RobeNodes": [
[
"List Image Path \ud83d\udc24",
"List Model Path \ud83d\udc24",
"List Video Path \ud83d\udc24"
],
{
@@ -2669,6 +2670,15 @@
"title_aux": "VoidCustomNodes"
}
],
"https://github.com/dasilva333/ComfyUI_MarkdownImage": [
[
"CreateDialogImage",
"CreateMarkdownImage"
],
{
"title_aux": "ComfyUI_MarkdownImage [WIP]"
}
],
"https://github.com/denislov/Comfyui_AutoSurvey": [
[
"AddDoc2Knowledge",
@@ -2906,6 +2916,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",
@@ -2980,7 +3001,8 @@
"https://github.com/greengerong/ComfyUI-Lumina-Video": [
[
"LuminaVideoModelLoader",
"LuminaVideoSampler"
"LuminaVideoSampler",
"LuminaVideoVAEDecode"
],
{
"title_aux": "ComfyUI-Lumina-Video [WIP]"
@@ -3068,6 +3090,21 @@
"title_aux": "ComfyUI AceNodes [UNSAFE]"
}
],
"https://github.com/hdfhssg/ComfyUI_pxtool": [
[
"CivitaiHelper",
"DanbooruCharacterTag",
"E621CharacterTag",
"NegativeTag",
"QualityTag",
"RandomArtists",
"RandomArtistsAdvanced",
"RandomTag"
],
{
"title_aux": "ComfyUI_pxtool [WIP]"
}
],
"https://github.com/horidream/ComfyUI-Horidream": [
[
"PassThroughWithSound"
@@ -4391,7 +4428,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",

View File

File diff suppressed because it is too large Load Diff

View File

@@ -10,6 +10,16 @@
},
{
"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]",

View File

@@ -11,6 +11,67 @@
{
"author": "lum3on",
"title": "LLM Polymath Chat Node",
"id": "polymath",
"reference": "https://github.com/lum3on/comfyui_LLM_Polymath",
"files": [
"https://github.com/lum3on/comfyui_LLM_Polymath"
],
"install_type": "git-clone",
"description": "Advanced LLM driven node with many custom instructions, including node finder, expert prompter and json converter."
},
{
"author": "austinbrown34",
"title": "ComfyUI-IO-Helpers",
"reference": "https://github.com/austinbrown34/ComfyUI-IO-Helpers",
"files": [
"https://github.com/austinbrown34/ComfyUI-IO-Helpers"
],
"install_type": "git-clone",
"description": "A custom nodes package for ComfyUI that enhances workflow flexibility by providing specialized nodes for saving and loading intermediate data (encoded prompts and sampled latents) in multiple formats. This package leverages helper classes for file I/O, supports gzip compression for efficient storage, and integrates progress feedback via a progress bar to improve user experience during long operations."
},
{
"author": "HowToSD",
"title": "ComfyUI-Data-Analysis",
"reference": "https://github.com/HowToSD/ComfyUI-Data-Analysis",
"files": [
"https://github.com/HowToSD/ComfyUI-Data-Analysis"
],
"install_type": "git-clone",
"description": "Data analysis custom modules for ComfyUI - Use Pandas & Matplotlib from within ComfyUI"
},
{
"author": "dasilva333",
"title": "ComfyUI_ContrastingColor",
"reference": "https://github.com/dasilva333/ComfyUI_ContrastingColor",
"files": [
"https://github.com/dasilva333/ComfyUI_ContrastingColor"
],
"install_type": "git-clone",
"description": "This node calculates a contrasting complementary color based on an input RGB color. The goal is to ensure visibility and contrast when overlaying text, UI elements, or graphical components against a given background color."
},
{
"author": "mie",
"title": "ComfyUI_JanusProCaption",
"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": "moon7star9",
"title": "ComfyUI_BiRefNet_Universal",
"reference": "https://github.com/moon7star9/ComfyUI_BiRefNet_Universal",
"files": [
"https://github.com/moon7star9/ComfyUI_BiRefNet_Universal"
],
"install_type": "git-clone",
"description": "A comprehensive node package that seamlessly integrates all BiRefNet series models into ComfyUI"
},
{
"author": "ShunL12324",
"title": "comfy-portal-endpoint",

View File

@@ -2389,6 +2389,7 @@
"ClownSamplerAdvanced",
"ClownsharKSampler",
"ClownsharKSamplerAutomation",
"ClownsharKSamplerAutomation_Advanced",
"ClownsharKSamplerAutomation_Beta",
"ClownsharKSamplerGuide",
"ClownsharKSamplerGuide_Beta",
@@ -2405,6 +2406,7 @@
"ConditioningToBase64",
"ConditioningTruncate",
"ConditioningZeroAndTruncate",
"Constant Scheduler",
"EmptyLatentImage64",
"EmptyLatentImageCustom",
"Film Grain",
@@ -2439,6 +2441,7 @@
"Legacy_ClownsharKSampler",
"Legacy_ClownsharKSamplerGuides",
"Legacy_SharkSampler",
"Linear Quadratic Advanced",
"MaskToggle",
"ModelSamplingAdvanced",
"ModelSamplingAdvancedResolution",
@@ -5070,6 +5073,7 @@
"Simple Extract Lora From Text",
"Simple Image Saver (as Forge)",
"Simple Load Image With Metadata",
"Simple Load Images from Dir",
"Simple Load Line From Text File",
"Simple Lora Loader"
],
@@ -8532,6 +8536,7 @@
"SDVN Easy IPAdapter weight",
"SDVN Exif check",
"SDVN Filter List",
"SDVN Flip Image",
"SDVN Google Imagen",
"SDVN IC-Light v2",
"SDVN Image Adjust",
@@ -9673,6 +9678,7 @@
],
"https://github.com/Visionatrix/ComfyUI-Visionatrix": [
[
"StyleAlignedBatchAlign",
"VixCheckboxLogic",
"VixDynamicLoraDefinition",
"VixUiAspectRatioSelector",
@@ -11640,6 +11646,17 @@
"title_aux": "Save Image Extended for ComfyUI"
}
],
"https://github.com/austinbrown34/ComfyUI-IO-Helpers": [
[
"Encoded Prompt from File",
"Encoded Prompt to File",
"Sampled Latents from File",
"Sampled Latents to File"
],
{
"title_aux": "ComfyUI-IO-Helpers"
}
],
"https://github.com/avatechai/avatar-graph-comfyui": [
[
"ApplyMeshTransformAsShapeKey",
@@ -12580,6 +12597,7 @@
[
"ClipLoaderGGUF",
"DualClipLoaderGGUF",
"GGUFRun",
"GGUFSave",
"GGUFUndo",
"LoaderGGUF",
@@ -13416,6 +13434,7 @@
"LayerUtility: NumberCalculatorV2",
"LayerUtility: PrintInfo",
"LayerUtility: PurgeVRAM",
"LayerUtility: PurgeVRAM V2",
"LayerUtility: QueueStop",
"LayerUtility: RGB Value",
"LayerUtility: RandomGenerator",
@@ -13477,6 +13496,7 @@
"LayerMask: TransparentBackgroundUltra",
"LayerMask: YoloV8Detect",
"LayerUtility: AddBlindWaterMark",
"LayerUtility: Collage",
"LayerUtility: CreateQRCode",
"LayerUtility: DecodeQRCode",
"LayerUtility: DeepSeekAPI",
@@ -14876,6 +14896,14 @@
"title_aux": "ComfyUI-LoadFiles"
}
],
"https://github.com/dasilva333/ComfyUI_ContrastingColor": [
[
"ContrastingComplementaryColor|pysssss"
],
{
"title_aux": "ComfyUI_ContrastingColor"
}
],
"https://github.com/dave-palt/comfyui_DSP_imagehelpers": [
[
"dsp-imagehelpers-concat"
@@ -15404,9 +15432,12 @@
"Qwen2AudioInstruct",
"StringToDict",
"SwitchDuo",
"TextBoxStyle",
"TextLineSelect",
"TextLinesToList",
"TextPlusPlus"
"TextMargins",
"TextPlusPlus",
"TextShadow"
],
{
"title_aux": "comfyui-dreambait-nodes"
@@ -17162,21 +17193,6 @@
"title_aux": "ComfyUI-ToolBox"
}
],
"https://github.com/hdfhssg/ComfyUI_pxtool": [
[
"CivitaiHelper",
"DanbooruCharacterTag",
"E621CharacterTag",
"NegativeTag",
"QualityTag",
"RandomArtists",
"RandomArtistsAdvanced",
"RandomTag"
],
{
"title_aux": "ComfyUI_pxtool"
}
],
"https://github.com/heshengtao/comfyui_LLM_party": [
[
"About_us",
@@ -17861,7 +17877,8 @@
[
"PROMPT_ENHANCER",
"PROMPT_ENHANCER_CHAIN_CONTROL",
"PROMPT_ENHANCER_CHAIN_RANDOM"
"PROMPT_ENHANCER_CHAIN_RANDOM",
"PROMPT_ENHANCER_REPROMPT"
],
{
"title_aux": "comfyui-prompt-enhancer"
@@ -18876,6 +18893,15 @@
"title_aux": "ComfyUI LayerDivider"
}
],
"https://github.com/juehackr/comfyui_fk_server": [
[
"FK_Node",
"FK_ShowBaseNode"
],
{
"title_aux": "comfyui_fk_server"
}
],
"https://github.com/jurdnisglobby/ComfyUI-Jurdns-Groq-Node": [
[
"JurdnsGroqAPIPromptEnhancer"
@@ -19679,6 +19705,7 @@
"InjectNoiseToLatent",
"InsertImageBatchByIndexes",
"InsertImagesToBatchIndexed",
"InsertLatentToIndexed",
"InterpolateCoords",
"Intrinsic_lora_sampling",
"JoinStringMulti",
@@ -19710,6 +19737,7 @@
"SV3D_BatchSchedule",
"SaveImageKJ",
"SaveImageWithAlpha",
"SaveStringKJ",
"ScaleBatchPromptSchedule",
"Screencap_mss",
"SeparateMasks",
@@ -21727,6 +21755,15 @@
"title_aux": "ComfyUI-CatvtonFluxWrapper"
}
],
"https://github.com/lum3on/comfyui_LLM_Polymath": [
[
"polymath_chat",
"polymath_scraper"
],
{
"title_aux": "LLM Polymath Chat Node"
}
],
"https://github.com/lumalabs/ComfyUI-LumaAI-API": [
[
"CharacterReference",
@@ -22465,6 +22502,15 @@
"title_aux": "Preset Dimensions"
}
],
"https://github.com/moon7star9/ComfyUI_BiRefNet_Universal": [
[
"BiRefNet_Loader",
"BiRefNet_Remove_Background"
],
{
"title_aux": "ComfyUI_BiRefNet_Universal"
}
],
"https://github.com/morino-kumasan/comfyui-toml-prompt": [
[
"IntSelector",
@@ -24486,22 +24532,26 @@
"https://github.com/ryanontheinside/ComfyUI_RealtimeNodes": [
[
"DTypeConverter",
"DeltaControl",
"FPSMonitor",
"FastWebcamCapture",
"FloatControl",
"FloatSequence",
"HandMaskNode",
"HandTrackingNode",
"IntControl",
"IntSequence",
"IntegerMotionController",
"IntervalControl",
"LazyCondition",
"LoadImageFromPath_",
"MotionController",
"MultilineText",
"QuickShapeMask",
"ROINode",
"RepulsiveMaskNode",
"ResizeMaskNode",
"SimilarityFilter",
"StateResetNode",
"StateTestNode",
"StringControl",
"StringSequence",
"TextRenderer",
@@ -25328,7 +25378,9 @@
"SmartFormatString",
"SmartFormatString10",
"SmartHVLoraSelect",
"SmartHVLoraStack"
"SmartHVLoraStack",
"SmartRemoveComments",
"SmartSaveText"
],
{
"title_aux": "ComfyUI Smart Helper Nodes"
@@ -27866,7 +27918,9 @@
"MaskSmartValleySplit",
"MaskSplitFilter",
"MaskTopNFilter",
"TextBeforeKeyword"
"TextBeforeKeyword",
"YC Extract Number",
"YC Text Index Switch"
],
{
"title_aux": "ComfyUI-YCNodes"
@@ -28504,6 +28558,7 @@
"https://github.com/zentrocdot/ComfyUI-Simple_Image_To_Prompt": [
[
"\ud83d\udc41\ufe0f Image To Prompt",
"\ud83d\udc41\ufe0f Image To Prompt (NO UPDATE)",
"\ud83e\uddf3 Show Data"
],
{

View File

@@ -475,6 +475,7 @@ def read_downgrade_blacklist():
read_downgrade_blacklist()
print("[DBG] point1")
def check_bypass_ssl():
try:
@@ -487,12 +488,14 @@ def check_bypass_ssl():
check_bypass_ssl()
print("[DBG] point2")
# Perform install
processed_install = set()
script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
print("[DBG] point3")
def is_installed(name):
name = name.strip()
@@ -544,6 +547,7 @@ def is_installed(name):
return True # prevent downgrade
print("[DBG] point4")
if os.path.exists(restore_snapshot_path):
try:
@@ -593,6 +597,8 @@ if os.path.exists(restore_snapshot_path):
def execute_lazy_install_script(repo_path, executable):
global processed_install
print("[DBG] point5")
install_script_path = os.path.join(repo_path, "install.py")
requirements_path = os.path.join(repo_path, "requirements.txt")
@@ -625,6 +631,8 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
import uuid
import shutil
print("[DBG] point6")
# 1. download
archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip" # should be unpredictable name - security precaution
download_path = os.path.join(custom_nodes_path, archive_name)
@@ -674,12 +682,17 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
def execute_migration(moves):
import shutil
print("[DBG] point7")
for x in moves:
if os.path.exists(x[0]) and not os.path.exists(x[1]):
shutil.move(x[0], x[1])
print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
print("[DBG] point8")
# Check if script_list_path exists
if os.path.exists(script_list_path):
print("\n#######################################################################")
@@ -738,14 +751,20 @@ if os.path.exists(script_list_path):
print("\n[ComfyUI-Manager] Startup script completed.")
print("#######################################################################\n")
print("[DBG] point9")
pip_fixer.fix_broken()
print("[DBG] point10")
del processed_install
del pip_fixer
manager_util.clear_pip_cache()
print("[DBG] point11")
def check_windows_event_loop_policy():
print("[DBG] point12")
try:
import configparser
config = configparser.ConfigParser()
@@ -763,6 +782,10 @@ def check_windows_event_loop_policy():
except Exception:
pass
print("[DBG] point13")
if platform.system() == 'Windows':
check_windows_event_loop_policy()
print("[DBG] point14")

View File

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