fixed: Issue where an invalid channel exception occurred when using the default channel

- Mismatch issue between ltdrdata/ and Comfy-Org/
modified: /v2/customnode/installed – cnr_id was being returned in a normalized form
modified: /v2/customnode/installed – when both an enabled nodepack and a disabled nodepack existed, modified to report only the enabled nodepack
fixed: Removed unnecessary warning messages printed during nodepack installation

Author: ltdrdata

comfyui_manager/common/cnr_utils.py

@@ -211,6 +211,7 @@ def read_cnr_info(fullpath):
 
             project = data.get('project', {})
             name = project.get('name').strip().lower()
+            original_name = project.get('name')
 
             # normalize version
             # for example: 2.5 -> 2.5.0
@@ -222,6 +223,7 @@ def read_cnr_info(fullpath):
             if name and version:  # repository is optional
                 return {
                     "id": name,
+                    "original_name": original_name,
                     "version": version,
                     "url": repository
                 }

comfyui_manager/glob/manager_core.py

@@ -46,6 +46,7 @@
 
 
 DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
+DEFAULT_CHANNEL_LEGACY = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
 
 
 default_custom_nodes_path = None
@@ -153,14 +154,8 @@ def check(root):
 cached_config = None
 js_path = None
 
-comfy_ui_required_revision = 1930
-comfy_ui_required_commit_datetime = datetime(2024, 1, 24, 0, 0, 0)
-
-comfy_ui_revision = "Unknown"
-comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
-
 channel_dict = None
-valid_channels = {'default', 'local'}
+valid_channels = {'default', 'local', DEFAULT_CHANNEL, DEFAULT_CHANNEL_LEGACY}
 channel_list = None
 
 
@@ -1479,7 +1474,7 @@ def identify_node_pack_from_path(fullpath):
         # cnr
         cnr = cnr_utils.read_cnr_info(fullpath)
         if cnr is not None:
-            return module_name, cnr['version'], cnr['id'], None
+            return module_name, cnr['version'], cnr['original_name'], None
 
         return None
     else:
@@ -1529,7 +1524,10 @@ def get_installed_node_packs():
                 if info is None:
                     continue
 
-                res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': False }
+                # NOTE: don't add disabled nodepack if there is enabled nodepack
+                original_name = info[0].split('@')[0]
+                if original_name not in res:
+                    res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': False }
 
     return res
 
@@ -1786,16 +1784,6 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
         print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
         code = manager_funcs.run_script(install_cmd, cwd=repo_path)
 
-        if platform.system() != "Windows":
-            try:
-                if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
-                    print("\n\n###################################################################")
-                    print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
-                    print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
-                    print("###################################################################\n\n")
-            except Exception:
-                pass
-
         if code != 0:
             if url is None:
                 url = os.path.dirname(repo_path)

comfyui_manager/legacy/manager_core.py

@@ -46,6 +46,7 @@
 
 
 DEFAULT_CHANNEL = "https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main"
+DEFAULT_CHANNEL_LEGACY = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
 
 
 default_custom_nodes_path = None
@@ -160,7 +161,7 @@ def check(root):
 comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
 
 channel_dict = None
-valid_channels = {'default', 'local'}
+valid_channels = {'default', 'local', DEFAULT_CHANNEL, DEFAULT_CHANNEL_LEGACY}
 channel_list = None
 
 

comfyui_manager/legacy/manager_server.py

@@ -1072,12 +1072,15 @@ async def fetch_customnode_list(request):
     if channel != 'local':
         found = 'custom'
 
-        for name, url in core.get_channel_dict().items():
-            if url == channel:
-                found = name
-                break
+        if channel == core.DEFAULT_CHANNEL or channel == core.DEFAULT_CHANNEL_LEGACY:
+            channel = 'default'
+        else:
+            for name, url in core.get_channel_dict().items():
+                if url == channel:
+                    found = name
+                    break
 
-        channel = found
+            channel = found
 
     result = dict(channel=channel, node_packs=node_packs.to_dict())
 

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "comfyui-manager"
 license = { text = "GPL-3.0-only" }
-version = "4.0.1-beta.4"
+version = "4.0.1-beta.5"
 requires-python = ">= 3.9"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
 readme = "README.md"