@an5/adapters 0.2.13 → 0.2.14

package/README.md

@@ -68,7 +68,7 @@ dragged in three drivers would not fit.
 <dependency>
   <groupId>io.github.an5orm</groupId>
   <artifactId>an5-adapters-java</artifactId>
-  <version>0.2.13</version>
+  <version>0.2.14</version>
 </dependency>
 ```
 
@@ -91,7 +91,7 @@ rather than reimplementing it, so the dialect rules and the where builder exist
 
 ```kotlin
 dependencies {
-    implementation("io.github.an5orm:an5-adapters-kotlin:0.2.13")
+    implementation("io.github.an5orm:an5-adapters-kotlin:0.2.14")
 }
 ```
 
@@ -115,7 +115,7 @@ input. It needs the repository secrets `MAVEN_CENTRAL_USERNAME` and `MAVEN_CENTR
 ### Swift
 
 ```swift
-.package(url: "https://github.com/an5ORM/an5Adapters.git", from: "0.2.13")
+.package(url: "https://github.com/an5ORM/an5Adapters.git", from: "0.2.14")
 ```
 
 A SwiftPM package that links the **system** SQLite — the database every Apple platform
@@ -169,7 +169,7 @@ returns the NBase hits — id, metadata and `distance` — instead of table rows
 With an `nbase://` connection string, search returns the hits themselves:
 
 ```ts
-const hits = await db.table('Article').vectorSearch({ vector: queryEmbedding, take: 5 });
+const hits = await db.article.vectorSearch({ vector: queryEmbedding, take: 5 });
 // hits[0] = { id: 'Article:42', an5Id: '42', an5Model: 'Article', distance: 0.11 }
 ```
 
@@ -185,10 +185,10 @@ const db = createAn5Adapter({
   nbase: 'nbase://localhost:1307',
 });
 
-await db.table('Article').indexVectorsInNBase({ vectorField: 'embedding' });
+await db.article.indexVectorsInNBase({ vectorField: 'embedding' });
 // → { indexed: 1200 }
 
-const hits = await db.table('Article').vectorSearch({ vector: queryEmbedding, take: 5 });
+const hits = await db.article.vectorSearch({ vector: queryEmbedding, take: 5 });
 // hits[0] = { id, title, ..., distance }
 ```
 
@@ -229,9 +229,9 @@ that already holds JSON text (`'[0.1, 0.2]'`) keeps working, so nothing has to
 be migrated.
 
 ```ts
-await db.table('Article').create({ data: { title: '…', embedding: queryEmbedding } });
+await db.article.create({ data: { title: '…', embedding: queryEmbedding } });
 
-const row = await db.table('Article').findFirst({ where: { title: '…' } });
+const row = await db.article.findFirst({ where: { title: '…' } });
 row.embedding; // number[]
 ```
 
@@ -260,7 +260,8 @@ const db = createAn5Adapter({
 ```
 
 `vectorStrategy` pins one strategy instead of probing — `'auto'` (the default),
-`'sqlite-vec'`, `'udf'`, `'sql'` or `'memory'`. Every other runtime implements
+`'sqlite-vec'`, `'udf'`, `'sql'` or `'memory'`. In TypeScript it can also be
+supplied per query on `vectorSearch`. Every other runtime implements
 the same four strategies with the same order; `sqlx` (Rust) and JDBC (Java,
 Kotlin) use `sql` for JSON text and `memory` for BLOB columns without
 driver-specific vector functions.

package/dist/an5Adapter.d.ts

@@ -134,9 +134,12 @@ export declare class ViewClient<T = any> {
 export declare class An5AdapterTx {
     private readonly handle;
     readonly dialect: Dialect;
+    private readonly parentVectorSupport;
+    readonly vectorStrategy?: VectorStrategyPreference | undefined;
     [key: string]: any;
     private closed;
-    constructor(handle: TransactionHandle, dialect: Dialect);
+    constructor(handle: TransactionHandle, dialect: Dialect, parentVectorSupport?: SqliteVectorSupport | null, vectorStrategy?: VectorStrategyPreference | undefined);
+    sqliteVectorSupport(): Promise<SqliteVectorSupport | null>;
     exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]>;
     _executeRaw(query: string, params?: Record<string, any>): Promise<number>;
     $commit(): Promise<void>;
@@ -271,6 +274,7 @@ export declare class AdapterTableClient<T = any> {
         vectorField?: string;
         distanceMetric?: 'cosine' | 'euclidean' | 'dot';
         vectorElementType?: 'float32' | 'float16' | 'uint8';
+        vectorStrategy?: VectorStrategyPreference;
     }): Promise<(T & {
         distance: number;
     })[]>;

package/dist/an5Adapter.js

@@ -360,7 +360,7 @@ class An5Adapter {
     }
     /** `vectorStrategy` from the config, so a project can pin one strategy. */
     get vectorStrategy() {
-        return this._engineConfig?.vectorStrategy;
+        return this._engineConfig?.vectorStrategy ?? this.engine?.vectorSupport?.options?.vectorStrategy;
     }
     /** INTERNAL: used by AdapterTableClient for DML statements needing row count */
     async _executeRaw(query, params) {
@@ -449,7 +449,7 @@ class An5Adapter {
             return Promise.all(fn);
         const engine = await this.requireEngine();
         const handle = await engine.beginTransaction();
-        const txAdapter = new An5AdapterTx(handle, this.dialect);
+        const txAdapter = new An5AdapterTx(handle, this.dialect, engine.vectorSupport ?? null, this.vectorStrategy);
         try {
             const result = await fn(txAdapter);
             await handle.commit();
@@ -465,7 +465,7 @@ class An5Adapter {
             throw new Error('Interactive transactions are not supported by the Google Sheets adapter');
         }
         const engine = await this.requireEngine();
-        return new An5AdapterTx(await engine.beginTransaction(), this.dialect);
+        return new An5AdapterTx(await engine.beginTransaction(), this.dialect, engine.vectorSupport ?? null, this.vectorStrategy);
     }
     table(modelName) {
         if (this.sheetsAdapter)
@@ -633,12 +633,17 @@ class ViewClient {
 exports.ViewClient = ViewClient;
 // ─── Transaction-scoped adapter ────────────────────────────────────────────────────
 class An5AdapterTx {
-    constructor(handle, dialect) {
+    constructor(handle, dialect, parentVectorSupport = null, vectorStrategy) {
         this.handle = handle;
         this.dialect = dialect;
+        this.parentVectorSupport = parentVectorSupport;
+        this.vectorStrategy = vectorStrategy;
         this.closed = false;
         return (0, metadata_1.createAdapterProxy)(this, (name) => this.table(name));
     }
+    async sqliteVectorSupport() {
+        return this.dialect === 'sqlite' ? this.parentVectorSupport : null;
+    }
     async exec(query, params) {
         this.ensureOpen();
         return this.handle.exec(query, params);
@@ -1412,7 +1417,7 @@ class AdapterTableClient {
                 take,
                 tail: whereSql ? ` WHERE ${whereSql}` : '',
                 params,
-                preference: this.adapter.vectorStrategy,
+                preference: args.vectorStrategy ?? this.adapter.vectorStrategy ?? support?.options?.vectorStrategy,
             });
             if (ranked)
                 return this.decodeVectorFields(ranked.rows);

package/dist/sqlite/vector.js

@@ -351,12 +351,8 @@ class SqliteVectorSupport {
      * since taken new float32 rows would otherwise rank just the old ones.
      */
     async hasBinaryRows(exec, table, column, tail, params) {
-        const key = `${table}.${column}`;
-        if (!this.binaryRows.has(key)) {
-            const rows = await exec(`SELECT 1 FROM ${table}${tail ? `${tail} AND` : ' WHERE'} typeof(${column}) = 'blob' LIMIT 1`, params).catch(() => []);
-            this.binaryRows.set(key, rows.length > 0);
-        }
-        return this.binaryRows.get(key) === true;
+        const rows = await exec(`SELECT 1 FROM ${table}${tail ? `${tail} AND` : ' WHERE'} typeof(${column}) = 'blob' LIMIT 1`, params).catch(() => []);
+        return rows.length > 0;
     }
     reset() {
         this.caps = null;
@@ -406,7 +402,7 @@ async function runSqliteVectorSearch(args) {
     for (const strategy of planSqliteVectorStrategies(caps, declaredType, args.preference)) {
         if (strategy === 'sql') {
             const binary = args.vectorSupport
-                ? await args.vectorSupport.hasBinaryRows(args.exec, args.rawTable, args.rawColumn, args.tail ?? '', args.params)
+                ? await args.vectorSupport.hasBinaryRows(args.exec, args.table, args.column, args.tail ?? '', args.params)
                 : (await args.exec(`SELECT 1 FROM ${args.table}${args.tail ? `${args.tail} AND` : ' WHERE'} typeof(${args.column}) = 'blob' LIMIT 1`, args.params)).length > 0;
             if (binary)
                 continue;

package/dotnet/An5Adapter.cs

@@ -908,7 +908,20 @@ namespace An5Orm
         public List<(T Item, double Distance)> VectorSearch(VectorSearchArgs args)
         {
             args ??= new VectorSearchArgs();
-            return VectorSearch(args.Vector, args.Take, null, null, args.VectorField, args.DistanceMetric);
+            Dictionary<string, object> parameters = null;
+            string whereSql = null;
+            if (args.Where != null)
+            {
+                parameters = new Dictionary<string, object>();
+                whereSql = SqlBuilder.ParseWhere(args.Where, parameters, _dialect);
+            }
+            return VectorSearch(
+                args.Vector,
+                args.Take,
+                string.IsNullOrEmpty(whereSql) ? null : whereSql,
+                parameters,
+                args.VectorField,
+                args.DistanceMetric);
         }
 
         public T FindFirst(string whereClause = null, Dictionary<string, object> parameters = null, string orderBy = null)

package/java/pom.xml

@@ -17,7 +17,7 @@
 
   <groupId>io.github.an5orm</groupId>
   <artifactId>an5-adapters-java</artifactId>
-  <version>0.2.13</version>
+  <version>0.2.14</version>
   <packaging>jar</packaging>
 
   <name>AN5 ORM Java adapter</name>

package/java/src/main/java/an5/adapters/An5TableClient.java

@@ -486,7 +486,6 @@ public class An5TableClient {
     int limit = take == null ? 10 : take;
     String field = vectorField == null || vectorField.isEmpty() ? "embedding" : vectorField;
     String distanceMetric = metric == null || metric.isEmpty() ? "cosine" : metric;
-    int dimension = vector.length;
 
     Map<String, Object> params = new LinkedHashMap<String, Object>();
     SqlBuilder.Where clause = SqlBuilder.parseWhere(where, dialect, params, "");

package/kotlin/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 // phone app cannot resolve is not a mobile runtime. Maven consumers can still use the
 // published Maven coordinates; this module publishes both.
 group = "io.github.an5orm"
-version = "0.2.13"
+version = "0.2.14"
 
 repositories {
     // The Java runtime is a sibling checkout, not a published artifact during development:

package/native/sqlite/README.md

@@ -63,7 +63,7 @@ const db = createAn5Adapter({
   connectionString: 'sqlite:///app.db',
   sqliteVec: '/absolute/path/an5_vector.so', // .dylib / .dll on other platforms
 });
-await db.table('Document').vectorSearch({ vector: query, take: 10 });
+await db.document.vectorSearch({ vector: query, take: 10 });
 ```
 
 ```python

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@an5/adapters",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "Standalone language adapters for AN5 ORM - TypeScript, Python, .NET, Go, Rust, Java, Kotlin, Swift, and Google Sheets query execution.",
   "license": "MIT",
   "main": "dist/index.js",

package/python/base/vectors.py

@@ -313,17 +313,14 @@ class SqliteVectorSupport:
         Checked only for the `sql` strategy, where a legacy JSON column that has
         since taken new float32 rows would otherwise rank just the old ones.
         """
-        key = f"{table}.{column}"
-        if key not in self._has_binary_rows:
-            clause = (tail + " AND ") if tail else " WHERE "
-            try:
-                rows = exec_fn(
-                    f"SELECT 1 FROM {table}{clause}typeof({column}) = 'blob' LIMIT 1",
-                    list(params))
-                self._has_binary_rows[key] = bool(rows)
-            except Exception:
-                self._has_binary_rows[key] = False
-        return self._has_binary_rows[key]
+        clause = (tail + " AND ") if tail else " WHERE "
+        try:
+            rows = exec_fn(
+                f"SELECT 1 FROM {table}{clause}typeof({column}) = 'blob' LIMIT 1",
+                list(params))
+            return bool(rows)
+        except Exception:
+            return False
 
     def capabilities(self) -> Dict[str, bool]:
         """Probes once and caches the answer."""
@@ -415,7 +412,7 @@ def run_sqlite_vector_search(
                 else read_sqlite_column_type(exec_fn, raw_table, raw_column))
     for strategy in plan_sqlite_vector_strategies(caps, declared, preference):
         if strategy == STRATEGY_SQL:
-            binary = (support.has_binary_rows(exec_fn, raw_table, raw_column, tail, list(params or []))
+            binary = (support.has_binary_rows(exec_fn, table, column, tail, list(params or []))
                       if support is not None
                       else bool(exec_fn("SELECT 1 FROM " + table + (tail + " AND " if tail else " WHERE ")
                                         + f"typeof({column}) = 'blob' LIMIT 1", list(params or []))))

package/typescript/src/an5Adapter.ts

@@ -411,7 +411,7 @@ export class An5Adapter {
 
   /** `vectorStrategy` from the config, so a project can pin one strategy. */
   get vectorStrategy(): VectorStrategyPreference | undefined {
-    return this._engineConfig?.vectorStrategy;
+    return this._engineConfig?.vectorStrategy ?? (this.engine as any)?.vectorSupport?.options?.vectorStrategy;
   }
 
   /** INTERNAL: used by AdapterTableClient for DML statements needing row count */
@@ -500,7 +500,7 @@ export class An5Adapter {
     if (Array.isArray(fn)) return Promise.all(fn);
     const engine = await this.requireEngine();
     const handle = await engine.beginTransaction();
-    const txAdapter = new An5AdapterTx(handle, this.dialect);
+    const txAdapter = new An5AdapterTx(handle, this.dialect, engine.vectorSupport ?? null, this.vectorStrategy);
     try {
       const result = await fn(txAdapter);
       await handle.commit();
@@ -516,7 +516,7 @@ export class An5Adapter {
       throw new Error('Interactive transactions are not supported by the Google Sheets adapter');
     }
     const engine = await this.requireEngine();
-    return new An5AdapterTx(await engine.beginTransaction(), this.dialect);
+    return new An5AdapterTx(await engine.beginTransaction(), this.dialect, engine.vectorSupport ?? null, this.vectorStrategy);
   }
 
   table<T = any>(modelName: string): AdapterTableClient<T> | SheetsTableClient<T> {
@@ -714,10 +714,16 @@ export class An5AdapterTx {
   constructor(
     private readonly handle: TransactionHandle,
     public readonly dialect: Dialect,
+    private readonly parentVectorSupport: SqliteVectorSupport | null = null,
+    public readonly vectorStrategy?: VectorStrategyPreference | undefined,
   ) {
     return createAdapterProxy(this, (name) => this.table(name));
   }
 
+  async sqliteVectorSupport(): Promise<SqliteVectorSupport | null> {
+    return this.dialect === 'sqlite' ? this.parentVectorSupport : null;
+  }
+
   async exec<T = any>(query: string, params?: Record<string, any>): Promise<T[]> {
     this.ensureOpen();
     return this.handle.exec<T>(query, params);
@@ -1462,6 +1468,7 @@ export class AdapterTableClient<T = any> {
     vectorField?: string;
     distanceMetric?: 'cosine' | 'euclidean' | 'dot';
     vectorElementType?: 'float32' | 'float16' | 'uint8';
+    vectorStrategy?: VectorStrategyPreference;
   }): Promise<(T & { distance: number })[]> {
     const vectorField = args.vectorField || 'embedding';
     const METRICS = ['cosine', 'euclidean', 'dot'];
@@ -1521,7 +1528,7 @@ export class AdapterTableClient<T = any> {
         take,
         tail: whereSql ? ` WHERE ${whereSql}` : '',
         params,
-        preference: (this.adapter as any).vectorStrategy,
+        preference: args.vectorStrategy ?? (this.adapter as any).vectorStrategy ?? support?.options?.vectorStrategy,
       });
       if (ranked) return this.decodeVectorFields(ranked.rows) as (T & { distance: number })[];
       // No in-database strategy: score the column in the client instead.

package/typescript/src/sqlite/vector.ts

@@ -422,15 +422,11 @@ export class SqliteVectorSupport {
     tail: string,
     params: Record<string, any>,
   ): Promise<boolean> {
-    const key = `${table}.${column}`;
-    if (!this.binaryRows.has(key)) {
-      const rows = await exec(
-        `SELECT 1 FROM ${table}${tail ? `${tail} AND` : ' WHERE'} typeof(${column}) = 'blob' LIMIT 1`,
-        params,
-      ).catch(() => []);
-      this.binaryRows.set(key, rows.length > 0);
-    }
-    return this.binaryRows.get(key) === true;
+    const rows = await exec(
+      `SELECT 1 FROM ${table}${tail ? `${tail} AND` : ' WHERE'} typeof(${column}) = 'blob' LIMIT 1`,
+      params,
+    ).catch(() => []);
+    return rows.length > 0;
   }
 
   reset(): void {
@@ -510,7 +506,7 @@ export async function runSqliteVectorSearch(
   for (const strategy of planSqliteVectorStrategies(caps, declaredType, args.preference)) {
     if (strategy === 'sql') {
       const binary = args.vectorSupport
-        ? await args.vectorSupport.hasBinaryRows(args.exec, args.rawTable, args.rawColumn, args.tail ?? '', args.params)
+        ? await args.vectorSupport.hasBinaryRows(args.exec, args.table, args.column, args.tail ?? '', args.params)
         : (await args.exec(
             `SELECT 1 FROM ${args.table}${args.tail ? `${args.tail} AND` : ' WHERE'} typeof(${args.column}) = 'blob' LIMIT 1`,
             args.params,