Ewald
94f212a261
Completes the except Exception: pass -> observable-debug-log sweep. This batch covers the ~26 files that had no module-level logger yet: adds `logger = get_logger(__name__)` (mjr_am_backend.shared, or mjr_am_shared.log for files inside mjr_am_shared itself) alongside the existing import block, then applies the same pass -> logger.debug substitution as the earlier 4 batches. __init__.py and nodes.py already had a differently-named logger (_logger / _log) and just needed the substitution. mjr_am_shared/log.py is the one true special case: its silent except lives inside _ensure_correlation_filter(logger), which already takes the target logger as a parameter -- logging through that same parameter instead of adding a redundant module logger. Ran `ruff check --fix` after each batch to normalize import ordering, then verified every touched module still imports cleanly (import smoke test) in addition to the full pytest suite (1846 passed). This closes out the backend "silent exception" audit finding: every `except Exception: pass` in the codebase that could reasonably get a logger now has one.
230 lines
8.2 KiB
Python
230 lines
8.2 KiB
Python
"""
|
|
ComfyUI-Majoor-AssetsManager
|
|
Advanced asset browser for ComfyUI with ratings, tags, and metadata management.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import importlib
|
|
import logging
|
|
import os
|
|
import re
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
|
|
# ComfyUI Nodes V3 extension entrypoint. Node classes are defined in nodes.py
|
|
# using the comfy_api.latest io.ComfyNode schema and are resolved lazily here
|
|
# so a broken optional dependency (torch/av) degrades to zero nodes instead of
|
|
# preventing the rest of the extension (routes, frontend bundle) from loading.
|
|
async def comfy_entrypoint():
|
|
from comfy_api.latest import ComfyExtension # type: ignore[import-untyped]
|
|
|
|
# Wraps nodes.comfy_entrypoint() rather than re-exporting it directly so a
|
|
# broken nodes.py import degrades to zero nodes (see except below) instead
|
|
# of aborting extension load entirely.
|
|
class _MajoorAssetsManagerExtension(ComfyExtension):
|
|
async def get_node_list(self):
|
|
try:
|
|
from .nodes import comfy_entrypoint as _nodes_entrypoint
|
|
except Exception:
|
|
logging.getLogger("majoor_assets_manager").debug(
|
|
"failed to import custom nodes", exc_info=True,
|
|
)
|
|
return []
|
|
extension = await _nodes_entrypoint()
|
|
return await extension.get_node_list()
|
|
|
|
return _MajoorAssetsManagerExtension()
|
|
|
|
|
|
# Resolved below after `root` is known; keep None as sentinel so imports
|
|
# executed before root assignment don't accidentally use a relative path.
|
|
WEB_DIRECTORY = None
|
|
|
|
_logger = logging.getLogger("majoor_assets_manager")
|
|
_REGISTRY_HOOKS_DONE = False
|
|
_REGISTERED_APPS: set[int] = set()
|
|
|
|
|
|
def _read_version_from_pyproject() -> str:
|
|
try:
|
|
root = Path(__file__).resolve().parent
|
|
pyproject_path = root / "pyproject.toml"
|
|
if not pyproject_path.exists():
|
|
return "0.0.0"
|
|
raw = pyproject_path.read_text(encoding="utf-8")
|
|
match = re.search(r'^version\s*=\s*"(.*?)"', raw, flags=re.MULTILINE)
|
|
if match:
|
|
return match.group(1).strip()
|
|
except Exception:
|
|
_logger.debug("_read_version_from_pyproject: suppressed exception", exc_info=True)
|
|
return "0.0.0"
|
|
|
|
|
|
def _detect_branch_from_env() -> str:
|
|
candidates = (
|
|
"MAJOR_ASSETS_MANAGER_BRANCH",
|
|
"MAJOOR_ASSETS_MANAGER_BRANCH",
|
|
)
|
|
for key in candidates:
|
|
value = os.environ.get(key)
|
|
if value:
|
|
return value.strip()
|
|
return "main"
|
|
|
|
|
|
__version__ = _read_version_from_pyproject()
|
|
__branch__ = _detect_branch_from_env()
|
|
|
|
root = Path(__file__).resolve().parent
|
|
if WEB_DIRECTORY is None:
|
|
# ComfyUI only auto-loads browser-ready .js files from WEB_DIRECTORY.
|
|
# The TypeScript/Vue source under ui/ must be bundled first with `npm run build`.
|
|
_dist = root / "dist"
|
|
WEB_DIRECTORY = str(_dist)
|
|
if not (_dist / "entry.js").is_file():
|
|
_logger.warning(
|
|
"Majoor Assets Manager frontend bundle is missing at %s. "
|
|
"Run `npm run build` before loading the custom node.",
|
|
_dist / "entry.js",
|
|
)
|
|
|
|
# Ensure extension-local packages (e.g. `mjr_am_backend`) are importable even when
|
|
# ComfyUI loads this module by file path without adding custom node root to sys.path.
|
|
try:
|
|
root_str = str(root)
|
|
if root_str not in sys.path:
|
|
sys.path.append(root_str)
|
|
except Exception:
|
|
_logger.debug("failed to ensure extension root on sys.path", exc_info=True)
|
|
|
|
|
|
def init_prompt_server() -> None:
|
|
"""
|
|
Initialize routes against ComfyUI PromptServer.
|
|
|
|
This is kept as a convenience wrapper for ComfyUI runtime.
|
|
Bootstrap stages are recorded in ``mjr_am_backend.bootstrap_report``
|
|
so their status is visible via ``/mjr/am/health``.
|
|
"""
|
|
global _REGISTRY_HOOKS_DONE
|
|
try:
|
|
from mjr_am_backend.bootstrap_report import (
|
|
record_stage,
|
|
)
|
|
except Exception:
|
|
record_stage = None # type: ignore[assignment]
|
|
|
|
def _record(name: str, status: str, severity: str = "none", detail: str | None = None) -> None:
|
|
if callable(record_stage):
|
|
try:
|
|
record_stage(name, status, severity, detail)
|
|
except Exception:
|
|
_logger.debug("_record: suppressed exception", exc_info=True)
|
|
|
|
try:
|
|
try:
|
|
from mjr_am_backend.runtime_activity import ensure_prompt_lifecycle_provider_registered
|
|
|
|
ensure_prompt_lifecycle_provider_registered()
|
|
_record("prompt_lifecycle", "ok")
|
|
except Exception as exc:
|
|
_logger.debug("failed to register prompt lifecycle provider", exc_info=True)
|
|
_record("prompt_lifecycle", "degraded", "internal", str(exc)[:120])
|
|
|
|
_registry = importlib.import_module("mjr_am_backend.routes.registry")
|
|
|
|
register_all_routes = getattr(_registry, "register_all_routes", None)
|
|
register_routes = getattr(_registry, "register_routes", None)
|
|
install_observability = getattr(_registry, "_install_observability_on_prompt_server", None)
|
|
|
|
# Always register decorator-backed routes first; this does not require app.
|
|
if not _REGISTRY_HOOKS_DONE and callable(register_all_routes):
|
|
register_all_routes()
|
|
_record("route_table", "ok")
|
|
|
|
from server import PromptServer # type: ignore
|
|
prompt_server = getattr(PromptServer, "instance", None)
|
|
app = getattr(prompt_server, "app", None)
|
|
user_manager = getattr(prompt_server, "user_manager", None)
|
|
if app is None:
|
|
_logger.debug("PromptServer app is not available yet; route table registered only")
|
|
_record("app_mount", "degraded", "internal", "PromptServer app not yet available")
|
|
return
|
|
if not _REGISTRY_HOOKS_DONE and callable(install_observability):
|
|
try:
|
|
install_observability()
|
|
_record("observability", "ok")
|
|
except Exception as exc:
|
|
_record("observability", "degraded", "internal", str(exc)[:120])
|
|
_REGISTRY_HOOKS_DONE = True
|
|
if callable(register_routes):
|
|
app_id = id(app)
|
|
if app_id not in _REGISTERED_APPS:
|
|
register_routes(app, user_manager=user_manager)
|
|
_REGISTERED_APPS.add(app_id)
|
|
_record("routes", "ok")
|
|
except Exception as exc:
|
|
_logger.exception("failed to initialize prompt server routes")
|
|
_record("init", "fatal", "fatal", str(exc)[:120])
|
|
|
|
|
|
def init(app) -> None:
|
|
"""Public explicit initializer for host integrations and tests."""
|
|
if app is None:
|
|
raise ValueError("init(app) requires a valid aiohttp app instance")
|
|
try:
|
|
from mjr_am_backend.routes.registry import register_routes
|
|
user_manager = None
|
|
try:
|
|
from server import PromptServer # type: ignore
|
|
|
|
user_manager = getattr(getattr(PromptServer, "instance", None), "user_manager", None)
|
|
except Exception:
|
|
user_manager = None
|
|
app_id = id(app)
|
|
if app_id not in _REGISTERED_APPS:
|
|
register_routes(app, user_manager=user_manager)
|
|
_REGISTERED_APPS.add(app_id)
|
|
except Exception:
|
|
_logger.exception("failed to initialize routes on provided app")
|
|
|
|
|
|
def register(app, user_manager=None) -> None:
|
|
"""
|
|
Explicit host integration entrypoint.
|
|
|
|
Args:
|
|
app: aiohttp application instance
|
|
user_manager: optional ComfyUI user manager for auth-aware route policies
|
|
"""
|
|
if app is None:
|
|
raise ValueError("register(app, user_manager=None) requires a valid aiohttp app instance")
|
|
try:
|
|
from mjr_am_backend.routes.registry import register_routes
|
|
app_id = id(app)
|
|
if app_id not in _REGISTERED_APPS:
|
|
register_routes(app, user_manager=user_manager)
|
|
_REGISTERED_APPS.add(app_id)
|
|
except Exception:
|
|
_logger.exception("failed to register routes on provided app")
|
|
|
|
|
|
try:
|
|
# Minimal ComfyUI custom_nodes import-time behavior:
|
|
# register routes/UI via explicit init path, no sys.modules mutation.
|
|
init_prompt_server()
|
|
except Exception:
|
|
_logger.exception("failed to initialize at import time")
|
|
|
|
__all__ = [
|
|
"comfy_entrypoint",
|
|
"WEB_DIRECTORY",
|
|
"__version__",
|
|
"__branch__",
|
|
"init",
|
|
"register",
|
|
"init_prompt_server",
|
|
]
|