completr 0.2.2__tar.gz → 0.2.3__tar.gz

{completr-0.2.2 → completr-0.2.3}/Cargo.lock

@@ -735,7 +735,7 @@ dependencies = [
 
 [[package]]
 name = "completr"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "arc-swap",
  "async-trait",
@@ -765,7 +765,7 @@ dependencies = [
 
 [[package]]
 name = "completr-cli"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "clap",
  "completr",
@@ -776,7 +776,7 @@ dependencies = [
 
 [[package]]
 name = "completr-py"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "completr",
  "mimalloc",

{completr-0.2.2 → completr-0.2.3}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/completr", "crates/completr-py"]
 
 [workspace.package]
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 rust-version = "1.94.1"
 license = "MIT"

{completr-0.2.2 → completr-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: completr
-Version: 0.2.2
+Version: 0.2.3
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: MacOS

{completr-0.2.2 → completr-0.2.3}/crates/completr/src/engine.rs

@@ -5,7 +5,8 @@ use rustc_hash::FxHashMap;
 
 use crate::hybrid::fuse;
 use crate::{
-    AliasSuggestion, Error, HybridOptions, HybridSuggestion, Index, SearchOptions, Suggestion,
+    AliasSuggestion, Error, HybridOptions, HybridSuggestion, Index, MatchKind, SearchOptions,
+    Suggestion,
 };
 
 /// The namespace of indexes published or written without naming one.
@@ -409,7 +410,7 @@ pub fn layered_complete(
         })
         .collect();
     merge(layers, per_layer, options.limit, |s: &Suggestion| {
-        (s.id, s.score)
+        (s.id, s.kind == MatchKind::Fuzzy, s.score)
     })
 }
 
@@ -433,7 +434,7 @@ pub fn layered_complete_aliases(
         })
         .collect();
     merge(layers, per_layer, options.limit, |s: &AliasSuggestion| {
-        (s.id, s.score)
+        (s.id, false, s.score)
     })
 }
 
@@ -452,7 +453,7 @@ pub fn layered_vector_search(
         });
     }
     Ok(merge(layers, per_layer, options.limit, |s: &Suggestion| {
-        (s.id, s.score)
+        (s.id, false, s.score)
     }))
 }
 
@@ -471,7 +472,7 @@ fn merge<S>(
     layers: &[Option<&Index>],
     per_layer: Vec<Vec<S>>,
     limit: usize,
-    key: impl Fn(&S) -> (u64, f64),
+    key: impl Fn(&S) -> (u64, bool, f64),
 ) -> Vec<LayeredSuggestion<S>> {
     let mut merged: Vec<LayeredSuggestion<S>> = Vec::new();
     let mut position: FxHashMap<u64, usize> = FxHashMap::default();
@@ -495,11 +496,11 @@ fn merge<S>(
             .flatten()
             .any(|index| index.covers(id))
     });
+    // A correction from one layer never outranks a direct match from another.
     merged.sort_by(|a, b| {
-        key(&b.suggestion)
-            .1
-            .partial_cmp(&key(&a.suggestion).1)
-            .unwrap_or(std::cmp::Ordering::Equal)
+        let (a, b) = (key(&a.suggestion), key(&b.suggestion));
+        a.1.cmp(&b.1)
+            .then(b.2.partial_cmp(&a.2).unwrap_or(std::cmp::Ordering::Equal))
     });
     merged.truncate(limit);
     merged

{completr-0.2.2 → completr-0.2.3}/crates/completr/src/search.rs

@@ -9,6 +9,9 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use crate::index::{char_count, current_filter, with_filter, Field};
 use crate::{fuzzy, text, Index};
 
+/// Shorter queries are not corrected: one edit away from two characters is almost anything.
+const MIN_CORRECTED_CHARS: usize = 3;
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 #[non_exhaustive]
 pub enum MatchKind {
@@ -898,7 +901,10 @@ impl Index {
             .collect();
 
         let mut fuzzy_matches: FxHashMap<u32, (usize, usize, f64)> = FxHashMap::default();
-        if prefix_matches.len() < max_results && depth < 2 {
+        if prefix_matches.len() < max_results
+            && depth < 2
+            && text::char_len(q) >= MIN_CORRECTED_CHARS
+        {
             let mut last_distance = 0;
             for (rank, (phrase, distance)) in self
                 .fix_spell(
@@ -1017,9 +1023,11 @@ impl Index {
                 (score, len, self.id_key(doc), doc, m)
             })
             .collect();
+        // Corrections rank below every direct match before the cut, so a longer limit only appends.
         scored.sort_unstable_by(|a, b| {
-            b.0.partial_cmp(&a.0)
-                .unwrap_or(Ordering::Equal)
+            (a.4.fuzzy_distance > 0)
+                .cmp(&(b.4.fuzzy_distance > 0))
+                .then(b.0.partial_cmp(&a.0).unwrap_or(Ordering::Equal))
                 .then(a.1.cmp(&b.1))
                 .then(a.2.cmp(&b.2))
         });