usearch 0.11.0 → 0.11.1

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "usearch"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Ashot Vardanian <1983160+ashvardanian@users.noreply.github.com>"]
 description = "Smaller & Faster Single-File Vector Search Engine from Unum"
 edition = "2021"

package/VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

package/conanfile.py

@@ -4,7 +4,7 @@ from conans import ConanFile
 class USearchConan(ConanFile):
 
     name = 'USearch'
-    version = '0.11.0'
+    version = '0.11.1'
     license = 'Apache 2.0'
     url = 'https://github.com/unum-cloud/usearch'
     description = 'Smaller & Faster Single-File Vector Search Engine from Unum'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "usearch",
-    "version": "0.11.0",
+    "version": "0.11.1",
     "description": "Smaller & Faster Single-File Vector Search Engine from Unum",
     "author": "Ashot Vardanian",
     "license": "Apache 2.0",

package/python/usearch/client.py

@@ -1,8 +1,10 @@
-from typing import Union, Optional
+from typing import Union, Optional, List
 
 import numpy as np
 from ucall.client import Client
 
+from usearch.index import Matches
+
 
 def _vector_to_ascii(vector: np.ndarray) -> Optional[str]:
     if vector.dtype != np.int8 and vector.dtype != np.uint8 and vector.dtype != np.byte:
@@ -18,9 +20,6 @@ def _vector_to_ascii(vector: np.ndarray) -> Optional[str]:
     return ascii
 
 
-Triplet = tuple[np.ndarray, np.ndarray, np.ndarray]
-
-
 class IndexClient:
 
     def __init__(
@@ -53,8 +52,8 @@ class IndexClient:
         else:
             return self.add_many(labels, vectors)
 
-    def search_one(self, vector: np.ndarray, count: int) -> Triplet:
-        matches: list[dict] = []
+    def search_one(self, vector: np.ndarray, count: int) -> Matches:
+        matches: List[dict] = []
         vector = vector.flatten()
         ascii = _vector_to_ascii(vector)
         if ascii:
@@ -75,9 +74,9 @@ class IndexClient:
 
         return labels, distances, counts
 
-    def search_many(self, vectors: np.ndarray, count: int) -> Triplet:
+    def search_many(self, vectors: np.ndarray, count: int) -> Matches:
         batch_size: int = vectors.shape[0]
-        list_of_matches: list[list[dict]] = self.client.search_many(
+        list_of_matches: List[List[dict]] = self.client.search_many(
             vectors=vectors, count=count)
 
         labels = np.array((batch_size, count), dtype=np.uint32)
@@ -91,7 +90,7 @@ class IndexClient:
 
         return labels, distances, counts
 
-    def search(self, vectors: np.ndarray, count: int) -> Triplet:
+    def search(self, vectors: np.ndarray, count: int) -> Matches:
         if vectors.ndim == 1 or (vectors.ndim == 2 and vectors.shape[0] == 1):
             return self.search_one(vectors, count)
         else:

package/python/usearch/index.py

@@ -4,7 +4,7 @@
 # into the primary `Index` class, connecting USearch with Numba.
 import os
 from math import sqrt
-from typing import Optional, Callable, Union
+from typing import Optional, Callable, Union, NamedTuple, List
 
 import numpy as np
 
@@ -13,12 +13,17 @@ from usearch.compiled import SetsIndex as _CompiledSetsIndex
 from usearch.compiled import HashIndex as _CompiledHashIndex
 from usearch.compiled import DEFAULT_CONNECTIVITY, DEFAULT_EXPANSION_ADD, DEFAULT_EXPANSION_SEARCH
 
-Triplet = tuple[np.ndarray, np.ndarray, np.ndarray]
 SetsIndex = _CompiledSetsIndex
 HashIndex = _CompiledHashIndex
 
 
-def results_to_list(results: Triplet, row: int) -> list[dict]:
+class Matches(NamedTuple):
+    labels: np.ndarray
+    distances: np.ndarray
+    counts: np.ndarray
+
+
+def list_matches(results: Matches, row: int) -> List[dict]:
 
     count = results[2][row]
     labels = results[0][row, :count]
@@ -236,8 +241,11 @@ class Index:
 
     def search(
             self, vectors, k: int = 10, *,
-            threads: int = 0, exact: bool = False) -> Triplet:
-        return self._compiled.search(vectors, k, exact=exact, threads=threads)
+            threads: int = 0, exact: bool = False) -> Matches:
+        tuple_ = self._compiled.search(
+            vectors, k,
+            exact=exact, threads=threads)
+        return Matches(*tuple_)
 
     def __len__(self) -> int:
         return len(self._compiled)

package/python/usearch/server.py

@@ -4,20 +4,10 @@
 import os
 import argparse
 import numpy as np
+from typing import List
 
 from ucall.rich_posix import Server
-from usearch.index import Index
-
-Triplet = tuple[np.ndarray, np.ndarray, np.ndarray]
-
-
-def _results_to_json(results: Triplet, row: int) -> list[dict]:
-
-    count = results[2][row]
-    labels = results[0][row, :count]
-    distances = results[1][row, :count]
-    return [{'label': int(label), 'distance': float(distance)}
-            for label, distance in zip(labels, distances)]
+from usearch.index import Index, list_matches
 
 
 def _ascii_to_vector(string: str) -> np.ndarray:
@@ -78,16 +68,16 @@ def serve(
         index.add(labels, vectors, threads=threads)
 
     @server
-    def search_one(vector: np.ndarray, count: int) -> list[dict]:
+    def search_one(vector: np.ndarray, count: int) -> List[dict]:
         print('search', vector, count)
         vectors = vector.reshape(vector.shape[0], 1)
         results = index.search(vectors, count)
-        return _results_to_json(results, 0)
+        return list_matches(results, 0)
 
     @server
-    def search_many(vectors: np.ndarray, count: int) -> list[list[dict]]:
+    def search_many(vectors: np.ndarray, count: int) -> List[List[dict]]:
         results = index.search(vectors, count)
-        return [_results_to_json(results, i) for i in range(vectors.shape[0])]
+        return [list_matches(results, i) for i in range(vectors.shape[0])]
 
     @server
     def add_ascii(label: int, string: str):