712be0d30a
The Scene Analyzer built its own Config from local model_name/temperature/ timeout/system_prompt widgets and ignored the Configuration node entirely, so the analyzer model was set in two disconnected places (bug report #4). - Scene Analyzer: add an optional `config` (COMPILER_CONFIG) input and drop the duplicated model/temperature/timeout widgets. Settings now come from the Configuration node; without one, defaults apply with a 300 s cold-load-friendly timeout. A non-empty `system_prompt` widget still overrides the config. - Knowledge Base Loader: accept an optional `config`; when wired, its KB path and version take precedence over the node's own widgets. - Add tooltips to every input on all six nodes. Docs (docs/nodes.md) updated for the Analyzer/KB Loader input changes. Co-authored-by: kunail0804 <kunail0804@gmail.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
105 lines
3.9 KiB
Python
105 lines
3.9 KiB
Python
"""Tests for the Scene Analyzer ComfyUI node (issue #19). No live Ollama."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import nodes
|
|
import nodes.scene_analyzer_node as node_module
|
|
from compiler.common.config import Config
|
|
from compiler.common.message_codes import message
|
|
from compiler.common.result import CompilerResult
|
|
from nodes.scene_analyzer_node import SceneAnalyzerNode
|
|
|
|
|
|
def test_input_types_structure() -> None:
|
|
inputs = SceneAnalyzerNode.INPUT_TYPES()
|
|
# Analyzer settings now live on the Configuration node; only the per-run text
|
|
# and the optional config/override remain.
|
|
assert set(inputs["required"]) == {"natural_language"}
|
|
assert set(inputs["optional"]) == {"config", "system_prompt"}
|
|
|
|
|
|
def test_node_metadata() -> None:
|
|
assert SceneAnalyzerNode.RETURN_TYPES == ("SCENE", "STRING", "STRING", "STRING")
|
|
assert SceneAnalyzerNode.RETURN_NAMES == ("scene", "warnings", "errors", "raw")
|
|
assert SceneAnalyzerNode.FUNCTION == "run"
|
|
assert SceneAnalyzerNode.CATEGORY == "Scene Compiler"
|
|
|
|
|
|
def test_run_uses_model_from_config(monkeypatch) -> None:
|
|
captured = {}
|
|
|
|
def fake_analyze(description, backend, config):
|
|
captured["description"] = description
|
|
captured["model"] = config.analyzer.model
|
|
return (
|
|
CompilerResult(data="SCENE_MODEL")
|
|
.add_warning(message("SC0001", "unknown concept 'x'"))
|
|
.add_error(message("SC0011", "bad response"))
|
|
)
|
|
|
|
monkeypatch.setattr(node_module, "analyze", fake_analyze)
|
|
|
|
config = Config.from_json({"analyzer": {"model": "mistral"}})
|
|
scene, warnings, errors, *_ = SceneAnalyzerNode().run(
|
|
natural_language="A girl.",
|
|
config=config,
|
|
)
|
|
assert scene == "SCENE_MODEL"
|
|
assert captured["description"] == "A girl."
|
|
assert captured["model"] == "mistral"
|
|
assert "SC0001: unknown concept 'x'" in warnings
|
|
assert "SC0011: bad response" in errors
|
|
|
|
|
|
def test_defaults_apply_without_a_configuration_node(monkeypatch) -> None:
|
|
captured = {}
|
|
|
|
def fake_analyze(description, backend, config):
|
|
captured["model"] = config.analyzer.model
|
|
captured["timeout"] = config.analyzer.timeout
|
|
return CompilerResult(data="S")
|
|
|
|
monkeypatch.setattr(node_module, "analyze", fake_analyze)
|
|
SceneAnalyzerNode().run("A girl.")
|
|
# Falls back to the built-in model with a cold-load-friendly timeout.
|
|
assert captured["model"] == "llama3"
|
|
assert captured["timeout"] == 300
|
|
|
|
|
|
def test_no_messages_yield_empty_strings(monkeypatch) -> None:
|
|
monkeypatch.setattr(node_module, "analyze", lambda d, b, c: CompilerResult(data="S"))
|
|
scene, warnings, errors, *_ = SceneAnalyzerNode().run("x")
|
|
assert (warnings, errors) == ("", "")
|
|
|
|
|
|
def test_system_prompt_override_without_config(monkeypatch) -> None:
|
|
captured = {}
|
|
|
|
def fake_analyze(description, backend, config):
|
|
captured["system_prompt"] = config.analyzer.system_prompt
|
|
return CompilerResult(data="S")
|
|
|
|
monkeypatch.setattr(node_module, "analyze", fake_analyze)
|
|
SceneAnalyzerNode().run("x", system_prompt="CUSTOM")
|
|
assert captured["system_prompt"] == "CUSTOM"
|
|
|
|
|
|
def test_system_prompt_override_wins_over_config(monkeypatch) -> None:
|
|
captured = {}
|
|
|
|
def fake_analyze(description, backend, config):
|
|
captured["system_prompt"] = config.analyzer.system_prompt
|
|
captured["model"] = config.analyzer.model
|
|
return CompilerResult(data="S")
|
|
|
|
monkeypatch.setattr(node_module, "analyze", fake_analyze)
|
|
config = Config.from_json({"analyzer": {"model": "mistral", "system_prompt": "FROM_CONFIG"}})
|
|
SceneAnalyzerNode().run("x", config=config, system_prompt="OVERRIDE")
|
|
assert captured["system_prompt"] == "OVERRIDE"
|
|
assert captured["model"] == "mistral"
|
|
|
|
|
|
def test_registered_for_comfyui() -> None:
|
|
assert nodes.NODE_CLASS_MAPPINGS["SceneCompilerAnalyzer"] is SceneAnalyzerNode
|
|
assert nodes.NODE_DISPLAY_NAME_MAPPINGS["SceneCompilerAnalyzer"] == "Scene Analyzer"
|