iris-vector-graph 1.55.2__tar.gz → 1.55.3__tar.gz

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-vector-graph
-Version: 1.55.2
+Version: 1.55.3
 Summary: Transactional Graph + Vector retrieval system for InterSystems IRIS with hybrid search, openCypher, and GraphQL APIs
 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
@@ -556,6 +556,14 @@ anchors = engine.get_kg_anchors(icd_codes=["J18.0", "E11.9"])
 
 ## Changelog
 
+### v1.55.3 (2026-04-19)
+- fix: Bug 6 final — SQLCODE -400 on rdf_edges CREATE INDEX now debug-level (ALTER TABLE fallback handles it)
+- fix: type(r) now returns edge predicate column (e.p) not node_id
+- fix: id(n) now returns actual node_id column
+- feat: =~ regex match operator — translates to IRIS %MATCHES
+- fix: N-Quads import captures graph URI from quad's 4th element as graph_id
+
+
 ### v1.55.2 (2026-04-19)
 - fix: Bug 6 (final) — SQLCODE -400 on rdf_edges index creation now falls back to ALTER TABLE ADD INDEX; all standard indexes created even when Graph.KG.Edge class was never compiled
 

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/README.md

@@ -484,6 +484,14 @@ anchors = engine.get_kg_anchors(icd_codes=["J18.0", "E11.9"])
 
 ## Changelog
 
+### v1.55.3 (2026-04-19)
+- fix: Bug 6 final — SQLCODE -400 on rdf_edges CREATE INDEX now debug-level (ALTER TABLE fallback handles it)
+- fix: type(r) now returns edge predicate column (e.p) not node_id
+- fix: id(n) now returns actual node_id column
+- feat: =~ regex match operator — translates to IRIS %MATCHES
+- fix: N-Quads import captures graph URI from quad's 4th element as graph_id
+
+
 ### v1.55.2 (2026-04-19)
 - fix: Bug 6 (final) — SQLCODE -400 on rdf_edges index creation now falls back to ALTER TABLE ADD INDEX; all standard indexes created even when Graph.KG.Edge class was never compiled
 

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/iris_vector_graph/cypher/ast.py

@@ -42,6 +42,7 @@ class BooleanOperator(Enum):
     STARTS_WITH = "STARTS WITH"
     ENDS_WITH = "ENDS WITH"
     CONTAINS = "CONTAINS"
+    REGEX_MATCH = "=~"
 
 
 # ==============================================================================

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/iris_vector_graph/cypher/lexer.py

@@ -77,6 +77,8 @@ class TokenType(enum.Enum):
     MINUS = "-"
     STAR = "*"
     SLASH = "/"
+    TILDE = "~"
+    REGEX_MATCH = "=~"
     PERCENT = "%"
     CARET = "^"
     FOREACH = "FOREACH"
@@ -148,7 +150,12 @@ class Lexer:
                 case "^":
                     self._add_token(TokenType.CARET, char)
                 case "=":
-                    self._add_token(TokenType.EQUALS, char)
+                    if self._peek() == "~":
+                        self.cursor += 1
+                        self.column += 1
+                        self._add_token(TokenType.REGEX_MATCH, "=~")
+                    else:
+                        self._add_token(TokenType.EQUALS, char)
                 case "<":
                     if self._peek() == ">":
                         self.cursor += 1

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/iris_vector_graph/cypher/parser.py

@@ -838,6 +838,8 @@ class Parser:
                 already_consumed = True
             case TokenType.CONTAINS:
                 op = ast.BooleanOperator.CONTAINS
+            case TokenType.REGEX_MATCH:
+                op = ast.BooleanOperator.REGEX_MATCH
             case TokenType.IN:
                 op = ast.BooleanOperator.IN
             case TokenType.IS:

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/iris_vector_graph/cypher/translator.py

@@ -1979,6 +1979,8 @@ def translate_boolean_expression(expr, context) -> str:
         return f"{left} LIKE ('%' || {right})"
     if op == ast.BooleanOperator.CONTAINS:
         return f"{left} LIKE ('%' || {right} || '%')"
+    if op == ast.BooleanOperator.REGEX_MATCH:
+        return f"{left} %MATCHES {right}"
     if op == ast.BooleanOperator.IN:
         return f"{left} IN {right}"
     raise ValueError(f"Unsupported operator: {op}")
@@ -2310,8 +2312,22 @@ def translate_expression(expr, context, segment="select") -> str:
         fn, args_exprs = expr.function_name.lower(), expr.arguments
         args = [translate_expression(a, context, segment=segment) for a in args_exprs]
 
-        if fn in ("id", "type"):
+        if fn == "type":
+            if args_exprs and isinstance(args_exprs[0], ast.Variable):
+                var_name = args_exprs[0].name
+                alias = context.variable_aliases.get(var_name, "")
+                if alias:
+                    return f"{alias}.p"
             return args[0] if args else "NULL"
+
+        if fn == "id":
+            if args_exprs and isinstance(args_exprs[0], ast.Variable):
+                var_name = args_exprs[0].name
+                alias = context.variable_aliases.get(var_name, "")
+                if alias:
+                    return f"{alias}.node_id"
+            return args[0] if args else "NULL"
+
         if fn == "labels":
             return labels_subquery(args[0] if args else "NULL")
         if fn == "properties":

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/iris_vector_graph/engine.py

@@ -469,10 +469,28 @@ class IRISGraphEngine:
                     and "already has a" not in err
                     and "already has index" not in err
                 ):
-                    if any(
-                        p in err or p in stmt.lower() for p in _OPTIONAL_DDL_PATTERNS
+                    import re as _re_ddl
+
+                    _sqlcode = _re_ddl.search(
+                        r"sqlcode.*?<(-?\d+)>", err
+                    ) or _re_ddl.search(r"<(-\d+)>", err)
+                    _sqlcode_val = _sqlcode.group(1) if _sqlcode else ""
+                    is_index_on_rdf_edges = (
+                        _sqlcode_val == "-400"
+                        and "rdf_edges" in stmt.lower()
+                        and "create index" in stmt.lower()
+                    )
+                    if (
+                        any(
+                            p in err or p in stmt.lower()
+                            for p in _OPTIONAL_DDL_PATTERNS
+                        )
+                        or is_index_on_rdf_edges
                     ):
-                        logger.debug("Optional DDL skipped: %s", stmt[:80])
+                        logger.debug(
+                            "Optional DDL skipped (will retry via ALTER TABLE): %s",
+                            stmt[:80],
+                        )
                     else:
                         logger.warning(
                             "Schema setup warning: %s | Statement: %.100s", e, stmt
@@ -2203,12 +2221,12 @@ class IRISGraphEngine:
             for nid in batch_nodes:
                 if _ensure_node(nid):
                     nodes_inserted += 1
-            for s, p, o in batch_edges:
+            for s, p, o, edge_graph in batch_edges:
                 try:
-                    if graph:
+                    if edge_graph:
                         cursor.execute(
                             f"INSERT INTO {_table('rdf_edges')} (s, p, o_id, graph_id) SELECT ?, ?, ?, ? WHERE NOT EXISTS (SELECT 1 FROM {_table('rdf_edges')} WHERE s = ? AND p = ? AND o_id = ? AND graph_id = ?)",
-                            [s, p, o, graph, s, p, o, graph],
+                            [s, p, o, edge_graph, s, p, o, edge_graph],
                         )
                     else:
                         cursor.execute(
@@ -2243,6 +2261,12 @@ class IRISGraphEngine:
             p_str = _node_id(p)
             batch_nodes.add(s_id)
 
+            effective_graph = graph
+            if graph_ctx is not None:
+                ctx_str = str(graph_ctx)
+                if ctx_str and ctx_str not in ("", "DEFAULT", "urn:x-rdflib:default"):
+                    effective_graph = ctx_str
+
             if isinstance(o, RDFLiteral):
                 key = p_str.rsplit("/", 1)[-1].rsplit("#", 1)[-1][:128]
                 val = str(o)
@@ -2256,7 +2280,7 @@ class IRISGraphEngine:
             elif isinstance(o, (URIRef, BNode)):
                 o_id = _node_id(o)
                 batch_nodes.add(o_id)
-                batch_edges.append((s_id, p_str, o_id))
+                batch_edges.append((s_id, p_str, o_id, effective_graph))
             else:
                 batch_props.append((s_id, p_str[:128], str(o)[:64000]))
 

{iris_vector_graph-1.55.2 → iris_vector_graph-1.55.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "iris-vector-graph"
-version = "1.55.2"
+version = "1.55.3"
 description = "Transactional Graph + Vector retrieval system for InterSystems IRIS with hybrid search, openCypher, and GraphQL APIs"
 readme = "README.md"
 license = "MIT"