Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3d613cca9 | ||
|
|
86893d999a |
12
cm-cli.py
12
cm-cli.py
@@ -152,6 +152,11 @@ class Ctx:
|
|||||||
if y != '':
|
if y != '':
|
||||||
cm_global.pip_blacklist.add(y)
|
cm_global.pip_blacklist.add(y)
|
||||||
|
|
||||||
|
def update_custom_nodes_dir(self, target_dir):
|
||||||
|
import folder_paths
|
||||||
|
a, b = folder_paths.folder_names_and_paths['custom_nodes']
|
||||||
|
folder_paths.folder_names_and_paths['custom_nodes'] = [os.path.abspath(target_dir)], set()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_startup_scripts_path():
|
def get_startup_scripts_path():
|
||||||
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
|
return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
|
||||||
@@ -1075,10 +1080,17 @@ def restore_snapshot(
|
|||||||
user_directory: str = typer.Option(
|
user_directory: str = typer.Option(
|
||||||
None,
|
None,
|
||||||
help="user directory"
|
help="user directory"
|
||||||
|
),
|
||||||
|
restore_to: Optional[str] = typer.Option(
|
||||||
|
None,
|
||||||
|
help="Manually specify the installation path for the custom node. Ignore user directory."
|
||||||
)
|
)
|
||||||
):
|
):
|
||||||
cmd_ctx.set_user_directory(user_directory)
|
cmd_ctx.set_user_directory(user_directory)
|
||||||
|
|
||||||
|
if restore_to:
|
||||||
|
cmd_ctx.update_custom_nodes_dir(restore_to)
|
||||||
|
|
||||||
extras = []
|
extras = []
|
||||||
if pip_non_url:
|
if pip_non_url:
|
||||||
extras.append('--pip-non-url')
|
extras.append('--pip-non-url')
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ import manager_downloader
|
|||||||
from node_package import InstalledNodePackage
|
from node_package import InstalledNodePackage
|
||||||
|
|
||||||
|
|
||||||
version_code = [3, 26]
|
version_code = [3, 26, 2]
|
||||||
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 '')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
import logging
|
import logging
|
||||||
|
import platform
|
||||||
|
|
||||||
|
|
||||||
cache_lock = threading.Lock()
|
cache_lock = threading.Lock()
|
||||||
@@ -21,6 +22,16 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also up
|
|||||||
|
|
||||||
use_uv = False
|
use_uv = False
|
||||||
|
|
||||||
|
|
||||||
|
def add_python_path_to_env():
|
||||||
|
if platform.system() != "Windows":
|
||||||
|
sep = ':'
|
||||||
|
else:
|
||||||
|
sep = ';'
|
||||||
|
|
||||||
|
os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
|
||||||
|
|
||||||
|
|
||||||
def make_pip_cmd(cmd):
|
def make_pip_cmd(cmd):
|
||||||
if use_uv:
|
if use_uv:
|
||||||
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
||||||
|
|||||||
@@ -34,6 +34,8 @@ else:
|
|||||||
|
|
||||||
security_check.security_check()
|
security_check.security_check()
|
||||||
|
|
||||||
|
manager_util.add_python_path_to_env()
|
||||||
|
|
||||||
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
|
cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
|
||||||
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
|
||||||
|
|
||||||
|
|||||||
@@ -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.26"
|
version = "3.26.2"
|
||||||
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", "toml", "uv", "chardet"]
|
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user