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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-vector-graph
-Version: 2.5.0
+Version: 2.7.0
 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
@@ -86,6 +86,8 @@ Requires-Dist: scikit-learn>=1.3.0; extra == 'plaid'
 Provides-Extra: rdf
 Requires-Dist: pyshacl>=0.25.0; extra == 'rdf'
 Requires-Dist: rdflib>=6.0.0; extra == 'rdf'
+Provides-Extra: tck
+Requires-Dist: behave>=1.2.6; extra == 'tck'
 Provides-Extra: visualization
 Requires-Dist: graphviz>=0.20.0; extra == 'visualization'
 Requires-Dist: matplotlib>=3.7.0; extra == 'visualization'

iris_vector_graph-2.7.0/iris_src/src/IVG/Percentile.cls

@@ -0,0 +1,54 @@
+/// Percentile aggregate helpers for IVG Cypher engine.
+Class IVG.Percentile Extends %RegisteredObject [ SqlSchemaName = IVG ]
+{
+
+/// percentileDisc(vals, p) — discrete Nth percentile of sorted JSON array.
+ClassMethod PDISC(vals As %String, p As %Double) As %String [ SqlProc ]
+{
+	If (p < 0) || (p > 1) { Throw ##class(%Exception.General).%New("ArgumentError","5030","Bad argument given; Details: Incorrect number out of range") }
+	Set arr = ##class(%Library.DynamicArray).%FromJSON(vals)
+	Set n = arr.%Size()
+	If n = 0 { Quit "" }
+	Set sorted = ..SortArray(arr, n)
+	Set i = ((n - 1) * p) \ 1
+	If i < 0 { Set i = 0 }
+	If i >= n { Set i = n - 1 }
+	Quit sorted.%Get(i)
+}
+
+/// percentileCont(vals, p) — continuous Nth percentile (linear interpolation).
+ClassMethod PCONT(vals As %String, p As %Double) As %Double [ SqlProc ]
+{
+	If (p < 0) || (p > 1) { Throw ##class(%Exception.General).%New("ArgumentError","5030","Bad argument given; Details: Incorrect number out of range") }
+	Set arr = ##class(%Library.DynamicArray).%FromJSON(vals)
+	Set n = arr.%Size()
+	If n = 0 { Quit 0 }
+	Set sorted = ..SortArray(arr, n)
+	Set pos = (n - 1) * p
+	Set lower = pos \ 1
+	If lower < 0 { Set lower = 0 }
+	If lower >= (n - 1) { Quit sorted.%Get(n - 1) + 0 }
+	Set frac = pos - lower
+	Set lo = sorted.%Get(lower) + 0
+	Set hi = sorted.%Get(lower + 1) + 0
+	Quit lo + (frac * (hi - lo))
+}
+
+/// Sort a DynamicArray of numbers ascending (insertion sort, in-place).
+ClassMethod SortArray(arr As %Library.DynamicArray, n As %Integer) As %Library.DynamicArray
+{
+	Set i = 1
+	While i < n {
+		Set key = arr.%Get(i) + 0
+		Set j = i - 1
+		While j >= 0 && (arr.%Get(j) + 0 > key) {
+			Do arr.%Set(j + 1, arr.%Get(j) + 0)
+			Set j = j - 1
+		}
+		Do arr.%Set(j + 1, key)
+		Set i = i + 1
+	}
+	Quit arr
+}
+
+}

iris_vector_graph-2.7.0/iris_src/src/User.CypherFn.cls

@@ -0,0 +1,237 @@
+/// User.CypherFn — SQL UDFs for Cypher expression translation
+/// All method names use IVG prefix to avoid IRIS 2026.3 reserved keyword conflicts.
+/// SQL projection names: SQLUser.CypherFn_IVG<Name>
+Class User.CypherFn Extends %RegisteredObject
+{
+
+/// Regex match operator (=~ in Cypher). Returns 1 if string matches pattern, 0 otherwise.
+ClassMethod IVGREGEXMATCH(s As %String = "", p As %String = "") As %Integer [ SqlProc ]
+{
+    If s = "" || p = "" { Return 0 }
+    Try {
+        Set m = ##class(%Regex.Matcher).%New(p)
+        Set r = m.Match(s)
+        Return $Select(r: 1, 1: 0)
+    } Catch { Return 0 }
+}
+
+/// JSON array length. Returns 0 for null/empty.
+ClassMethod IVGJSONARRAYLENGTH(json As %String = "") As %Integer [ SqlProc ]
+{
+    If json = "" || json = "null" { Return 0 }
+    Try {
+        Set arr = ##class(%DynamicArray).%FromJSON(json)
+        If arr = "" { Return 0 }
+        Return arr.%Size()
+    } Catch { Return 0 }
+}
+
+/// JSON value extraction via JSONPath (supports $.key and $[N] forms).
+ClassMethod IVGJSONVALUE(json As %String = "", path As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "" }
+    Try {
+        Set obj = ##class(%DynamicObject).%FromJSON(json)
+        If obj = "" { Return "" }
+        If $Extract(path, 1, 2) = "$." {
+            Return obj.%Get($Extract(path, 3, *))
+        } ElseIf $Extract(path, 1, 2) = "$[" {
+            Set idx = +$Extract(path, 3, $Length(path) - 1)
+            If obj.%IsA("%DynamicArray") { Return obj.%Get(idx) }
+        }
+        Return ""
+    } Catch { Return "" }
+}
+
+/// Return keys of a JSON object as a JSON array string.
+ClassMethod IVGJSONKEYS(json As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "[]" }
+    Try {
+        Set obj = ##class(%DynamicObject).%FromJSON(json)
+        If obj = "" { Return "[]" }
+        Set keys = ##class(%DynamicArray).%New()
+        Set iter = obj.%GetIterator()
+        While iter.%GetNext(.key, .val) { Do keys.%Push(key) }
+        Return keys.%ToJSON()
+    } Catch { Return "[]" }
+}
+
+/// Reverse a JSON array.
+ClassMethod IVGLISTREVERSE(json As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "[]" }
+    Try {
+        Set arr = ##class(%DynamicArray).%FromJSON(json)
+        If arr = "" { Return "[]" }
+        Set rev = ##class(%DynamicArray).%New()
+        Set sz = arr.%Size()
+        For i = sz:-1:1 { Do rev.%Push(arr.%Get(i - 1)) }
+        Return rev.%ToJSON()
+    } Catch { Return "[]" }
+}
+
+/// Split string by delimiter and return as JSON array.
+ClassMethod IVGSTRSPLIT(s As %String = "", delim As %String = "") As %String [ SqlProc ]
+{
+    If s = "" { Return "[]" }
+    Set result = ##class(%DynamicArray).%New()
+    Set pieces = $Length(s, delim)
+    For i = 1:1:pieces { Do result.%Push($Piece(s, delim, i)) }
+    Return result.%ToJSON()
+}
+
+/// Generate a random UUID.
+ClassMethod IVGNEWID() As %String [ SqlProc ]
+{
+    Return ##class(%SYS.Util).CreateGUID()
+}
+
+/// Generate a random float in [0, 1).
+ClassMethod IVGRAND() As %Decimal [ SqlProc ]
+{
+    Return ##class(%PopulationStatistics).RandomDouble()
+}
+
+/// Get first element of a JSON array.
+ClassMethod IVGLISTHEAD(json As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "" }
+    Try {
+        Set arr = ##class(%DynamicArray).%FromJSON(json)
+        If arr = "" || arr.%Size() = 0 { Return "" }
+        Return arr.%Get(0)
+    } Catch { Return "" }
+}
+
+/// Get last element of a JSON array.
+ClassMethod IVGLISTLAST(json As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "" }
+    Try {
+        Set arr = ##class(%DynamicArray).%FromJSON(json)
+        If arr = "" || arr.%Size() = 0 { Return "" }
+        Return arr.%Get(arr.%Size() - 1)
+    } Catch { Return "" }
+}
+
+/// Get all but the first element of a JSON array.
+ClassMethod IVGLISTTAIL(json As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "[]" }
+    Try {
+        Set arr = ##class(%DynamicArray).%FromJSON(json)
+        If arr = "" || arr.%Size() = 0 { Return "[]" }
+        Set tail = ##class(%DynamicArray).%New()
+        For i = 1:1:arr.%Size() - 1 { Do tail.%Push(arr.%Get(i)) }
+        Return tail.%ToJSON()
+    } Catch { Return "[]" }
+}
+
+/// List element access with strict integer type checking (Cypher TCK compliance).
+/// idx must be a string representation of an integer (no decimals, no leading zeros beyond "0").
+/// Raises an error for non-integer indices (boolean, float, string, list, map).
+/// Returns the array element at 0-based index idx, or NULL for out-of-bounds.
+ClassMethod IVGLISTGET(json As %String = "", idx As %String = "") As %String [ SqlProc ]
+{
+    // Reject empty/null list
+    If json = "" || json = "null" { Return "" }
+    // Type-check: idx must parse as an exact integer (no decimal point)
+    // IRIS $IsValidNum returns 1 for integers and floats; use $Find for dot check
+    If $Find(idx, ".") > 0 {
+        // Float index: TypeError
+        Throw ##class(%Exception.General).%New("TypeError","5001",,"Non-integer index for list subscript: "_idx)
+    }
+    // Check if idx looks like a JSON array or object (starts with [ or {)
+    Set firstChar = $Extract($ZStrip(idx,"<W"), 1)
+    If firstChar = "[" || (firstChar = "{") {
+        Throw ##class(%Exception.General).%New("TypeError","5001",,"Non-integer index for list subscript: "_idx)
+    }
+    // Must be a valid integer
+    If '$IsValidNum(idx, 0) {
+        Throw ##class(%Exception.General).%New("TypeError","5001",,"Non-integer index for list subscript: "_idx)
+    }
+    Set intIdx = +idx
+    Try {
+        Set arr = ##class(%DynamicArray).%FromJSON(json)
+        If arr = "" { Return "" }
+        If arr.%IsA("%DynamicArray") = 0 {
+            // Not an array (it's an object): TypeError
+            Throw ##class(%Exception.General).%New("TypeError","5001",,"Cannot use list subscript on non-list value")
+        }
+        // Negative index: wrap around
+        If intIdx < 0 {
+            Set intIdx = arr.%Size() + intIdx
+        }
+        If intIdx < 0 || intIdx >= arr.%Size() { Return "" }
+        Return arr.%Get(intIdx)
+    } Catch e {
+        Throw e
+    }
+}
+
+/// Always raises a TypeError. Used to signal type errors at SQL execution time.
+ClassMethod IVGTYPEERROR(msg As %String = "TypeError") As %String [ SqlProc ]
+{
+    Throw ##class(%Exception.General).%New("TypeError","5001",,msg)
+}
+
+/// Map property access by dynamic key. Returns NULL for missing keys.
+ClassMethod IVGMAPGET(json As %String = "", key As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "" }
+    Try {
+        Set obj = ##class(%DynamicObject).%FromJSON(json)
+        If obj = "" { Return "" }
+        Return obj.%Get(key)
+    } Catch { Return "" }
+}
+
+/// Set a key in a JSON object, returning the updated JSON string.
+/// Creates a new empty object if json is null/empty.
+/// Numeric values are stored as numbers; others as strings.
+ClassMethod IVGJSONSET(json As %String = "", key As %String = "", val As %String = "") As %String [ SqlProc ]
+{
+    Try {
+        If json = "" || json = "null" {
+            Set obj = ##class(%DynamicObject).%New()
+        } Else {
+            Set obj = ##class(%DynamicObject).%FromJSON(json)
+            If '$IsObject(obj) { Set obj = ##class(%DynamicObject).%New() }
+        }
+        If $IsValidNum(val) {
+            Set obj = obj.%Set(key, +val)
+        } Else {
+            Set obj = obj.%Set(key, val)
+        }
+        Return obj.%ToJSON()
+    } Catch { Return json }
+}
+
+/// Remove a key from a JSON object, returning the updated JSON string.
+ClassMethod IVGJSONREMOVE(json As %String = "", key As %String = "") As %String [ SqlProc ]
+{
+    If json = "" || json = "null" { Return "{}" }
+    Try {
+        Set obj = ##class(%DynamicObject).%FromJSON(json)
+        If obj = "" { Return "{}" }
+        Do obj.%Remove(key)
+        Return obj.%ToJSON()
+    } Catch { Return json }
+}
+
+/// Generate a Cypher range [start, end] as a JSON array. Step defaults to 1.
+ClassMethod IVGRANGE(startVal As %Integer = 0, endVal As %Integer = 0, stepVal As %Integer = 1) As %String [ SqlProc ]
+{
+    If stepVal = 0 { Return "[]" }
+    Set arr = ##class(%DynamicArray).%New()
+    If stepVal > 0 {
+        For i = startVal:stepVal:endVal { Do arr.%Push(i) }
+    } Else {
+        Set i = startVal
+        While i >= endVal { Do arr.%Push(i)  Set i = i + stepVal }
+    }
+    Return arr.%ToJSON()
+}
+
+}

iris_vector_graph-2.7.0/iris_src/src/User.SQL.cls

@@ -0,0 +1,22 @@
+/// User.SQL — legacy helper class kept for non-SQL ObjectScript use.
+/// SQL UDFs have moved to User.CypherFn (IVG-prefixed names avoid 2026.3 reserved keywords).
+Class User.SQL Extends %RegisteredObject
+{
+
+/// Regex match — non-SQL helper method (SQL version: SQLUser.CypherFn_IVGREGEXMATCH)
+ClassMethod REGEXMATCH(str As %String = "", pattern As %String = "") As %Integer
+{
+    If str = "" || pattern = "" {
+        Return 0
+    }
+
+    Try {
+        Set compiled = ##class(%Regex.Matcher).%New(pattern)
+        Set result = compiled.Match(str)
+        Return $Select(result: 1, 1: 0)
+    } Catch ex {
+        Return 0
+    }
+}
+
+}

iris_vector_graph-2.7.0/iris_src/src/User.funcJSONKEYS.cls

@@ -0,0 +1,20 @@
+/// User.funcJSONKEYS — SQL UDF for Cypher keys() function
+/// SQL projection name: SQLUser.JSON_KEYS
+Class User.funcJSONKEYS Extends %RegisteredObject
+{
+
+/// Return keys of a JSON object as a JSON array string.
+ClassMethod JSONKEYS(json As %String = "") As %String [ SqlName = JSON_KEYS, SqlProc ]
+{
+    If json = "" || json = "null" { Return "[]" }
+    Try {
+        Set obj = ##class(%DynamicObject).%FromJSON(json)
+        If obj = "" { Return "[]" }
+        Set keys = ##class(%DynamicArray).%New()
+        Set iter = obj.%GetIterator()
+        While iter.%GetNext(.key, .val) { Do keys.%Push(key) }
+        Return keys.%ToJSON()
+    } Catch { Return "[]" }
+}
+
+}

iris_vector_graph-2.7.0/iris_src/src/User.funcSTRSPLIT.cls

@@ -0,0 +1,18 @@
+/// User.funcSTRSPLIT — SQL UDF for Cypher split() function
+/// SQL projection name: SQLUser.STR_SPLIT
+/// Note: method name cannot be STR_SPLIT (reserved keyword in IRIS 2026.3);
+/// use SqlName annotation to project as STR_SPLIT.
+Class User.funcSTRSPLIT Extends %RegisteredObject
+{
+
+/// Split string by delimiter and return as JSON array.
+ClassMethod STRSPLIT(s As %String = "", delim As %String = "") As %String [ SqlName = STR_SPLIT, SqlProc ]
+{
+    If s = "" { Return "[]" }
+    Set result = ##class(%DynamicArray).%New()
+    Set pieces = $Length(s, delim)
+    For i = 1:1:pieces { Do result.%Push($Piece(s, delim, i)) }
+    Return result.%ToJSON()
+}
+
+}

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

@@ -6,7 +6,6 @@ from iris_vector_graph.status import (
     ObjectScriptStatus, ArnoStatus, IndexInventory,
 )
 from iris_vector_graph.result import IVGResult
-from iris_vector_graph.cypher.translator import _table
 
 logger = logging.getLogger(__name__)
 
@@ -90,7 +89,7 @@ class AdminMixin:
         # HNSW vector index on kg_NodeEmbeddings
         hnsw_count = 0
         try:
-            cursor.execute(f"SELECT COUNT(*) FROM {_table('kg_NodeEmbeddings_optimized')}")
+            cursor.execute(f"SELECT COUNT(*) FROM {self._t('kg_NodeEmbeddings_optimized')}")
             r = cursor.fetchone()
             hnsw_count = int(r[0]) if r else 0
         except Exception:
@@ -100,13 +99,13 @@ class AdminMixin:
             "ONLINE" if hnsw_count > 0 else "BUILDING",
         ])
 
-        for (name,) in _try(f"SELECT DISTINCT name FROM {_table('kg_IVFMeta')}"):
+        for (name,) in _try(f"SELECT DISTINCT name FROM {self._t('kg_IVFMeta')}"):
             rows.append([name, "VECTOR(IVF)", "NODE", ["*"], ["emb"], "ONLINE"])
 
-        for (name,) in _try(f"SELECT DISTINCT name FROM {_table('kg_BM25Meta')}"):
+        for (name,) in _try(f"SELECT DISTINCT name FROM {self._t('kg_BM25Meta')}"):
             rows.append([name, "FULLTEXT(BM25)", "NODE", ["*"], ["*"], "ONLINE"])
 
-        for (idx_name,) in _try(f"SELECT DISTINCT idx_name FROM {_table('kg_PlaidMeta')}"):
+        for (idx_name,) in _try(f"SELECT DISTINCT idx_name FROM {self._t('kg_PlaidMeta')}"):
             rows.append([idx_name, "VECTOR(PLAID)", "NODE", ["*"], ["emb"], "ONLINE"])
 
         try:
@@ -172,12 +171,12 @@ class AdminMixin:
                 return 0
 
         tables = TableCounts(
-            nodes=_count(f"SELECT COUNT(*) FROM {_table('nodes')}"),
-            edges=_count(f"SELECT COUNT(*) FROM {_table('rdf_edges')}"),
-            labels=_count(f"SELECT COUNT(*) FROM {_table('rdf_labels')}"),
-            props=_count(f"SELECT COUNT(*) FROM {_table('rdf_props')}"),
-            node_embeddings=_count(f"SELECT COUNT(*) FROM {_table('kg_NodeEmbeddings')}"),
-            edge_embeddings=_count(f"SELECT COUNT(*) FROM {_table('kg_EdgeEmbeddings')}"),
+            nodes=_count(f"SELECT COUNT(*) FROM {self._t('nodes')}"),
+            edges=_count(f"SELECT COUNT(*) FROM {self._t('rdf_edges')}"),
+            labels=_count(f"SELECT COUNT(*) FROM {self._t('rdf_labels')}"),
+            props=_count(f"SELECT COUNT(*) FROM {self._t('rdf_props')}"),
+            node_embeddings=_count(f"SELECT COUNT(*) FROM {self._t('kg_NodeEmbeddings')}"),
+            edge_embeddings=_count(f"SELECT COUNT(*) FROM {self._t('kg_EdgeEmbeddings')}"),
         )
 
         kg_count = 0
@@ -215,7 +214,7 @@ class AdminMixin:
             if kg_pred:
                 try:
                     cursor.execute(
-                        f"SELECT COUNT(*) FROM {_table('rdf_edges')} WHERE p = ?",
+                        f"SELECT COUNT(*) FROM {self._t('rdf_edges')} WHERE p = ?",
                         [kg_pred],
                     )
                     row = cursor.fetchone()
@@ -265,7 +264,7 @@ class AdminMixin:
             capabilities=dict(self._arno_capabilities),
         )
 
-        hnsw_built = _count(f"SELECT COUNT(*) FROM {_table('kg_NodeEmbeddings_optimized')}") > 0
+        hnsw_built = _count(f"SELECT COUNT(*) FROM {self._t('kg_NodeEmbeddings_optimized')}") > 0
 
         def _list_index(sql):
             try:
@@ -274,9 +273,9 @@ class AdminMixin:
             except Exception:
                 return []
 
-        ivf = _list_index(f"SELECT DISTINCT name FROM {_table('kg_IVFMeta')}")
-        bm25 = _list_index(f"SELECT DISTINCT name FROM {_table('kg_BM25Meta')}")
-        plaid = _list_index(f"SELECT DISTINCT idx_name FROM {_table('kg_PlaidMeta')}")
+        ivf = _list_index(f"SELECT DISTINCT name FROM {self._t('kg_IVFMeta')}")
+        bm25 = _list_index(f"SELECT DISTINCT name FROM {self._t('kg_BM25Meta')}")
+        plaid = _list_index(f"SELECT DISTINCT idx_name FROM {self._t('kg_PlaidMeta')}")
 
         indexes = IndexInventory(
             hnsw_built=hnsw_built,
@@ -335,7 +334,7 @@ class AdminMixin:
 
         cursor = self.conn.cursor()
         try:
-            cursor.execute(f"SELECT COUNT(*) FROM {_table('rdf_edges')}")
+            cursor.execute(f"SELECT COUNT(*) FROM {self._t('rdf_edges')}")
             row = cursor.fetchone()
             sql_edges = int(row[0]) if row else 0
         except Exception as e:

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

@@ -2,7 +2,6 @@ import json
 import logging
 from typing import Dict, Any, List, Optional, Tuple, Callable
 
-from iris_vector_graph.cypher.translator import _table
 
 logger = logging.getLogger(__name__)
 
@@ -394,7 +393,7 @@ class AlgorithmsMixin:
             node_labels = parsed.get("labels", {})
             node_embeddings: Dict[str, Any] = {}
             if include_embeddings and nodes:
-                emb_table = _table("kg_NodeEmbeddings")
+                emb_table = self._t("kg_NodeEmbeddings")
                 cursor = self.conn.cursor()
                 phs = ",".join(["?"] * len(nodes))
                 cursor.execute(

{iris_vector_graph-2.5.0 → iris_vector_graph-2.7.0}/iris_vector_graph/_engine/embeddings.py

@@ -3,7 +3,6 @@ import json
 import logging
 
 from iris_vector_graph.schema import GraphSchema
-from iris_vector_graph.cypher.translator import _table
 
 logger = logging.getLogger(__name__)
 
@@ -138,7 +137,7 @@ class EmbeddingsMixin:
         try:
             cursor.execute(
                 "SELECT TOP 1 VECTOR_COSINE(emb, TO_VECTOR('[0]', DOUBLE)) "
-                f"FROM {_table('kg_NodeEmbeddings')} WHERE 1=0"
+                f"FROM {self._t('kg_NodeEmbeddings')} WHERE 1=0"
             )
             self._native_vec_available = True
         except Exception as e:
@@ -201,12 +200,12 @@ class EmbeddingsMixin:
 
         try:
             cursor.execute(
-                f"DELETE FROM {_table('kg_NodeEmbeddings')} WHERE id = ?", [node_id]
+                f"DELETE FROM {self._t('kg_NodeEmbeddings')} WHERE id = ?", [node_id]
             )
         except Exception:
             pass
         cursor.execute(
-            f"INSERT INTO {_table('kg_NodeEmbeddings')} (id, emb, metadata) VALUES (?, TO_VECTOR('{emb_str}', {self.vector_dtype}), ?)",
+            f"INSERT INTO {self._t('kg_NodeEmbeddings')} (id, emb, metadata) VALUES (?, TO_VECTOR('{emb_str}', {self.vector_dtype}), ?)",
             [node_id, meta_json],
         )
         self.conn.commit()
@@ -250,12 +249,12 @@ class EmbeddingsMixin:
 
                 try:
                     cursor.execute(
-                        f"DELETE FROM {_table('kg_NodeEmbeddings')} WHERE id = ?", [node_id]
+                        f"DELETE FROM {self._t('kg_NodeEmbeddings')} WHERE id = ?", [node_id]
                     )
                 except Exception:
                     pass
                 cursor.execute(
-            f"INSERT INTO {_table('kg_NodeEmbeddings')} (id, emb, metadata) VALUES (?, TO_VECTOR('{emb_str}', {_dtype}), ?)",
+            f"INSERT INTO {self._t('kg_NodeEmbeddings')} (id, emb, metadata) VALUES (?, TO_VECTOR('{emb_str}', {_dtype}), ?)",
                     [node_id, meta_json],
                 )
             cursor.execute("COMMIT")
@@ -278,7 +277,6 @@ class EmbeddingsMixin:
         missing_only: bool = False,
     ) -> dict:
         from iris_vector_graph.embed_selector import EmbedSelector, build_node_where
-        from iris_vector_graph.cypher import get_schema_prefix
         from iris_vector_graph.engine import _load_sentence_transformer, _is_sentence_transformer
 
         sel = EmbedSelector(
@@ -287,7 +285,7 @@ class EmbeddingsMixin:
             exclude_pattern=exclude_pattern,
             missing_only=missing_only,
         )
-        where = build_node_where(sel, schema_prefix=get_schema_prefix())
+        where = build_node_where(sel, schema_prefix=self._schema_prefix)
 
         orig_embedder = self.embedder
         if model is not None:
@@ -300,12 +298,12 @@ class EmbeddingsMixin:
             cursor = self.conn.cursor()
 
             where_clause = f"WHERE {where}" if where else ""
-            cursor.execute(f"SELECT node_id FROM {_table('nodes')} {where_clause}")
+            cursor.execute(f"SELECT node_id FROM {self._t('nodes')} {where_clause}")
             all_node_ids = [row[0] for row in cursor.fetchall()]
             n_total = len(all_node_ids)
 
             if not force and not missing_only:
-                cursor.execute(f"SELECT id FROM {_table('kg_NodeEmbeddings')}")
+                cursor.execute(f"SELECT id FROM {self._t('kg_NodeEmbeddings')}")
                 already_embedded = {row[0] for row in cursor.fetchall()}
                 to_embed = [nid for nid in all_node_ids if nid not in already_embedded]
             else:
@@ -319,7 +317,7 @@ class EmbeddingsMixin:
 
                 placeholders = ", ".join("?" * len(batch_ids))
                 cursor.execute(
-                    f'SELECT s, "key", val FROM {_table("rdf_props")} WHERE s IN ({placeholders})',
+                    f'SELECT s, "key", val FROM {self._t("rdf_props")} WHERE s IN ({placeholders})',
                     batch_ids,
                 )
                 props_by_node: Dict[str, Dict[str, Any]] = {}
@@ -394,7 +392,7 @@ class EmbeddingsMixin:
                     del_placeholders = ", ".join("?" * len(ids_to_delete))
                     try:
                         cursor.execute(
-                            f"DELETE FROM {_table('kg_NodeEmbeddings')} WHERE id IN ({del_placeholders})",
+                            f"DELETE FROM {self._t('kg_NodeEmbeddings')} WHERE id IN ({del_placeholders})",
                             ids_to_delete,
                         )
                     except Exception:
@@ -402,7 +400,7 @@ class EmbeddingsMixin:
                     for node_id, emb_str in insert_params:
                         try:
                             cursor.execute(
-                                f"INSERT INTO {_table('kg_NodeEmbeddings')} (id, emb) VALUES (?, TO_VECTOR('{emb_str}', {self.vector_dtype}))",
+                                f"INSERT INTO {self._t('kg_NodeEmbeddings')} (id, emb) VALUES (?, TO_VECTOR('{emb_str}', {self.vector_dtype}))",
                                 [node_id],
                             )
                             embedded += 1
@@ -443,7 +441,6 @@ class EmbeddingsMixin:
         missing_only: bool = False,
     ) -> dict:
         from iris_vector_graph.embed_selector import EmbedSelector, build_edge_where
-        from iris_vector_graph.cypher import get_schema_prefix
         from iris_vector_graph.engine import _load_sentence_transformer, _is_sentence_transformer
 
         sel = EmbedSelector(
@@ -453,7 +450,7 @@ class EmbeddingsMixin:
             exclude_pattern=exclude_pattern,
             missing_only=missing_only,
         )
-        where = build_edge_where(sel, schema_prefix=get_schema_prefix())
+        where = build_edge_where(sel, schema_prefix=self._schema_prefix)
 
         orig_embedder = self.embedder
         if model is not None:
@@ -467,14 +464,14 @@ class EmbeddingsMixin:
 
             where_clause = f"WHERE {where}" if where else ""
             cursor.execute(
-                f"SELECT s, p, o_id FROM {_table('rdf_edges')} {where_clause}"
+                f"SELECT s, p, o_id FROM {self._t('rdf_edges')} {where_clause}"
             )
             all_edges = [(row[0], row[1], row[2]) for row in cursor.fetchall()]
             n_total = len(all_edges)
 
             if not force:
                 cursor.execute(
-                    f"SELECT s, p, o_id FROM {_table('kg_EdgeEmbeddings')}"
+                    f"SELECT s, p, o_id FROM {self._t('kg_EdgeEmbeddings')}"
                 )
                 already_embedded = {
                     (row[0], row[1], row[2]) for row in cursor.fetchall()
@@ -555,7 +552,7 @@ class EmbeddingsMixin:
                         for s, p, o_id in del_params:
                             try:
                                 cursor.execute(
-                                    f"DELETE FROM {_table('kg_EdgeEmbeddings')} "
+                                    f"DELETE FROM {self._t('kg_EdgeEmbeddings')} "
                                     "WHERE s=? AND p=? AND o_id=?",
                                     [s, p, o_id],
                                 )
@@ -566,7 +563,7 @@ class EmbeddingsMixin:
                     for s, p, o_id, emb_str in insert_params:
                         try:
                             cursor.execute(
-                                f"INSERT INTO {_table('kg_EdgeEmbeddings')} "
+                                f"INSERT INTO {self._t('kg_EdgeEmbeddings')} "
                                 f"(s, p, o_id, emb) VALUES (?, ?, ?, TO_VECTOR('{emb_str}', {self.vector_dtype}))",
                                 [s, p, o_id],
                             )
@@ -611,7 +608,7 @@ class EmbeddingsMixin:
         """
         cursor = self.conn.cursor()
         cursor.execute(
-            f"SELECT id, emb, metadata FROM {_table('kg_NodeEmbeddings')} WHERE id = ?",
+            f"SELECT id, emb, metadata FROM {self._t('kg_NodeEmbeddings')} WHERE id = ?",
             [node_id],
         )
         row = cursor.fetchone()
@@ -644,7 +641,7 @@ class EmbeddingsMixin:
         cursor = self.conn.cursor()
         placeholders = ",".join(["?"] * len(node_ids))
         cursor.execute(
-            f"SELECT id, emb, metadata FROM {_table('kg_NodeEmbeddings')} WHERE id IN ({placeholders})",
+            f"SELECT id, emb, metadata FROM {self._t('kg_NodeEmbeddings')} WHERE id IN ({placeholders})",
             node_ids,
         )
 
@@ -790,10 +787,10 @@ class EmbeddingsMixin:
         cursor = self.conn.cursor()
         try:
             cursor.execute(
-                f"DELETE FROM {_table('kg_NodeEmbeddings')} WHERE id=?", [node_id]
+                f"DELETE FROM {self._t('kg_NodeEmbeddings')} WHERE id=?", [node_id]
             )
             cursor.execute(
-                f"INSERT INTO {_table('kg_NodeEmbeddings')} (id, emb) "
+                f"INSERT INTO {self._t('kg_NodeEmbeddings')} (id, emb) "
                 f"VALUES (?, TO_VECTOR('{emb_str}', {self.vector_dtype}))",
                 [node_id],
             )
@@ -839,7 +836,7 @@ class EmbeddingsMixin:
     def embedding_count(self) -> int:
         cursor = self.conn.cursor()
         try:
-            cursor.execute(f"SELECT COUNT(*) FROM {_table('kg_NodeEmbeddings')}")
+            cursor.execute(f"SELECT COUNT(*) FROM {self._t('kg_NodeEmbeddings')}")
             row = cursor.fetchone()
             return int(row[0]) if row else 0
         except Exception: