iris-vector-graph 1.65.2__tar.gz → 1.65.4__tar.gz

{iris_vector_graph-1.65.2 → iris_vector_graph-1.65.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-vector-graph
-Version: 1.65.2
+Version: 1.65.4
 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

{iris_vector_graph-1.65.2 → iris_vector_graph-1.65.4}/iris_vector_graph/cypher/parser.py

@@ -214,7 +214,7 @@ class Parser:
             self.peek().kind == TokenType.IDENTIFIER
             and self.peek().value
             and self.peek().value.upper() in ("OPTIONAL", "USE")
-        ) or self.peek().kind == TokenType.WHERE:
+        ) or self.peek().kind == TokenType.WHERE or self.peek().kind == TokenType.RETURN:
             if self.peek().kind == TokenType.WHERE:
                 self.eat()
                 self.parse_expression()
@@ -227,6 +227,15 @@ class Parser:
                                           order_by_clause=ob2, skip=sk2, limit=li2)
                     q.subsequent_queries.append(stub)
                 continue
+            if self.peek().kind == TokenType.RETURN:
+                ret2 = self.parse_return_clause()
+                ob2 = self.parse_order_by_clause()
+                sk2 = self.parse_skip()
+                li2 = self.parse_limit()
+                stub = ast.CypherQuery(query_parts=q.query_parts, return_clause=ret2,
+                                      order_by_clause=ob2, skip=sk2, limit=li2)
+                q.subsequent_queries.append(stub)
+                continue
             subsequent = self.parse()
             q.subsequent_queries.append(subsequent)
 

{iris_vector_graph-1.65.2 → iris_vector_graph-1.65.4}/iris_vector_graph/cypher/translator.py

@@ -1156,11 +1156,20 @@ def preprocess_order_by(query: ast.CypherQuery, context: TranslationContext) ->
     if query.return_clause:
         for ret_item in query.return_clause.items:
             if ret_item.alias:
+                saved_select = list(context.select_params)
+                saved_where = list(context.where_params)
+                saved_join = list(context.join_params)
+                saved_join_clauses = list(context.join_clauses)
                 try:
                     sql_expr = translate_expression(ret_item.expression, context, segment="select")
                     alias_to_sql[ret_item.alias] = sql_expr
                 except Exception:
                     pass
+                finally:
+                    context.select_params = saved_select
+                    context.where_params = saved_where
+                    context.join_params = saved_join
+                    context.join_clauses = saved_join_clauses
     for item in query.order_by_clause.items:
         try:
             if (isinstance(item.expression, ast.Variable)

{iris_vector_graph-1.65.2 → iris_vector_graph-1.65.4}/iris_vector_graph/engine.py

@@ -816,9 +816,15 @@ class IRISGraphEngine:
 
         if parsed.subsequent_queries:
             result = None
+            current_params = dict(parameters) if parameters else {}
             for part_query in [parsed] + parsed.subsequent_queries:
                 part_query.subsequent_queries = []
-                result = self._execute_parsed(part_query, parameters)
+                result = self._execute_parsed(part_query, current_params)
+                if result and result.get("rows") and result.get("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))):
+                            current_params[col] = val
             return result
 
         if parsed.procedure_call is not None:

{iris_vector_graph-1.65.2 → iris_vector_graph-1.65.4}/pyproject.toml

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