Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85a03e6249 | ||
|
|
0903f28b0c | ||
|
|
c663907e37 |
@@ -41,7 +41,7 @@ import manager_downloader
|
|||||||
from node_package import InstalledNodePackage
|
from node_package import InstalledNodePackage
|
||||||
|
|
||||||
|
|
||||||
version_code = [3, 6, 1]
|
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 '')
|
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 match is None:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
return True
|
return True
|
||||||
elif match.group(2) in ['<=', '==', '<']:
|
elif match.group(2) in ['<=', '==', '<', '~=']:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
||||||
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
||||||
@@ -723,8 +723,12 @@ class UnifiedManager:
|
|||||||
return res
|
return res
|
||||||
|
|
||||||
async def get_custom_nodes(self, channel, mode):
|
async def get_custom_nodes(self, channel, mode):
|
||||||
default_channel = normalize_channel('default')
|
# 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.
|
# 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:
|
if cache is not None:
|
||||||
return cache
|
return cache
|
||||||
@@ -1321,7 +1325,7 @@ class UnifiedManager:
|
|||||||
custom_nodes = await self.get_custom_nodes(channel, mode)
|
custom_nodes = await self.get_custom_nodes(channel, mode)
|
||||||
the_node = custom_nodes.get(node_id)
|
the_node = custom_nodes.get(node_id)
|
||||||
if the_node is not None:
|
if the_node is not None:
|
||||||
if version_spec is 'unknown':
|
if version_spec == 'unknown':
|
||||||
repo_url = the_node['files'][0]
|
repo_url = the_node['files'][0]
|
||||||
else: # nightly
|
else: # nightly
|
||||||
repo_url = the_node['reference']
|
repo_url = the_node['reference']
|
||||||
|
|||||||
@@ -867,7 +867,7 @@ async def install_custom_node(request):
|
|||||||
node_spec_str = f"{cnr_id}@{selected_version}"
|
node_spec_str = f"{cnr_id}@{selected_version}"
|
||||||
else:
|
else:
|
||||||
node_spec_str = f"{cnr_id}@nightly"
|
node_spec_str = f"{cnr_id}@nightly"
|
||||||
git_url = json_data.get('reference')
|
git_url = [json_data.get('reference')]
|
||||||
if git_url is None:
|
if git_url is None:
|
||||||
logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
|
logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
|
||||||
return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
|
return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
|
||||||
@@ -1414,6 +1414,10 @@ async def default_cache_update():
|
|||||||
|
|
||||||
await asyncio.gather(a, b, c, d, e)
|
await asyncio.gather(a, b, c, d, e)
|
||||||
|
|
||||||
|
# load at least once
|
||||||
|
await core.unified_manager.reload('cache')
|
||||||
|
await core.unified_manager.get_custom_nodes('default', 'cache')
|
||||||
|
|
||||||
# NOTE: hide migration button temporarily.
|
# NOTE: hide migration button temporarily.
|
||||||
# if not core.get_config()['skip_migration_check']:
|
# if not core.get_config()['skip_migration_check']:
|
||||||
# await core.check_need_to_migrate()
|
# await core.check_need_to_migrate()
|
||||||
|
|||||||
@@ -418,7 +418,7 @@ def is_installed(name):
|
|||||||
if match is None:
|
if match is None:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
return True
|
return True
|
||||||
elif match.group(2) in ['<=', '==', '<']:
|
elif match.group(2) in ['<=', '==', '<', '~=']:
|
||||||
if name in pips:
|
if name in pips:
|
||||||
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
|
||||||
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "comfyui-manager"
|
name = "comfyui-manager"
|
||||||
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
|
||||||
version = "3.6.1"
|
version = "3.6.4"
|
||||||
license = { file = "LICENSE.txt" }
|
license = { file = "LICENSE.txt" }
|
||||||
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
|
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user