Fix mixed prompt syntax diagnostics

This commit is contained in:
ukr8b3g-cmyk
2026-08-27 19:25:02 +09:00
parent 9b2b976a79
commit e626053893
5 changed files with 215 additions and 14 deletions
+136
View File
@@ -3,6 +3,8 @@ import pytest
from ComfyUI_H3_Continuum_Join.constants import (
PROMPT_FORMAT_AUTO,
PROMPT_FORMAT_FIXED,
PROMPT_FORMAT_LIST,
PROMPT_FORMAT_TIMELINE,
PROMPT_MODE_FIXED,
PROMPT_MODE_LIST,
PROMPT_MODE_TIMELINE,
@@ -18,6 +20,7 @@ from ComfyUI_H3_Continuum_Join.v2.prompts import (
validate_sparse_prompt_overrides,
validate_prompt_plan,
)
from ComfyUI_H3_Continuum_Join.v2.nodes import H3ContinuumPromptPlanPreview
def test_fixed_prompt_repeats_without_mutation():
@@ -71,6 +74,126 @@ def test_timeline_prompt_maps_ranges_and_chunk_headers():
chunk_seconds=5,
)
assert plan["prompts"] == ["one", "two", "three"]
assert not any(item["code"] == "H3C-P105" for item in plan.get("diagnostics", []))
def test_clean_list_keeps_assignments_without_mixed_syntax_warning():
plan = make_prompt_plan(
mode=PROMPT_FORMAT_LIST,
script="A\n---\nB\n---\nC",
chunks=3,
chunk_seconds=5,
)
assert plan["prompts"] == ["A", "B", "C"]
assert not any(item["code"] == "H3C-P105" for item in plan.get("diagnostics", []))
@pytest.mark.parametrize("mode", [PROMPT_FORMAT_AUTO, PROMPT_FORMAT_TIMELINE])
def test_timeline_mixed_with_list_separator_warns_and_ignores_separator(mode):
plan = make_prompt_plan(
mode=mode,
script="[Chunk 1]\nA\n[Chunk 2]\nB\n---\nC",
chunks=3,
chunk_seconds=5,
)
assert plan["mode"] == PROMPT_MODE_TIMELINE
assert plan["prompts"] == ["A", "B\nC", "B\nC"]
assert all("---" not in prompt for prompt in plan["prompts"])
assert any(item["code"] == "H3C-P105" for item in plan["diagnostics"])
assert any(item["code"] == "H3C-P101" for item in plan["diagnostics"])
def test_timeline_mixed_separator_is_removed_from_shared_preamble():
plan = make_prompt_plan(
mode=PROMPT_FORMAT_AUTO,
script="Shared preamble\n---\n[Chunk 1]\nA\n[Chunk 2]\nB",
chunks=2,
chunk_seconds=5,
)
assert plan["prompts"] == ["Shared preamble\n\nA", "Shared preamble\n\nB"]
assert all("---" not in prompt for prompt in plan["prompts"])
assert any(item["code"] == "H3C-P105" for item in plan["diagnostics"])
def test_five_chunk_timeline_with_trailing_separator_preserves_all_assignments():
script = "\n".join(
[
"[Chunk 1]", "A", "[Chunk 2]", "B", "[Chunk 3]", "C",
"[Chunk 4]", "D", "[Chunk 5]", "E", "---",
]
)
plan = make_prompt_plan(
mode=PROMPT_FORMAT_AUTO,
script=script,
chunks=5,
chunk_seconds=5,
)
assert plan["prompts"] == ["A", "B", "C", "D", "E"]
assert any(item["code"] == "H3C-P105" for item in plan["diagnostics"])
def test_explicit_list_with_timeline_header_warns_but_keeps_list_parsing():
plan = make_prompt_plan(
mode=PROMPT_FORMAT_LIST,
script="[Chunk 1]\nA\n---\nB\n---\nC",
chunks=3,
chunk_seconds=5,
)
assert plan["mode"] == PROMPT_MODE_LIST
assert plan["prompts"] == ["[Chunk 1]\nA", "B", "C"]
assert any(item["code"] == "H3C-P105" for item in plan["diagnostics"])
assert [item["message"] for item in plan["diagnostics"] if item["code"] == "H3C-P000"] == [
"Chunk 1 source: List section 1",
"Chunk 2 source: List section 2",
"Chunk 3 source: List section 3",
]
def test_explicit_fixed_keeps_all_special_syntax_literal_without_warning():
script = "[Chunk 1]\nA\n[0-5s]\nB\n---\nC"
plan = make_prompt_plan(
mode=PROMPT_FORMAT_FIXED,
script=script,
chunks=2,
chunk_seconds=5,
)
assert plan["prompts"] == [script, script]
assert "diagnostics" not in plan
def test_mixed_syntax_report_leads_with_warning_and_resolved_chunk_sources():
plan = make_prompt_plan(
mode=PROMPT_FORMAT_AUTO,
script="[Chunk 1]\nA\n[Chunk 2]\nB\n---\nC",
chunks=3,
chunk_seconds=5,
)
report = prompt_plan_report(plan)
assert report.startswith("PROMPT PREFLIGHT WARNING")
assert "H3C-P105" in report
assert "H3C-P101" in report
assert "Chunk 1 source:" in report
assert "Chunk 3 source:" in report
def test_prompt_preview_uses_the_same_mixed_syntax_resolution():
script = "[Chunk 1]\nA\n[Chunk 2]\nB\n---\nC"
expected = make_prompt_plan(
mode=PROMPT_FORMAT_AUTO,
script=script,
chunks=3,
chunk_seconds=5,
)
preview_plan, preview_report = H3ContinuumPromptPlanPreview().build(
PROMPT_FORMAT_AUTO,
script,
3,
5,
)
assert preview_plan == expected
assert preview_report.startswith("PROMPT PREFLIGHT WARNING")
assert "Chunk 2:\nB\nC" in preview_report
assert "Chunk 3:\nB\nC" in preview_report
def test_timeline_preamble_is_applied_to_every_chunk():
@@ -140,6 +263,19 @@ def test_invalid_timeline_falls_back_with_actionable_diagnostic(script, code):
assert code in plan["diagnostics"][0]["message"]
def test_invalid_mixed_timeline_fallback_preserves_original_text():
script = "[Chunk 0]\nA\n---\nB"
plan = make_prompt_plan(
mode=PROMPT_FORMAT_TIMELINE,
script=script,
chunks=2,
chunk_seconds=5,
)
assert plan["mode"] == PROMPT_MODE_FIXED
assert plan["prompts"] == [script, script]
assert plan["diagnostics"][0]["code"] == "H3C-P100"
def test_duplicate_chunk_section_falls_back_without_blocking():
plan = make_prompt_plan(
mode=PROMPT_MODE_TIMELINE,
+22 -2
View File
@@ -30,6 +30,7 @@ from ComfyUI_H3_Continuum_Join.graph_contract import (
classify_h3_checkpoint,
)
from ComfyUI_H3_Continuum_Join.state import make_plan
from ComfyUI_H3_Continuum_Join.v2.prompts import make_prompt_plan, prompt_hash
from ComfyUI_H3_Continuum_Join.v2.session import make_chunk_entry
from ComfyUI_H3_Continuum_Join.v3.nodes import _validate_regenerate_storage
@@ -295,7 +296,7 @@ def _sampling_contract(
upstream_graph_reasons=None,
execution_semantics=None,
reference_audio_contract=None,
reference_audio_vae=None,
reference_audio_vae=None, prompt_hashes=None,
):
return build_sampling_contract(
model=model or _Model(),
@@ -306,7 +307,7 @@ def _sampling_contract(
sigmas=torch.tensor([1.0, 0.0]),
prompt_plan={
"chunks": 3,
"hashes": ["1" * 64, "2" * 64, "3" * 64],
"hashes": list(prompt_hashes or ["1" * 64, "2" * 64, "3" * 64]),
"mode": "list",
},
width=96,
@@ -331,6 +332,25 @@ def _sampling_contract(
)
def test_mixed_timeline_normalization_separates_run_storage_revision():
script = "[Chunk 1]\nA\n[Chunk 2]\nB\n---\nC"
normalized = make_prompt_plan(
mode="Auto",
script=script,
chunks=3,
chunk_seconds=5,
)
legacy_hashes = [prompt_hash("A"), prompt_hash("B\n---\nC"), prompt_hash("B\n---\nC")]
legacy_contract, legacy_safe, legacy_reasons = _sampling_contract(prompt_hashes=legacy_hashes)
normalized_contract, normalized_safe, normalized_reasons = _sampling_contract(prompt_hashes=normalized["hashes"])
assert legacy_safe, legacy_reasons
assert normalized_safe, normalized_reasons
assert normalized["prompts"] == ["A", "B\nC", "B\nC"]
assert revision_identity(legacy_contract) != revision_identity(normalized_contract)
def test_reference_audio_revision_separates_changes_and_restores_on_disconnect():
model = _Model()
clip = _Clip()