fixed: invalid skipping of pip dependencies installation if ==, ~=

removed: useless badge related code

README.md

@@ -133,14 +133,29 @@ This repository provides Colab notebooks that allow you to install and use Comfy
     * `All`: Show a dialog where the user can select a title for sharing.
 
 
+## Paths
+In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/default/ComfyUI-Manager/`.
+
+* <USER_DIRECTORY>  
+  * If executed without any options, the path defaults to ComfyUI/user.  
+  * It can be set using --user-directory <USER_DIRECTORY>.  
+
+* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
+* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
+* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
+* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
+* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
+* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
+  
+
 ## Snapshot-Manager
 * When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
-  * Snapshot file dir: `ComfyUI-Manager/snapshots`
+  * Snapshot file dir: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
   * You can rename snapshot file.
 * Press the "Restore" button to revert to the installation status of the respective snapshot.
   * However, for custom nodes not managed by Git, snapshot support is incomplete.
 * When you press `Restore`, it will take effect on the next ComfyUI startup.
-  * The selected snapshot file is saved in `ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
+  * The selected snapshot file is saved in `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
 
 ![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)
 
@@ -188,12 +203,12 @@ This repository provides Colab notebooks that allow you to install and use Comfy
     }
     ```
   * `<current timestamp>` Ensure that the timestamp is always unique.
-    * "components" should have the same structure as the content of the file stored in ComfyUI-Manager/components.
+    * "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
       * `<component name>`: The name should be in the format `<prefix>::<node name>`.
         * `<compnent nodeata>`: In the nodedata of the group node.
           * `<version>`: Only two formats are allowed: `major.minor.patch` or `major.minor`. (e.g. `1.0`, `2.2.1`)
           * `<datetime>`: Saved time
-          * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in ComfyUI-Manager/components.
+          * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
           * `<category>`: If there is neither a category nor a packname, it is saved in the components category.
           ```
               "version":"1.0",
@@ -268,12 +283,8 @@ When you run the `scan.sh` script:
 
 
 ## Troubleshooting
-* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the ComfyUI-Manager/config.ini file that is generated.
+* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini` file that is generated.
 * If updating ComfyUI-Manager itself fails, please go to the **ComfyUI-Manager** directory and execute the command `git update-ref refs/remotes/origin/main a361cc1 && git fetch --all && git pull`.
- * Alternatively, download the update-fix.py script from [update-fix.py](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/update-fix.py) and place it in the ComfyUI-Manager directory. Then, run it using your Python command.
-   For the portable version, use `..\..\..\python_embeded\python.exe update-fix.py`.
-* For cases where nodes like `PreviewTextNode` from `ComfyUI_Custom_Nodes_AlekPet` are only supported as front-end nodes, we currently do not provide missing nodes for them.
-* Currently, `vid2vid` is not being updated, causing compatibility issues.
 * If you encounter the error message `Overlapped Object has pending operation at deallocation on Comfyui Manager load` under Windows
   * Edit `config.ini` file: add `windows_selector_event_loop_policy = True`
 * if `SSL: CERTIFICATE_VERIFY_FAILED` error is occured.

custom-node-list.json

@@ -490,7 +490,7 @@
         {
             "author": "YinBailiang",
             "title": "MergeBlockWeighted_fo_ComfyUI",
-            "id": "mbw",
+            "id": "mergeblockweighted_fo_comfyui",
             "reference": "https://github.com/YinBailiang/MergeBlockWeighted_fo_ComfyUI",
             "files": [
                 "https://github.com/YinBailiang/MergeBlockWeighted_fo_ComfyUI"
@@ -18040,7 +18040,17 @@
                 "https://github.com/LucipherDev/ComfyUI-Golden-Noise"
             ],
             "install_type": "git-clone",
-            "description": "ComfyUI Custom Node for [a/'Golden Noise for Diffusion Models: A Learning Framework'](https://arxiv.org/abs/2411.09502) and most of the code is adapted from [a/here](https://github.com/xie-lab-ml/Golden-Noise-for-Diffusion-Models). This node refines the initial latent noise in the diffusion process, enhancing both image quality and semantic coherence."
+            "description": "ComfyUI Custom Node for 'Golden Noise for Diffusion Models: A Learning Framework'. This node refines the initial latent noise in the diffusion process, enhancing both image quality and semantic coherence."
+        },
+        {
+            "author": "LucipherDev",
+            "title": "ComfyUI-AniDoc",
+            "reference": "https://github.com/LucipherDev/ComfyUI-AniDoc",
+            "files": [
+                "https://github.com/LucipherDev/ComfyUI-AniDoc"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Custom Nodes for 'AniDoc: Animation Creation Made Easier'. This approach automates line art video colorization using a novel model that aligns color information from references, ensures temporal consistency, and reduces manual effort in animation production."
         },
         {
             "author": "envy-ai",
@@ -18757,6 +18767,38 @@
             "install_type": "git-clone",
             "description": "ComfyUI Workflow to run audioldm-l-full pipeline\n[a/https://huggingface.co/cvssp/audioldm-l-full](https://huggingface.co/cvssp/audioldm-l-full)"
         },
+        {
+            "author": "bear2b",
+            "title": "ColorMatrixGPU Node for ComfyUI",
+            "reference": "https://github.com/bear2b/comfyui-argo-nodes",
+            "files": [
+                "https://github.com/bear2b/comfyui-argo-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "This node applies a custom 4x4 color matrix to an image using GPU acceleration via PyTorch."
+        },
+        {
+            "author": "phuvinh010701",
+            "title": "ComfyUI-Nudenet",
+            "reference": "https://github.com/phuvinh010701/ComfyUI-Nudenet",
+            "files": [
+                "https://github.com/phuvinh010701/ComfyUI-Nudenet"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes for NSFW content filtering"
+        },
+        {
+            "author": "Vaibhavs10",
+            "title": "ComfyUI-DDUF",
+            "reference": "https://github.com/Vaibhavs10/ComfyUI-DDUF",
+            "files": [
+                "https://github.com/Vaibhavs10/ComfyUI-DDUF"
+            ],
+            "install_type": "git-clone",
+            "description": "Run DDUF in ComfyUI - powered by Diffusers."
+        },
+
+
 
 
 

extension-node-map.json

@@ -39,6 +39,7 @@
     ],
     "https://github.com/1038lab/ComfyUI-RMBG": [
         [
+            "ClothesSegment",
             "RMBG",
             "Segment"
         ],
@@ -2486,6 +2487,7 @@
             "ImageMinusMask",
             "Light or Dark",
             "Load Random Images",
+            "Mask Preprocess Morphology",
             "PhotoShop Transfer",
             "Yuan"
         ],
@@ -5203,6 +5205,17 @@
             "title_aux": "ComfyUI-RawSaver"
         }
     ],
+    "https://github.com/LucipherDev/ComfyUI-AniDoc": [
+        [
+            "AniDocLoader",
+            "AniDocSampler",
+            "GetAniDocControlnetImages",
+            "LoadCoTracker"
+        ],
+        {
+            "title_aux": "ComfyUI-AniDoc"
+        }
+    ],
     "https://github.com/LucipherDev/ComfyUI-Golden-Noise": [
         [
             "GoldenNoise"
@@ -5779,6 +5792,7 @@
             "ImageSizeAdjusterV3",
             "LoadVideoDirectory",
             "ProjectFilePathNode",
+            "SequentialNumberGenerator",
             "StringWeights",
             "ZenkaiPrompt",
             "ZenkaiPromptV2",
@@ -7297,7 +7311,8 @@
     ],
     "https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper": [
         [
-            "D_LatentSyncNode"
+            "D_LatentSyncNode",
+            "D_VideoLengthAdjuster"
         ],
         {
             "title_aux": "ComfyUI-LatentSyncWrapper"
@@ -7669,6 +7684,7 @@
             "SDVN Image Repeat",
             "SDVN Image Size",
             "SDVN Inpaint",
+            "SDVN Join Parameter",
             "SDVN KSampler",
             "SDVN Load Checkpoint",
             "SDVN Load Image",
@@ -7676,6 +7692,7 @@
             "SDVN Load Image From List",
             "SDVN Load Image Url",
             "SDVN Load Lora",
+            "SDVN Load Model",
             "SDVN Load Text",
             "SDVN Logic",
             "SDVN Lora Download",
@@ -8693,6 +8710,18 @@
             "title_aux": "Tripo for ComfyUI"
         }
     ],
+    "https://github.com/Vaibhavs10/ComfyUI-DDUF": [
+        [
+            "DDUFLoader",
+            "DiffusersModelMakeup",
+            "DiffusersPipelineLoader",
+            "DiffusersSchedulerLoader",
+            "DiffusersSimpleSampler"
+        ],
+        {
+            "title_aux": "ComfyUI-DDUF"
+        }
+    ],
     "https://github.com/VangengLab/ComfyUI-LivePortrait_v2": [
         [
             "LivePortraitProcess_animal"
@@ -10798,6 +10827,14 @@
             "title_aux": "Mikey Nodes"
         }
     ],
+    "https://github.com/bear2b/comfyui-argo-nodes": [
+        [
+            "ColorMatrixGPU"
+        ],
+        {
+            "title_aux": "ColorMatrixGPU Node for ComfyUI"
+        }
+    ],
     "https://github.com/bedovyy/ComfyUI_NAIDGenerator": [
         [
             "ColorizeNAID",
@@ -14263,7 +14300,8 @@
             "Genera.BatchTester",
             "Genera.GCPStorageNode",
             "Genera.MaskDrawer",
-            "Genera.Utils"
+            "Genera.Utils",
+            "PainterNode"
         ],
         {
             "title_aux": "ComfyUI-GeneraNodes"
@@ -16538,7 +16576,9 @@
             "Ksampler Parameters JK",
             "Latent Crop Offset JK",
             "Latent Upscale Parameters Extract JK",
+            "Load Image With Alpha JK",
             "Load Image With Metadata JK",
+            "Make Image Grid JK",
             "Metadata Pipe Extract JK",
             "Metadata Pipe JK",
             "NodesState JK",
@@ -16609,6 +16649,7 @@
             "Save Image with Metadata Flow JK",
             "Save Image with Metadata JK",
             "Scale To Resolution JK",
+            "Split Image Grid JK",
             "Stability Conservative Upscale",
             "Stability Control Sketch",
             "Stability Control Structure",
@@ -21345,13 +21386,15 @@
             "ConditioningZeroOutCombine",
             "ConvertTimestepToSigma",
             "DynSamplerSelect",
+            "DynamicThresholdingSimplePost",
             "EmptyLatentImageAR",
             "FreeU2PPM",
             "Guidance Limiter",
             "LatentOperationTonemapLuminance",
             "LatentToMaskBB",
             "LatentToWidthHeight",
-            "PPMSamplerSelect"
+            "PPMSamplerSelect",
+            "RescaleCFGPost"
         ],
         {
             "title_aux": "ComfyUI-ppm"
@@ -21457,6 +21500,16 @@
             "title_aux": "\u2728 Clarity AI - Creative Image Upscaler and Enhancer for ComfyUI"
         }
     ],
+    "https://github.com/phuvinh010701/ComfyUI-Nudenet": [
+        [
+            "ApplyNudenet",
+            "FilterdLabel",
+            "NudenetModelLoader"
+        ],
+        {
+            "title_aux": "ComfyUI-Nudenet"
+        }
+    ],
     "https://github.com/phyblas/paint-by-example_comfyui": [
         [
             "PaintbyExampleAdvanced",

glob/manager_core.py

@@ -36,7 +36,7 @@ import manager_downloader
 from node_package import InstalledNodePackage
 
 
-version_code = [3, 3, 2]
+version_code = [3, 3, 7]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -150,6 +150,7 @@ manager_channel_list_path = None
 manager_startup_script_path = None
 manager_snapshot_path = None
 manager_pip_overrides_path = None
+manager_components_path = None
 
 def update_user_directory(user_dir):
     global manager_files_path
@@ -158,6 +159,7 @@ def update_user_directory(user_dir):
     global manager_startup_script_path
     global manager_snapshot_path
     global manager_pip_overrides_path
+    global manager_components_path
 
     manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
     if not os.path.exists(manager_files_path):
@@ -174,6 +176,7 @@ def update_user_directory(user_dir):
     manager_config_path = os.path.join(manager_files_path, 'config.ini')
     manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
     manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+    manager_components_path = os.path.join(manager_files_path, "components")
 
 try:
     import folder_paths
@@ -260,6 +263,27 @@ def is_installed(name):
                     print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
                     return True
 
+    pkg = manager_util.get_installed_packages().get(name.lower())
+    if pkg is None:
+        return False  # update if not installed
+
+    if match is None:
+        return True   # don't update if version is not specified
+
+    if match.group(2) in ['>', '>=']:
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+        elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
+            print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
+
+    if match.group(2) == '==':
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+
+    if match.group(2) == '~=':
+        if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
+            return False
+
     return name.lower() in manager_util.get_installed_packages()
 
 
@@ -1234,6 +1258,8 @@ class UnifiedManager:
             return ManagedResult('skip').with_msg('Up to date')
 
     def unified_update(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
+        orig_print(f"\x1b[2K\rUpdating: {node_id}", end='')
+
         if version_spec is None:
             version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
 
@@ -1400,7 +1426,6 @@ def write_config():
     config = configparser.ConfigParser()
     config['default'] = {
         'preview_method': manager_funcs.get_current_preview_method(),
-        'badge_mode': get_config()['badge_mode'],
         'git_exe':  get_config()['git_exe'],
         'channel_url': get_config()['channel_url'],
         'share_option': get_config()['share_option'],
@@ -1441,7 +1466,6 @@ def read_config():
 
         return {
                     'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
-                    'badge_mode': default_conf['badge_mode'] if 'badge_mode' in default_conf else 'none',
                     'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
                     'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL,
                     'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
@@ -1460,7 +1484,6 @@ def read_config():
     except Exception:
         return {
             'preview_method': manager_funcs.get_current_preview_method(),
-            'badge_mode': 'none',
             'git_exe': '',
             'channel_url': DEFAULT_CHANNEL,
             'share_option': 'all',
@@ -1695,7 +1718,7 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
 
         if do_update:
             if repo.is_dirty():
-                print(f"STASH: '{path}' is dirty.")
+                print(f"\nSTASH: '{path}' is dirty.")
                 repo.git.stash()
 
             if f'{remote_name}/{branch_name}' not in repo.refs:
@@ -2946,7 +2969,7 @@ def get_comfyui_versions():
         versions = sorted(versions + [current_tag], reverse=True)
         versions = versions[:4]
 
-    main_branch = repo.heads.main
+    main_branch = repo.heads.master
     latest_commit = main_branch.commit
     latest_tag = repo.git.describe('--tags', latest_commit.hexsha)
 

glob/manager_server.py

@@ -135,7 +135,6 @@ local_db_model = os.path.join(manager_util.comfyui_manager_path, "model-list.jso
 local_db_alter = os.path.join(manager_util.comfyui_manager_path, "alter-list.json")
 local_db_custom_node_list = os.path.join(manager_util.comfyui_manager_path, "custom-node-list.json")
 local_db_extension_node_mappings = os.path.join(manager_util.comfyui_manager_path, "extension-node-map.json")
-components_path = os.path.join(manager_util.comfyui_manager_path, 'components')
 
 
 def set_preview_method(method):
@@ -154,10 +153,6 @@ def set_preview_method(method):
 set_preview_method(core.get_config()['preview_method'])
 
 
-def set_badge_mode(mode):
-    core.get_config()['badge_mode'] = mode
-
-
 def set_default_ui_mode(mode):
     core.get_config()['default_ui'] = mode
 
@@ -1154,17 +1149,6 @@ async def preview_method(request):
     return web.Response(status=200)
 
 
-@routes.get("/manager/badge_mode")
-async def badge_mode(request):
-    if "value" in request.rel_url.query:
-        set_badge_mode(request.rel_url.query['value'])
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['badge_mode'], status=200)
-
-    return web.Response(status=200)
-
-
 @routes.get("/manager/default_ui")
 async def default_ui_mode(request):
     if "value" in request.rel_url.query:
@@ -1314,15 +1298,15 @@ async def save_component(request):
         name = data['name']
         workflow = data['workflow']
 
-        if not os.path.exists(components_path):
-            os.mkdir(components_path)
+        if not os.path.exists(core.manager_components_path):
+            os.mkdir(core.manager_components_path)
 
         if 'packname' in workflow and workflow['packname'] != '':
             sanitized_name = manager_util.sanitize_filename(workflow['packname']) + '.pack'
         else:
             sanitized_name = manager_util.sanitize_filename(name) + '.json'
 
-        filepath = os.path.join(components_path, sanitized_name)
+        filepath = os.path.join(core.manager_components_path, sanitized_name)
         components = {}
         if os.path.exists(filepath):
             with open(filepath) as f:
@@ -1339,24 +1323,27 @@ async def save_component(request):
 
 @routes.post("/manager/component/loads")
 async def load_components(request):
-    try:
-        json_files = [f for f in os.listdir(components_path) if f.endswith('.json')]
-        pack_files = [f for f in os.listdir(components_path) if f.endswith('.pack')]
+    if os.path.exists(core.manager_components_path):
+        try:
+            json_files = [f for f in os.listdir(core.manager_components_path) if f.endswith('.json')]
+            pack_files = [f for f in os.listdir(core.manager_components_path) if f.endswith('.pack')]
 
-        components = {}
-        for json_file in json_files + pack_files:
-            file_path = os.path.join(components_path, json_file)
-            with open(file_path, 'r') as file:
-                try:
-                    # When there is a conflict between the .pack and the .json, the pack takes precedence and overrides.
-                    components.update(json.load(file))
-                except json.JSONDecodeError as e:
-                    logging.error(f"[ComfyUI-Manager] Error decoding component file in file {json_file}: {e}")
+            components = {}
+            for json_file in json_files + pack_files:
+                file_path = os.path.join(core.manager_components_path, json_file)
+                with open(file_path, 'r') as file:
+                    try:
+                        # When there is a conflict between the .pack and the .json, the pack takes precedence and overrides.
+                        components.update(json.load(file))
+                    except json.JSONDecodeError as e:
+                        logging.error(f"[ComfyUI-Manager] Error decoding component file in file {json_file}: {e}")
 
-        return web.json_response(components)
-    except Exception as e:
-        logging.error(f"[ComfyUI-Manager] failed to load components\n{e}")
-        return web.Response(status=400)
+            return web.json_response(components)
+        except Exception as e:
+            logging.error(f"[ComfyUI-Manager] failed to load components\n{e}")
+            return web.Response(status=400)
+    else:
+        return web.json_response({})
 
 
 @routes.get("/manager/version")

js/comfyui-manager.js

@@ -103,24 +103,6 @@ docStyle.innerHTML = `
 	vertical-align: middle;
 }
 
-#cm-channel-badge {
-	color: white;
-	background-color: #AA0000;
-	width: 220px;
-	height: 23px;
-	font-size: 13px;
-	border-radius: 5px;
-	left: 5px;
-	top: 5px;
-	align-content: center;
-	justify-content: center;
-	text-align: center;
-	font-weight: bold;
-	float: left;
-	vertical-align: middle;
-	position: relative;
-}
-
 #custom-nodes-grid a {
 	color: #5555FF;
 	font-weight: bold;
@@ -244,7 +226,6 @@ var update_comfyui_button = null;
 var switch_comfyui_button = null;
 var fetch_updates_button = null;
 var update_all_button = null;
-var badge_mode = "none";
 let share_option = 'all';
 
 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -426,14 +407,6 @@ const style = `
 }
 `;
 
-
-
-async function init_badge_mode() {
-	api.fetchApi('/manager/badge_mode')
-		.then(response => response.text())
-		.then(data => { badge_mode = data; })
-}
-
 async function init_share_option() {
 	api.fetchApi('/manager/share_option')
 		.then(response => response.text())
@@ -450,7 +423,6 @@ async function init_notice(notice) {
 		})
 }
 
-await init_badge_mode();
 await init_share_option();
 
 async function fetchNicknames() {
@@ -517,65 +489,6 @@ function getNickname(node, nodename) {
 	}
 }
 
-function drawBadge(node, orig, restArgs) {
-	let ctx = restArgs[0];
-	const r = orig?.apply?.(node, restArgs);
-
-	if (!node.flags.collapsed && badge_mode != 'none' && node.constructor.title_mode != LiteGraph.NO_TITLE) {
-		let text = "";
-		if (badge_mode.startsWith('id_nick'))
-			text = `#${node.id} `;
-
-		let nick = node.getNickname();
-		if (nick) {
-			if (nick == 'ComfyUI') {
-				if(badge_mode.endsWith('hide')) {
-					nick = "";
-				}
-				else {
-					nick = "🦊"
-				}
-			}
-
-			if (nick.length > 25) {
-				text += nick.substring(0, 23) + "..";
-			}
-			else {
-				text += nick;
-			}
-		}
-
-		if (text != "") {
-			let fgColor = "white";
-			let bgColor = "#0F1F0F";
-			let visible = true;
-
-			ctx.save();
-			ctx.font = "12px sans-serif";
-			const sz = ctx.measureText(text);
-			ctx.fillStyle = bgColor;
-			ctx.beginPath();
-			ctx.roundRect(node.size[0] - sz.width - 12, -LiteGraph.NODE_TITLE_HEIGHT - 20, sz.width + 12, 20, 5);
-			ctx.fill();
-
-			ctx.fillStyle = fgColor;
-			ctx.fillText(text, node.size[0] - sz.width - 6, -LiteGraph.NODE_TITLE_HEIGHT - 6);
-			ctx.restore();
-
-			if (node.has_errors) {
-				ctx.save();
-				ctx.font = "bold 14px sans-serif";
-				const sz2 = ctx.measureText(node.type);
-				ctx.fillStyle = 'white';
-				ctx.fillText(node.type, node.size[0] / 2 - sz2.width / 2, node.size[1] / 2);
-				ctx.restore();
-			}
-		}
-	}
-	return r;
-}
-
-
 async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
@@ -1069,32 +982,9 @@ class ManagerMenuDialog extends ComfyDialog {
 			api.fetchApi(`/manager/preview_method?value=${event.target.value}`);
 		});
 
-		// nickname
-		let badge_combo = "";
-		if(is_legacy_front()) {
-            badge_combo = document.createElement("select");
-            badge_combo.setAttribute("title", "Configure the content to be displayed on the badge at the top right corner of the node. The ID is the identifier of the node. If 'hide built-in' is selected, both unknown nodes and built-in nodes will be omitted, making them indistinguishable");
-            badge_combo.className = "cm-menu-combo";
-            badge_combo.appendChild($el('option', { value: 'none', text: 'Badge: None' }, []));
-            badge_combo.appendChild($el('option', { value: 'nick', text: 'Badge: Nickname' }, []));
-            badge_combo.appendChild($el('option', { value: 'nick_hide', text: 'Badge: Nickname (hide built-in)' }, []));
-            badge_combo.appendChild($el('option', { value: 'id_nick', text: 'Badge: #ID Nickname' }, []));
-            badge_combo.appendChild($el('option', { value: 'id_nick_hide', text: 'Badge: #ID Nickname (hide built-in)' }, []));
-
-            api.fetchApi('/manager/badge_mode')
-                .then(response => response.text())
-                .then(data => { badge_combo.value = data; badge_mode = data; });
-
-            badge_combo.addEventListener('change', function (event) {
-                api.fetchApi(`/manager/badge_mode?value=${event.target.value}`);
-                badge_mode = event.target.value;
-                app.graph.setDirtyCanvas(true);
-            });
-		}
-
 		// channel
 		let channel_combo = document.createElement("select");
-		channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list. Note that the badge utilizes local information.");
+		channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
 		channel_combo.className = "cm-menu-combo";
 		api.fetchApi('/manager/channel_url_list')
 			.then(response => response.json())
@@ -1218,7 +1108,6 @@ class ManagerMenuDialog extends ComfyDialog {
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
-			badge_combo,
 			default_ui_combo,
 			share_combo,
 			component_policy_combo,
@@ -1663,32 +1552,6 @@ app.registerExtension({
 		this._addExtraNodeContextMenu(nodeType, app);
 	},
 
-	async nodeCreated(node, app) {
-	    if(is_legacy_front()) {
-            if(!node.badge_enabled) {
-                node.getNickname = function () { return getNickname(node, node.comfyClass.trim()) };
-                let orig = node.onDrawForeground;
-                if(!orig)
-                    orig = node.__proto__.onDrawForeground;
-
-                node.onDrawForeground = function (ctx) {
-                    drawBadge(node, orig, arguments)
-                };
-                node.badge_enabled = true;
-            }
-		}
-	},
-
-	async loadedGraphNode(node, app) {
-	    if(is_legacy_front()) {
-            if(!node.badge_enabled) {
-                const orig = node.onDrawForeground;
-                node.getNickname = function () { return getNickname(node, node.type.trim()) };
-                node.onDrawForeground = function (ctx) { drawBadge(node, orig, arguments) };
-            }
-		}
-	},
-
 	_addExtraNodeContextMenu(node, app) {
 		const origGetExtraMenuOptions = node.prototype.getExtraMenuOptions;
 		node.prototype.cm_menu_added = true;

node_db/dev/custom-node-list.json

@@ -10,7 +10,26 @@
         },
 
 
-        
+        {
+            "author": "sourceful-official",
+            "title": "ComfyUI_InstructPixToPixConditioningLatent [WIP]",
+            "reference": "https://github.com/sourceful-official/ComfyUI_InstructPixToPixConditioningLatent",
+            "files": [
+               "https://github.com/sourceful-official/ComfyUI_InstructPixToPixConditioningLatent"
+            ],
+            "description": "ComfyUI-ComfyUI_InstructPixToPixConditioningLatent\nNOTE:invalid pyproject.toml",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "fritzprix",
+            "title": "ComfyUI-LLM-Utils [WIP]",
+            "reference": "https://github.com/fritzprix/ComfyUI-LLM-Utils",
+            "files": [
+                "https://github.com/fritzprix/ComfyUI-LLM-Utils"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of utility nodes for ComfyUI focused on text and LLM-related operations\nNOTE: The files in the repo are not organized."
+        },
         {
             "author": "ciga2011",
             "title": "ComfyUI-AppGen [UNSAFE]",

node_db/dev/extension-node-map.json

@@ -510,6 +510,7 @@
     "https://github.com/Chargeuk/ComfyUI-vts-nodes": [
         [
             "VTS Clean Text",
+            "VTS Clip Text Encode",
             "VTS Color Mask To Mask",
             "VTS Conditioning Set Batch Mask",
             "VTS Merge Delimited Text",
@@ -2445,7 +2446,8 @@
             "Genera.BatchTester",
             "Genera.GCPStorageNode",
             "Genera.MaskDrawer",
-            "Genera.Utils"
+            "Genera.Utils",
+            "PainterNode"
         ],
         {
             "title_aux": "ComfyUI-GeneraNodes"
@@ -2498,6 +2500,19 @@
             "title_aux": "comfyui-cem-tools"
         }
     ],
+    "https://github.com/fritzprix/ComfyUI-LLM-Utils": [
+        [
+            "WeightedDict",
+            "WeightedDictConcat",
+            "WeightedDictInput",
+            "WeightedDictSelect",
+            "WeightedDictSelectGroup",
+            "WeightedDictToPrompt"
+        ],
+        {
+            "title_aux": "ComfyUI-LLM-Utils [WIP]"
+        }
+    ],
     "https://github.com/galoreware/ComfyUI-GaloreNodes": [
         [
             "GNI_HEX_TO_COLOR",
@@ -3768,13 +3783,15 @@
             "ConditioningZeroOutCombine",
             "ConvertTimestepToSigma",
             "DynSamplerSelect",
+            "DynamicThresholdingSimplePost",
             "EmptyLatentImageAR",
             "FreeU2PPM",
             "Guidance Limiter",
             "LatentOperationTonemapLuminance",
             "LatentToMaskBB",
             "LatentToWidthHeight",
-            "PPMSamplerSelect"
+            "PPMSamplerSelect",
+            "RescaleCFGPost"
         ],
         {
             "title_aux": "ComfyUI-ppm"
@@ -4073,6 +4090,14 @@
             "title_aux": "dandy [UNSAFE]"
         }
     ],
+    "https://github.com/sourceful-official/ComfyUI_InstructPixToPixConditioningLatent": [
+        [
+            "InstructPixToPixConditioningLatent"
+        ],
+        {
+            "title_aux": "ComfyUI_InstructPixToPixConditioningLatent [WIP]"
+        }
+    ],
     "https://github.com/sswink/comfyui-lingshang": [
         [
             "LS_ALY_Seg_Body_Utils",

node_db/new/custom-node-list.json

@@ -9,6 +9,36 @@
         },
 
         
+        {
+            "author": "LucipherDev",
+            "title": "ComfyUI-AniDoc",
+            "reference": "https://github.com/LucipherDev/ComfyUI-AniDoc",
+            "files": [
+                "https://github.com/LucipherDev/ComfyUI-AniDoc"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Custom Nodes for 'AniDoc: Animation Creation Made Easier'. This approach automates line art video colorization using a novel model that aligns color information from references, ensures temporal consistency, and reduces manual effort in animation production."
+        },
+        {
+            "author": "bear2b",
+            "title": "ColorMatrixGPU Node for ComfyUI",
+            "reference": "https://github.com/bear2b/comfyui-argo-nodes",
+            "files": [
+                "https://github.com/bear2b/comfyui-argo-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "This node applies a custom 4x4 color matrix to an image using GPU acceleration via PyTorch."
+        },
+        {
+            "author": "Vaibhavs10",
+            "title": "ComfyUI-DDUF",
+            "reference": "https://github.com/Vaibhavs10/ComfyUI-DDUF",
+            "files": [
+                "https://github.com/Vaibhavs10/ComfyUI-DDUF"
+            ],
+            "install_type": "git-clone",
+            "description": "Run DDUF in ComfyUI - powered by Diffusers."
+        },
         {
             "author": "tocubed",
             "title": "ComfyUI-EvTexture",
@@ -665,26 +695,6 @@
             ],
             "install_type": "git-clone",
             "description": "A ComfyUI plugin for quick image sequence processing. This plugin allows users to manipulate frame sequences with various operations including frame insertion, deletion, and duplication."
-        },
-        {
-            "author": "ptmaster",
-            "title": "Embedding Merge for ComfyUI",
-            "reference": "https://github.com/ptmaster/ComfyUI-Load-Diffusion-Model-to-Muti-GPUs",
-            "files": [
-                "https://github.com/ptmaster/ComfyUI-Load-Diffusion-Model-to-Muti-GPUs/raw/refs/heads/main/Load%20Diffusion%20Model%20into%20Muti%20GPUs.py"
-            ],
-            "install_type": "copy",
-            "description": "NODES: OverrideLoadedDiffusionDevice.\nI happen to have two graphics cards, and I want to load models into another graphics card in Comfyui, so I designed this small node."
-        },
-        {
-            "author": "ADDOOR",
-            "title": "ComfyUI-Addoor",
-            "reference": "https://github.com/Eagle-CN/ComfyUI-Addoor",
-            "files": [
-                "https://github.com/Eagle-CN/ComfyUI-Addoor"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of batch operation toolkits suitable for ComfyUI"
         }
     ]
 }

node_db/new/extension-node-map.json

@@ -39,6 +39,7 @@
     ],
     "https://github.com/1038lab/ComfyUI-RMBG": [
         [
+            "ClothesSegment",
             "RMBG",
             "Segment"
         ],
@@ -2486,6 +2487,7 @@
             "ImageMinusMask",
             "Light or Dark",
             "Load Random Images",
+            "Mask Preprocess Morphology",
             "PhotoShop Transfer",
             "Yuan"
         ],
@@ -5203,6 +5205,17 @@
             "title_aux": "ComfyUI-RawSaver"
         }
     ],
+    "https://github.com/LucipherDev/ComfyUI-AniDoc": [
+        [
+            "AniDocLoader",
+            "AniDocSampler",
+            "GetAniDocControlnetImages",
+            "LoadCoTracker"
+        ],
+        {
+            "title_aux": "ComfyUI-AniDoc"
+        }
+    ],
     "https://github.com/LucipherDev/ComfyUI-Golden-Noise": [
         [
             "GoldenNoise"
@@ -5779,6 +5792,7 @@
             "ImageSizeAdjusterV3",
             "LoadVideoDirectory",
             "ProjectFilePathNode",
+            "SequentialNumberGenerator",
             "StringWeights",
             "ZenkaiPrompt",
             "ZenkaiPromptV2",
@@ -7297,7 +7311,8 @@
     ],
     "https://github.com/ShmuelRonen/ComfyUI-LatentSyncWrapper": [
         [
-            "D_LatentSyncNode"
+            "D_LatentSyncNode",
+            "D_VideoLengthAdjuster"
         ],
         {
             "title_aux": "ComfyUI-LatentSyncWrapper"
@@ -7669,6 +7684,7 @@
             "SDVN Image Repeat",
             "SDVN Image Size",
             "SDVN Inpaint",
+            "SDVN Join Parameter",
             "SDVN KSampler",
             "SDVN Load Checkpoint",
             "SDVN Load Image",
@@ -7676,6 +7692,7 @@
             "SDVN Load Image From List",
             "SDVN Load Image Url",
             "SDVN Load Lora",
+            "SDVN Load Model",
             "SDVN Load Text",
             "SDVN Logic",
             "SDVN Lora Download",
@@ -8693,6 +8710,18 @@
             "title_aux": "Tripo for ComfyUI"
         }
     ],
+    "https://github.com/Vaibhavs10/ComfyUI-DDUF": [
+        [
+            "DDUFLoader",
+            "DiffusersModelMakeup",
+            "DiffusersPipelineLoader",
+            "DiffusersSchedulerLoader",
+            "DiffusersSimpleSampler"
+        ],
+        {
+            "title_aux": "ComfyUI-DDUF"
+        }
+    ],
     "https://github.com/VangengLab/ComfyUI-LivePortrait_v2": [
         [
             "LivePortraitProcess_animal"
@@ -10798,6 +10827,14 @@
             "title_aux": "Mikey Nodes"
         }
     ],
+    "https://github.com/bear2b/comfyui-argo-nodes": [
+        [
+            "ColorMatrixGPU"
+        ],
+        {
+            "title_aux": "ColorMatrixGPU Node for ComfyUI"
+        }
+    ],
     "https://github.com/bedovyy/ComfyUI_NAIDGenerator": [
         [
             "ColorizeNAID",
@@ -14263,7 +14300,8 @@
             "Genera.BatchTester",
             "Genera.GCPStorageNode",
             "Genera.MaskDrawer",
-            "Genera.Utils"
+            "Genera.Utils",
+            "PainterNode"
         ],
         {
             "title_aux": "ComfyUI-GeneraNodes"
@@ -16538,7 +16576,9 @@
             "Ksampler Parameters JK",
             "Latent Crop Offset JK",
             "Latent Upscale Parameters Extract JK",
+            "Load Image With Alpha JK",
             "Load Image With Metadata JK",
+            "Make Image Grid JK",
             "Metadata Pipe Extract JK",
             "Metadata Pipe JK",
             "NodesState JK",
@@ -16609,6 +16649,7 @@
             "Save Image with Metadata Flow JK",
             "Save Image with Metadata JK",
             "Scale To Resolution JK",
+            "Split Image Grid JK",
             "Stability Conservative Upscale",
             "Stability Control Sketch",
             "Stability Control Structure",
@@ -21345,13 +21386,15 @@
             "ConditioningZeroOutCombine",
             "ConvertTimestepToSigma",
             "DynSamplerSelect",
+            "DynamicThresholdingSimplePost",
             "EmptyLatentImageAR",
             "FreeU2PPM",
             "Guidance Limiter",
             "LatentOperationTonemapLuminance",
             "LatentToMaskBB",
             "LatentToWidthHeight",
-            "PPMSamplerSelect"
+            "PPMSamplerSelect",
+            "RescaleCFGPost"
         ],
         {
             "title_aux": "ComfyUI-ppm"
@@ -21457,6 +21500,16 @@
             "title_aux": "\u2728 Clarity AI - Creative Image Upscaler and Enhancer for ComfyUI"
         }
     ],
+    "https://github.com/phuvinh010701/ComfyUI-Nudenet": [
+        [
+            "ApplyNudenet",
+            "FilterdLabel",
+            "NudenetModelLoader"
+        ],
+        {
+            "title_aux": "ComfyUI-Nudenet"
+        }
+    ],
     "https://github.com/phyblas/paint-by-example_comfyui": [
         [
             "PaintbyExampleAdvanced",

prestartup_script.py

@@ -318,6 +318,7 @@ except Exception as e:
 
 try:
     import git  # noqa: F401
+    import toml  # noqa: F401
 except ModuleNotFoundError:
     my_path = os.path.dirname(__file__)
     requirements_path = os.path.join(my_path, "requirements.txt")
@@ -436,6 +437,14 @@ def is_installed(name):
         elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
             print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
 
+    if match.group(2) == '==':
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+
+    if match.group(2) == '~=':
+        if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
+            return False
+
     return True       # prevent downgrade
 
 

pyproject.toml

@@ -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.3.2"
+version = "3.3.7"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
 

scripts/install-manager-for-portable-version.bat

@@ -1,2 +1,2 @@
 .\python_embeded\python.exe -s -m pip install gitpython
-.\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/ComfyUI-Manager')"
+.\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"

scripts/update-fix.py

@@ -1,12 +0,0 @@
-import git
-
-commit_hash = "a361cc1"
-
-repo = git.Repo('.')
-
-if repo.is_dirty():
-    repo.git.stash()
-
-repo.git.update_ref("refs/remotes/origin/main", commit_hash)
-repo.remotes.origin.fetch()
-repo.git.pull("origin", "main")