Skip to content

Commit 9793d9c

Browse files
committed
Merge branch 'dev/1.26' of https://github.com/weaviate/typescript-client into dev/support-multi-vector-search
2 parents 94bea82 + ed69dac commit 9793d9c

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
WEAVIATE_124: 1.24.19
1111
WEAVIATE_125: 1.25.5
12-
WEAVIATE_126: preview--13e65f1
12+
WEAVIATE_126: preview--4e2eb3a
1313

1414
jobs:
1515
checks:

src/collections/aggregate/integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ describe('Testing of the collection.aggregate methods', () => {
145145
it('should aggregate grouped by data with a near text search and no property metrics', async () => {
146146
const result = await collection.aggregate.groupBy.nearText('test', {
147147
groupBy: 'text',
148-
certainty: 0.1,
148+
certainty: 0.01,
149149
});
150150
expect(result.length).toEqual(1);
151151
expect(result[0].totalCount).toEqual(100);

src/collections/config/integration.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('Testing of the collection.config namespace', () => {
5353
expect(config.vectorizers.default.indexConfig).toEqual<VectorIndexConfigHNSW>({
5454
skip: false,
5555
cleanupIntervalSeconds: 300,
56-
maxConnections: 64,
56+
maxConnections: (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 26, 0))) ? 64 : 32,
5757
efConstruction: 128,
5858
ef: -1,
5959
dynamicEfMin: 100,
@@ -106,7 +106,7 @@ describe('Testing of the collection.config namespace', () => {
106106
expect(config.vectorizers.default.indexConfig).toEqual<VectorIndexConfigHNSW>({
107107
skip: false,
108108
cleanupIntervalSeconds: 300,
109-
maxConnections: 64,
109+
maxConnections: (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 26, 0))) ? 64 : 32,
110110
efConstruction: 128,
111111
ef: -1,
112112
dynamicEfMin: 100,
@@ -475,7 +475,7 @@ describe('Testing of the collection.config namespace', () => {
475475
expect(config.vectorizers.default.indexConfig).toEqual<VectorIndexConfigHNSW>({
476476
skip: false,
477477
cleanupIntervalSeconds: 300,
478-
maxConnections: 64,
478+
maxConnections: (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 26, 0))) ? 64 : 32,
479479
efConstruction: 128,
480480
ef: 4,
481481
dynamicEfMin: 100,

src/collections/configure/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const tokenization = {
4343
FIELD: 'field' as const,
4444
TRIGRAM: 'trigram' as const,
4545
GSE: 'gse' as const,
46+
KAGOME_KR: 'kagome_kr' as const,
4647
};
4748

4849
const vectorDistances = {

src/collections/journey.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('Journey testing of the client using a WCD cluster', () => {
5353
return client.collections
5454
.get(collectionName)
5555
.config.get()
56-
.then((config) => {
56+
.then(async (config) => {
5757
expect(config).toEqual<CollectionConfig>({
5858
name: collectionName,
5959
generative: {
@@ -172,7 +172,9 @@ describe('Journey testing of the client using a WCD cluster', () => {
172172
ef: -1,
173173
efConstruction: 128,
174174
flatSearchCutoff: 40000,
175-
maxConnections: 64,
175+
maxConnections: (await client.getWeaviateVersion().then((ver) => ver.isLowerThan(1, 26, 0)))
176+
? 64
177+
: 32,
176178
skip: false,
177179
vectorCacheMaxObjects: 1000000000000,
178180
quantizer: undefined,

src/openapi/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ export interface definitions {
518518
* @description Determines tokenization of the property as separate words or whole field. Optional. Applies to text and text[] data types. Allowed values are `word` (default; splits on any non-alphanumerical, lowercases), `lowercase` (splits on white spaces, lowercases), `whitespace` (splits on white spaces), `field` (trims). Not supported for remaining data types
519519
* @enum {string}
520520
*/
521-
tokenization?: 'word' | 'lowercase' | 'whitespace' | 'field' | 'trigram' | 'gse';
521+
tokenization?: 'word' | 'lowercase' | 'whitespace' | 'field' | 'trigram' | 'gse' | 'kagome_kr';
522522
/** @description The properties of the nested object(s). Applies to object and object[] data types. */
523523
nestedProperties?: definitions['NestedProperty'][];
524524
};

0 commit comments

Comments
 (0)