mirror of
https://github.com/Comfy-Org/ComfyUI-Manager.git
synced 2025-12-16 18:02:58 +08:00
43647249cf
Remove package-level caching in cnr_utils and node_package modules to enable proper dynamic custom node installation and version switching without ComfyUI server restarts. Key Changes: - Remove @lru_cache decorators from version-sensitive functions - Remove cached_property from NodePackage for dynamic state updates - Add comprehensive test suite with parallel execution support - Implement version switching tests (CNR ↔ Nightly) - Add case sensitivity integration tests - Improve error handling and logging API Priority Rules (manager_core.py:1801): - Enabled-Priority: Show only enabled version when both exist - CNR-Priority: Show only CNR when both CNR and Nightly are disabled - Prevents duplicate package entries in /v2/customnode/installed API - Cross-match using cnr_id and aux_id for CNR ↔ Nightly detection Test Infrastructure: - 8 test files with 59 comprehensive test cases - Parallel test execution across 5 isolated environments - Automated test scripts with environment setup - Configurable timeout (60 minutes default) - Support for both master and dr-support-pip-cm branches Bug Fixes: - Fix COMFYUI_CUSTOM_NODES_PATH environment variable export - Resolve test fixture regression with module-level variables - Fix import timing issues in test configuration - Register pytest integration marker to eliminate warnings - Fix POSIX compliance in shell scripts (((var++)) → $((var + 1))) Documentation: - CNR_VERSION_MANAGEMENT_DESIGN.md v1.0 → v1.1 with API priority rules - Add test guides and execution documentation (TESTING_PROMPT.md) - Add security-enhanced installation guide - Create CLI migration guides and references - Document package version management 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
122 lines
2.8 KiB
Python
122 lines
2.8 KiB
Python
import traceback
|
|
|
|
#
|
|
# Global Var
|
|
#
|
|
# Usage:
|
|
# import cm_global
|
|
# cm_global.variables['comfyui.revision'] = 1832
|
|
# print(f"log mode: {cm_global.variables['logger.enabled']}")
|
|
#
|
|
variables = {}
|
|
|
|
|
|
#
|
|
# Global API
|
|
#
|
|
# Usage:
|
|
# [register API]
|
|
# import cm_global
|
|
#
|
|
# def api_hello(msg):
|
|
# print(f"hello: {msg}")
|
|
# return msg
|
|
#
|
|
# cm_global.register_api('hello', api_hello)
|
|
#
|
|
# [use API]
|
|
# import cm_global
|
|
#
|
|
# test = cm_global.try_call(api='hello', msg='an example')
|
|
# print(f"'{test}' is returned")
|
|
#
|
|
|
|
APIs = {}
|
|
|
|
|
|
pip_overrides = {}
|
|
pip_blacklist = {}
|
|
pip_downgrade_blacklist = {}
|
|
|
|
|
|
def register_api(k, f):
|
|
global APIs
|
|
APIs[k] = f
|
|
|
|
|
|
def try_call(**kwargs):
|
|
if 'api' in kwargs:
|
|
api_name = kwargs['api']
|
|
try:
|
|
api = APIs.get(api_name)
|
|
if api is not None:
|
|
del kwargs['api']
|
|
return api(**kwargs)
|
|
else:
|
|
print(f"WARN: The '{kwargs['api']}' API has not been registered.")
|
|
except Exception as e:
|
|
print(f"ERROR: An exception occurred while calling the '{api_name}' API.")
|
|
raise e
|
|
else:
|
|
return None
|
|
|
|
|
|
#
|
|
# Extension Info
|
|
#
|
|
# Usage:
|
|
# import cm_global
|
|
#
|
|
# cm_global.extension_infos['my_extension'] = {'version': [0, 1], 'name': 'me', 'description': 'example extension', }
|
|
#
|
|
extension_infos = {}
|
|
|
|
on_extension_registered_handlers = {}
|
|
|
|
|
|
def register_extension(extension_name, v):
|
|
global extension_infos
|
|
global on_extension_registered_handlers
|
|
extension_infos[extension_name] = v
|
|
|
|
if extension_name in on_extension_registered_handlers:
|
|
for k, f in on_extension_registered_handlers[extension_name]:
|
|
try:
|
|
f(extension_name, v)
|
|
except Exception:
|
|
print(f"[ERROR] '{k}' on_extension_registered_handlers")
|
|
traceback.print_exc()
|
|
|
|
del on_extension_registered_handlers[extension_name]
|
|
|
|
|
|
def add_on_extension_registered(k, extension_name, f):
|
|
global on_extension_registered_handlers
|
|
if extension_name in extension_infos:
|
|
try:
|
|
v = extension_infos[extension_name]
|
|
f(extension_name, v)
|
|
except Exception:
|
|
print(f"[ERROR] '{k}' on_extension_registered_handler")
|
|
traceback.print_exc()
|
|
else:
|
|
if extension_name not in on_extension_registered_handlers:
|
|
on_extension_registered_handlers[extension_name] = []
|
|
|
|
on_extension_registered_handlers[extension_name].append((k, f))
|
|
|
|
|
|
def add_on_revision_detected(k, f):
|
|
if 'comfyui.revision' in variables:
|
|
try:
|
|
f(variables['comfyui.revision'])
|
|
except Exception:
|
|
print(f"[ERROR] '{k}' on_revision_detected_handler")
|
|
traceback.print_exc()
|
|
else:
|
|
variables['cm.on_revision_detected_handler'].append((k, f))
|
|
|
|
|
|
error_dict = {}
|
|
|
|
disable_front = False |