graph.py reads an input's TYPE, which is all a wire needs. Editing a value needs the rest -- the choices a combo offers, the bounds on a number, whether the box is multiline -- so that is asked separately rather than widening the question graph.py asks. Read from ComfyUI's own INPUT_TYPES, so a node written for ComfyUI is editable here without knowing anything about FunPack. Caught while looking at the real output rather than after committing: deciding "a socket is upper case" is wrong, because STRING is upper case -- every prompt box in the pipeline came back as something nobody could type in. The honest rule is ComfyUI's own primitive set, plus forceInput, which is a short list core holds on purpose. /funpack/api/nodes answers by name. ComfyUI's /object_info returns every installed node, which on a machine with a few packs is megabytes for a question about a dozen; a node nobody installed comes back as null rather than missing, so "this slot points at something absent" reads differently from "I did not ask". The dev server now registers ComfyUI's nodes and FunPack's own, through the same function the tests use. Without it the pipeline was fourteen "there is no node called X installed" and nothing to edit -- so the one thing the dev server exists for could not reach the half of the app that matters. It now reports the three problems that are real: no model, no CLIP, no VAE chosen.
129 lines
5.5 KiB
Python
129 lines
5.5 KiB
Python
"""Collecting the ComfyUI nodes that modules announced.
|
|
|
|
Core holds no list of nodes. It walks the registry, takes whatever each module
|
|
declared in `NODES`, and hands the result to ComfyUI -- the same inversion the
|
|
panels use, applied to node registration.
|
|
|
|
Nothing here may raise. ComfyUI wraps `comfy_entrypoint` in one try/except and
|
|
skips the ENTIRE pack on any exception (nodes.py, the `elif` branch), so a single
|
|
bad module must not take every other node down with it. Every failure is caught,
|
|
logged once, and turns into that node's absence.
|
|
"""
|
|
|
|
from typing import List, Optional, Tuple
|
|
|
|
from . import log, registry as registry_mod
|
|
|
|
# Node ids are global in ComfyUI: `NODE_CLASS_MAPPINGS[schema.node_id]`, with no
|
|
# collision check -- a clash silently overwrites whoever registered first. The
|
|
# prefix is what keeps FunPack out of everyone else's namespace.
|
|
PREFIX = "FunPack"
|
|
|
|
|
|
def _schema_of(node) -> Optional[object]:
|
|
"""The node's V3 schema, or None if it cannot produce one."""
|
|
getter = getattr(node, "GET_SCHEMA", None)
|
|
if not callable(getter):
|
|
return None
|
|
return getter()
|
|
|
|
|
|
def collect(registry=None) -> Tuple[List[type], List[Tuple[str, str]]]:
|
|
"""(nodes, rejected) -- rejected carries the reason, for the modules dump."""
|
|
reg = registry if registry is not None else registry_mod.current()
|
|
nodes: List[type] = []
|
|
rejected: List[Tuple[str, str]] = []
|
|
claimed = {} # node_id -> module id
|
|
|
|
# Sorted so the set of registered nodes does not depend on filesystem order.
|
|
for spec in sorted(reg.specs.values(), key=lambda s: s.id):
|
|
for node in spec.nodes:
|
|
# Named inside the guard, and starting from a name that cannot fail.
|
|
# `getattr(node, "__name__", repr(node))` looks safe and is not:
|
|
# Python evaluates the default eagerly, so a class whose metaclass
|
|
# raises in __repr__ threw BEFORE the try and took every other
|
|
# module's nodes with it -- the one thing this loop exists to stop.
|
|
where = f"{spec.id}.<unnamed node>"
|
|
try:
|
|
name = getattr(node, "__name__", None)
|
|
if isinstance(name, str) and name:
|
|
where = f"{spec.id}.{name}"
|
|
schema = _schema_of(node)
|
|
except Exception as exc: # noqa: BLE001 -- absence, not a crash
|
|
log.broke(where, exc, "describing itself")
|
|
rejected.append((where, f"{type(exc).__name__}: {exc}"))
|
|
continue
|
|
|
|
if schema is None:
|
|
rejected.append((where, "is not a comfy_api io.ComfyNode (no GET_SCHEMA)"))
|
|
log.warning(where, "is not a ComfyUI V3 node and was not registered")
|
|
continue
|
|
|
|
node_id = getattr(schema, "node_id", None)
|
|
if not isinstance(node_id, str) or not node_id.startswith(PREFIX):
|
|
rejected.append((where, f"node_id {node_id!r} does not start with {PREFIX!r}"))
|
|
log.warning(where, f"declares node_id {node_id!r}, which is not prefixed "
|
|
f"{PREFIX!r}, and was not registered")
|
|
continue
|
|
|
|
if node_id in claimed:
|
|
# ComfyUI would let the second one silently replace the first,
|
|
# and which one wins would depend on import order.
|
|
rejected.append((where, f"duplicate node_id {node_id!r}, already "
|
|
f"declared by {claimed[node_id]}"))
|
|
log.warning(where, f"reuses node_id {node_id!r}, already declared by "
|
|
f"{claimed[node_id]}, and was not registered")
|
|
continue
|
|
|
|
claimed[node_id] = where
|
|
nodes.append(node)
|
|
|
|
return nodes, rejected
|
|
|
|
|
|
def install_into(mapping, display_mapping=None) -> List[type]:
|
|
"""Put FunPack's nodes into a ComfyUI-shaped registry, and say which.
|
|
|
|
ComfyUI itself does this from `comfy_entrypoint` and nothing here should
|
|
replace that -- a NODE_CLASS_MAPPINGS at module level would suppress the
|
|
entrypoint entirely. This is for the two places that need the registry
|
|
populated WITHOUT ComfyUI having loaded the pack: the dev server, so the app
|
|
can be looked at, and the tests that read a node's declaration.
|
|
|
|
One function rather than two copies, because the copies would drift and the
|
|
one that drifted would be the one nobody runs.
|
|
"""
|
|
installed = []
|
|
for node in collect()[0]:
|
|
schema = _schema_of(node)
|
|
node_id = getattr(schema, "node_id", None)
|
|
if not node_id:
|
|
continue
|
|
mapping[node_id] = node
|
|
display = getattr(schema, "display_name", None)
|
|
if display and display_mapping is not None:
|
|
display_mapping[node_id] = display
|
|
installed.append(node)
|
|
return installed
|
|
|
|
|
|
def extension():
|
|
"""A ComfyExtension over whatever announced itself, or None without ComfyUI."""
|
|
try:
|
|
from comfy_api.latest import ComfyExtension
|
|
except Exception as exc: # noqa: BLE001 -- not inside ComfyUI
|
|
log.failed("comfy_api.latest", exc)
|
|
return None
|
|
|
|
nodes, rejected = collect()
|
|
|
|
class FunPackExtension(ComfyExtension):
|
|
async def get_node_list(self) -> List[type]:
|
|
return list(nodes)
|
|
|
|
if rejected:
|
|
log.warning("nodes", f"{len(rejected)} node(s) were not registered; "
|
|
+ "; ".join(f"{where}: {why}" for where, why in rejected))
|
|
log.info("nodes", f"registered {len(nodes)} node(s)")
|
|
return FunPackExtension()
|