mirror of
https://github.com/Comfy-Org/ComfyUI-Manager.git
synced 2026-03-29 12:53:34 +08:00
49e205acd4
* feat: add pygit2 compatibility wrapper for standalone Desktop 2.0 installs Add git_compat.py abstraction layer that wraps both GitPython and pygit2 behind a unified GitRepo interface. When CM_USE_PYGIT2=1 is set (by the Desktop 2.0 Launcher for standalone installs), or when system git is not available, the pygit2 backend is used automatically. Key changes: - New comfyui_manager/common/git_compat.py with abstract GitRepo base class, _GitPythonRepo (1:1 pass-throughs) and _Pygit2Repo implementations - All 6 non-legacy files updated to use the wrapper: - comfyui_manager/glob/manager_core.py (14 git.Repo usages) - comfyui_manager/common/git_helper.py (7 git.Repo usages) - comfyui_manager/common/context.py (1 usage) - comfyui_manager/glob/utils/environment_utils.py (2 usages) - cm_cli/__main__.py (1 usage) - comfyui_manager/common/timestamp_utils.py (repo.heads usage) - get_script_env() propagates CM_USE_PYGIT2 to subprocesses - git_helper.py uses sys.path.insert to find git_compat as standalone script - All repo handles wrapped in context managers to prevent resource leaks - get_head_by_name returns _HeadProxy for interface consistency - Submodule fallback logs clear message when system git is absent - 47 tests comparing both backends via subprocess isolation Co-authored-by: Amp <amp@ampcode.com> Amp-Thread-ID: https://ampcode.com/threads/T-019d0ec5-cb9f-74df-a1a2-0c8154a330b3 * fix(pygit2): address review findings + bump version to 4.2b1 - C1: add submodule_update() after pygit2 clone for recursive parity - C2: check subprocess returncode in submodule_update fallback - C3: move GIT_OPT_SET_OWNER_VALIDATION to module-level (once at import) - H1: use context manager in git_pull() to prevent resource leaks - Bump version to 4.2b1, version_code to [4, 2] - Add pygit2 to dev dependencies and requirements.txt * style: fix ruff F841 unused variable and F541 unnecessary f-string --------- Co-authored-by: Amp <amp@ampcode.com> Co-authored-by: Dr.Lt.Data <dr.lt.data@gmail.com>
106 lines
3.4 KiB
Python
106 lines
3.4 KiB
Python
import sys
|
|
import os
|
|
import logging
|
|
from . import manager_util
|
|
import toml
|
|
from .git_compat import open_repo
|
|
|
|
|
|
# read env vars
|
|
comfy_path: str = os.environ.get('COMFYUI_PATH')
|
|
comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
|
|
|
|
if comfy_path is None:
|
|
try:
|
|
comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
|
|
os.environ['COMFYUI_PATH'] = comfy_path
|
|
except Exception:
|
|
logging.error("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
|
|
exit(-1)
|
|
|
|
if comfy_base_path is None:
|
|
comfy_base_path = comfy_path
|
|
|
|
channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
|
|
git_script_path = os.path.join(manager_util.comfyui_manager_path, "common", "git_helper.py")
|
|
|
|
manager_files_path = None
|
|
manager_config_path = None
|
|
manager_channel_list_path = None
|
|
manager_startup_script_path:str = None
|
|
manager_snapshot_path = None
|
|
manager_pip_overrides_path = None
|
|
manager_pip_blacklist_path = None
|
|
manager_batch_history_path = None
|
|
|
|
def update_user_directory(manager_dir):
|
|
global manager_files_path
|
|
global manager_config_path
|
|
global manager_channel_list_path
|
|
global manager_startup_script_path
|
|
global manager_snapshot_path
|
|
global manager_pip_overrides_path
|
|
global manager_pip_blacklist_path
|
|
global manager_batch_history_path
|
|
|
|
manager_files_path = manager_dir
|
|
if not os.path.exists(manager_files_path):
|
|
os.makedirs(manager_files_path)
|
|
|
|
manager_snapshot_path = os.path.join(manager_files_path, "snapshots")
|
|
if not os.path.exists(manager_snapshot_path):
|
|
os.makedirs(manager_snapshot_path)
|
|
|
|
manager_startup_script_path = os.path.join(manager_files_path, "startup-scripts")
|
|
if not os.path.exists(manager_startup_script_path):
|
|
os.makedirs(manager_startup_script_path)
|
|
|
|
manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
|
manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
|
|
manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
|
|
manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
|
|
manager_util.cache_dir = os.path.join(manager_files_path, "cache")
|
|
manager_batch_history_path = os.path.join(manager_files_path, "batch_history")
|
|
|
|
if not os.path.exists(manager_util.cache_dir):
|
|
os.makedirs(manager_util.cache_dir)
|
|
|
|
if not os.path.exists(manager_batch_history_path):
|
|
os.makedirs(manager_batch_history_path)
|
|
|
|
try:
|
|
import folder_paths
|
|
update_user_directory(folder_paths.get_system_user_directory("manager"))
|
|
|
|
except Exception:
|
|
# fallback:
|
|
# This case is only possible when running with cm-cli, and in practice, this case is not actually used.
|
|
update_user_directory(os.path.abspath(manager_util.comfyui_manager_path))
|
|
|
|
|
|
def get_current_comfyui_ver():
|
|
"""
|
|
Extract version from pyproject.toml
|
|
"""
|
|
toml_path = os.path.join(comfy_path, 'pyproject.toml')
|
|
if not os.path.exists(toml_path):
|
|
return None
|
|
else:
|
|
try:
|
|
with open(toml_path, "r", encoding="utf-8") as f:
|
|
data = toml.load(f)
|
|
|
|
project = data.get('project', {})
|
|
return project.get('version')
|
|
except Exception:
|
|
return None
|
|
|
|
|
|
def get_comfyui_tag():
|
|
try:
|
|
with open_repo(comfy_path) as repo:
|
|
return repo.describe_tags()
|
|
except Exception:
|
|
return None
|
|
|