ethanfelandClaude Opus 4.8
783a294d43
A missing 'mcp' package made the whole custom_node load fail with ModuleNotFoundError. Now the Agent Emit/Receive nodes register regardless and the bridge prints an actionable install hint (with ComfyUI's python path) instead of crashing. Use __package__ to pick relative vs sys.path import so a broad except no longer masks a missing-dependency error. Adds a no-mcp load test. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
76 lines
3.3 KiB
Python
76 lines
3.3 KiB
Python
"""Regression: the package must import the way ComfyUI loads custom nodes —
|
|
as a package via spec_from_file_location, from a CWD where the repo root is NOT
|
|
on sys.path (so absolute `from src...` imports would fail). Run in a subprocess
|
|
so the parallel module tree / server thread don't touch the test interpreter.
|
|
"""
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import textwrap
|
|
|
|
|
|
def test_loads_like_comfyui(tmp_path):
|
|
repo = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
code = textwrap.dedent(
|
|
f"""
|
|
import importlib.util, os, sys
|
|
repo = {repo!r}
|
|
name = "ComfyUI_Agent_Bridge_under_test"
|
|
spec = importlib.util.spec_from_file_location(
|
|
name, os.path.join(repo, "__init__.py"),
|
|
submodule_search_locations=[repo])
|
|
mod = importlib.util.module_from_spec(spec)
|
|
sys.modules[name] = mod
|
|
spec.loader.exec_module(mod)
|
|
assert "AgentEmit" in mod.NODE_CLASS_MAPPINGS, "AgentEmit missing"
|
|
assert "AgentReceive" in mod.NODE_CLASS_MAPPINGS, "AgentReceive missing"
|
|
# Relative imports must not leak a generic top-level `src` (collision risk
|
|
# with other custom nodes that also ship a `src` package).
|
|
assert "src" not in sys.modules, "top-level `src` leaked onto sys.modules"
|
|
print("COMFY_LOAD_OK")
|
|
"""
|
|
)
|
|
env = dict(os.environ, COMFY_BRIDGE_MCP_PORT="0")
|
|
env.pop("PYTHONPATH", None) # ensure repo isn't importable as top-level `src`
|
|
r = subprocess.run([sys.executable, "-c", code], cwd=str(tmp_path),
|
|
env=env, capture_output=True, text=True)
|
|
assert r.returncode == 0, f"stdout={r.stdout!r} stderr={r.stderr!r}"
|
|
assert "COMFY_LOAD_OK" in r.stdout
|
|
|
|
|
|
def test_nodes_load_without_mcp(tmp_path):
|
|
"""If the optional `mcp` dependency is missing, the nodes must still register
|
|
(bridge disabled with a helpful message) rather than failing the whole load."""
|
|
repo = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
code = textwrap.dedent(
|
|
f"""
|
|
import importlib.abc, importlib.util, os, sys
|
|
|
|
class _NoMcp(importlib.abc.MetaPathFinder):
|
|
def find_spec(self, name, path=None, target=None):
|
|
if name == "mcp" or name.startswith("mcp."):
|
|
raise ModuleNotFoundError(f"No module named '{{name}}'", name=name)
|
|
return None
|
|
sys.meta_path.insert(0, _NoMcp())
|
|
|
|
repo = {repo!r}
|
|
name = "ComfyUI_Agent_Bridge_no_mcp"
|
|
spec = importlib.util.spec_from_file_location(
|
|
name, os.path.join(repo, "__init__.py"),
|
|
submodule_search_locations=[repo])
|
|
mod = importlib.util.module_from_spec(spec)
|
|
sys.modules[name] = mod
|
|
spec.loader.exec_module(mod) # must NOT raise
|
|
assert "AgentEmit" in mod.NODE_CLASS_MAPPINGS
|
|
assert "AgentReceive" in mod.NODE_CLASS_MAPPINGS
|
|
print("NODES_OK_NO_MCP")
|
|
"""
|
|
)
|
|
env = dict(os.environ, COMFY_BRIDGE_MCP_PORT="0")
|
|
env.pop("PYTHONPATH", None)
|
|
r = subprocess.run([sys.executable, "-c", code], cwd=str(tmp_path),
|
|
env=env, capture_output=True, text=True)
|
|
assert r.returncode == 0, f"stdout={r.stdout!r} stderr={r.stderr!r}"
|
|
assert "NODES_OK_NO_MCP" in r.stdout
|
|
assert "MCP bridge disabled" in r.stdout # the helpful hint was printed
|