mirror of
https://github.com/Comfy-Org/ComfyUI-Manager.git
synced 2025-12-16 18:02:58 +08:00
* FIXED: cm-cli.py - mode doesn't work
* FIXED: get_cnr_data - use timeout fallback
This commit is contained in:
parent
c6153ea67d
commit
3274885803
@ -118,7 +118,7 @@ class Ctx:
|
|||||||
if channel is not None:
|
if channel is not None:
|
||||||
self.channel = channel
|
self.channel = channel
|
||||||
|
|
||||||
asyncio.run(unified_manager.reload(cache_mode=self.mode == 'cache', dont_wait=False))
|
asyncio.run(unified_manager.reload(cache_mode=self.mode, dont_wait=False))
|
||||||
asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
|
asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
|
||||||
|
|
||||||
def set_no_deps(self, no_deps):
|
def set_no_deps(self, no_deps):
|
||||||
|
|||||||
@ -15,6 +15,13 @@ lock = asyncio.Lock()
|
|||||||
is_cache_loading = False
|
is_cache_loading = False
|
||||||
|
|
||||||
async def get_cnr_data(cache_mode=True, dont_wait=True):
|
async def get_cnr_data(cache_mode=True, dont_wait=True):
|
||||||
|
try:
|
||||||
|
return await _get_cnr_data(cache_mode, dont_wait)
|
||||||
|
except asyncio.TimeoutError:
|
||||||
|
print(f"A timeout occurred during the fetch process from ComfyRegistry.")
|
||||||
|
return await _get_cnr_data(cache_mode=True, dont_wait=True) # timeout fallback
|
||||||
|
|
||||||
|
async def _get_cnr_data(cache_mode=True, dont_wait=True):
|
||||||
global is_cache_loading
|
global is_cache_loading
|
||||||
|
|
||||||
uri = f'{base_url}/nodes'
|
uri = f'{base_url}/nodes'
|
||||||
@ -26,7 +33,7 @@ async def get_cnr_data(cache_mode=True, dont_wait=True):
|
|||||||
full_nodes = {}
|
full_nodes = {}
|
||||||
while remained:
|
while remained:
|
||||||
sub_uri = f'{base_url}/nodes?page={page}&limit=30'
|
sub_uri = f'{base_url}/nodes?page={page}&limit=30'
|
||||||
sub_json_obj = await manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True)
|
sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True), timeout=10)
|
||||||
remained = page < sub_json_obj['totalPages']
|
remained = page < sub_json_obj['totalPages']
|
||||||
|
|
||||||
for x in sub_json_obj['nodes']:
|
for x in sub_json_obj['nodes']:
|
||||||
|
|||||||
@ -41,7 +41,7 @@ import manager_downloader
|
|||||||
from node_package import InstalledNodePackage
|
from node_package import InstalledNodePackage
|
||||||
|
|
||||||
|
|
||||||
version_code = [3, 9]
|
version_code = [3, 9, 1]
|
||||||
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 '')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -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.9"
|
version = "3.9.1"
|
||||||
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"]
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user