iris-vector-graph 2.7.0__tar.gz → 2.7.1__tar.gz

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: iris-vector-graph
-Version: 2.7.0
+Version: 2.7.1
 Summary: Native graph database layer for InterSystems IRIS — openCypher, hybrid vector search, temporal property graph, RDF export, SHACL validation
 Project-URL: Homepage, https://github.com/intersystems-community/iris-vector-graph
 Project-URL: Documentation, https://github.com/intersystems-community/iris-vector-graph/tree/main/docs
@@ -49,6 +49,7 @@ Requires-Dist: intersystems-iris>=1.0.0; extra == 'core'
 Provides-Extra: demo
 Requires-Dist: python-fasthtml>=0.12.0; extra == 'demo'
 Provides-Extra: dev
+Requires-Dist: behave>=1.2.6; extra == 'dev'
 Requires-Dist: black>=23.0.0; extra == 'dev'
 Requires-Dist: flake8>=6.0.0; extra == 'dev'
 Requires-Dist: iris-devtester>=1.18.1; extra == 'dev'
@@ -57,6 +58,7 @@ Requires-Dist: mypy>=1.5.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.21.0; extra == 'dev'
 Requires-Dist: pytest-playwright>=0.7.0; extra == 'dev'
 Requires-Dist: pytest>=7.4.0; extra == 'dev'
+Requires-Dist: scikit-learn>=1.3.0; extra == 'dev'
 Provides-Extra: full
 Requires-Dist: fastapi>=0.118.0; extra == 'full'
 Requires-Dist: httpx>=0.28.1; extra == 'full'

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/_engine/admin.py

@@ -58,7 +58,7 @@ class AdminMixin:
             )
             if procs:
                 return IVGResult(columns=["name", "description", "signature"],
-                    rows=[[r[0], r[2], r[1]] for r in procs.get("rows", [])])
+                    rows=[[r[0], r[2], r[1]] for r in procs.rows])
             return IVGResult(columns=["name", "description", "signature"], rows=[])
         if "FUNCTIONS" in cmd:
             fns = self._try_system_procedure(
@@ -66,7 +66,7 @@ class AdminMixin:
             )
             if fns:
                 return IVGResult(columns=["name", "description", "signature"],
-                    rows=[[r[0], r[2], r[1]] for r in fns.get("rows", [])])
+                    rows=[[r[0], r[2], r[1]] for r in fns.rows])
             return IVGResult(columns=["name", "description", "signature"], rows=[])
         if "INDEXES" in cmd:
             return self._show_indexes()

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/_engine/algorithms.py

@@ -305,14 +305,14 @@ class AlgorithmsMixin:
         result = self.execute_cypher(
             "MATCH (a {node_id: $src})-[r1]->(b)-[r2]->(c) "
             "WHERE type(r1) = $p1 AND type(r2) = $p2 "
-            "RETURN 1 AS path_id, 1 AS step, a.node_id, type(r1), b.node_id "
+            "RETURN 1 AS path_id, 1 AS step, a.node_id AS from_id, type(r1) AS rel_type, b.node_id AS to_id "
             "UNION ALL "
             "MATCH (a {node_id: $src})-[r1]->(b)-[r2]->(c) "
             "WHERE type(r1) = $p1 AND type(r2) = $p2 "
-            "RETURN 1 AS path_id, 2 AS step, b.node_id, type(r2), c.node_id",
+            "RETURN 1 AS path_id, 2 AS step, b.node_id AS from_id, type(r2) AS rel_type, c.node_id AS to_id",
             {"src": src_id, "p1": pred1, "p2": pred2},
         )
-        return [(int(r[0]), int(r[1]), r[2], r[3], r[4]) for r in (result.get("rows") or [])]
+        return [(int(r[0]), int(r[1]), r[2], r[3], r[4]) for r in result.rows]
     def kg_GRAPH_WALK(self, start_entity: str, max_depth: int = 3,
                       edge_types: Optional[List[str]] = None,
                       max_results: int = 100):
@@ -468,7 +468,7 @@ class AlgorithmsMixin:
                     if predicate:
                         params["p"] = predicate
                     r = self.execute_cypher(q, params)
-                    for row in (r.get("rows") or []):
+                    for row in r.rows:
                         t = row[0]
                         if t and (not distinct or t not in seen):
                             all_targets.append(t)

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/_engine/nodes_edges.py

@@ -306,7 +306,7 @@ class NodesEdgesMixin:
         cypher = "MATCH (n) WHERE n.id = $node_id RETURN n"
         result = self.execute_cypher(cypher, parameters={"node_id": node_id})
 
-        if not result.get("rows"):
+        if not result.rows:
             return None
 
         row = result["rows"][0]
@@ -1186,13 +1186,13 @@ class NodesEdgesMixin:
 
     def node_count(self) -> int:
         result = self.execute_cypher("MATCH (n) RETURN count(n) AS c")
-        rows = result.get("rows") or []
+        rows = result.rows
         return int(rows[0][0]) if rows else 0
 
 
     def edge_count(self) -> int:
         result = self.execute_cypher("MATCH ()-[r]->() RETURN count(r) AS c")
-        rows = result.get("rows") or []
+        rows = result.rows
         return int(rows[0][0]) if rows else 0
 
 

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/_engine/query.py

@@ -208,10 +208,10 @@ class QueryMixin:
         if "CALL DB.LABELS() YIELD" in stripped and "UNION" in stripped:
             labels = self._try_system_procedure(
                 type("P", (), {"procedure_name": "db.labels"})()
-            ).get("rows", [])
+            ).rows
             rels = self._try_system_procedure(
                 type("P", (), {"procedure_name": "db.relationshipTypes"})()
-            ).get("rows", [])
+            ).rows
             cursor = self.conn.cursor()
             cursor.execute(
                 'SELECT DISTINCT TOP 1000 "key" FROM Graph_KG.rdf_props ORDER BY "key"'
@@ -263,8 +263,8 @@ class QueryMixin:
                     try:
                         sub = self.execute_cypher(part, parameters=parameters)
                         if all_cols is None:
-                            all_cols = sub.get("columns", [])
-                        all_rows.extend(sub.get("rows", []))
+                            all_cols = sub.columns
+                        all_rows.extend(sub.rows)
                     except Exception:
                         pass
                 return IVGResult(columns=all_cols or ["result"], rows=all_rows)
@@ -304,7 +304,7 @@ class QueryMixin:
             for part_query in [parsed] + parsed.subsequent_queries:
                 part_query.subsequent_queries = []
                 result = self._execute_parsed(part_query, current_params, procedures)
-                if result and result.get("rows") and result.get("columns"):
+                if result and result.rows and result.columns:
                     first_row = result["rows"][0] if result["rows"] else []
                     for col, val in zip(result["columns"], first_row):
                         if isinstance(val, (str, int, float, bool, type(None))):
@@ -458,13 +458,28 @@ class QueryMixin:
             if src_var and src_var in parameters:
                 source_id = str(parameters[src_var])
 
+        # When source is not ID-bound, try to resolve from SQL parameters before
+        # falling back to labeled multi-source traversal.
+        source_labels = vl0.get("source_labels") or []
+        if source_id is None and src_id_param is None:
+            # Fallback: extract source_id from the first SQL param that looks like
+            # a node ID (non-schema-prefix string). Covers WHERE a.node_id = $src
+            # patterns where the translator doesn't set src_id_param.
+            params_list = sql_query.parameters[0] if sql_query.parameters else []
+            for item in params_list:
+                if isinstance(item, str) and not item.startswith("Graph_KG"):
+                    source_id = item
+                    break
+            if source_id is None and parameters:
+                source_id = next(iter(parameters.values()), None)
+                if source_id is not None:
+                    source_id = str(source_id)
+
         # When source is not ID-bound, use labeled multi-source traversal.
         # This covers two cases:
         #   (a) source labeled in this pattern: source_labels is populated
         #   (b) source bound in a prior MATCH: source_labels=[] but source_alias
         #       is present in the SQL with label joins we can query.
-        # In both cases src_id_param is None and source_id remains None here.
-        source_labels = vl0.get("source_labels") or []
         if source_id is None and src_id_param is None:
             # When path functions (length/nodes/relationships) are in RETURN,
             # use dedicated method that tracks (source, target, hop) triples.

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/bolt_server.py

@@ -543,9 +543,9 @@ class BoltSession:
         try:
             engine = self._get_engine()
             result = engine.execute_cypher(query, parameters=params or {})
-            columns = result.get("columns", [])
-            rows = result.get("rows", [])
-            col_types = result.get("_bolt_column_types", ["scalar"] * len(columns))
+            columns = result.columns
+            rows = result.rows
+            col_types = result.bolt_column_types or ["scalar"] * len(columns)
 
             # Use AST-derived column types (from translate_to_sql) to detect
             # relationship columns, supplemented by the heuristic node-triplet detector.

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/cypher/translator.py

@@ -5542,7 +5542,7 @@ def translate_node_pattern(node, context, metadata, optional=False):
                     )
             for k, v in node.properties.items():
                 val_sql = translate_expression(v, context, segment="where")
-                if k == "node_id":
+                if k in ("node_id", "id"):
                     context.where_conditions.append(f"{node_id_col} = {val_sql}")
                 else:
                     if not optional:
@@ -5645,7 +5645,7 @@ def translate_node_pattern(node, context, metadata, optional=False):
                     context.optional_null_row_labels.append(label)
     for k, v in node.properties.items():
         val_sql = translate_expression(v, context, segment="where")
-        if k == "node_id":
+        if k in ("node_id", "id"):
             context.where_conditions.append(f"{alias}.node_id = {val_sql}")
         else:
             if not optional:

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/cypher_api.py

@@ -196,8 +196,8 @@ def _run_cypher(query: str, parameters: dict | None = None, limit: int = 1000) -
                     _reset_engine()
                     continue
                 raise
-    columns = result.get("columns", [])
-    rows = result.get("rows", [])
+    columns = result.columns
+    rows = result.rows
     if len(rows) > limit:
         rows = rows[:limit]
     return {
@@ -213,7 +213,7 @@ def health():
     try:
         engine = _get_engine()
         result = engine.execute_cypher("MATCH (n) RETURN count(n) AS c")
-        node_count = result["rows"][0][0] if result.get("rows") else 0
+        node_count = result.rows[0][0] if result.rows else 0
         return {"status": "ok", "engine": True, "nodes": node_count}
     except Exception as e:
         return {"status": "ok", "engine": False, "error": str(e)}

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/gql/resolvers.py

@@ -144,12 +144,12 @@ async def resolve_cypher(
     
     # Apply recursive serialization to rows
     serialized_rows = []
-    for row in result.get("rows", []):
+    for row in result.rows:
         serialized_rows.append(serialize_value(row))
-        
+
     from .schema import CypherResult
     return CypherResult(
-        columns=result.get("columns", []),
+        columns=result.columns,
         rows=serialized_rows
     )
 

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/iris_vector_graph/result.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from typing import Any, Optional
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 
 from iris_vector_graph.cypher.translator import QueryMetadata
 
@@ -18,6 +18,18 @@ class IVGResult(BaseModel):
 
     model_config = {"arbitrary_types_allowed": True}
 
+    @field_validator("metadata", mode="before")
+    @classmethod
+    def _coerce_metadata(cls, v: Any) -> Any:
+        if isinstance(v, QueryMetadata):
+            return v
+        if isinstance(v, dict):
+            return QueryMetadata(**v)
+        return QueryMetadata()
+
+    def __len__(self) -> int:
+        return len(self.rows)
+
     def __bool__(self) -> bool:
         return self.error is None
 
@@ -54,7 +66,7 @@ class IVGResult(BaseModel):
         return key in {"columns", "rows", "metadata", "_bolt_column_types"}
 
     def get(self, key: str, default: Any = None) -> Any:
-        try:
-            return self[key]
-        except KeyError:
-            return default
+        raise TypeError(
+            f"IVGResult.get('{key}') is not supported — use attribute access "
+            f"(result.{key}) or subscript (result['{key}']) instead"
+        )

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "iris-vector-graph"
-version = "2.7.0"
+version = "2.7.1"
 description = "Native graph database layer for InterSystems IRIS — openCypher, hybrid vector search, temporal property graph, RDF export, SHACL validation"
 readme = "README.md"
 license = "MIT"
@@ -96,6 +96,8 @@ dev = [
     "mypy>=1.5.0",
     "iris-devtester>=1.18.1",
     "pytest-playwright>=0.7.0",
+    "behave>=1.2.6",
+    "scikit-learn>=1.3.0",
 ]
 performance = [
     "psutil>=5.9.0",

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_admin_rdf_prov_shacl_coverage.py

@@ -45,9 +45,11 @@ def make_engine(rows=None, fetchone=None):
 def test_handle_show_command_procedures():
     """SHOW PROCEDURES → _try_system_procedure(dbms.procedures)."""
     eng, cur = make_engine()
-    eng._try_system_procedure = MagicMock(return_value={
-        "rows": [["apoc.create.node", "sig", "desc"]]
-    })
+    from iris_vector_graph.result import IVGResult
+    eng._try_system_procedure = MagicMock(return_value=IVGResult(
+        columns=["name", "signature", "description"],
+        rows=[["apoc.create.node", "sig", "desc"]]
+    ))
     result = eng._handle_show_command("SHOW PROCEDURES")
     assert result is not None
     assert result.columns == ["name", "description", "signature"]
@@ -64,9 +66,11 @@ def test_handle_show_command_procedures_no_result():
 def test_handle_show_command_functions():
     """SHOW FUNCTIONS → _try_system_procedure(dbms.functions)."""
     eng, cur = make_engine()
-    eng._try_system_procedure = MagicMock(return_value={
-        "rows": [["coalesce", "sig", "Returns first non-null"]]
-    })
+    from iris_vector_graph.result import IVGResult
+    eng._try_system_procedure = MagicMock(return_value=IVGResult(
+        columns=["name", "signature", "description"],
+        rows=[["coalesce", "sig", "Returns first non-null"]]
+    ))
     result = eng._handle_show_command("SHOW FUNCTIONS")
     assert result.columns == ["name", "description", "signature"]
 

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_admin_remaining.py

@@ -114,10 +114,10 @@ class TestHandleShowFunctions:
     def test_show_functions_with_results(self):
         """SHOW FUNCTIONS when _try_system_procedure returns rows."""
         eng = _make_eng()
-        mock_result = {
-            "rows": [["ivg.betweenness", "(topK: INTEGER)", "Betweenness centrality"]],
-            "columns": ["name", "signature", "description"],
-        }
+        mock_result = IVGResult(
+            columns=["name", "signature", "description"],
+            rows=[["ivg.betweenness", "(topK: INTEGER)", "Betweenness centrality"]],
+        )
         with patch.object(eng, "_try_system_procedure", return_value=mock_result):
             result = eng._handle_show_command("SHOW FUNCTIONS")
         assert isinstance(result, IVGResult)
@@ -128,10 +128,10 @@ class TestHandleShowFunctions:
     def test_show_procedures_with_results(self):
         """SHOW PROCEDURES when _try_system_procedure returns rows."""
         eng = _make_eng()
-        mock_result = {
-            "rows": [["ivg.leiden", "(gamma: FLOAT)", "Leiden community detection"]],
-            "columns": ["name", "signature", "description"],
-        }
+        mock_result = IVGResult(
+            columns=["name", "signature", "description"],
+            rows=[["ivg.leiden", "(gamma: FLOAT)", "Leiden community detection"]],
+        )
         with patch.object(eng, "_try_system_procedure", return_value=mock_result):
             result = eng._handle_show_command("SHOW PROCEDURES")
         assert isinstance(result, IVGResult)

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_algorithms_extended_unit.py

@@ -290,7 +290,7 @@ class TestKgNeighbors:
                 rows = next(call_seq)
             except StopIteration:
                 rows = []
-            return {"rows": rows}
+            return IVGResult(columns=[], rows=rows)
 
         with patch.object(eng, "execute_cypher", side_effect=fake_execute_cypher):
             result = eng.kg_NEIGHBORS(["n1"], direction="both")
@@ -299,7 +299,7 @@ class TestKgNeighbors:
     def test_with_predicate(self):
         eng, _, _ = _make_eng()
         def fake_execute_cypher(q, params):
-            return {"rows": [["n2"]]}
+            return IVGResult(columns=[], rows=[["n2"]])
         with patch.object(eng, "execute_cypher", side_effect=fake_execute_cypher):
             result = eng.kg_NEIGHBORS(["n1"], predicate="TREATS")
         assert "n2" in result

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_bolt_server.py

@@ -6,6 +6,7 @@ T015-T018: BoltSession state machine (mocked WebSocket)
 T021-T022: Graph object encoding
 """
 from __future__ import annotations
+from iris_vector_graph.result import IVGResult
 
 import asyncio
 import struct
@@ -233,7 +234,7 @@ class TestBoltSessionHello:
         monkeypatch.delenv("IVG_API_KEY", raising=False)
         ws = self._make_ws([(0x01, [{"user_agent": "test/1.0", "routing": None}])])
         mock_engine = MagicMock()
-        mock_engine.execute_cypher.return_value = {"columns": ["c"], "rows": [[0]]}
+        mock_engine.execute_cypher.return_value = IVGResult(columns=["c"], rows=[[0]])
         session = BoltSession(ws, lambda: mock_engine)
         try:
             asyncio.run(session.run())

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_cypher_e2e_new_features.py

@@ -612,7 +612,7 @@ class TestAdjacencyIndexBuilt:
             "MATCH (a)-[r*1..1]->(b) WHERE a.id = $id RETURN b.id",
             {"id": src},
         )
-        rows = result.get("rows", [])
+        rows = result.rows
         ids = {row[0] for row in rows}
         assert dst in ids, (
             f"BFS returned 0 results after create_edge(). "
@@ -635,7 +635,7 @@ class TestAdjacencyIndexBuilt:
             "MATCH (a)-[r*1..3]->(b) WHERE a.id = $id RETURN b.id",
             {"id": nodes[0]},
         )
-        ids = {row[0] for row in result.get("rows", [])}
+        ids = {row[0] for row in result.rows}
         assert nodes[1] in ids and nodes[3] in ids, (
             f"bulk_create_edges BFS returned {ids} — expected all 3 downstream nodes. "
             f"Check that BuildKG() is called in the finally block of bulk_create_edges()."

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_edgeprop_ndjson.py

@@ -117,7 +117,7 @@ class TestEdgePropNdjsonE2E:
             attrs={"latency_ms": "237", "error": "true", "trace_id": "abc123"})
         attrs = self.engine.get_edge_attrs(now, f"{self.PREFIX}:A", "CALLS", f"{self.PREFIX}:B")
         assert attrs.get("latency_ms") == "237"
-        assert attrs.get("error") == "true"
+        assert attrs.error == "true"
         assert attrs.get("trace_id") == "abc123"
 
     def test_ndjson_import(self):

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_embedded_wgproto.py

@@ -291,6 +291,7 @@ class TestVectorDtypeConsistency:
         eng._arno_capabilities = {}
         eng._index_registry = {}
         eng.vector_dtype = "DOUBLE"
+        eng._schema_prefix = "Graph_KG"
 
         query_vec = json.dumps([0.1, 0.2, 0.3, 0.4])
         eng.kg_KNN_VEC(query_vec, k=5)
@@ -315,6 +316,7 @@ class TestVectorDtypeConsistency:
         eng._arno_capabilities = {}
         eng._index_registry = {}
         eng.vector_dtype = "FLOAT"
+        eng._schema_prefix = "Graph_KG"
 
         query_vec = json.dumps([0.1, 0.2, 0.3, 0.4])
         eng.kg_KNN_VEC(query_vec, k=5)
@@ -547,6 +549,7 @@ class TestNewEngineAPIs:
         eng._index_registry = {}
         eng.vector_dtype = "DOUBLE"
         eng.capabilities = IRISCapabilities()
+        eng._schema_prefix = "Graph_KG"
         return eng
 
     def test_get_node_name_returns_name_property(self):
@@ -592,14 +595,16 @@ class TestNewEngineAPIs:
 
     def test_node_count_calls_execute_cypher(self):
         eng = self._make_engine()
-        eng.execute_cypher = MagicMock(return_value={"rows": [(42,)]})
+        from iris_vector_graph.result import IVGResult
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["c"], rows=[(42,)]))
         assert eng.node_count() == 42
         eng.execute_cypher.assert_called_once()
         assert "count" in eng.execute_cypher.call_args[0][0].lower()
 
     def test_edge_count_calls_execute_cypher(self):
         eng = self._make_engine()
-        eng.execute_cypher = MagicMock(return_value={"rows": [(100,)]})
+        from iris_vector_graph.result import IVGResult
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["c"], rows=[(100,)]))
         assert eng.edge_count() == 100
 
     def test_embedding_count_queries_table(self):
@@ -629,6 +634,7 @@ class TestDetectStoredVectorDtype:
         eng._index_registry = {}
         eng.vector_dtype = "DOUBLE"
         eng.capabilities = IRISCapabilities()
+        eng._schema_prefix = "Graph_KG"
         return eng
 
     def test_returns_float_when_float_works(self):

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_engine_coverage_v8.py

@@ -1,3 +1,4 @@
+from iris_vector_graph.result import IVGResult
 """Coverage tests for snapshot.py and nodes_edges.py missing lines.
 
 Targets:
@@ -1833,11 +1834,11 @@ class TestMiscNodeMethods:
     def test_node_count_via_cypher(self):
         eng, conn, cur = make_engine()
         _patch_t(eng)
-        eng.execute_cypher = MagicMock(return_value={"rows": [[10]], "columns": ["c"]})
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["c"], rows=[[10]]))
         assert eng.node_count() == 10
 
     def test_edge_count_via_cypher(self):
         eng, conn, cur = make_engine()
         _patch_t(eng)
-        eng.execute_cypher = MagicMock(return_value={"rows": [[5]], "columns": ["c"]})
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["c"], rows=[[5]]))
         assert eng.edge_count() == 5

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_fetch_first_join_bug.py

@@ -48,9 +48,10 @@ class TestFetchFirstJoinWorkaround:
         assert "TOP 3" in sql
 
     def test_unsafe_skip_plus_limit_keeps_fetch_first(self):
-        # TOP cannot express OFFSET; SKIP+LIMIT must retain FETCH FIRST + OFFSET
-        # (rare; residual build-106 risk is documented in apply_pagination).
+        # TOP cannot express OFFSET; SKIP+LIMIT uses ROW_NUMBER pagination instead.
+        # Verified: translator emits ROW_NUMBER() OVER() window with __rn range filter.
         sql = _sql("MATCH (n) RETURN n.node_id SKIP 2 LIMIT 4", unsafe=True)
-        assert "OFFSET 2" in sql
-        assert "FETCH FIRST 4 ROWS ONLY" in sql
-        assert "TOP 4" not in sql
+        assert "FETCH FIRST" not in sql, f"FETCH FIRST must not appear for SKIP+LIMIT on unsafe build:\n{sql}"
+        assert "TOP 4" not in sql, f"TOP must not appear for SKIP+LIMIT:\n{sql}"
+        # ROW_NUMBER-based pagination: rows 3-6 (SKIP 2 LIMIT 4)
+        assert "ROW_NUMBER" in sql or "__rn" in sql, f"expected ROW_NUMBER pagination:\n{sql}"

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_fhir_bridges.py

@@ -77,6 +77,7 @@ class TestGetKgAnchors:
         from iris_vector_graph.engine import IRISGraphEngine
         engine = IRISGraphEngine.__new__(IRISGraphEngine)
         engine.conn = MagicMock()
+        engine._schema_prefix = "Graph_KG"
         return engine
 
     def test_returns_mesh_nodes_for_icd_codes(self):

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_ingest_formats.py

@@ -9,6 +9,7 @@ class TestLoadNetworkx:
         from iris_vector_graph.engine import IRISGraphEngine
         engine = IRISGraphEngine.__new__(IRISGraphEngine)
         engine.conn = MagicMock()
+        engine._schema_prefix = "Graph_KG"
         cursor_mock = MagicMock()
         cursor_mock.fetchone.return_value = (0,)
         engine.conn.cursor.return_value = cursor_mock
@@ -48,6 +49,7 @@ class TestLoadObo:
         from iris_vector_graph.engine import IRISGraphEngine
         engine = IRISGraphEngine.__new__(IRISGraphEngine)
         engine.conn = MagicMock()
+        engine._schema_prefix = "Graph_KG"
         cursor_mock = MagicMock()
         cursor_mock.fetchone.return_value = (0,)
         engine.conn.cursor.return_value = cursor_mock

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_ivf_index.py

@@ -28,6 +28,7 @@ def _make_engine():
     engine._arno_capabilities = {}
     engine._nkg_dirty = False
     engine._native_vec_available = None
+    engine._schema_prefix = "Graph_KG"
     return engine
 
 
@@ -183,6 +184,7 @@ class TestIVFIndexUnit:
         set_schema_prefix("MySchema")
         try:
             engine = _make_engine()
+            engine._schema_prefix = "MySchema"
             iris_mock = MagicMock()
             iris_mock.classMethodValue.return_value = '{"nlist":2,"dim":3,"metric":"cosine","indexed":2}'
             engine._iris_obj = lambda: iris_mock
@@ -467,7 +469,7 @@ class TestIVFIndexE2E:
         result = self.engine.execute_cypher(cypher)
         assert "columns" in result
         assert "node" in result["columns"] or "score" in result["columns"]
-        assert len(result.get("rows", [])) > 0
+        assert len(result.rows) > 0
         self._cleanup_nodes(node_ids)
 
 

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_ivgresult.py

@@ -69,22 +69,23 @@ def test_dict_compat_getitem_error_present():
 
 def test_dict_compat_get_returns_none_for_absent_sql():
     r = make_empty()
-    assert r.get("sql") is None
+    assert r.sql is None
 
 
 def test_dict_compat_get_returns_none_for_absent_error():
     r = make_success()
-    assert r.get("error") is None
+    assert r.error is None
 
 
 def test_dict_compat_get_returns_value_for_present_key():
     r = make_success()
-    assert r.get("columns") == ["id", "name"]
+    assert r.columns == ["id", "name"]
 
 
-def test_dict_compat_get_with_default():
+def test_dict_compat_get_raises_typeerror():
     r = make_empty()
-    assert r.get("nonexistent", "fallback") == "fallback"
+    with pytest.raises(TypeError, match="IVGResult.get"):
+        r.get("nonexistent", "fallback")
 
 
 def test_dict_compat_contains_error_false_on_success():

{iris_vector_graph-2.7.0 → iris_vector_graph-2.7.1}/tests/unit/test_misc_coverage_v8.py

@@ -15,6 +15,7 @@ Coverage tests for:
 All tests use mocks — no IRIS connection required.
 """
 from __future__ import annotations
+from iris_vector_graph.result import IVGResult
 
 import json
 import os
@@ -67,7 +68,7 @@ class TestCypherAPIHealth:
         eng, conn, cursor = _make_engine()
         cursor.fetchall.return_value = [(5,)]
         cursor.fetchone.return_value = (5,)
-        eng.execute_cypher = MagicMock(return_value={"columns": ["c"], "rows": [[5]]})
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["c"], rows=[[5]]))
         client = self._client(eng)
         resp = client.get("/health")
         assert resp.status_code == 200
@@ -98,7 +99,7 @@ class TestCypherAPICypherPost:
 
     def test_cypher_post_success(self):
         eng, conn, cursor = _make_engine()
-        eng.execute_cypher = MagicMock(return_value={"columns": ["n"], "rows": [["a"]]})
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["n"], rows=[["a"]]))
         client = self._client_with_engine(eng)
         resp = client.post("/api/cypher", json={"query": "MATCH (n) RETURN n"})
         assert resp.status_code == 200
@@ -118,7 +119,7 @@ class TestCypherAPICypherPost:
         from fastapi.testclient import TestClient
         import iris_vector_graph.cypher_api as capi
         eng, conn, cursor = _make_engine()
-        eng.execute_cypher = MagicMock(return_value={"columns": ["n"], "rows": []})
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["n"], rows=[]))
         capi._engine_cache = eng
         with patch.object(capi, "_resolve_patient_anchors", return_value=["n1", "n2"]):
             client = TestClient(capi.app, raise_server_exceptions=False)
@@ -131,7 +132,7 @@ class TestCypherAPICypherPost:
     def test_neo4j_tx_commit_success(self):
         """Lines 278-279."""
         eng, conn, cursor = _make_engine()
-        eng.execute_cypher = MagicMock(return_value={"columns": ["c"], "rows": [[1]]})
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["c"], rows=[[1]]))
         client = self._client_with_engine(eng)
         resp = client.post("/db/neo4j/tx/commit", json={
             "statements": [{"statement": "RETURN 1", "parameters": {}}]
@@ -166,7 +167,7 @@ class TestCypherAPISchemaEndpoints:
     def test_get_indexes_success(self):
         """Lines 374-375."""
         eng, client = self._eng_client()
-        eng.execute_cypher = MagicMock(return_value={"columns": ["name"], "rows": [["idx1"]]})
+        eng.execute_cypher = MagicMock(return_value=IVGResult(columns=["name"], rows=[["idx1"]]))
         # /indexes calls eng.execute_cypher("SHOW INDEXES") but result has .columns and .rows attrs
         result_mock = MagicMock()
         result_mock.columns = ["name"]