feat: add prompt placeholder substitution with {filename} syntax
This commit is contained in:
parent
760eac5a7b
commit
3de3614433
6 changed files with 274 additions and 33 deletions
|
|
@ -13,7 +13,6 @@ from hokusai.builder import (
|
|||
_collect_all_deps, # pyright: ignore[reportPrivateUsage]
|
||||
_collect_dep_files, # pyright: ignore[reportPrivateUsage]
|
||||
_collect_extra_params, # pyright: ignore[reportPrivateUsage]
|
||||
_resolve_prompt, # pyright: ignore[reportPrivateUsage]
|
||||
run_build,
|
||||
)
|
||||
from hokusai.config import GenerateTargetConfig, ProjectConfig
|
||||
|
|
@ -112,21 +111,6 @@ def _fake_providers() -> list[Provider]:
|
|||
return [FakeTextProvider(), FakeImageProvider()]
|
||||
|
||||
|
||||
class TestResolvePrompt:
|
||||
"""Test prompt resolution (file vs inline)."""
|
||||
|
||||
def test_inline_prompt(self, project_dir: Path) -> None:
|
||||
assert _resolve_prompt("Just a string", project_dir) == "Just a string"
|
||||
|
||||
def test_file_prompt(self, project_dir: Path, prompt_file: Path) -> None:
|
||||
result = _resolve_prompt(prompt_file.name, project_dir)
|
||||
assert result == "This prompt comes from a file"
|
||||
|
||||
def test_nonexistent_file_treated_as_inline(self, project_dir: Path) -> None:
|
||||
result = _resolve_prompt("no_such_file.txt", project_dir)
|
||||
assert result == "no_such_file.txt"
|
||||
|
||||
|
||||
class TestCollectHelpers:
|
||||
"""Test dependency collection helpers."""
|
||||
|
||||
|
|
@ -568,3 +552,47 @@ class TestDownloadTarget:
|
|||
assert "description.txt" in result.built
|
||||
assert (project_dir / "fish.png").read_bytes() == b"fake fish image"
|
||||
assert (project_dir / "description.txt").exists()
|
||||
|
||||
|
||||
class TestPlaceholderPrompts:
|
||||
"""Tests for prompt placeholder substitution in builds."""
|
||||
|
||||
async def test_placeholder_in_prompt_triggers_rebuild(
|
||||
self, project_dir: Path, write_config: WriteConfig
|
||||
) -> None:
|
||||
_ = (project_dir / "style.txt").write_text("impressionist")
|
||||
config = write_config(
|
||||
{
|
||||
"targets": {
|
||||
"out.txt": {"prompt": "Paint in {style.txt} style"},
|
||||
}
|
||||
}
|
||||
)
|
||||
with patch("hokusai.builder._create_providers", return_value=_fake_providers()):
|
||||
r1 = await run_build(config, project_dir, _PROJECT)
|
||||
assert r1.built == ["out.txt"]
|
||||
content1 = (project_dir / "out.txt").read_text()
|
||||
assert "impressionist" in content1
|
||||
|
||||
# Change the placeholder file
|
||||
_ = (project_dir / "style.txt").write_text("cubist")
|
||||
r2 = await run_build(config, project_dir, _PROJECT)
|
||||
assert r2.built == ["out.txt"]
|
||||
|
||||
async def test_placeholder_deps_in_collect_all(
|
||||
self, write_config: WriteConfig
|
||||
) -> None:
|
||||
config = write_config(
|
||||
{
|
||||
"targets": {
|
||||
"out.txt": {
|
||||
"prompt": "Use {a.txt} and {b.txt}",
|
||||
"inputs": ["c.txt"],
|
||||
},
|
||||
}
|
||||
}
|
||||
)
|
||||
deps = _collect_all_deps("out.txt", config)
|
||||
assert "a.txt" in deps
|
||||
assert "b.txt" in deps
|
||||
assert "c.txt" in deps
|
||||
|
|
|
|||
|
|
@ -194,3 +194,30 @@ class TestGetSubgraphForTarget:
|
|||
|
||||
assert sub.has_edge("input.txt", "summary.md")
|
||||
assert sub.has_edge("summary.md", "final.txt")
|
||||
|
||||
def test_placeholder_files_in_graph(
|
||||
self, project_dir: Path, write_config: WriteConfig
|
||||
) -> None:
|
||||
_ = (project_dir / "style.txt").write_text("impressionist")
|
||||
config = write_config(
|
||||
{
|
||||
"targets": {
|
||||
"out.txt": {"prompt": "Paint in {style.txt} style"},
|
||||
}
|
||||
}
|
||||
)
|
||||
graph = build_graph(config, project_dir)
|
||||
assert graph.has_edge("style.txt", "out.txt")
|
||||
|
||||
def test_escaped_placeholder_not_in_graph(
|
||||
self, project_dir: Path, write_config: WriteConfig
|
||||
) -> None:
|
||||
config = write_config(
|
||||
{
|
||||
"targets": {
|
||||
"out.txt": {"prompt": "Literal \\{not_a_dep.txt}"},
|
||||
}
|
||||
}
|
||||
)
|
||||
graph = build_graph(config, project_dir)
|
||||
assert "not_a_dep.txt" not in graph.nodes
|
||||
|
|
|
|||
109
tests/test_prompt.py
Normal file
109
tests/test_prompt.py
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
"""Tests for hokusai.prompt — prompt resolution and placeholder substitution."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from hokusai.prompt import (
|
||||
extract_placeholder_files,
|
||||
resolve_prompt,
|
||||
substitute_placeholders,
|
||||
)
|
||||
|
||||
|
||||
class TestSubstitutePlaceholders:
|
||||
"""Test placeholder substitution in prompt text."""
|
||||
|
||||
def test_no_placeholders(self, project_dir: Path) -> None:
|
||||
assert substitute_placeholders("Hello world", project_dir) == "Hello world"
|
||||
|
||||
def test_single_placeholder(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "name.txt").write_text("World")
|
||||
result = substitute_placeholders("Hello {name.txt}", project_dir)
|
||||
assert result == "Hello World"
|
||||
|
||||
def test_multiple_placeholders(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "first.txt").write_text("Alice")
|
||||
_ = (project_dir / "last.txt").write_text("Smith")
|
||||
result = substitute_placeholders("Dear {first.txt} {last.txt}", project_dir)
|
||||
assert result == "Dear Alice Smith"
|
||||
|
||||
def test_escaped_placeholder(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "name.txt").write_text("World")
|
||||
result = substitute_placeholders("Hello \\{name.txt}", project_dir)
|
||||
assert result == "Hello {name.txt}"
|
||||
|
||||
def test_double_escaped_placeholder(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "name.txt").write_text("World")
|
||||
result = substitute_placeholders("Hello \\\\{name.txt}", project_dir)
|
||||
assert result == "Hello \\World"
|
||||
|
||||
def test_triple_escaped_placeholder(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "name.txt").write_text("World")
|
||||
result = substitute_placeholders("Hello \\\\\\{name.txt}", project_dir)
|
||||
assert result == "Hello \\{name.txt}"
|
||||
|
||||
def test_placeholder_at_start(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "greeting.txt").write_text("Hi there")
|
||||
result = substitute_placeholders("{greeting.txt}!", project_dir)
|
||||
assert result == "Hi there!"
|
||||
|
||||
def test_placeholder_with_multiline_content(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "block.txt").write_text("line1\nline2\nline3")
|
||||
result = substitute_placeholders("Start: {block.txt} :End", project_dir)
|
||||
assert result == "Start: line1\nline2\nline3 :End"
|
||||
|
||||
|
||||
class TestExtractPlaceholderFiles:
|
||||
"""Test extraction of placeholder filenames from prompts."""
|
||||
|
||||
def test_no_placeholders(self) -> None:
|
||||
assert extract_placeholder_files("Hello world") == []
|
||||
|
||||
def test_single_placeholder(self) -> None:
|
||||
assert extract_placeholder_files("Hello {name.txt}") == ["name.txt"]
|
||||
|
||||
def test_multiple_placeholders(self) -> None:
|
||||
result = extract_placeholder_files("{a.txt} and {b.txt}")
|
||||
assert result == ["a.txt", "b.txt"]
|
||||
|
||||
def test_escaped_placeholder_ignored(self) -> None:
|
||||
assert extract_placeholder_files("\\{name.txt}") == []
|
||||
|
||||
def test_double_escaped_included(self) -> None:
|
||||
assert extract_placeholder_files("\\\\{name.txt}") == ["name.txt"]
|
||||
|
||||
def test_triple_escaped_ignored(self) -> None:
|
||||
assert extract_placeholder_files("\\\\\\{name.txt}") == []
|
||||
|
||||
|
||||
class TestResolvePrompt:
|
||||
"""Test full prompt resolution (file loading + placeholder substitution)."""
|
||||
|
||||
def test_inline_prompt_no_placeholders(self, project_dir: Path) -> None:
|
||||
assert resolve_prompt("Just a string", project_dir) == "Just a string"
|
||||
|
||||
def test_file_prompt(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "prompt.txt").write_text("From file")
|
||||
result = resolve_prompt("prompt.txt", project_dir)
|
||||
assert result == "From file"
|
||||
|
||||
def test_nonexistent_file_treated_as_inline(self, project_dir: Path) -> None:
|
||||
result = resolve_prompt("no_such_file.txt", project_dir)
|
||||
assert result == "no_such_file.txt"
|
||||
|
||||
def test_inline_with_placeholder(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "style.txt").write_text("impressionist")
|
||||
result = resolve_prompt("Paint in {style.txt} style", project_dir)
|
||||
assert result == "Paint in impressionist style"
|
||||
|
||||
def test_multiline_prompt_with_placeholder(self, project_dir: Path) -> None:
|
||||
_ = (project_dir / "detail.txt").write_text("vivid colours")
|
||||
result = resolve_prompt("First line\nWith {detail.txt}", project_dir)
|
||||
assert result == "First line\nWith vivid colours"
|
||||
|
||||
def test_file_prompt_no_placeholder_processing(self, project_dir: Path) -> None:
|
||||
"""When the prompt is a file path, the file is loaded verbatim."""
|
||||
_ = (project_dir / "prompt.txt").write_text("Literal {not_a_file.txt}")
|
||||
result = resolve_prompt("prompt.txt", project_dir)
|
||||
assert result == "Literal {not_a_file.txt}"
|
||||
Loading…
Add table
Add a link
Reference in a new issue