diff --git a/glob/manager_core.py b/glob/manager_core.py index 9e1caa5c..c77da09e 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -41,7 +41,7 @@ import manager_downloader from node_package import InstalledNodePackage -version_code = [3, 6, 3] +version_code = [3, 6, 4] version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') @@ -277,7 +277,7 @@ def is_installed(name): if match is None: if name in pips: return True - elif match.group(2) in ['<=', '==', '<']: + elif match.group(2) in ['<=', '==', '<', '~=']: if name in pips: if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)): print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'") @@ -723,8 +723,12 @@ class UnifiedManager: return res async def get_custom_nodes(self, channel, mode): - default_channel = normalize_channel('default') - cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel. + # default_channel = normalize_channel('default') + # cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel. + + + channel = normalize_channel(channel) + cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel. if cache is not None: return cache diff --git a/prestartup_script.py b/prestartup_script.py index 3a32b5d2..9c8d63c2 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -418,7 +418,7 @@ def is_installed(name): if match is None: if name in pips: return True - elif match.group(2) in ['<=', '==', '<']: + elif match.group(2) in ['<=', '==', '<', '~=']: if name in pips: if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)): print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'") diff --git a/pyproject.toml b/pyproject.toml index 5c20e123..76d916b8 100644 --- a/pyproject.toml +++ b/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.6.3" +version = "3.6.4" license = { file = "LICENSE.txt" } dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]