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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-vector-graph
-Version: 1.65.0
+Version: 1.65.2
 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.0 → iris_vector_graph-1.65.2}/iris_vector_graph/cypher/translator.py

@@ -1152,20 +1152,26 @@ def preprocess_order_by(query: ast.CypherQuery, context: TranslationContext) ->
     if not query.order_by_clause:
         return []
     items = []
-    select_aliases = set()
+    alias_to_sql: dict = {}
     if query.return_clause:
-        for item in query.return_clause.items:
-            if item.alias:
-                select_aliases.add(item.alias)
+        for ret_item in query.return_clause.items:
+            if ret_item.alias:
+                try:
+                    sql_expr = translate_expression(ret_item.expression, context, segment="select")
+                    alias_to_sql[ret_item.alias] = sql_expr
+                except Exception:
+                    pass
     for item in query.order_by_clause.items:
         try:
-            expr = translate_expression(item.expression, context, segment="where")
+            if (isinstance(item.expression, ast.Variable)
+                    and item.expression.name in alias_to_sql):
+                expr = alias_to_sql[item.expression.name]
+            else:
+                expr = translate_expression(item.expression, context, segment="where")
         except ValueError:
-            if (
-                isinstance(item.expression, ast.Variable)
-                and item.expression.name in select_aliases
-            ):
-                expr = sanitize_identifier(item.expression.name)
+            if (isinstance(item.expression, ast.Variable)
+                    and item.expression.name in alias_to_sql):
+                expr = alias_to_sql[item.expression.name]
             else:
                 raise
         items.append(f"{expr} {'ASC' if item.ascending else 'DESC'}")
@@ -2646,6 +2652,10 @@ def translate_expression(expr, context, segment="select") -> str:
                     raise ValueError(f"'{arg.name}' is not a named path variable")
 
         fn, args_exprs = expr.function_name.lower(), expr.arguments
+        if fn == "toboolean" and args_exprs and isinstance(args_exprs[0], ast.Literal):
+            v = args_exprs[0].value
+            if not isinstance(v, str):
+                return "1" if v else "0"
         args = [translate_expression(a, context, segment=segment) for a in args_exprs]
 
         if fn == "type":
@@ -2788,7 +2798,7 @@ def translate_expression(expr, context, segment="select") -> str:
         if fn == "tostring":
             return f"CAST({args[0]} AS VARCHAR(4096))"
         if fn == "toboolean":
-            return f"CASE WHEN LOWER({args[0]}) IN ('true','1','yes','y') THEN 1 ELSE 0 END"
+            return f"CASE WHEN LOWER(CAST({args[0]} AS VARCHAR)) IN ('true','1','yes','y') THEN 1 ELSE 0 END"
         return f"{sql_fn}({', '.join(args)})"
     return "NULL"
 

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

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