Restore Continuum image reference inputs
This commit is contained in:
@@ -77,9 +77,8 @@ class H3NodeTests(unittest.TestCase):
|
||||
"Dumas/MiniMax H3/Prompt",
|
||||
)
|
||||
optional = PROMPT.DumasH3SequencePromptBuilder.INPUT_TYPES()["optional"]
|
||||
self.assertEqual(optional["ref_mod_1"][0], "H3_REF_MODS")
|
||||
self.assertEqual(optional["ref_mod_9"][0], "H3_REF_MODS")
|
||||
self.assertNotIn("reference_image_1", optional)
|
||||
self.assertEqual(optional["reference_image_1"][0], "IMAGE")
|
||||
self.assertEqual(optional["reference_image_9"][0], "IMAGE")
|
||||
reference_module = types.ModuleType("upstream.v3.reference_images_v39")
|
||||
reference_module.ReferenceImagesV39Bundle = FakeReferenceBundle
|
||||
sys.modules[reference_module.__name__] = reference_module
|
||||
@@ -90,8 +89,8 @@ class H3NodeTests(unittest.TestCase):
|
||||
'{"clips":[{"slots":[{"start":0,"end":4,"text":"Walk."}]},'
|
||||
'{"slots":[{"start":0,"end":4,"text":"Turn."}]}]}',
|
||||
"Use @R2 ambience.", "Music.",
|
||||
ref_mod_1=[(FakeRefMod("environment"), 1.0)],
|
||||
ref_mod_2=[(FakeRefMod("hero"), 1.0)],
|
||||
reference_image_1="environment",
|
||||
reference_image_2="hero",
|
||||
)
|
||||
self.assertEqual(result[1], 2)
|
||||
self.assertEqual(result[2], 4.0)
|
||||
@@ -101,7 +100,7 @@ class H3NodeTests(unittest.TestCase):
|
||||
finally:
|
||||
sys.modules.pop(reference_module.__name__, None)
|
||||
|
||||
def test_prompt_builder_defines_connected_refmods_and_emits_them(self):
|
||||
def test_prompt_builder_emits_connected_images(self):
|
||||
reference_module = types.ModuleType("upstream.v3.reference_images_v39")
|
||||
reference_module.ReferenceImagesV39Bundle = FakeReferenceBundle
|
||||
sys.modules[reference_module.__name__] = reference_module
|
||||
@@ -109,11 +108,9 @@ class H3NodeTests(unittest.TestCase):
|
||||
result = PROMPT.DumasH3SequencePromptBuilder().build(
|
||||
2, 4, "", '{"clips":[{"slots":[{"start":0,"end":4,"text":"Use @R1."}]},'
|
||||
'{"slots":[{"start":0,"end":4,"text":"Continue with @R1."}]}]}',
|
||||
"", "", ref_mod_1=[(FakeRefMod("hero_ref"), 1.0)],
|
||||
"", "", reference_image_1="hero_ref",
|
||||
)
|
||||
self.assertEqual(result[4][0][0].name, "hero_ref")
|
||||
self.assertEqual(result[5], 0)
|
||||
self.assertIn("@R1 is the hero_ref visual reference", result[0])
|
||||
self.assertEqual(result[3].images[0], "hero_ref")
|
||||
self.assertEqual(result[3].selectors[0], "1,2")
|
||||
finally:
|
||||
sys.modules.pop(reference_module.__name__, None)
|
||||
@@ -128,7 +125,7 @@ class H3NodeTests(unittest.TestCase):
|
||||
'{"enabled":true,"slots":[{"start":0,"end":4,"text":"Use @R1."}]},'
|
||||
'{"enabled":false,"slots":[{"start":0,"end":4,"text":"Do not emit @R1."}]},'
|
||||
'{"enabled":true,"slots":[{"start":0,"end":4,"text":"Continue @R1."}]}]}',
|
||||
"", "", ref_mod_1=[(FakeRefMod("hero"), 1.0)],
|
||||
"", "", reference_image_1="hero",
|
||||
)
|
||||
self.assertEqual(result[1], 2)
|
||||
self.assertEqual(result[3].selectors[0], "1,2")
|
||||
@@ -139,7 +136,7 @@ class H3NodeTests(unittest.TestCase):
|
||||
finally:
|
||||
sys.modules.pop(reference_module.__name__, None)
|
||||
|
||||
def test_only_authored_refmod_tags_are_emitted(self):
|
||||
def test_image_slots_are_preserved_even_when_not_referenced(self):
|
||||
reference_module = types.ModuleType("upstream.v3.reference_images_v39")
|
||||
reference_module.ReferenceImagesV39Bundle = FakeReferenceBundle
|
||||
sys.modules[reference_module.__name__] = reference_module
|
||||
@@ -148,14 +145,13 @@ class H3NodeTests(unittest.TestCase):
|
||||
2, 4, "", '{"clips":['
|
||||
'{"slots":[{"start":0,"end":4,"text":"Use @R2."}]},'
|
||||
'{"slots":[{"start":0,"end":4,"text":"No extra reference."}]}]}',
|
||||
"", "", ref_mod_1=[(FakeRefMod("unused"), 1.0)],
|
||||
ref_mod_2=[(FakeRefMod("used"), 1.0)],
|
||||
ref_mod_3=[(FakeRefMod("also_unused"), 1.0)],
|
||||
"", "", reference_image_1="unused",
|
||||
reference_image_2="used",
|
||||
reference_image_3="also_unused",
|
||||
)
|
||||
self.assertEqual([mod.name for mod, _strength in result[4]], ["used"])
|
||||
self.assertEqual(result[4].chunk_refs, ((0,), ()))
|
||||
self.assertIn("@R2 is the used visual reference", result[0])
|
||||
self.assertNotIn("unused visual reference", result[0])
|
||||
self.assertEqual(result[3].images[1], "used")
|
||||
self.assertEqual(result[3].images[0], "unused")
|
||||
self.assertEqual(result[3].images[2], "also_unused")
|
||||
finally:
|
||||
sys.modules.pop(reference_module.__name__, None)
|
||||
|
||||
|
||||
@@ -49,8 +49,8 @@ class _Sampler(_SamplerBase):
|
||||
|
||||
|
||||
class VendoredNamespaceTests(unittest.TestCase):
|
||||
def test_v39_sampler_exposes_direct_refmod_socket(self):
|
||||
sampler = vendored._add_direct_refmod_input(_Sampler)
|
||||
def test_v39_sampler_keeps_clean_image_reference_surface(self):
|
||||
sampler = vendored._clean_v39_sampler_input(_Sampler)
|
||||
inputs = sampler.INPUT_TYPES()
|
||||
self.assertNotIn("aspect", inputs["required"])
|
||||
self.assertNotIn("preset", inputs["required"])
|
||||
@@ -60,9 +60,9 @@ class VendoredNamespaceTests(unittest.TestCase):
|
||||
self.assertIn("height", inputs["required"])
|
||||
self.assertNotIn("reference_audio_1", inputs["optional"])
|
||||
self.assertNotIn("reference_audio_vae", inputs["optional"])
|
||||
self.assertEqual(inputs["optional"]["refmods"][0], "H3_REF_MODS")
|
||||
self.assertIn("refmod_retention", inputs["optional"])
|
||||
self.assertIn("refmod_max_total_tokens", inputs["optional"])
|
||||
self.assertNotIn("refmods", inputs["optional"])
|
||||
self.assertNotIn("refmod_retention", inputs["optional"])
|
||||
self.assertNotIn("refmod_max_total_tokens", inputs["optional"])
|
||||
result = sampler().run(
|
||||
model=object(), width=128, height=64, size_source="Legacy",
|
||||
aspect="Auto", preset="Draft", custom_mp=0.3,
|
||||
|
||||
Reference in New Issue
Block a user