fix: handle objects in a unified way (#109)

Author: mathislucka

src/deepset_mcp/tools/tokonomics/decorators.py

@@ -207,7 +207,7 @@ def resolve_reference(ref_str: str) -> Any:
 
         obj = object_store.get(ref.obj_id)
         if obj is None:
-            raise ValueError(f"Object {ref.obj_id} not found or expired")
+            raise ValueError(f"Object @{ref.obj_id} not found or expired")
 
         if ref.path:
             try:

src/deepset_mcp/tools/tokonomics/explorer.py

@@ -14,7 +14,7 @@
 from rich.console import Console
 from rich.pretty import Pretty
 
-from .object_store import ObjectStore
+from .object_store import ObjectRef, ObjectStore
 
 
 class RichExplorer:
@@ -58,21 +58,10 @@ def explore(self, obj_id: str, path: str = "") -> str:
         """Return a string preview of the requested object.
 
         :param obj_id: Identifier obtained from the store.
-        :param path: Navigation path using ``.`` or ``[...]`` notation.
+        :param path: Navigation path using ``.`` or ``[...]`` notation (e.g. ``@obj_001.path.to.attribute``).
         :return: String representation of the object.
         """
-        obj = self.store.get(obj_id)
-        if obj is None:
-            return f"Object {obj_id} not found or expired"
-
-        # Navigate to path if provided
-        if path:
-            try:
-                self._validate_path(path)
-                obj = glom(obj, self._parse_path(path))
-            except GlomError as exc:
-                return f"Navigation error at {path}: {exc}"
-            # Let ValueError from _validate_path bubble up
+        obj = self._get_object_at_path(obj_id, path)
 
         # Generate header and body
         header = self._make_header(obj_id, path, obj)
@@ -90,8 +79,6 @@ def search(self, obj_id: str, pattern: str, path: str = "", case_sensitive: bool
         :return: Search results as formatted string.
         """
         obj = self._get_object_at_path(obj_id, path)
-        if isinstance(obj, str) and obj.startswith("Object") and "not found" in obj:
-            return obj
 
         # Generate header
         header = self._make_header(obj_id, path, obj)
@@ -138,15 +125,13 @@ def search(self, obj_id: str, pattern: str, path: str = "", case_sensitive: bool
     def slice(self, obj_id: str, start: int = 0, end: int | None = None, path: str = "") -> str:
         """Extract a slice from a string or list object.
 
-        :param obj_id: Identifier obtained from the store.
+        :param obj_id: Identifier of the object.
         :param start: Start index for slicing.
         :param end: End index for slicing (None for end of sequence).
         :param path: Navigation path to object to slice (optional).
         :return: String representation of the slice.
         """
         obj = self._get_object_at_path(obj_id, path)
-        if isinstance(obj, str) and obj.startswith("Object") and "not found" in obj:
-            return obj
 
         # Generate header
         header = self._make_header(obj_id, path, obj)
@@ -193,17 +178,23 @@ def _get_object_at_path(self, obj_id: str, path: str) -> Any:
         :param path: Navigation path (optional).
         :return: Object at path or error string.
         """
-        obj = self.store.get(obj_id)
+        ref = ObjectRef.parse(obj_id)
+        # We accept @obj_001 as well as obj_001
+        if ref is None:
+            resolved_obj_id = obj_id
+        else:
+            resolved_obj_id = ref.obj_id
+
+        obj = self.store.get(resolved_obj_id)
         if obj is None:
-            return f"Object {obj_id} not found or expired"
+            raise ValueError(f"Object {obj_id} not found or expired.")
 
         if path:
+            self._validate_path(path)
             try:
-                self._validate_path(path)
                 obj = glom(obj, self._parse_path(path))
-            except GlomError as exc:
-                return f"Navigation error at {path}: {exc}"
-            # Let ValueError from _validate_path bubble up
+            except GlomError as e:
+                raise ValueError(f"Object '{obj_id}' does not have a value at path '{path}'.") from e
 
         return obj
 

test/unit/tools/tokonomics/test_decorators.py

@@ -305,7 +305,7 @@ def test_referenceable_nonexistent_object(self, store: ObjectStore, explorer: Ri
         def test_func(data: dict) -> str:
             return "success"
 
-        with pytest.raises(ValueError, match="Object obj_999 not found or expired"):
+        with pytest.raises(ValueError, match="Object @obj_999 not found or expired"):
             test_func("@obj_999")
 
     def test_referenceable_invalid_path(self, store: ObjectStore, explorer: RichExplorer) -> None:

test/unit/tools/tokonomics/test_explorer.py

@@ -50,9 +50,8 @@ def test_init_custom_params(self, store: ObjectStore) -> None:
 
     def test_explore_nonexistent_object(self, explorer: RichExplorer) -> None:
         """Test exploring a non-existent object."""
-        result = explorer.explore("obj_999")
-
-        assert "Object obj_999 not found or expired" in result
+        with pytest.raises(ValueError, match="Object obj_999 not found or expired"):
+            explorer.explore("obj_999")
 
     def test_explore_simple_object(self, store: ObjectStore, explorer: RichExplorer) -> None:
         """Test exploring a simple object."""
@@ -83,9 +82,8 @@ def test_explore_invalid_path(self, store: ObjectStore, explorer: RichExplorer)
         test_data = {"key": "value"}
         obj_id = store.put(test_data)
 
-        result = explorer.explore(obj_id, "nonexistent.path")
-
-        assert "Navigation error" in result
+        with pytest.raises(ValueError, match="does not have a value at path"):
+            explorer.explore(obj_id, "nonexistent.path")
 
     def test_explore_disallowed_attribute(self, store: ObjectStore, explorer: RichExplorer) -> None:
         """Test exploring with disallowed attribute name."""
@@ -377,19 +375,16 @@ def test_get_object_at_path_success(self, store: ObjectStore, explorer: RichExpl
 
     def test_get_object_at_path_nonexistent(self, explorer: RichExplorer) -> None:
         """Test object retrieval for non-existent object."""
-        result = explorer._get_object_at_path("obj_999", "")
-
-        assert "Object obj_999 not found or expired" in result
+        with pytest.raises(ValueError, match="Object obj_999 not found or expired"):
+            explorer._get_object_at_path("obj_999", "")
 
     def test_get_object_at_path_invalid_path(self, store: ObjectStore, explorer: RichExplorer) -> None:
         """Test object retrieval with invalid path."""
         test_data = {"key": "value"}
         obj_id = store.put(test_data)
 
-        result = explorer._get_object_at_path(obj_id, "nonexistent")
-
-        assert isinstance(result, str)
-        assert "Navigation error" in result
+        with pytest.raises(ValueError, match="does not have a value at path"):
+            explorer._get_object_at_path(obj_id, "nonexistent")
 
     def test_search_context_length(self, store: ObjectStore) -> None:
         """Test search context length configuration."""

test/unit/tools/tokonomics/test_integration.py

@@ -129,7 +129,7 @@ def process_data(data: dict) -> str:
             return f"Processed {len(data)} items"
 
         # Test non-existent object reference
-        with pytest.raises(ValueError, match="Object obj_999 not found or expired"):
+        with pytest.raises(ValueError, match="Object @obj_999 not found or expired"):
             process_data("@obj_999")
 
         # Test invalid reference format
@@ -232,12 +232,14 @@ def test_ttl_expiration_integration(self, explorer: RichExplorer) -> None:
         """Test TTL expiration in integrated workflow."""
         # Create store with short TTL
         short_ttl_store = ObjectStore(ttl=0.1)  # 100ms TTL
+        # Create explorer that uses the same store
+        short_ttl_explorer = RichExplorer(short_ttl_store)
 
-        @explorable(object_store=short_ttl_store, explorer=explorer)
+        @explorable(object_store=short_ttl_store, explorer=short_ttl_explorer)
         def create_data() -> dict:
             return {"data": "will_expire"}
 
-        @referenceable(object_store=short_ttl_store, explorer=explorer)
+        @referenceable(object_store=short_ttl_store, explorer=short_ttl_explorer)
         def use_data(data: dict) -> str:
             return data["data"]