Use DUMAS Continuum reference bundle class
This commit is contained in:
@@ -14,12 +14,31 @@ REFERENCE_IMAGES_V39_TYPE = "H3_CONTINUUM_REFERENCE_IMAGES_V39"
|
|||||||
|
|
||||||
def _continuum_reference_bundle_type():
|
def _continuum_reference_bundle_type():
|
||||||
"""Find the upstream H3 bundle class without copying its implementation."""
|
"""Find the upstream H3 bundle class without copying its implementation."""
|
||||||
|
# Prefer the exact vendored Continuum module used by the namespaced DUMAS
|
||||||
|
# sampler. If the original Continuum pack is installed too, importing its
|
||||||
|
# equally named class first creates a bundle that fails isinstance checks
|
||||||
|
# in the DUMAS sampler.
|
||||||
|
import importlib
|
||||||
|
package_candidates = []
|
||||||
|
if __package__:
|
||||||
|
package_candidates.append(
|
||||||
|
f"{__package__}.vendor.dumas_h3_continuum.v3.reference_images_v39"
|
||||||
|
)
|
||||||
|
package_candidates.append("vendor.dumas_h3_continuum.v3.reference_images_v39")
|
||||||
|
for name in package_candidates:
|
||||||
|
try:
|
||||||
|
module = importlib.import_module(name)
|
||||||
|
except Exception:
|
||||||
|
continue
|
||||||
|
bundle = getattr(module, "ReferenceImagesV39Bundle", None)
|
||||||
|
if bundle is not None:
|
||||||
|
return bundle
|
||||||
|
|
||||||
candidates = [
|
candidates = [
|
||||||
module for name, module in list(sys.modules.items())
|
module for name, module in list(sys.modules.items())
|
||||||
if module is not None and name.endswith(".v3.reference_images_v39")
|
if module is not None and name.endswith(".v3.reference_images_v39")
|
||||||
]
|
]
|
||||||
try:
|
try:
|
||||||
import importlib
|
|
||||||
candidates.append(importlib.import_module("v3.reference_images_v39"))
|
candidates.append(importlib.import_module("v3.reference_images_v39"))
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -71,6 +71,32 @@ class FakeRefMod:
|
|||||||
|
|
||||||
|
|
||||||
class H3NodeTests(unittest.TestCase):
|
class H3NodeTests(unittest.TestCase):
|
||||||
|
def test_prompt_builder_prefers_dumas_continuum_bundle_class(self):
|
||||||
|
dumas_name = "vendor.dumas_h3_continuum.v3.reference_images_v39"
|
||||||
|
original_name = "v3.reference_images_v39"
|
||||||
|
dumas_module = types.ModuleType(dumas_name)
|
||||||
|
original_module = types.ModuleType(original_name)
|
||||||
|
|
||||||
|
class DumasBundle:
|
||||||
|
pass
|
||||||
|
|
||||||
|
class OriginalBundle:
|
||||||
|
pass
|
||||||
|
|
||||||
|
dumas_module.ReferenceImagesV39Bundle = DumasBundle
|
||||||
|
original_module.ReferenceImagesV39Bundle = OriginalBundle
|
||||||
|
old_modules = {name: sys.modules.get(name) for name in (dumas_name, original_name)}
|
||||||
|
sys.modules[dumas_name] = dumas_module
|
||||||
|
sys.modules[original_name] = original_module
|
||||||
|
try:
|
||||||
|
self.assertIs(PROMPT._continuum_reference_bundle_type(), DumasBundle)
|
||||||
|
finally:
|
||||||
|
for name, module in old_modules.items():
|
||||||
|
if module is None:
|
||||||
|
sys.modules.pop(name, None)
|
||||||
|
else:
|
||||||
|
sys.modules[name] = module
|
||||||
|
|
||||||
def test_prompt_schema_and_full_chunk_reference_routing(self):
|
def test_prompt_schema_and_full_chunk_reference_routing(self):
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
PROMPT.DumasH3SequencePromptBuilder.CATEGORY,
|
PROMPT.DumasH3SequencePromptBuilder.CATEGORY,
|
||||||
|
|||||||
Reference in New Issue
Block a user