Fix ComfyUI custom node package imports

nodes.py

@@ -5,8 +5,12 @@ import os
 from pathlib import Path
 from typing import Any
 
-from smart_metadata_reader.image_io import load_image_and_mask
-from smart_metadata_reader.metadata_reader import parse_metadata_bundle, read_metadata
+try:
+    from .smart_metadata_reader.image_io import load_image_and_mask
+    from .smart_metadata_reader.metadata_reader import parse_metadata_bundle, read_metadata
+except ImportError:
+    from smart_metadata_reader.image_io import load_image_and_mask
+    from smart_metadata_reader.metadata_reader import parse_metadata_bundle, read_metadata
 
 try:
     import folder_paths  # type: ignore

smart_metadata_reader/adapters/base.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from typing import Protocol
 
-from smart_metadata_reader.graph import GraphIndex
-from smart_metadata_reader.models import NodeRecord, PromptSegment
-from smart_metadata_reader.trace import TraceCollector
+from ..graph import GraphIndex
+from ..models import NodeRecord, PromptSegment
+from ..trace import TraceCollector
 
 
 class NodeAdapter(Protocol):

smart_metadata_reader/adapters/clip_text.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from smart_metadata_reader.adapters.base import TextResolutionContext
-from smart_metadata_reader.models import NodeRecord, PromptSegment
+from .base import TextResolutionContext
+from ..models import NodeRecord, PromptSegment
 
 
 class CLIPTextEncodeAdapter:

smart_metadata_reader/adapters/conditioning.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from smart_metadata_reader.models import NodeRecord
+from ..models import NodeRecord
 
 
 ROLE_FIELD_ORDER = {

smart_metadata_reader/adapters/loaders.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from smart_metadata_reader.models import NodeRecord
+from ..models import NodeRecord
 
 
 CHECKPOINT_NAME_FIELDS = ("ckpt_name", "checkpoint", "model_name", "name")

smart_metadata_reader/adapters/pysssss.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from smart_metadata_reader.adapters.base import TextResolutionContext
-from smart_metadata_reader.models import NodeRecord, PromptSegment
+from .base import TextResolutionContext
+from ..models import NodeRecord, PromptSegment
 
 
 class StringFunctionAdapter:

smart_metadata_reader/adapters/samplers.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from smart_metadata_reader.models import NodeRecord
+from ..models import NodeRecord
 
 
 SAMPLER_CLASS_TYPES = {

smart_metadata_reader/adapters/text_sources.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from smart_metadata_reader.adapters.base import TextResolutionContext
-from smart_metadata_reader.models import NodeRecord, PromptSegment
+from .base import TextResolutionContext
+from ..models import NodeRecord, PromptSegment
 
 
 COMMON_TEXT_FIELDS = (

tests/test_node_contract.py

@@ -1,6 +1,8 @@
 import json
 import importlib.util
+import subprocess
 import sys
+import textwrap
 from types import SimpleNamespace
 
 import pytest
@@ -184,6 +186,49 @@ def test_plugin_root_init_exports_comfyui_mappings():
     assert module.NODE_DISPLAY_NAME_MAPPINGS["SmartMetadataReader"] == "Smart Metadata Reader"
 
 
+def test_plugin_package_import_works_without_repo_root_on_sys_path(tmp_path):
+    root_dir = pytest.importorskip("pathlib").Path(__file__).resolve().parents[1]
+    script = textwrap.dedent(
+        f"""
+        import importlib.util
+        import pathlib
+        import sys
+
+        root = pathlib.Path({str(root_dir)!r})
+        sys.path = [
+            path for path in sys.path
+            if pathlib.Path(path or ".").resolve() != root
+        ]
+        for name in list(sys.modules):
+            if name == "smart_metadata_reader" or name.startswith("smart_metadata_reader."):
+                sys.modules.pop(name, None)
+
+        spec = importlib.util.spec_from_file_location(
+            "comfyui_custom_node_under_test",
+            root / "__init__.py",
+            submodule_search_locations=[str(root)],
+        )
+        module = importlib.util.module_from_spec(spec)
+        sys.modules[spec.name] = module
+        spec.loader.exec_module(module)
+        assert "SmartMetadataReader" in module.NODE_CLASS_MAPPINGS
+        assert module.NODE_DISPLAY_NAME_MAPPINGS["SmartMetadataReader"] == "Smart Metadata Reader"
+        print("package import ok")
+        """
+    )
+
+    completed = subprocess.run(
+        [sys.executable, "-c", script],
+        cwd=tmp_path,
+        text=True,
+        capture_output=True,
+        check=False,
+    )
+
+    assert completed.returncode == 0, completed.stderr
+    assert "package import ok" in completed.stdout
+
+
 def test_input_types_prefers_comfyui_filename_list(monkeypatch):
     import nodes