diff --git a/MANIFEST.in b/MANIFEST.in index ef0db890..21e7402f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,4 +10,5 @@ include extension-node-list.json include extras.json include github-stats.json include model-list.json -include alter-list.json \ No newline at end of file +include alter-list.json +include comfyui_manager/channels.list.template \ No newline at end of file diff --git a/channels.list.template b/channels.list.template deleted file mode 100644 index 9a8d6877..00000000 --- a/channels.list.template +++ /dev/null @@ -1,6 +0,0 @@ -default::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main -recent::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/new -legacy::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/legacy -forked::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/forked -dev::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/dev -tutorial::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/tutorial \ No newline at end of file diff --git a/comfyui_manager/channels.list.template b/comfyui_manager/channels.list.template new file mode 100644 index 00000000..eeeae938 --- /dev/null +++ b/comfyui_manager/channels.list.template @@ -0,0 +1,6 @@ +default::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main +recent::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/new +legacy::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/legacy +forked::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/forked +dev::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/dev +tutorial::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/tutorial \ No newline at end of file diff --git a/comfyui_manager/legacy/manager_core.py b/comfyui_manager/legacy/manager_core.py index 77e07bb9..71653eab 100644 --- a/comfyui_manager/legacy/manager_core.py +++ b/comfyui_manager/legacy/manager_core.py @@ -45,7 +45,7 @@ version_code = [4, 0] version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') -DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main" +DEFAULT_CHANNEL = "https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main" default_custom_nodes_path = None @@ -1601,7 +1601,7 @@ def read_config(): 'model_download_by_agent': False, 'downgrade_blacklist': '', 'always_lazy_install': False, - 'network_mode': NetworkMode.OFFLINE.value, + 'network_mode': NetworkMode.PUBLIC.value, 'security_level': SecurityLevel.NORMAL.value, 'db_mode': DBMode.CACHE.value, } diff --git a/comfyui_manager/legacy/manager_server.py b/comfyui_manager/legacy/manager_server.py index 94214d93..760d09b9 100644 --- a/comfyui_manager/legacy/manager_server.py +++ b/comfyui_manager/legacy/manager_server.py @@ -36,9 +36,9 @@ logging.info("[ComfyUI-Manager] network_mode: " + network_mode_description) comfy_ui_hash = "-" comfyui_tag = None -SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy" -SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy" -SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy" +SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/Comfy-Org/ComfyUI-Manager#security-policy" +SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/Comfy-Org/ComfyUI-Manager#security-policy" +SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/Comfy-Org/ComfyUI-Manager#security-policy" SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower." routes = PromptServer.instance.routes @@ -108,7 +108,7 @@ def is_allowed_security_level(level): async def get_risky_level(files, pip_packages): json_data1 = await core.get_data_by_mode('local', 'custom-node-list.json') - json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main') + json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main') all_urls = set() for x in json_data1['custom_nodes'] + json_data2['custom_nodes']: @@ -1049,6 +1049,9 @@ async def fetch_customnode_list(request): if 'https://github.com/ltdrdata/ComfyUI-Manager' in node_packs: del node_packs['https://github.com/ltdrdata/ComfyUI-Manager'] + + if 'https://github.com/Comfy-Org/ComfyUI-Manager' in node_packs: + del node_packs['https://github.com/Comfy-Org/ComfyUI-Manager'] if channel != 'local': found = 'custom' @@ -1918,7 +1921,7 @@ async def default_cache_update(): logging.error(f"[ComfyUI-Manager] Failed to perform initial fetching '{filename}': {e}") traceback.print_exc() - if core.get_config()['network_mode'] != 'offline' and not manager_util.is_manager_pip_package(): + if core.get_config()['network_mode'] != 'offline': a = get_cache("custom-node-list.json") b = get_cache("extension-node-map.json") c = get_cache("model-list.json") diff --git a/pyproject.toml b/pyproject.toml index 00fe1d61..69f836b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "comfyui-manager" license = { text = "GPL-3.0-only" } -version = "4.0.0-beta.1" +version = "4.0.0-beta.2" 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"