redis-vl 0.1.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/index.d.ts +14 -13
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -6
- package/dist/index.js.map +1 -1
- package/dist/indexes/search-index.d.ts +30 -4
- package/dist/indexes/search-index.d.ts.map +1 -1
- package/dist/indexes/search-index.js +44 -16
- package/dist/indexes/search-index.js.map +1 -1
- package/dist/query/{aggregation.d.ts → aggregate/aggregation.d.ts} +1 -1
- package/dist/query/aggregate/aggregation.d.ts.map +1 -0
- package/dist/query/{aggregation.js → aggregate/aggregation.js} +2 -2
- package/dist/query/aggregate/aggregation.js.map +1 -0
- package/dist/query/hybrid.d.ts +17 -8
- package/dist/query/hybrid.d.ts.map +1 -1
- package/dist/query/hybrid.js +22 -13
- package/dist/query/hybrid.js.map +1 -1
- package/dist/query/index.d.ts +7 -7
- package/dist/query/index.d.ts.map +1 -1
- package/dist/query/index.js +7 -7
- package/dist/query/index.js.map +1 -1
- package/dist/query/search/base.d.ts +170 -0
- package/dist/query/search/base.d.ts.map +1 -0
- package/dist/query/search/base.js +196 -0
- package/dist/query/search/base.js.map +1 -0
- package/dist/query/{count.d.ts → search/count.d.ts} +2 -6
- package/dist/query/search/count.d.ts.map +1 -0
- package/dist/query/{count.js → search/count.js} +3 -9
- package/dist/query/search/count.js.map +1 -0
- package/dist/query/{filter-query.d.ts → search/filter-query.d.ts} +3 -8
- package/dist/query/search/filter-query.d.ts.map +1 -0
- package/dist/query/{filter-query.js → search/filter-query.js} +10 -14
- package/dist/query/search/filter-query.js.map +1 -0
- package/dist/query/{range.d.ts → search/range.d.ts} +4 -16
- package/dist/query/search/range.d.ts.map +1 -0
- package/dist/query/{range.js → search/range.js} +9 -36
- package/dist/query/search/range.js.map +1 -0
- package/dist/query/{text.d.ts → search/text.d.ts} +5 -9
- package/dist/query/search/text.d.ts.map +1 -0
- package/dist/query/{text.js → search/text.js} +13 -14
- package/dist/query/search/text.js.map +1 -0
- package/dist/query/{vector.d.ts → search/vector.d.ts} +7 -33
- package/dist/query/search/vector.d.ts.map +1 -0
- package/dist/query/{vector.js → search/vector.js} +9 -38
- package/dist/query/search/vector.js.map +1 -0
- package/dist/redis/client-types.d.ts +1 -1
- package/dist/redis/client-types.js +1 -1
- package/dist/redis/utils.d.ts +12 -1
- package/dist/redis/utils.d.ts.map +1 -1
- package/dist/redis/utils.js +17 -1
- package/dist/redis/utils.js.map +1 -1
- package/dist/schema/schema.d.ts +2 -2
- package/dist/schema/types.d.ts +5 -0
- package/dist/schema/types.d.ts.map +1 -1
- package/dist/schema/types.js.map +1 -1
- package/dist/storage/base-storage.d.ts +0 -1
- package/dist/storage/base-storage.d.ts.map +1 -1
- package/dist/storage/base-storage.js.map +1 -1
- package/dist/storage/json-storage.d.ts +5 -0
- package/dist/storage/json-storage.d.ts.map +1 -1
- package/dist/storage/json-storage.js +34 -0
- package/dist/storage/json-storage.js.map +1 -1
- package/package.json +13 -13
- package/dist/query/aggregation.d.ts.map +0 -1
- package/dist/query/aggregation.js.map +0 -1
- package/dist/query/base.d.ts +0 -77
- package/dist/query/base.d.ts.map +0 -1
- package/dist/query/base.js +0 -14
- package/dist/query/base.js.map +0 -1
- package/dist/query/count.d.ts.map +0 -1
- package/dist/query/count.js.map +0 -1
- package/dist/query/filter-query.d.ts.map +0 -1
- package/dist/query/filter-query.js.map +0 -1
- package/dist/query/range.d.ts.map +0 -1
- package/dist/query/range.js.map +0 -1
- package/dist/query/text.d.ts.map +0 -1
- package/dist/query/text.js.map +0 -1
- package/dist/query/vector.d.ts.map +0 -1
- package/dist/query/vector.js.map +0 -1
- package/dist/redis/protocol.d.ts +0 -34
- package/dist/redis/protocol.d.ts.map +0 -1
- package/dist/redis/protocol.js +0 -47
- package/dist/redis/protocol.js.map +0 -1
package/README.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<div align="center">
|
|
2
|
-
<img width="300" src="https://redis.io/
|
|
2
|
+
<img width="300" src="https://redis-developer.github.io/redis-vl-typescript/img/logo.svg" alt="Redis">
|
|
3
3
|
<h1>Redis Vector Library</h1>
|
|
4
4
|
<p><strong>The AI-native Redis TypeScript/Node.js client</strong></p>
|
|
5
5
|
</div>
|
package/dist/index.d.ts
CHANGED
|
@@ -12,23 +12,24 @@ FieldFactory, } from './schema/fields.js';
|
|
|
12
12
|
export * from './schema/types.js';
|
|
13
13
|
export { SearchIndex } from './indexes/search-index.js';
|
|
14
14
|
export type { CreateIndexOptions, DeleteIndexOptions } from './indexes/search-index.js';
|
|
15
|
-
export { VectorQuery } from './query/vector.js';
|
|
16
|
-
export type { VectorQueryConfig, HybridPolicy, UseSearchHistory } from './query/vector.js';
|
|
17
|
-
export { VectorRangeQuery } from './query/range.js';
|
|
18
|
-
export type { VectorRangeQueryConfig } from './query/range.js';
|
|
19
|
-
export { FilterQuery } from './query/filter-query.js';
|
|
20
|
-
export type { FilterQueryConfig } from './query/filter-query.js';
|
|
21
|
-
export { CountQuery } from './query/count.js';
|
|
22
|
-
export type { CountQueryConfig } from './query/count.js';
|
|
23
|
-
export { TextQuery } from './query/text.js';
|
|
24
|
-
export type { TextQueryConfig, TextScorer } from './query/text.js';
|
|
15
|
+
export { VectorQuery } from './query/search/vector.js';
|
|
16
|
+
export type { VectorQueryConfig, HybridPolicy, UseSearchHistory } from './query/search/vector.js';
|
|
17
|
+
export { VectorRangeQuery } from './query/search/range.js';
|
|
18
|
+
export type { VectorRangeQueryConfig } from './query/search/range.js';
|
|
19
|
+
export { FilterQuery } from './query/search/filter-query.js';
|
|
20
|
+
export type { FilterQueryConfig } from './query/search/filter-query.js';
|
|
21
|
+
export { CountQuery } from './query/search/count.js';
|
|
22
|
+
export type { CountQueryConfig } from './query/search/count.js';
|
|
23
|
+
export { TextQuery } from './query/search/text.js';
|
|
24
|
+
export type { TextQueryConfig, TextScorer } from './query/search/text.js';
|
|
25
25
|
export { HybridQuery } from './query/hybrid.js';
|
|
26
26
|
export type { HybridQueryConfig, HybridVectorMethod, HybridCombine, HybridCommand, } from './query/hybrid.js';
|
|
27
|
-
export { AggregationQuery, Reducers } from './query/aggregation.js';
|
|
28
|
-
export type { AggregateCommand, SortSpec, LoadField, Reducer } from './query/aggregation.js';
|
|
27
|
+
export { AggregationQuery, Reducers } from './query/aggregate/aggregation.js';
|
|
28
|
+
export type { AggregateCommand, SortSpec, LoadField, Reducer, } from './query/aggregate/aggregation.js';
|
|
29
29
|
export { Tag, Num, Text, Geo, GeoRadius, Timestamp, FilterExpression } from './query/filter.js';
|
|
30
30
|
export type { Inclusive, GeoUnit } from './query/filter.js';
|
|
31
|
-
export
|
|
31
|
+
export { BaseQuery, BaseVectorQuery } from './query/search/base.js';
|
|
32
|
+
export type { BaseQueryConfig, BaseVectorQueryConfig, SearchResult, SearchDocument, QueryOptions, FilterInput, HybridSearchResult, SortByOptions, SortDirection, SortField, } from './query/search/base.js';
|
|
32
33
|
export { RedisVLError, RedisSearchError, SchemaValidationError, QueryValidationError, RedisModuleVersionError, VectorizerError, } from './errors.js';
|
|
33
34
|
export { BaseVectorizer, HuggingFaceVectorizer, type HuggingFaceConfig, } from './vectorizers/index.js';
|
|
34
35
|
export { normalizeCosineDistance, denormalizeCosineDistance, normalizeL2Distance, DISTANCE_NORMALIZERS, type DistanceNormalizer, } from './utils/distance.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,eAAO,MAAM,OAAO,UAAU,CAAC;AAG/B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACH,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,WAAW,EAAE,+CAA+C;AAC5D,eAAe,EAAE,iCAAiC;AAClD,eAAe,EAAE,iCAAiC;AAClD,YAAY,GACf,MAAM,oBAAoB,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGxF,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,eAAO,MAAM,OAAO,UAAU,CAAC;AAG/B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACH,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,WAAW,EAAE,+CAA+C;AAC5D,eAAe,EAAE,iCAAiC;AAClD,eAAe,EAAE,iCAAiC;AAClD,YAAY,GACf,MAAM,oBAAoB,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,YAAY,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAGxF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,YAAY,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EACR,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,aAAa,GAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC9E,YAAY,EACR,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,OAAO,GACV,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAChG,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACpE,YAAY,EACR,eAAe,EACf,qBAAqB,EACrB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,SAAS,GACZ,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EACH,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,eAAe,GAClB,MAAM,aAAa,CAAC;AAGrB,OAAO,EACH,cAAc,EACd,qBAAqB,EACrB,KAAK,iBAAiB,GACzB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EACH,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACnB,oBAAoB,EACpB,KAAK,kBAAkB,GAC1B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,YAAY,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -15,14 +15,15 @@ export * from './schema/types.js';
|
|
|
15
15
|
// Index exports
|
|
16
16
|
export { SearchIndex } from './indexes/search-index.js';
|
|
17
17
|
// Query exports
|
|
18
|
-
export { VectorQuery } from './query/vector.js';
|
|
19
|
-
export { VectorRangeQuery } from './query/range.js';
|
|
20
|
-
export { FilterQuery } from './query/filter-query.js';
|
|
21
|
-
export { CountQuery } from './query/count.js';
|
|
22
|
-
export { TextQuery } from './query/text.js';
|
|
18
|
+
export { VectorQuery } from './query/search/vector.js';
|
|
19
|
+
export { VectorRangeQuery } from './query/search/range.js';
|
|
20
|
+
export { FilterQuery } from './query/search/filter-query.js';
|
|
21
|
+
export { CountQuery } from './query/search/count.js';
|
|
22
|
+
export { TextQuery } from './query/search/text.js';
|
|
23
23
|
export { HybridQuery } from './query/hybrid.js';
|
|
24
|
-
export { AggregationQuery, Reducers } from './query/aggregation.js';
|
|
24
|
+
export { AggregationQuery, Reducers } from './query/aggregate/aggregation.js';
|
|
25
25
|
export { Tag, Num, Text, Geo, GeoRadius, Timestamp, FilterExpression } from './query/filter.js';
|
|
26
|
+
export { BaseQuery, BaseVectorQuery } from './query/search/base.js';
|
|
26
27
|
// Error exports
|
|
27
28
|
export { RedisVLError, RedisSearchError, SchemaValidationError, QueryValidationError, RedisModuleVersionError, VectorizerError, } from './errors.js';
|
|
28
29
|
// Vectorizer exports
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,UAAU;AACV,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAE/B,iBAAiB;AACjB,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACH,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,WAAW,EAAE,+CAA+C;AAC5D,eAAe,EAAE,iCAAiC;AAClD,eAAe,EAAE,iCAAiC;AAClD,YAAY,GACf,MAAM,oBAAoB,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAElC,gBAAgB;AAChB,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,gBAAgB;AAChB,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,UAAU;AACV,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAE/B,iBAAiB;AACjB,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EACH,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,WAAW,EAAE,+CAA+C;AAC5D,eAAe,EAAE,iCAAiC;AAClD,eAAe,EAAE,iCAAiC;AAClD,YAAY,GACf,MAAM,oBAAoB,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAElC,gBAAgB;AAChB,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,gBAAgB;AAChB,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAOhD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAO9E,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEhG,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAcpE,gBAAgB;AAChB,OAAO,EACH,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,eAAe,GAClB,MAAM,aAAa,CAAC;AAErB,qBAAqB;AACrB,OAAO,EACH,cAAc,EACd,qBAAqB,GAExB,MAAM,wBAAwB,CAAC;AAEhC,kBAAkB;AAClB,OAAO,EACH,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACnB,oBAAoB,GAEvB,MAAM,qBAAqB,CAAC;AAE7B,yEAAyE;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC"}
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import type { AnyRedisClient } from '../redis/client-types.js';
|
|
6
6
|
import { IndexSchema } from '../schema/schema.js';
|
|
7
|
-
import type { BaseQuery, SearchResult, QueryOptions, HybridSearchResult } from '../query/base.js';
|
|
7
|
+
import type { BaseQuery, SearchResult, QueryOptions, HybridSearchResult } from '../query/search/base.js';
|
|
8
8
|
import { HybridQuery } from '../query/hybrid.js';
|
|
9
|
-
import type { AggregationQuery } from '../query/aggregation.js';
|
|
9
|
+
import type { AggregationQuery } from '../query/aggregate/aggregation.js';
|
|
10
10
|
/**
|
|
11
11
|
* Options for creating an index.
|
|
12
12
|
*/
|
|
@@ -184,13 +184,27 @@ export declare class SearchIndex {
|
|
|
184
184
|
* @returns True if the index exists, false otherwise
|
|
185
185
|
*/
|
|
186
186
|
exists(): Promise<boolean>;
|
|
187
|
+
/**
|
|
188
|
+
* List the names of all search indices in the Redis database.
|
|
189
|
+
*
|
|
190
|
+
* @param client - Redis client instance
|
|
191
|
+
* @returns Names of every search index in the database
|
|
192
|
+
*
|
|
193
|
+
* @example
|
|
194
|
+
* ```typescript
|
|
195
|
+
* const names = await SearchIndex.listAll(client);
|
|
196
|
+
* // Next, you can load one of the existing index:
|
|
197
|
+
* const index = await SearchIndex.fromExisting(names[0], client);
|
|
198
|
+
* ```
|
|
199
|
+
*/
|
|
200
|
+
static listAll(client: AnyRedisClient): Promise<string[]>;
|
|
187
201
|
/**
|
|
188
202
|
* Delete the index from Redis.
|
|
189
203
|
*
|
|
190
204
|
* @param options - Deletion options
|
|
191
205
|
* @returns The result from Redis FT.DROPINDEX command
|
|
192
206
|
*/
|
|
193
|
-
delete(options?: DeleteIndexOptions): Promise<
|
|
207
|
+
delete(options?: DeleteIndexOptions): Promise<number>;
|
|
194
208
|
/**
|
|
195
209
|
* Get information about the index.
|
|
196
210
|
*
|
|
@@ -245,6 +259,15 @@ export declare class SearchIndex {
|
|
|
245
259
|
index_capacity: number;
|
|
246
260
|
index_total: number;
|
|
247
261
|
};
|
|
262
|
+
dialect_stats?: {
|
|
263
|
+
[x: string]: number;
|
|
264
|
+
} | undefined;
|
|
265
|
+
'Index Errors'?: {
|
|
266
|
+
'indexing failures': number;
|
|
267
|
+
'last indexing error': string;
|
|
268
|
+
'last indexing error key': string;
|
|
269
|
+
'background indexing status': string;
|
|
270
|
+
} | undefined;
|
|
248
271
|
stopwords_list?: string[] | null[] | undefined;
|
|
249
272
|
}>;
|
|
250
273
|
/**
|
|
@@ -266,6 +289,7 @@ export declare class SearchIndex {
|
|
|
266
289
|
* @throws {Error} If keys length doesn't match data length
|
|
267
290
|
* @throws {Error} If idField is not found in a document
|
|
268
291
|
* @throws {SchemaValidationError} If validation fails when validateOnLoad is enabled
|
|
292
|
+
* @throws {SchemaValidationError} If a vector field holds a Buffer on a JSON index
|
|
269
293
|
* @throws {RedisVLError} If there's an error loading data to Redis
|
|
270
294
|
*
|
|
271
295
|
* @example
|
|
@@ -329,7 +353,9 @@ export declare class SearchIndex {
|
|
|
329
353
|
* Execute a search query against the index
|
|
330
354
|
*
|
|
331
355
|
* @param query - Query object (VectorQuery, FilterQuery, etc.)
|
|
332
|
-
* @param options - Optional query execution options
|
|
356
|
+
* @param options - Optional query execution options. If both query-level
|
|
357
|
+
* `query.sortBy(...)` and `options.sortBy` are supplied, `options.sortBy`
|
|
358
|
+
* takes precedence.
|
|
333
359
|
* @returns Search results with documents and scores
|
|
334
360
|
*
|
|
335
361
|
* @example
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-index.d.ts","sourceRoot":"","sources":["../../src/indexes/search-index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"search-index.d.ts","sourceRoot":"","sources":["../../src/indexes/search-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,12 @@
|
|
|
2
2
|
* @module Search Index
|
|
3
3
|
* Main search index class for managing Redis search indexes.
|
|
4
4
|
*/
|
|
5
|
-
import { assertSupportedProtocol } from '../redis/protocol.js';
|
|
6
5
|
import { IndexSchema } from '../schema/schema.js';
|
|
7
6
|
import { buildRedisVLSchemaFromRedisIndexInfo } from '../redis/index-info-parser.js';
|
|
8
7
|
import { HashStorage, JsonStorage } from '../storage/index.js';
|
|
9
8
|
import { RedisVLError, SchemaValidationError } from '../errors.js';
|
|
10
|
-
import { VectorQuery } from '../query/vector.js';
|
|
11
|
-
import { VectorRangeQuery } from '../query/range.js';
|
|
9
|
+
import { VectorQuery } from '../query/search/vector.js';
|
|
10
|
+
import { VectorRangeQuery } from '../query/search/range.js';
|
|
12
11
|
import { DISTANCE_NORMALIZERS } from '../utils/distance.js';
|
|
13
12
|
/**
|
|
14
13
|
* SearchIndex class for managing Redis vector search indices.
|
|
@@ -67,10 +66,9 @@ export class SearchIndex {
|
|
|
67
66
|
if (!client) {
|
|
68
67
|
throw new RedisVLError('Must provide a valid Redis client');
|
|
69
68
|
}
|
|
70
|
-
assertSupportedProtocol(client);
|
|
71
69
|
this.schema = schema;
|
|
72
|
-
// Narrow the publicly-accepted wide client surface to the
|
|
73
|
-
//
|
|
70
|
+
// Narrow the publicly-accepted wide client surface to the shape
|
|
71
|
+
// this library is implemented against. See client-types.ts.
|
|
74
72
|
this.client = client;
|
|
75
73
|
this.validateOnLoad = validateOnLoad;
|
|
76
74
|
// Initialize appropriate storage based on storage type
|
|
@@ -99,7 +97,6 @@ export class SearchIndex {
|
|
|
99
97
|
* ```
|
|
100
98
|
*/
|
|
101
99
|
static async fromExisting(name, client, validateOnLoad = false) {
|
|
102
|
-
assertSupportedProtocol(client);
|
|
103
100
|
const ftClient = client;
|
|
104
101
|
let info;
|
|
105
102
|
try {
|
|
@@ -217,6 +214,28 @@ export class SearchIndex {
|
|
|
217
214
|
return false;
|
|
218
215
|
}
|
|
219
216
|
}
|
|
217
|
+
/**
|
|
218
|
+
* List the names of all search indices in the Redis database.
|
|
219
|
+
*
|
|
220
|
+
* @param client - Redis client instance
|
|
221
|
+
* @returns Names of every search index in the database
|
|
222
|
+
*
|
|
223
|
+
* @example
|
|
224
|
+
* ```typescript
|
|
225
|
+
* const names = await SearchIndex.listAll(client);
|
|
226
|
+
* // Next, you can load one of the existing index:
|
|
227
|
+
* const index = await SearchIndex.fromExisting(names[0], client);
|
|
228
|
+
* ```
|
|
229
|
+
*/
|
|
230
|
+
static async listAll(client) {
|
|
231
|
+
const ftClient = client;
|
|
232
|
+
try {
|
|
233
|
+
return await ftClient.ft._list();
|
|
234
|
+
}
|
|
235
|
+
catch (error) {
|
|
236
|
+
throw new RedisVLError(`Failed to list indices: ${error instanceof Error ? error.message : String(error)}`, { cause: error instanceof Error ? error : undefined });
|
|
237
|
+
}
|
|
238
|
+
}
|
|
220
239
|
/**
|
|
221
240
|
* Delete the index from Redis.
|
|
222
241
|
*
|
|
@@ -261,6 +280,7 @@ export class SearchIndex {
|
|
|
261
280
|
* @throws {Error} If keys length doesn't match data length
|
|
262
281
|
* @throws {Error} If idField is not found in a document
|
|
263
282
|
* @throws {SchemaValidationError} If validation fails when validateOnLoad is enabled
|
|
283
|
+
* @throws {SchemaValidationError} If a vector field holds a Buffer on a JSON index
|
|
264
284
|
* @throws {RedisVLError} If there's an error loading data to Redis
|
|
265
285
|
*
|
|
266
286
|
* @example
|
|
@@ -383,7 +403,9 @@ export class SearchIndex {
|
|
|
383
403
|
* Execute a search query against the index
|
|
384
404
|
*
|
|
385
405
|
* @param query - Query object (VectorQuery, FilterQuery, etc.)
|
|
386
|
-
* @param options - Optional query execution options
|
|
406
|
+
* @param options - Optional query execution options. If both query-level
|
|
407
|
+
* `query.sortBy(...)` and `options.sortBy` are supplied, `options.sortBy`
|
|
408
|
+
* takes precedence.
|
|
387
409
|
* @returns Search results with documents and scores
|
|
388
410
|
*
|
|
389
411
|
* @example
|
|
@@ -450,15 +472,20 @@ export class SearchIndex {
|
|
|
450
472
|
const limit = query.limit ?? 10;
|
|
451
473
|
searchOptions.LIMIT = { from: offset, size: limit };
|
|
452
474
|
}
|
|
453
|
-
// Add sorting if specified
|
|
475
|
+
// Add sorting if specified on the query.
|
|
476
|
+
const [sortField] = query.sortFields;
|
|
477
|
+
if (sortField) {
|
|
478
|
+
searchOptions.SORTBY = {
|
|
479
|
+
BY: sortField.field,
|
|
480
|
+
DIRECTION: sortField.direction,
|
|
481
|
+
};
|
|
482
|
+
}
|
|
483
|
+
// Execution options override query-level sorting.
|
|
454
484
|
if (options?.sortBy) {
|
|
455
|
-
searchOptions.SORTBY =
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
DIRECTION: options.sortOrder,
|
|
460
|
-
};
|
|
461
|
-
}
|
|
485
|
+
searchOptions.SORTBY = {
|
|
486
|
+
BY: options.sortBy,
|
|
487
|
+
...(options.sortOrder ? { DIRECTION: options.sortOrder } : {}),
|
|
488
|
+
};
|
|
462
489
|
}
|
|
463
490
|
// CountQuery (and any other consumer) can opt into NOCONTENT to
|
|
464
491
|
// skip payload retrieval — Redis only returns the total + ids.
|
|
@@ -490,6 +517,7 @@ export class SearchIndex {
|
|
|
490
517
|
return {
|
|
491
518
|
total: response.total,
|
|
492
519
|
documents,
|
|
520
|
+
warnings: response.warnings,
|
|
493
521
|
};
|
|
494
522
|
}
|
|
495
523
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-index.js","sourceRoot":"","sources":["../../src/indexes/search-index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"search-index.js","sourceRoot":"","sources":["../../src/indexes/search-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
* @see https://redis.io/docs/latest/commands/ft.aggregate/
|
|
10
10
|
*/
|
|
11
11
|
import type { FtAggregateOptions } from '@redis/search/dist/lib/commands/AGGREGATE.js';
|
|
12
|
-
import { type FilterInput } from '
|
|
12
|
+
import { type FilterInput } from '../search/base.js';
|
|
13
13
|
/** Output of {@link AggregationQuery.toCommand}. */
|
|
14
14
|
export interface AggregateCommand {
|
|
15
15
|
/** The query string (filter) — the second argument to `ft.aggregate`. */
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregation.d.ts","sourceRoot":"","sources":["../../../src/query/aggregate/aggregation.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
*
|
|
9
9
|
* @see https://redis.io/docs/latest/commands/ft.aggregate/
|
|
10
10
|
*/
|
|
11
|
-
import { QueryValidationError } from '
|
|
12
|
-
import { renderFilter } from '
|
|
11
|
+
import { QueryValidationError } from '../../errors.js';
|
|
12
|
+
import { renderFilter } from '../search/base.js';
|
|
13
13
|
/**
|
|
14
14
|
* Factory namespace mirroring Python `redis.commands.search.reducers`.
|
|
15
15
|
*
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregation.js","sourceRoot":"","sources":["../../../src/query/aggregate/aggregation.ts"],"names":[],"mappings":"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"}
|
package/dist/query/hybrid.d.ts
CHANGED
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
* release. Pin your `@redis/search` version if stability matters.
|
|
15
15
|
*/
|
|
16
16
|
import type { FtHybridOptions } from '@redis/search/dist/lib/commands/HYBRID.js';
|
|
17
|
-
import { VectorDataType } from '../schema/types.js';
|
|
18
|
-
import { type FilterInput } from './base.js';
|
|
19
|
-
import type { TextScorer } from './text.js';
|
|
17
|
+
import { VectorDataType, VectorInput } from '../schema/types.js';
|
|
18
|
+
import { type FilterInput } from './search/base.js';
|
|
19
|
+
import type { TextScorer } from './search/text.js';
|
|
20
20
|
/**
|
|
21
21
|
* Vector retrieval method used by FT.HYBRID's VSIM clause.
|
|
22
22
|
*
|
|
@@ -65,8 +65,11 @@ export interface HybridQueryConfig {
|
|
|
65
65
|
text: string;
|
|
66
66
|
/** Indexed text field name. When supplied, triggers tokenization. */
|
|
67
67
|
textFieldName?: string;
|
|
68
|
-
/**
|
|
69
|
-
|
|
68
|
+
/**
|
|
69
|
+
* Query vector: a number array, or a Buffer already encoded in the
|
|
70
|
+
* vector datatype (sent to Redis as-is).
|
|
71
|
+
*/
|
|
72
|
+
vector: VectorInput;
|
|
70
73
|
/** Indexed vector field name. */
|
|
71
74
|
vectorField: string;
|
|
72
75
|
/**
|
|
@@ -109,9 +112,14 @@ export interface HybridQueryConfig {
|
|
|
109
112
|
combinedScoreAlias?: string;
|
|
110
113
|
/** Fields to load into the result payload (FT.HYBRID `LOAD`). */
|
|
111
114
|
returnFields?: string[];
|
|
112
|
-
/**
|
|
115
|
+
/**
|
|
116
|
+
* Number of results to return. Default for `limit` (the FT.HYBRID
|
|
117
|
+
* `LIMIT` count). Defaults to 10.
|
|
118
|
+
*/
|
|
113
119
|
numResults?: number;
|
|
114
|
-
/**
|
|
120
|
+
/** FT.HYBRID `LIMIT` count. Takes priority over `numResults`. */
|
|
121
|
+
limit?: number;
|
|
122
|
+
/** FT.HYBRID `LIMIT` offset. */
|
|
115
123
|
offset?: number;
|
|
116
124
|
/** Sort specification (FT.HYBRID `SORTBY`). */
|
|
117
125
|
sortBy?: Array<{
|
|
@@ -155,7 +163,7 @@ export interface HybridCommand {
|
|
|
155
163
|
export declare class HybridQuery {
|
|
156
164
|
readonly text: string;
|
|
157
165
|
readonly textFieldName?: string;
|
|
158
|
-
readonly vector:
|
|
166
|
+
readonly vector: VectorInput;
|
|
159
167
|
readonly vectorField: string;
|
|
160
168
|
readonly vectorMethod: {
|
|
161
169
|
type: 'KNN';
|
|
@@ -175,6 +183,7 @@ export declare class HybridQuery {
|
|
|
175
183
|
readonly combinedScoreAlias: string;
|
|
176
184
|
readonly returnFields?: string[];
|
|
177
185
|
readonly numResults: number;
|
|
186
|
+
readonly limit: number;
|
|
178
187
|
readonly offset: number;
|
|
179
188
|
readonly sortBy?: Array<{
|
|
180
189
|
field: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hybrid.d.ts","sourceRoot":"","sources":["../../src/query/hybrid.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"hybrid.d.ts","sourceRoot":"","sources":["../../src/query/hybrid.ts"],"names":[],"mappings":"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"}
|
package/dist/query/hybrid.js
CHANGED
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
* release. Pin your `@redis/search` version if stability matters.
|
|
15
15
|
*/
|
|
16
16
|
import { QueryValidationError, SchemaValidationError } from '../errors.js';
|
|
17
|
-
import {
|
|
17
|
+
import { encodeVectorInput, normalizeVectorDataType, validateWholeVectorElements, } from '../redis/utils.js';
|
|
18
18
|
import { TokenEscaper } from '../utils/token-escaper.js';
|
|
19
|
-
import { renderFilter } from './base.js';
|
|
19
|
+
import { renderFilter } from './search/base.js';
|
|
20
20
|
const escaper = new TokenEscaper();
|
|
21
21
|
const DEFAULT_COMBINE = { type: 'RRF' };
|
|
22
22
|
/** Default parameter name for the encoded query vector. */
|
|
@@ -28,16 +28,17 @@ const VECTOR_PARAM_NAME = 'vector';
|
|
|
28
28
|
* doesn't belong in a LOAD/SORTBY slot or a typo of `@name`/`$.name`.
|
|
29
29
|
*/
|
|
30
30
|
function prefixFieldRef(name) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
31
|
+
const field = name.trim();
|
|
32
|
+
if (field.startsWith('@'))
|
|
33
|
+
return field;
|
|
34
|
+
if (field.startsWith('$')) {
|
|
35
|
+
if (!field.startsWith('$.')) {
|
|
36
|
+
throw new QueryValidationError(`Field reference '${field}' looks like a parameter ref or typo; ` +
|
|
37
|
+
`use '@${field.slice(1)}' for an index field or '$.${field.slice(1)}' for a JSONPath`);
|
|
37
38
|
}
|
|
38
|
-
return
|
|
39
|
+
return field;
|
|
39
40
|
}
|
|
40
|
-
return `@${
|
|
41
|
+
return `@${field}`;
|
|
41
42
|
}
|
|
42
43
|
function assertNonEmptyString(value, label) {
|
|
43
44
|
if (value !== undefined && (typeof value !== 'string' || value.trim() === '')) {
|
|
@@ -122,6 +123,7 @@ export class HybridQuery {
|
|
|
122
123
|
combinedScoreAlias;
|
|
123
124
|
returnFields;
|
|
124
125
|
numResults;
|
|
126
|
+
limit;
|
|
125
127
|
offset;
|
|
126
128
|
sortBy;
|
|
127
129
|
noSort;
|
|
@@ -162,6 +164,7 @@ export class HybridQuery {
|
|
|
162
164
|
assertPositiveInteger(config.combine.window, 'combine.window');
|
|
163
165
|
}
|
|
164
166
|
assertPositiveInteger(config.numResults ?? 10, 'numResults');
|
|
167
|
+
assertNonNegativeInteger(config.limit ?? 0, 'limit');
|
|
165
168
|
assertNonNegativeInteger(config.offset ?? 0, 'offset');
|
|
166
169
|
assertPositiveInteger(config.timeout, 'timeout');
|
|
167
170
|
const returnFields = validateFields(config.returnFields, 'returnFields');
|
|
@@ -180,6 +183,9 @@ export class HybridQuery {
|
|
|
180
183
|
}
|
|
181
184
|
try {
|
|
182
185
|
this.datatype = normalizeVectorDataType(config.datatype);
|
|
186
|
+
if (Buffer.isBuffer(config.vector)) {
|
|
187
|
+
validateWholeVectorElements(config.vector, this.datatype);
|
|
188
|
+
}
|
|
183
189
|
}
|
|
184
190
|
catch (error) {
|
|
185
191
|
if (error instanceof SchemaValidationError) {
|
|
@@ -189,7 +195,9 @@ export class HybridQuery {
|
|
|
189
195
|
}
|
|
190
196
|
this.text = config.text;
|
|
191
197
|
this.textFieldName = config.textFieldName;
|
|
192
|
-
this.vector =
|
|
198
|
+
this.vector = Buffer.isBuffer(config.vector)
|
|
199
|
+
? Buffer.from(config.vector)
|
|
200
|
+
: [...config.vector];
|
|
193
201
|
this.vectorField = config.vectorField;
|
|
194
202
|
this.vectorMethod =
|
|
195
203
|
method.type === 'KNN'
|
|
@@ -204,6 +212,7 @@ export class HybridQuery {
|
|
|
204
212
|
this.combinedScoreAlias = config.combinedScoreAlias ?? 'hybrid_score';
|
|
205
213
|
this.returnFields = returnFields;
|
|
206
214
|
this.numResults = config.numResults ?? 10;
|
|
215
|
+
this.limit = config.limit ?? this.numResults;
|
|
207
216
|
this.offset = config.offset ?? 0;
|
|
208
217
|
this.sortBy = sortBy;
|
|
209
218
|
this.noSort = config.noSort;
|
|
@@ -217,8 +226,8 @@ export class HybridQuery {
|
|
|
217
226
|
const options = {
|
|
218
227
|
SEARCH: this.buildSearchClause(),
|
|
219
228
|
VSIM: this.buildVsimClause(),
|
|
220
|
-
PARAMS: { [VECTOR_PARAM_NAME]:
|
|
221
|
-
LIMIT: { offset: this.offset, count: this.
|
|
229
|
+
PARAMS: { [VECTOR_PARAM_NAME]: encodeVectorInput(this.vector, this.datatype) },
|
|
230
|
+
LIMIT: { offset: this.offset, count: this.limit },
|
|
222
231
|
};
|
|
223
232
|
// Always yield a known combined score alias so result mapping is stable
|
|
224
233
|
// even when callers rely on Redis' default fusion behavior.
|