Merge branch 'main' of https://github.com/weaviate/typescript-client into 1.29/colbert-multivector-support

Author: tsmith023

.github/workflows/main.yaml

@@ -13,7 +13,7 @@ env:
   WEAVIATE_127: 1.27.15
   WEAVIATE_128: 1.28.11
   WEAVIATE_129: 1.29.1
-  WEAVIATE_130: 1.30.0-rc.0-6b9a01c
+  WEAVIATE_130: 1.30.1
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "weaviate-client",
-  "version": "3.6.0-alpha.0",
+  "version": "3.5.5",
   "description": "JS/TS client for Weaviate",
   "main": "dist/node/cjs/index.js",
   "type": "module",

package.json

@@ -25,6 +25,7 @@ export type GenerativeAnthropicConfig = {
 };
 
 export type GenerativeAnyscaleConfig = {
+  baseURL?: string;
   model?: string;
   temperature?: number;
 };
@@ -54,6 +55,7 @@ export type GenerativeFriendliAIConfig = {
 };
 
 export type GenerativeMistralConfig = {
+  baseURL?: string;
   maxTokens?: number;
   model?: string;
   temperature?: number;

src/collections/config/types/generative.ts

@@ -5,6 +5,7 @@ export type RerankerCohereConfig = {
 };
 
 export type RerankerVoyageAIConfig = {
+  baseURL?: string;
   model?: 'rerank-lite-1' | string;
 };
 
@@ -18,9 +19,15 @@ export type RerankerJinaAIConfig = {
     | string;
 };
 
+export type RerankerNvidiaConfig = {
+  baseURL?: string;
+  model?: 'nvidia/rerank-qa-mistral-4b' | string;
+};
+
 export type RerankerConfig =
   | RerankerCohereConfig
   | RerankerJinaAIConfig
+  | RerankerNvidiaConfig
   | RerankerTransformersConfig
   | RerankerVoyageAIConfig
   | Record<string, any>
@@ -29,6 +36,7 @@ export type RerankerConfig =
 export type Reranker =
   | 'reranker-cohere'
   | 'reranker-jinaai'
+  | 'reranker-nvidia'
   | 'reranker-transformers'
   | 'reranker-voyageai'
   | 'none'
@@ -38,6 +46,8 @@ export type RerankerConfigType<R> = R extends 'reranker-cohere'
   ? RerankerCohereConfig
   : R extends 'reranker-jinaai'
   ? RerankerJinaAIConfig
+  : R extends 'reranker-nvidia'
+  ? RerankerNvidiaConfig
   : R extends 'reranker-transformers'
   ? RerankerTransformersConfig
   : R extends 'reranker-voyageai'

src/collections/config/types/reranker.ts

@@ -390,6 +390,8 @@ export type Text2VecNvidiaConfig = {
  * See the [documentation](https://weaviate.io/developers/weaviate/model-providers/mistral/embeddings) for detailed usage.
  */
 export type Text2VecMistralConfig = {
+  /** The base URL to use where API requests should go. */
+  baseURL?: string;
   /** The model to use. */
   model?: 'mistral-embed' | string;
   /** Whether to vectorize the collection name. */

src/collections/config/types/vectorizer.ts

@@ -2,6 +2,7 @@ import {
   ModuleConfig,
   RerankerCohereConfig,
   RerankerJinaAIConfig,
+  RerankerNvidiaConfig,
   RerankerVoyageAIConfig,
 } from '../config/types/index.js';
 
@@ -38,6 +39,22 @@ export default {
       config: config,
     };
   },
+  /**
+   * Create a `ModuleConfig<'reranker-nvidia', RerankerNvidiaConfig>` object for use when reranking using the `reranker-nvidia` module.
+   *
+   * See the [documentation](https://weaviate.io/developers/weaviate/model-providers/nvidia/reranker) for detailed usage.
+   *
+   * @param {RerankerNvidiaConfig} [config] The configuration for the `reranker-nvidia` module.
+   * @returns {ModuleConfig<'reranker-nvidia', RerankerNvidiaConfig | undefined>} The configuration object.
+   */
+  nvidia: (
+    config?: RerankerNvidiaConfig
+  ): ModuleConfig<'reranker-nvidia', RerankerNvidiaConfig | undefined> => {
+    return {
+      name: 'reranker-nvidia',
+      config: config,
+    };
+  },
   /**
    * Create a `ModuleConfig<'reranker-transformers', Record<string, never>>` object for use when reranking using the `reranker-transformers` module.
    *

src/collections/configure/reranker.ts

@@ -12,6 +12,11 @@ import {
   GenerativeOpenAIConfig,
   GenerativeXAIConfig,
   ModuleConfig,
+  RerankerCohereConfig,
+  RerankerJinaAIConfig,
+  RerankerNvidiaConfig,
+  RerankerTransformersConfig,
+  RerankerVoyageAIConfig,
   VectorConfigCreate,
 } from '../types/index.js';
 import { configure } from './index.js';
@@ -1240,6 +1245,7 @@ describe('Unit testing of the vectorizer factory class', () => {
 
   it('should create the correct Text2VecMistralConfig type with all values', () => {
     const config = configure.vectorizer.text2VecMistral({
+      baseURL: 'base-url',
       name: 'test',
       model: 'model',
       vectorizeCollectionName: true,
@@ -1253,6 +1259,7 @@ describe('Unit testing of the vectorizer factory class', () => {
       vectorizer: {
         name: 'text2vec-mistral',
         config: {
+          baseURL: 'base-url',
           model: 'model',
           vectorizeCollectionName: true,
         },
@@ -1587,12 +1594,14 @@ describe('Unit testing of the generative factory class', () => {
 
   it('should create the correct GenerativeAnyscaleConfig type with all values', () => {
     const config = configure.generative.anyscale({
+      baseURL: 'base-url',
       model: 'model',
       temperature: 0.5,
     });
     expect(config).toEqual<ModuleConfig<'generative-anyscale', GenerativeAnyscaleConfig | undefined>>({
       name: 'generative-anyscale',
       config: {
+        baseURL: 'base-url',
         model: 'model',
         temperature: 0.5,
       },
@@ -1769,13 +1778,15 @@ describe('Unit testing of the generative factory class', () => {
 
   it('should create the correct GenerativeMistralConfig type with all values', () => {
     const config = configure.generative.mistral({
+      baseURL: 'base-url',
       maxTokens: 100,
       model: 'model',
       temperature: 0.5,
     });
     expect(config).toEqual<ModuleConfig<'generative-mistral', GenerativeMistralConfig | undefined>>({
       name: 'generative-mistral',
       config: {
+        baseURL: 'base-url',
         maxTokens: 100,
         model: 'model',
         temperature: 0.5,
@@ -1929,3 +1940,97 @@ describe('Unit testing of the generative factory class', () => {
     });
   });
 });
+
+describe('Unit testing of the reranker factory class', () => {
+  it('should create the correct RerankerCohereConfig type using required & default values', () => {
+    const config = configure.reranker.cohere();
+    expect(config).toEqual<ModuleConfig<'reranker-cohere', RerankerCohereConfig | undefined>>({
+      name: 'reranker-cohere',
+      config: undefined,
+    });
+  });
+
+  it('should create the correct RerankerCohereConfig type with all values', () => {
+    const config = configure.reranker.cohere({
+      model: 'model',
+    });
+    expect(config).toEqual<ModuleConfig<'reranker-cohere', RerankerCohereConfig | undefined>>({
+      name: 'reranker-cohere',
+      config: {
+        model: 'model',
+      },
+    });
+  });
+
+  it('should create the correct RerankerJinaAIConfig type using required & default values', () => {
+    const config = configure.reranker.jinaai();
+    expect(config).toEqual<ModuleConfig<'reranker-jinaai', RerankerJinaAIConfig | undefined>>({
+      name: 'reranker-jinaai',
+      config: undefined,
+    });
+  });
+
+  it('should create the correct RerankerJinaAIConfig type with all values', () => {
+    const config = configure.reranker.jinaai({
+      model: 'model',
+    });
+    expect(config).toEqual<ModuleConfig<'reranker-jinaai', RerankerJinaAIConfig | undefined>>({
+      name: 'reranker-jinaai',
+      config: {
+        model: 'model',
+      },
+    });
+  });
+
+  it('should create the correct RerankerNvidiaConfig type with required & default values', () => {
+    const config = configure.reranker.nvidia();
+    expect(config).toEqual<ModuleConfig<'reranker-nvidia', RerankerNvidiaConfig | undefined>>({
+      name: 'reranker-nvidia',
+      config: undefined,
+    });
+  });
+
+  it('should create the correct RerankerNvidiaConfig type with all values', () => {
+    const config = configure.reranker.nvidia({
+      baseURL: 'base-url',
+      model: 'model',
+    });
+    expect(config).toEqual<ModuleConfig<'reranker-nvidia', RerankerNvidiaConfig | undefined>>({
+      name: 'reranker-nvidia',
+      config: {
+        baseURL: 'base-url',
+        model: 'model',
+      },
+    });
+  });
+
+  it('should create the correct RerankerTransformersConfig type using required & default values', () => {
+    const config = configure.reranker.transformers();
+    expect(config).toEqual<ModuleConfig<'reranker-transformers', RerankerTransformersConfig>>({
+      name: 'reranker-transformers',
+      config: {},
+    });
+  });
+
+  it('should create the correct RerankerVoyageAIConfig with required & default values', () => {
+    const config = configure.reranker.voyageAI();
+    expect(config).toEqual<ModuleConfig<'reranker-voyageai', RerankerVoyageAIConfig | undefined>>({
+      name: 'reranker-voyageai',
+      config: undefined,
+    });
+  });
+
+  it('should create the correct RerankerVoyageAIConfig type with all values', () => {
+    const config = configure.reranker.voyageAI({
+      baseURL: 'base-url',
+      model: 'model',
+    });
+    expect(config).toEqual<ModuleConfig<'reranker-voyageai', RerankerVoyageAIConfig | undefined>>({
+      name: 'reranker-voyageai',
+      config: {
+        baseURL: 'base-url',
+        model: 'model',
+      },
+    });
+  });
+});

src/collections/configure/unit.test.ts

@@ -143,7 +143,7 @@ export interface BaseRefProperty<T> {
   /** The metadata to return for the referenced objects. */
   returnMetadata?: QueryMetadata;
   /** The properties to return for the referenced objects. */
-  returnProperties?: QueryProperty<T>[];
+  returnProperties?: QueryProperty<ExtractCrossReferenceType<T[this['linkOn']]>>[];
   /** The references to return for the referenced objects. */
   returnReferences?: QueryReference<ExtractCrossReferenceType<T[this['linkOn']]>>[];
   /** The collection to target when traversing the references. Required for multi-target references. */

src/collections/types/query.ts

@@ -5,7 +5,15 @@ import { InternalConnectionParams } from './http.js';
 
 import { ConsistencyLevel } from '../data/index.js';
 
-import { ChannelCredentials, ChannelOptions, createChannel, createClientFactory, Metadata } from 'nice-grpc';
+import {
+  ChannelCredentials,
+  ChannelOptions,
+  ClientError,
+  createChannel,
+  createClientFactory,
+  Metadata,
+  Status,
+} from 'nice-grpc';
 import { retryMiddleware } from 'nice-grpc-client-middleware-retry';
 
 import { HealthCheckResponse_ServingStatus, HealthDefinition } from '../proto/google/health/v1/health.js';
@@ -204,7 +212,18 @@ export const grpcClient = (config: GrpcConnectionParams & { grpcMaxMessageLength
       const controller = new AbortController();
       const timeoutId = setTimeout(() => controller.abort(), (config.timeout?.init || 2) * 1000);
       return health
-        .check({ service: '/grpc.health.v1.Health/Check' }, { signal: controller.signal })
+        .check(
+          { service: '/grpc.health.v1.Health/Check' },
+          {
+            signal: controller.signal,
+            retry: true,
+            retryMaxAttempts: 1,
+            retryableStatuses: [Status.UNAVAILABLE],
+            onRetryableError(error: ClientError, attempt: number, delayMs: number) {
+              console.warn(error, `Healthcheck ${attempt} failed. Retrying in ${delayMs}ms.`);
+            },
+          }
+        )
         .then((res) => res.status === HealthCheckResponse_ServingStatus.SERVING)
         .catch((err) => {
           if (isAbortError(err)) {