iris-vector-graph 4.1.0__tar.gz → 4.1.1__tar.gz

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: iris-vector-graph
-Version: 4.1.0
+Version: 4.1.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
@@ -55,8 +55,9 @@ 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'
+Requires-Dist: iris-devtester>=1.20.1; extra == 'dev'
 Requires-Dist: isort>=5.12.0; extra == 'dev'
+Requires-Dist: jsonschema>=4.0; extra == 'dev'
 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'
@@ -74,7 +75,7 @@ Requires-Dist: pydantic>=2.11.9; extra == 'full'
 Requires-Dist: pyshacl>=0.25.0; extra == 'full'
 Requires-Dist: python-dotenv>=1.0.0; extra == 'full'
 Requires-Dist: python-igraph>=0.11; extra == 'full'
-Requires-Dist: rdflib>=6.0.0; extra == 'full'
+Requires-Dist: rdflib<8,>=6.0.0; extra == 'full'
 Requires-Dist: requests>=2.28.0; extra == 'full'
 Requires-Dist: strawberry-graphql[fastapi]>=0.280.0; extra == 'full'
 Requires-Dist: uvicorn>=0.37.0; extra == 'full'
@@ -90,7 +91,7 @@ Requires-Dist: numpy>=1.24.0; extra == 'plaid'
 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'
+Requires-Dist: rdflib<8,>=6.0.0; extra == 'rdf'
 Provides-Extra: tck
 Requires-Dist: behave>=1.2.6; extra == 'tck'
 Provides-Extra: visualization
@@ -149,11 +150,13 @@ result = engine.execute_cypher(
     "MATCH (a {node_id:$id})-[:KNOWS]->(b) RETURN b.name AS name",
     {"id": "alice"}
 )
-print(result["rows"])  # [('Bob',)]
+print(result["rows"])  # [['Bob']]
 ```
 
-> **Note:** `initialize_schema()` prints compile warnings on Community Edition — safe to ignore.
-> Enterprise-only classes (`Graph.KG.MCPService`, `Graph.KG.MCPToolSet`) are not required.
+> **Note:** On a stock image `initialize_schema()` logs a few `IVG setup:` lines, and none of
+> them is an error. The MCP classes (`Graph.KG.MCPService`, `MCPToolSet`, `MCPTools`) need `%AI`
+> packages the image does not ship, and are not required. The `^KG` adjacency index stays empty
+> until data is loaded.
 
 ---
 

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/README.md

@@ -48,11 +48,13 @@ result = engine.execute_cypher(
     "MATCH (a {node_id:$id})-[:KNOWS]->(b) RETURN b.name AS name",
     {"id": "alice"}
 )
-print(result["rows"])  # [('Bob',)]
+print(result["rows"])  # [['Bob']]
 ```
 
-> **Note:** `initialize_schema()` prints compile warnings on Community Edition — safe to ignore.
-> Enterprise-only classes (`Graph.KG.MCPService`, `Graph.KG.MCPToolSet`) are not required.
+> **Note:** On a stock image `initialize_schema()` logs a few `IVG setup:` lines, and none of
+> them is an error. The MCP classes (`Graph.KG.MCPService`, `MCPToolSet`, `MCPTools`) need `%AI`
+> packages the image does not ship, and are not required. The `^KG` adjacency index stays empty
+> until data is loaded.
 
 ---
 

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/examples/demo_rdf_semantic_layer.py

@@ -25,19 +25,15 @@ import tempfile
 # ---------------------------------------------------------------------------
 
 def connect():
+    """This project's container, resolved by name like every other demo (demo_utils)."""
     try:
-        import iris.dbapi as dbapi
-        conn = dbapi.connect(
-            hostname=os.environ.get("IRIS_HOST", "localhost"),
-            port=int(os.environ.get("IVG_PORT", "21972")),
-            namespace="USER",
-            username=os.environ.get("IRIS_USER", "_SYSTEM"),
-            password=os.environ.get("IRIS_PASSWORD", "SYS"),
-        )
-        return conn
-    except Exception as e:
-        print(f"[ERROR] Cannot connect to IRIS: {e}")
-        print("        Start the container with: scripts/test-container.sh up")
+        from examples.demo_utils import DemoError, DemoRunner
+    except ImportError:  # run as `python demo_rdf_semantic_layer.py` from examples/
+        from demo_utils import DemoError, DemoRunner
+    try:
+        return DemoRunner("RDF semantic layer", total_steps=1).get_connection()
+    except DemoError as e:
+        e.display()
         sys.exit(1)
 
 

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/examples/demo_utils.py

@@ -33,6 +33,29 @@ def resolve_demo_container() -> str:
     return (os.environ.get("IVG_TEST_CONTAINER") or "").strip() or DEFAULT_DEMO_CONTAINER
 
 
+#: What the repo's docker-compose.yml names its container: where a README user's IRIS is.
+COMPOSE_DEMO_CONTAINER = "iris_vector_graph"
+
+
+def demo_container_candidates() -> List[str]:
+    """The containers a demo may use, by name, in order. A named one is the only one."""
+    if (os.environ.get("IVG_TEST_CONTAINER") or "").strip():
+        return [resolve_demo_container()]
+    return [DEFAULT_DEMO_CONTAINER, COMPOSE_DEMO_CONTAINER]
+
+
+def _driver_connect():
+    """iris-devtester's DBAPI shim when it is there; the driver the wheel requires if not."""
+    try:
+        from iris_devtester.utils.dbapi_compat import get_connection
+
+        return get_connection
+    except ImportError:
+        import iris
+
+        return iris.connect
+
+
 def _docker_inspect(container_name: str, fmt: str) -> Optional[str]:
     try:
         result = subprocess.run(
@@ -230,17 +253,25 @@ class DemoRunner:
         if self.connection:
             return self.connection
 
-        container_name = resolve_demo_container()
+        candidates = demo_container_candidates()
+        container_name = candidates[0]
         try:
-            from iris_devtester.utils.dbapi_compat import get_connection as dbapi_connect
-
-            targets = _demo_connection_targets(container_name)
+            dbapi_connect = _driver_connect()
+
+            targets = []
+            for name in candidates:
+                targets = _demo_connection_targets(name)
+                if targets:
+                    container_name = name
+                    break
             if not targets:
                 raise DemoError(
-                    f"Container '{container_name}' is not running, so there is nothing "
-                    "to connect to. A demo will not fall back to another instance.",
+                    f"Container {' or '.join(repr(c) for c in candidates)} is not "
+                    "running, so there is nothing to connect to. A demo will not fall "
+                    "back to another instance.",
                     next_steps=[
-                        "Start it: scripts/enterprise-container.sh up",
+                        "Start it: docker compose up -d --wait",
+                        "Or, developing IVG: scripts/enterprise-container.sh up",
                         "Or name another with IVG_TEST_CONTAINER=<name>",
                         "Check: docker ps",
                     ],
@@ -283,8 +314,8 @@ class DemoRunner:
             raise
         except ImportError:
             raise DemoError(
-                "iris-devtester package not installed",
-                next_steps=["Run: pip install iris-devtester", "Or: uv sync"],
+                "No IRIS driver: intersystems-irispython is not installed",
+                next_steps=["Run: pip install iris-vector-graph"],
             )
         except Exception as e:
             error_msg = str(e).lower()

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/examples/demo_working_system.py

@@ -68,7 +68,11 @@ def main():
 
             operators = IRISGraphOperators(conn)
 
-            test_vector = json.dumps([0.1] * 768)
+            from iris_vector_graph.schema import GraphSchema
+
+            # Match the stored width: another demo may have created the table.
+            width = GraphSchema.get_embedding_dimension(cursor) or 768
+            test_vector = json.dumps([0.1] * width)
             start_time = time.time()
             vector_results = operators.kg_KNN_VEC(test_vector, k=5)
             vector_time_ms = (time.time() - start_time) * 1000

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/ArnoAccel.cls

@@ -129,58 +129,35 @@ ClassMethod BuildGraphJson() As %String
 	Return graph.%ToJSON()
 }
 
+/// The Rust kg_*_global readers walk the live ^KG unreliably (first call sees only the
+/// first source; later calls disagree). Answer from ObjectScript until Arno fixes them.
+/// See docs/KNOWN_ISSUES.md and tests/unit/test_411_arno_kg_readers.py.
 ClassMethod PageRankGlobalJson(damping As %Double = 0.85, maxIter As %Integer = 20) As %String
 {
-	Try {
-		Do ..CacheGraphJson("KG")
-		Set result = ..CallFn("kg_pagerank_global", "KG", damping, maxIter)
-		If $Extract(result, 1, 5) '= "ERROR" Return result
-	} Catch {
-	}
 	Return ##class(Graph.KG.PageRank).PageRankGlobalJson(damping, maxIter)
 }
 
+/// ObjectScript answer; see PageRankGlobalJson.
 ClassMethod PPRJson(seedJson As %String, damping As %Double = 0.85, maxIter As %Integer = 20) As %String
 {
-	Try {
-		Do ..CacheGraphJson("KG")
-		Set result = ..CallFn("kg_ppr_global", "KG", seedJson, damping, maxIter)
-		If $Extract(result, 1, 5) '= "ERROR" Return result
-	} Catch {
-	}
 	Return ##class(Graph.KG.PageRank).RunJson(seedJson, damping, maxIter)
 }
 
+/// ObjectScript answer; see PageRankGlobalJson.
 ClassMethod WCCJson(maxIter As %Integer = 100) As %String
 {
-	Try {
-		Do ..CacheGraphJson("KG")
-		Set result = ..CallFn("kg_wcc_global", "KG")
-		If $Extract(result, 1, 5) '= "ERROR" Return result
-	} Catch {
-	}
 	Return ##class(Graph.KG.Algorithms).WCCJson(maxIter)
 }
 
+/// ObjectScript answer; see PageRankGlobalJson.
 ClassMethod CDLPJson(maxIter As %Integer = 10) As %String
 {
-	Try {
-		Do ..CacheGraphJson("KG")
-		Set result = ..CallFn("kg_cdlp_global", "KG", maxIter)
-		If $Extract(result, 1, 5) '= "ERROR" Return result
-	} Catch {
-	}
 	Return ##class(Graph.KG.Algorithms).CDLPJson(maxIter)
 }
 
+/// ObjectScript answer; see PageRankGlobalJson.
 ClassMethod SubgraphJson(seedJson As %String, hops As %Integer = 2, edgeTypesJson As %String = "", maxNodes As %Integer = 10000) As %String
 {
-	Try {
-		Do ..CacheGraphJson("KG")
-		Set result = ..CallFn("kg_subgraph_global", "KG", seedJson, hops, maxNodes)
-		If $Extract(result, 1, 5) '= "ERROR" Return result
-	} Catch {
-	}
 	Return ##class(Graph.KG.Subgraph).SubgraphJson(seedJson, hops, edgeTypesJson, maxNodes)
 }
 

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/BenchFormat.cls

@@ -27,7 +27,7 @@ ClassMethod BuildAdjacencyTSV() As %String
 ClassMethod Seed(n As %Integer = 5000, branching As %Integer = 4) As %Status
 {
 	Kill ^KG
-	Kill ^NKG
+	Do ##class(Graph.KG.GraphIndex).DropNKG()
 	Kill ^ArnoKG
 	For i = 1:1:n {
 		Set s = "N" _ i
@@ -88,7 +88,7 @@ ClassMethod Compare(n As %Integer = 5000) As %String
 	Set tsvKB = $Length(tsv) \ 1024
 
 	Kill ^KG
-	Kill ^NKG
+	Do ##class(Graph.KG.GraphIndex).DropNKG()
 	Kill ^ArnoKG
 	Return "n=" _ n _ " | $ORDER: " _ orderResult _ " | JSON: " _ jsonMs _ "ms (" _ jsonKB _ "KB) | TSV: " _ tsvMs _ "ms (" _ tsvKB _ "KB)"
 }

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/EdgeScan.cls

@@ -521,7 +521,10 @@ ClassMethod BulkIngestNodesSQL(nodesJson As %String) As %Integer
 			While piter.%GetNext(.key, .val) {
 				If key = "" { Continue }
 				Try {
-					Set valStr = $Select($IsObject(val):val.%ToJSON(), $IsValidNum(val):val, 1:""""_$Replace($ZConvert(val,"O","UTF8"),"""","""""")_"""")
+					// The caller sends prop_text() strings; stored as given, like create_node.
+					// Other JSON types are for direct callers: a boolean as true/false.
+					Set tType = node.props.%GetTypeOf(key)
+					Set valStr = $Select($IsObject(val):val.%ToJSON(), tType="boolean":$Select(val:"true",1:"false"), 1:val_"")
 					&sql(INSERT OR UPDATE INTO Graph_KG.rdf_props (graph_id, s, "key", val) VALUES ('', :id, :key, :valStr))
 				} Catch ex { }
 			}

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/Eraser.cls

@@ -803,7 +803,7 @@ ClassMethod EraseAll() As %Integer
 ClassMethod InvalidateDerived(pTouchedStructural As %Boolean) [ Private ]
 {
 	If pTouchedStructural {
-		Kill ^NKG
+		Do ##class(Graph.KG.GraphIndex).DropNKG()
 	}
 	Do ##class(Graph.KG.ArnoAccel).BumpVersion()
 }

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/FHIRGraph.cls

@@ -462,12 +462,19 @@ ClassMethod Rebuild(pGraph As %String) As %String
 		// Pass 1 over everything first, so every source resolves against the whole set.
 		Do tCtx.SyncAllDefinitions(tMaxR)
 
-		// Every current key. Deleted ones go through the same ResyncKey, which drops them.
+		// Every live key. A deleted one is skipped: FHIR deletes are soft, so the table
+		// keeps every one ever made, and resyncing them cost the history, not the data
+		// (282k of 306k rows on the 4.1.1 test repo). One the graph still holds is
+		// dropped by the stale pass below.
 		Set tKeys = 0
 		Kill tBatch
 		Set tN = 0
-		Set tRs = tCtx.Query("SELECT Key FROM " _ tCtx.RTable() _ " WHERE ID <= ?", tMaxR)
+		Set tRs = tCtx.Query("SELECT Key, Deleted FROM " _ tCtx.RTable() _ " WHERE ID <= ?", tMaxR)
 		While tRs.%Next() {
+			If +tRs.%GetData(2) {
+				Set tCtx.Live(tRs.%GetData(1)) = -1
+				Continue
+			}
 			Set tBatch($Increment(tN)) = tRs.%GetData(1)
 			If tN >= ..#BATCHSIZE {
 				Set tKeys = tKeys + tCtx.RunBatch(.tBatch, 0, "", "", 0)
@@ -480,14 +487,20 @@ ClassMethod Rebuild(pGraph As %String) As %String
 			Kill tBatch
 		}
 
-		// Nodes the repository no longer has at all (a purge, or a graph built against
-		// another state). Collected first: DropNode deletes from the table being read.
+		// Nodes of keys deleted or gone (a purge, or a graph built against another
+		// state), and unresolved rows whose source is. Collected first: DropNode deletes
+		// from the tables being read.
 		Kill tStale
 		Set tRs = tCtx.Query("SELECT node_id FROM Graph_KG.nodes WHERE graph_id = ?", pGraph)
 		While tRs.%Next() {
 			Set tK = tRs.%GetData(1)
 			If tCtx.Liveness(tK) '= 1 { Set tStale(tK) = "" }
 		}
+		Set tRs = tCtx.Query("SELECT source FROM Graph_KG.fhir_unresolved WHERE graph_id = ?", pGraph)
+		While tRs.%Next() {
+			Set tK = tRs.%GetData(1)
+			If tCtx.Liveness(tK) '= 1 { Set tStale(tK) = "" }
+		}
 		Set tDropped = 0
 		Set tK = ""
 		For {
@@ -541,6 +554,19 @@ ClassMethod SyncOnce(pGraph As %String) As %String
 		Set tMaxR = +tCtx.Scalar("SELECT MAX(ID) FROM " _ tCtx.RTable())
 		Set tMaxV = +tCtx.Scalar("SELECT MAX(ID) FROM " _ tCtx.VTable())
 
+		// A repository behind the watermarks (emptied by Installer.Reset, or restored
+		// from an older backup) has no rows above them, so the feeds would apply
+		// nothing and the graph would keep what is gone. Rebuild instead; it takes
+		// the same lock.
+		If (tMaxR < tCtx.WmRsrc) || (tMaxV < tCtx.WmVer) {
+			Lock -^IVG.FHIRGraph(pGraph)
+			Set tLocked = 0
+			Set tRes = {}.%FromJSON(..Rebuild(pGraph))
+			Do:tRes.status="ok" tRes.%Set("rebuilt", "repository_behind_watermark")
+			Set tOut = tRes.%ToJSON()
+			Quit
+		}
+
 		// A graph last interpreted by older rules (NULL: synced before spec 235, or erased) is re-derived
 		// in full first, then marked. An interrupted pass leaves the marker, so the next
 		// sync starts over (spec 235, FR-024).
@@ -1918,7 +1944,8 @@ Method SyncAllDefinitions(pMaxR As %Integer)
 	TSTART
 	Do ..Exec("DELETE FROM Graph_KG.fhir_canonical_refs WHERE graph_id = ?", ..GraphId)
 	Do ..Exec("DELETE FROM Graph_KG.fhir_definitions WHERE graph_id = ?", ..GraphId)
-	Set tRs = ..Query("SELECT Key FROM " _ ..RTable() _ " WHERE ID <= ?", pMaxR)
+	// Live keys only: a deleted key's definition row is none, and both tables are empty.
+	Set tRs = ..Query("SELECT Key FROM " _ ..RTable() _ " WHERE ID <= ? AND (Deleted IS NULL OR Deleted = 0)", pMaxR)
 	While tRs.%Next() {
 		Set tKey = tRs.%GetData(1)
 		Continue:'$Data(..DefTypes($Piece(tKey, "/", 1)))

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/GraphIndex.cls

@@ -15,6 +15,17 @@
 Class Graph.KG.GraphIndex Extends %RegisteredObject
 {
 
+/// Empty ^NKG but keep ^NKG("$meta","version") rising. kg_betweenness_global_v caches
+/// its answer in the process by that version and ^ArnoKG("KG","nkg_adj_ver") compares
+/// against it, so a fresh ^NKG counting up from nothing again answered with the
+/// previous graph. See tests/unit/test_411_nkg_version_monotonic.py.
+ClassMethod DropNKG()
+{
+	Set tVer = +$Get(^NKG("$meta", "version"))
+	Kill ^NKG
+	Set ^NKG("$meta", "version") = tVer + 1
+}
+
 ClassMethod InitStructuralLabels()
 {
 	If $Data(^NKG("$LS", 0)) Quit

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/Loader.cls

@@ -16,7 +16,7 @@ ClassMethod Load(path As %String) As %Status
     If $$$ISERR(sc) Return sc
     
     Kill ^KG
-    Kill ^NKG
+    Do ##class(Graph.KG.GraphIndex).DropNKG()
     Set count = 0
     Set start = $ZTimestamp
     

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/NKGAccelCentrality.cls

@@ -160,33 +160,11 @@ ClassMethod EigenvectorGlobal(maxIter As %Integer = 30, tol As %Float = 0.0001,
     Kill ^||x, ^||xNew, ^||nodeList
     Quit "OK:"_json_"]"
 }
+/// Exact directed Brandes in ObjectScript. kg_betweenness_global_v scores the graph as
+/// undirected (Pearson vs networkx 0.741 directed, 1.000 undirected on ER(20, 0.25)),
+/// so it is not asked until Arno fixes it. See tests/unit/test_411_betweenness_direction.py.
 ClassMethod BetweennessGlobal(sampleSize As %Integer = 0, topK As %Integer = 10000, maxSources As %Integer = 200) As %String
 {
-    Set firstNode = $Order(^NKG("$NI",""))
-    If firstNode = "" Quit "ERROR:^NKG not built"
-
-    Try {
-        If ##class(Graph.KG.NKGAccel).IsLoaded() {
-            Set dllid = $Get(^||NKGAccel("dllid"), 0)
-            If dllid '= 0 {
-                If '$Data(^ArnoKG("KG", "nkg_adj")) { Do ##class(Graph.KG.NKGAccelLoader).WarmAdjCache() }
-                Set fnidV = $ZF(-4, 3, dllid, "kg_betweenness_global_v")
-                If fnidV > 0 {
-                    Set nkgVer = +$Get(^NKG("$meta", "version"), -1)
-                    Set raw = $ZF(-5, dllid, fnidV, "^NKG", sampleSize, topK, nkgVer)
-                    If $Extract(raw, 1, 3) = "OK:" Return raw
-                } Else {
-                    Set fnid = $ZF(-4, 3, dllid, "kg_betweenness_global")
-                    If fnid > 0 {
-                        Set raw = $ZF(-5, dllid, fnid, "^NKG", sampleSize, topK)
-                        If $Extract(raw, 1, 3) = "OK:" Return raw
-                    }
-                }
-            }
-        }
-    } Catch ex {
-    }
-
     Quit ..BetweennessGlobalParallel(sampleSize, topK, maxSources)
 }
 ClassMethod BetweennessWorker(parentPid As %Integer, workerN As %Integer, srcFirst As %Integer, srcLast As %Integer, scale As %Double) As %Status

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/NKGAccelTraversal.cls

@@ -357,10 +357,17 @@ ClassMethod BFSJson(seed As %String, predicatesJson As %String = "[]", maxHops A
     If fnid = 0 {
         Return ##class(Graph.KG.Traversal).BFSFastJsonSorted(seed, predicatesJson, maxHops, "", "out", maxResults)
     }
-    Set adjStr = ##class(Graph.KG.NKGAccelAdjacency).ExportAdjacencyWithPreds()
-    Set resultGlobal = "ArnoKG"
-    Kill ^ArnoKG("bfs_result")
-    Set raw = $ZF(-5, dllid, fnid, adjStr, resultGlobal, seed, predicatesJson, maxHops, maxResults)
+    // 4.1.1: the whole adjacency is one $ZF argument. 300 nodes (30,532 chars) pass;
+    // 600 (61,132) raise <OUT OF $ZF HEAP SPACE>, 1,000 (101,864) <MAX $ZF STRING>.
+    // Answer from ObjectScript instead. See tests/unit/test_411_bfs_zf_limit.py.
+    Try {
+        Set adjStr = ##class(Graph.KG.NKGAccelAdjacency).ExportAdjacencyWithPreds()
+        Set resultGlobal = "ArnoKG"
+        Kill ^ArnoKG("bfs_result")
+        Set raw = $ZF(-5, dllid, fnid, adjStr, resultGlobal, seed, predicatesJson, maxHops, maxResults)
+    } Catch {
+        Return ##class(Graph.KG.Traversal).BFSFastJsonSorted(seed, predicatesJson, maxHops, "", "out", maxResults)
+    }
     If raw = "" || $Extract(raw, 1, 6) = "DEBUG:" {
         Return ##class(Graph.KG.Traversal).BFSFastJsonSorted(seed, predicatesJson, maxHops, "", "out", maxResults)
     }

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/TraversalBFS.cls

@@ -81,6 +81,9 @@ ClassMethod BFS(srcId As %String, preds As %DynamicArray = "", maxHops As %Integ
         }
         
         If '$Data(nextFrontier) Quit
+        // The next hop starts from this hop's new nodes only. Merging into the old
+        // frontier re-expanded every earlier node and recorded its edges again.
+        Kill frontier
         Merge frontier = nextFrontier
         
         Set node = ""
@@ -154,6 +157,9 @@ ClassMethod BFSFast(srcId As %String, preds As %DynamicArray = "", maxHops As %I
         
         If (maxResults > 0) && (count >= maxResults) Quit
         If '$Data(nextFrontier) Quit
+        // The next hop starts from this hop's new nodes only. Merging into the old
+        // frontier re-expanded every earlier node and recorded its edges again.
+        Kill frontier
         Merge frontier = nextFrontier
         Set node = ""
         For {
@@ -503,19 +509,4 @@ ClassMethod TraverseAllPredicatesFastInbound(pGraph As %String, s As %String, ho
         Do ..TraverseWithPredicateFastInbound(pGraph, s, p, hop, .count, .nextFrontier, .seen)
     }
 }
-ClassMethod TraverseWithPredicatePy(s As %String, p As %String, hop As %Integer, dstLabel As %String) [ Internal, Private, Language = python ]
-{
-    import iris
-    kg = iris.gref("^KG")
-    matches = []
-    o = ""
-    while True:
-        o = kg.order(["out", s, p, o])
-        if not o: break
-        if dstLabel and not kg.data(["label", dstLabel, o]):
-            continue
-        weight = kg.get(["out", s, p, o]) or 1.0
-        matches.append({"s": s, "p": p, "o": o, "step": hop, "w": float(weight)})
-    return matches
-}
 }

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_src/src/Graph/KG/TraversalBuild.cls

@@ -225,7 +225,7 @@ ClassMethod BuildNKG() As %Status
 	Try { Do ##class(Graph.KG.NKGAccel).InvalidateAdjCache() } Catch invEx {
 		Do ##class(%SYS.System).WriteToConsoleLog("Graph.KG.Traversal: InvalidateAdjCache failed: "_invEx.DisplayString(), 0, 1)
 	}
-	Kill ^NKG
+	Do ##class(Graph.KG.GraphIndex).DropNKG()
 	Do ##class(Graph.KG.GraphIndex).InitStructuralLabels()
 	Set edgeCount = 0
 	// Iterate all graph subscripts (merged view)

{iris_vector_graph-4.1.0 → iris_vector_graph-4.1.1}/iris_vector_graph/__init__.py

@@ -2,6 +2,8 @@
 IRIS Graph Core - Domain-Agnostic Graph Engine
 """
 
+# Before anything imports iris.dbapi: see _iris_compat.
+from . import _iris_compat  # noqa: F401  isort: skip
 from ._validate import (
     BetweennessInput,
     BM25BuildInput,