lora-python 0.28.0__tar.gz → 0.29.0__tar.gz

{lora_python-0.28.0 → lora_python-0.29.0}/Cargo.lock

@@ -854,7 +854,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lora-analyzer"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "lora-ast",
  "lora-builtins-meta",
@@ -865,14 +865,14 @@ dependencies = [
 
 [[package]]
 name = "lora-ast"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "smallvec 2.0.0-alpha.12",
 ]
 
 [[package]]
 name = "lora-binding-buffer"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "lora-database",
  "lora-store",
@@ -880,11 +880,11 @@ dependencies = [
 
 [[package]]
 name = "lora-builtins-meta"
-version = "0.28.0"
+version = "0.29.0"
 
 [[package]]
 name = "lora-compiler"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "lora-analyzer",
  "lora-ast",
@@ -893,7 +893,7 @@ dependencies = [
 
 [[package]]
 name = "lora-database"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "chacha20poly1305",
@@ -918,7 +918,7 @@ dependencies = [
 
 [[package]]
 name = "lora-executor"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "blake3",
  "crc32fast",
@@ -941,7 +941,7 @@ dependencies = [
 
 [[package]]
 name = "lora-ffi"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -953,7 +953,7 @@ dependencies = [
 
 [[package]]
 name = "lora-io"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "lora-executor",
  "lora-store",
@@ -964,7 +964,7 @@ dependencies = [
 
 [[package]]
 name = "lora-node"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -979,7 +979,7 @@ dependencies = [
 
 [[package]]
 name = "lora-parser"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "lora-ast",
  "pest",
@@ -990,7 +990,7 @@ dependencies = [
 
 [[package]]
 name = "lora-python"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "lora-binding-buffer",
@@ -1003,7 +1003,7 @@ dependencies = [
 
 [[package]]
 name = "lora-query-wasm"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -1017,7 +1017,7 @@ dependencies = [
 
 [[package]]
 name = "lora-server"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -1032,7 +1032,7 @@ dependencies = [
 
 [[package]]
 name = "lora-snapshot"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "argon2",
  "blake3",
@@ -1047,7 +1047,7 @@ dependencies = [
 
 [[package]]
 name = "lora-store"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "crc32fast",
  "jiff",
@@ -1062,7 +1062,7 @@ dependencies = [
 
 [[package]]
 name = "lora-wal"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "crc32fast",
  "lora-store",
@@ -1072,7 +1072,7 @@ dependencies = [
 
 [[package]]
 name = "lora-wasm"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
@@ -1088,7 +1088,7 @@ dependencies = [
 
 [[package]]
 name = "lora_ruby"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "anyhow",
  "lora-database",

{lora_python-0.28.0 → lora_python-0.29.0}/Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.28.0"
+version = "0.29.0"
 license = "BUSL-1.1"
 authors = ["LoraDB, Inc."]
 repository = "https://github.com/lora-db/lora"
@@ -15,18 +15,18 @@ rust-version = "1.87"
 # Internal crates — versions are kept in lockstep with [workspace.package].version
 # by `scripts/sync-versions.mjs`. Both `path` and `version` are set so that
 # `cargo publish` works (crates.io cannot resolve path-only deps).
-lora-ast = { path = "crates/lora-ast", version = "=0.28.0" }
-lora-parser = { path = "crates/lora-parser", version = "=0.28.0" }
-lora-builtins-meta = { path = "crates/lora-builtins-meta", version = "=0.28.0" }
-lora-analyzer = { path = "crates/lora-analyzer", version = "=0.28.0" }
-lora-compiler = { path = "crates/lora-compiler", version = "=0.28.0" }
-lora-store = { path = "crates/lora-store", version = "=0.28.0" }
-lora-snapshot = { path = "crates/lora-snapshot", version = "=0.28.0", default-features = false }
-lora-io = { path = "crates/lora-io", version = "=0.28.0" }
-lora-wal = { path = "crates/lora-wal", version = "=0.28.0" }
-lora-executor = { path = "crates/lora-executor", version = "=0.28.0", default-features = false }
-lora-database = { path = "crates/lora-database", version = "=0.28.0" }
-lora-binding-buffer = { path = "crates/bindings/lora-binding-buffer", version = "=0.28.0" }
+lora-ast = { path = "crates/lora-ast", version = "=0.29.0" }
+lora-parser = { path = "crates/lora-parser", version = "=0.29.0" }
+lora-builtins-meta = { path = "crates/lora-builtins-meta", version = "=0.29.0" }
+lora-analyzer = { path = "crates/lora-analyzer", version = "=0.29.0" }
+lora-compiler = { path = "crates/lora-compiler", version = "=0.29.0" }
+lora-store = { path = "crates/lora-store", version = "=0.29.0" }
+lora-snapshot = { path = "crates/lora-snapshot", version = "=0.29.0", default-features = false }
+lora-io = { path = "crates/lora-io", version = "=0.29.0" }
+lora-wal = { path = "crates/lora-wal", version = "=0.29.0" }
+lora-executor = { path = "crates/lora-executor", version = "=0.29.0", default-features = false }
+lora-database = { path = "crates/lora-database", version = "=0.29.0" }
+lora-binding-buffer = { path = "crates/bindings/lora-binding-buffer", version = "=0.29.0" }
 
 # External crates.
 anyhow = "1"

{lora_python-0.28.0 → lora_python-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lora-python
-Version: 0.28.0
+Version: 0.29.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8

{lora_python-0.28.0 → lora_python-0.29.0}/crates/lora-database/src/database/procedures.rs

@@ -19,7 +19,7 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use anyhow::Result;
 use lora_ast::{Expr, ProcedureInvocationKind, StandaloneCall, YieldItem};
-use lora_executor::{LoraValue, Row};
+use lora_executor::{FulltextPage, LoraValue, Row};
 use lora_store::{
     GraphStorage, GraphStorageMut, IndexDefinition, LoraVector, StoredIndexEntity, StoredIndexKind,
     VectorCoordinateType,
@@ -134,15 +134,18 @@ where
         params: &BTreeMap<String, LoraValue>,
         entity: StoredIndexEntity,
     ) -> Result<Vec<Row>> {
-        let (index_name, query_text) = parse_fulltext_args(args, params)?;
+        let (index_name, query_text, page) = parse_fulltext_args(args, params)?;
         let snapshot = self.read_store();
         let def = snapshot
             .get_index(&index_name)
             .ok_or_else(|| not_found_error(format!("no fulltext index named `{index_name}`")))?;
         validate_procedure_index(&def, StoredIndexKind::Fulltext, entity, "fulltext")?;
 
-        let scored = snapshot.fulltext_search(&index_name, &query_text);
-        Ok(hydrated(scored_rows(scored, None, entity), &*snapshot))
+        let scored = snapshot.fulltext_search(&index_name, &query_text, page.window());
+        Ok(hydrated(
+            scored_rows(page.skipped(scored), None, entity),
+            &*snapshot,
+        ))
     }
 }
 
@@ -262,7 +265,7 @@ fn invocation_parts(
 fn parse_fulltext_args(
     args: &[Expr],
     params: &BTreeMap<String, LoraValue>,
-) -> Result<(String, String)> {
+) -> Result<(String, String, FulltextPage)> {
     if args.len() < 2 || args.len() > 3 {
         return Err(invalid_params_error(format!(
             "fulltext procedure expects 2 or 3 arguments (indexName, queryString, options? ); got {}",
@@ -271,9 +274,22 @@ fn parse_fulltext_args(
     }
     let name = eval_string_arg(&args[0], params, "indexName")?;
     let query = eval_string_arg(&args[1], params, "queryString")?;
-    // args[2] (options map) parses but is currently ignored — we don't
-    // support skip/limit/analyzer overrides yet.
-    Ok((name, query))
+    let page = match args
+        .get(2)
+        .map(|expr| resolve_literal(expr, params))
+        .transpose()?
+    {
+        None | Some(LoraValue::Null) => FulltextPage::default(),
+        Some(LoraValue::Map(options)) => {
+            FulltextPage::parse(&options).map_err(invalid_params_error)?
+        }
+        Some(other) => {
+            return Err(invalid_params_error(format!(
+                "fulltext options must be a MAP like {{limit: 20}}, got {other:?}"
+            )))
+        }
+    };
+    Ok((name, query, page))
 }
 
 fn parse_vector_args(
@@ -441,6 +457,13 @@ fn resolve_literal(expr: &Expr, params: &BTreeMap<String, LoraValue>) -> Result<
             }
             Ok(LoraValue::List(out))
         }
+        Expr::Map(items, _) => {
+            let mut out = BTreeMap::new();
+            for (key, item) in items {
+                out.insert(key.clone(), resolve_literal(item, params)?);
+            }
+            Ok(LoraValue::Map(out))
+        }
         Expr::Unary {
             op: lora_ast::UnaryOp::Neg,
             expr: inner,

{lora_python-0.28.0 → lora_python-0.29.0}/crates/lora-database/tests/fulltext_index.rs

@@ -3,6 +3,9 @@
 mod test_helpers;
 use test_helpers::TestDb;
 
+use std::collections::BTreeMap;
+
+use lora_database::LoraValue;
 use serde_json::Value as JsonValue;
 
 fn index_named<'a>(rows: &'a [JsonValue], name: &str) -> Option<&'a JsonValue> {
@@ -312,3 +315,110 @@ fn fulltext_node_ids_returned() {
     let ids = node_ids(&rows);
     assert_eq!(ids.len(), 1);
 }
+
+// ---------- Options: {skip, limit} ----------
+
+fn seed_nights(db: &TestDb) {
+    db.run("CREATE FULLTEXT INDEX titles FOR (n:Track) ON EACH [n.title]");
+    for (key, title) in [
+        ("a", "Night Nights"),
+        ("b", "Nightfall"),
+        ("c", "Midnight"),
+        ("d", "Nightly"),
+        ("e", "Night"),
+    ] {
+        db.run(&format!(
+            "CREATE (:Track {{key: '{key}', title: '{title}'}})"
+        ));
+    }
+}
+
+fn keys(rows: &[JsonValue]) -> Vec<String> {
+    rows.iter()
+        .map(|r| r["key"].as_str().unwrap().to_string())
+        .collect()
+}
+
+#[test]
+fn fulltext_limit_returns_the_best_matches_in_order() {
+    let db = TestDb::new();
+    seed_nights(&db);
+    let all = keys(&db.run(
+        "CALL db.index.fulltext.queryNodes('titles', 'night*') YIELD node, score
+         RETURN node.key AS key",
+    ));
+    assert_eq!(all.len(), 4, "{all:?}");
+    assert_eq!(all[0], "a", "the two-term title ranks first: {all:?}");
+    for limit in 0..=5 {
+        let top = keys(&db.run(&format!(
+            "CALL db.index.fulltext.queryNodes('titles', 'night*', {{limit: {limit}}}) YIELD node, score
+             RETURN node.key AS key"
+        )));
+        assert_eq!(top, all[..limit.min(all.len())], "limit {limit}");
+    }
+}
+
+#[test]
+fn fulltext_skip_and_limit_page_through_the_ranking() {
+    let db = TestDb::new();
+    seed_nights(&db);
+    let all = keys(&db.run(
+        "CALL db.index.fulltext.queryNodes('titles', 'night*') YIELD node, score
+         RETURN node.key AS key",
+    ));
+    let options = BTreeMap::from([
+        ("skip".to_string(), LoraValue::Int(1)),
+        ("limit".to_string(), LoraValue::Int(2)),
+    ]);
+    let page = keys(&db.run_with_params(
+        "CALL db.index.fulltext.queryNodes('titles', 'night*', $options) YIELD node, score
+         RETURN node.key AS key",
+        BTreeMap::from([("options".to_string(), LoraValue::Map(options))]),
+    ));
+    assert_eq!(page, all[1..3]);
+    let tail = keys(&db.run(
+        "CALL db.index.fulltext.queryNodes('titles', 'night*', {skip: 3}) YIELD node, score
+         RETURN node.key AS key",
+    ));
+    assert_eq!(tail, all[3..]);
+}
+
+#[test]
+fn fulltext_limit_applies_before_where() {
+    // The index ranks `limit` matches; a later WHERE filters within them.
+    let db = TestDb::new();
+    seed_nights(&db);
+    let rows = db.run(
+        "CALL db.index.fulltext.queryNodes('titles', 'night*', {limit: 2}) YIELD node AS t, score
+         WHERE t.key <> 'a'
+         RETURN t.key AS key",
+    );
+    assert_eq!(rows.len(), 1, "{rows:?}");
+}
+
+#[test]
+fn fulltext_options_are_checked() {
+    let db = TestDb::new();
+    seed_nights(&db);
+    let err = db.run_err(
+        "CALL db.index.fulltext.queryNodes('titles', 'night', {analyzer: 'english'}) YIELD node",
+    );
+    assert!(
+        err.contains("unknown fulltext option `analyzer`"),
+        "got: {err}"
+    );
+    let err = db.run_err(
+        "CALL db.index.fulltext.queryNodes('titles', 'night', {limit: -1}) YIELD node
+         RETURN node",
+    );
+    assert!(err.contains("non-negative integer"), "got: {err}");
+}
+
+#[test]
+fn fulltext_standalone_call_takes_options() {
+    let db = TestDb::new();
+    seed_nights(&db);
+    let rows = db
+        .run("CALL db.index.fulltext.queryNodes('titles', 'night*', {limit: 1}) YIELD node, score");
+    assert_eq!(rows.len(), 1, "{rows:?}");
+}

{lora_python-0.28.0 → lora_python-0.29.0}/crates/lora-executor/src/eval/builtins/index_ns.rs

@@ -52,12 +52,62 @@ fn fulltext<S: GraphStorage>(
 ) -> Result<LoraValue, String> {
     let name = string_arg(args, 0, "indexName")?;
     let query = string_arg(args, 1, "queryString")?;
+    let page = match args.get(2) {
+        None | Some(LoraValue::Null) => FulltextPage::default(),
+        Some(LoraValue::Map(options)) => FulltextPage::parse(options)?,
+        Some(other) => return Err(format!("fulltext options must be a MAP, got {other:?}")),
+    };
     check_index(ctx, &name, StoredIndexKind::Fulltext, entity)?;
-    Ok(hits(
-        ctx.storage.fulltext_search(&name, &query),
-        None,
-        entity,
-    ))
+    let scored = ctx.storage.fulltext_search(&name, &query, page.window());
+    Ok(hits(page.skipped(scored), None, entity))
+}
+
+/// The `{skip, limit}` options of a full-text query (Neo4j's names): the
+/// index ranks only `skip + limit` matches, so a broad query with a limit
+/// never turns every match into a row.
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+pub struct FulltextPage {
+    pub skip: usize,
+    pub limit: Option<usize>,
+}
+
+impl FulltextPage {
+    pub fn parse(options: &BTreeMap<String, LoraValue>) -> Result<Self, String> {
+        let mut page = Self::default();
+        for (key, value) in options {
+            if key != "skip" && key != "limit" {
+                return Err(format!(
+                    "unknown fulltext option `{key}` (supported: skip, limit)"
+                ));
+            }
+            let n = match value {
+                LoraValue::Null => continue,
+                LoraValue::Int(n) if *n >= 0 => *n as usize,
+                other => {
+                    return Err(format!(
+                        "fulltext option `{key}` must be a non-negative integer, got {other:?}"
+                    ))
+                }
+            };
+            if key == "skip" {
+                page.skip = n;
+            } else {
+                page.limit = Some(n);
+            }
+        }
+        Ok(page)
+    }
+
+    /// How many of the best matches the index must rank.
+    pub fn window(&self) -> Option<usize> {
+        self.limit.map(|limit| limit.saturating_add(self.skip))
+    }
+
+    /// `scored` (best first) without the skipped head.
+    pub fn skipped(&self, mut scored: Vec<(u64, f64)>) -> Vec<(u64, f64)> {
+        scored.drain(..self.skip.min(scored.len()));
+        scored
+    }
 }
 
 fn vector<S: GraphStorage>(

{lora_python-0.28.0 → lora_python-0.29.0}/crates/lora-executor/src/eval/builtins/mod.rs

@@ -30,6 +30,7 @@ mod crypto;
 mod edge;
 mod geo;
 mod index_ns;
+pub use index_ns::FulltextPage;
 mod json_ns;
 mod list;
 mod map_ns;

{lora_python-0.28.0 → lora_python-0.29.0}/crates/lora-executor/src/eval/mod.rs

@@ -35,6 +35,7 @@ mod point;
 mod regex;
 mod vector;
 
+pub use builtins::FulltextPage;
 pub use errors::clear_eval_error;
 pub(crate) use errors::take_eval_error;
 pub use expr::{

{lora_python-0.28.0 → lora_python-0.29.0}/crates/lora-executor/src/lib.rs

@@ -8,6 +8,7 @@ mod value;
 
 pub use cancel::CancellableDeadline;
 pub use errors::{ExecResult, ExecutorError};
+pub use eval::FulltextPage;
 pub use executor::{
     value_matches_property_value, ExecutionContext, Executor, MutableExecutionContext,
     MutableExecutor,