merge

Author: tsmith023

.github/workflows/main.yaml

@@ -15,6 +15,10 @@ env:
   WEAVIATE_129: 1.29.1
   WEAVIATE_130: 1.30.0-dev-9df35ca
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+  
 jobs:
   checks:
     runs-on: ubuntu-latest

src/collections/config/types/generative.ts

@@ -58,6 +58,13 @@ export type GenerativeMistralConfig = {
   temperature?: number;
 };
 
+export type GenerativeNvidiaConfig = {
+  baseURL?: string;
+  maxTokens?: number;
+  model?: string;
+  temperature?: number;
+};
+
 export type GenerativeOllamaConfig = {
   apiEndpoint?: string;
   model?: string;

src/collections/configure/generative.ts

@@ -8,6 +8,7 @@ import {
   GenerativeFriendliAIConfig,
   GenerativeGoogleConfig,
   GenerativeMistralConfig,
+  GenerativeNvidiaConfig,
   GenerativeOllamaConfig,
   GenerativeOpenAIConfig,
   GenerativePaLMConfig,
@@ -22,6 +23,7 @@ import {
   GenerativeDatabricksConfigCreate,
   GenerativeFriendliAIConfigCreate,
   GenerativeMistralConfigCreate,
+  GenerativeNvidiaConfigCreate,
   GenerativeOllamaConfigCreate,
   GenerativeOpenAIConfigCreate,
   GenerativePaLMConfigCreate,
@@ -169,6 +171,22 @@ export default {
       config,
     };
   },
+  /**
+   * Create a `ModuleConfig<'generative-nvidia', GenerativeNvidiaConfig | undefined>` object for use when performing AI generation using the `generative-mistral` module.
+   *
+   * See the [documentation](https://weaviate.io/developers/weaviate/model-providers/nvidia/generative) for detailed usage.
+   *
+   * @param {GenerativeNvidiaConfigCreate} [config] The configuration for the `generative-nvidia` module.
+   * @returns {ModuleConfig<'generative-nvidia', GenerativeNvidiaConfig | undefined>} The configuration object.
+   */
+  nvidia(
+    config?: GenerativeNvidiaConfigCreate
+  ): ModuleConfig<'generative-nvidia', GenerativeNvidiaConfig | undefined> {
+    return {
+      name: 'generative-nvidia',
+      config,
+    };
+  },
   /**
    * Create a `ModuleConfig<'generative-ollama', GenerativeOllamaConfig | undefined>` object for use when performing AI generation using the `generative-ollama` module.
    *

src/collections/configure/types/generative.ts

@@ -5,6 +5,7 @@ import {
   GenerativeDatabricksConfig,
   GenerativeFriendliAIConfig,
   GenerativeMistralConfig,
+  GenerativeNvidiaConfig,
   GenerativeOllamaConfig,
   GenerativePaLMConfig,
 } from '../../index.js';
@@ -44,6 +45,8 @@ export type GenerativeFriendliAIConfigCreate = GenerativeFriendliAIConfig;
 
 export type GenerativeMistralConfigCreate = GenerativeMistralConfig;
 
+export type GenerativeNvidiaConfigCreate = GenerativeNvidiaConfig;
+
 export type GenerativeOllamaConfigCreate = GenerativeOllamaConfig;
 
 export type GenerativeOpenAIConfigCreate = GenerativeOpenAIConfigBaseCreate & {
@@ -61,6 +64,7 @@ export type GenerativeConfigCreate =
   | GenerativeDatabricksConfigCreate
   | GenerativeFriendliAIConfigCreate
   | GenerativeMistralConfigCreate
+  | GenerativeNvidiaConfigCreate
   | GenerativeOllamaConfigCreate
   | GenerativeOpenAIConfigCreate
   | GenerativePaLMConfigCreate
@@ -81,6 +85,8 @@ export type GenerativeConfigCreateType<G> = G extends 'generative-anthropic'
   ? GenerativeFriendliAIConfigCreate
   : G extends 'generative-mistral'
   ? GenerativeMistralConfigCreate
+  : G extends 'generative-nvidia'
+  ? GenerativeNvidiaConfigCreate
   : G extends 'generative-ollama'
   ? GenerativeOllamaConfigCreate
   : G extends 'generative-openai'

src/collections/deserialize/index.ts

@@ -25,6 +25,8 @@ import {
   AggregateResult,
   AggregateText,
   AggregateType,
+  GenerativeConfigRuntime,
+  GenerativeMetadata,
   PropertiesMetrics,
 } from '../index.js';
 import { referenceFromObjects } from '../references/utils.js';
@@ -207,19 +209,43 @@ export class Deserialize {
     };
   }
 
-  public generate<T>(reply: SearchReply): GenerativeReturn<T> {
+  public generate<T, C extends GenerativeConfigRuntime | undefined>(
+    reply: SearchReply
+  ): GenerativeReturn<T, C> {
     return {
       objects: reply.results.map((result) => {
         return {
-          generated: result.metadata?.generativePresent ? result.metadata?.generative : undefined,
+          generated: result.metadata?.generativePresent
+            ? result.metadata?.generative
+            : result.generative
+            ? result.generative.values[0].result
+            : undefined,
+          generative: result.generative
+            ? {
+                text: result.generative.values[0].result,
+                debug: result.generative.values[0].debug,
+                metadata: result.generative.values[0].metadata as GenerativeMetadata<C>,
+              }
+            : undefined,
           metadata: Deserialize.metadata(result.metadata),
           properties: this.properties(result.properties),
           references: this.references(result.properties),
           uuid: Deserialize.uuid(result.metadata),
           vectors: Deserialize.vectors(result.metadata),
         } as any;
       }),
-      generated: reply.generativeGroupedResult,
+      generated:
+        reply.generativeGroupedResult !== ''
+          ? reply.generativeGroupedResult
+          : reply.generativeGroupedResults
+          ? reply.generativeGroupedResults.values[0].result
+          : undefined,
+      generative: reply.generativeGroupedResults
+        ? {
+            text: reply.generativeGroupedResults?.values[0].result,
+            metadata: reply.generativeGroupedResults?.values[0].metadata as GenerativeMetadata<C>,
+          }
+        : undefined,
     };
   }
 
@@ -252,9 +278,9 @@ export class Deserialize {
     };
   }
 
-  public generateGroupBy<T>(reply: SearchReply): GenerativeGroupByReturn<T> {
+  public generateGroupBy<T>(reply: SearchReply): GenerativeGroupByReturn<T, any> {
     const objects: GroupByObject<T>[] = [];
-    const groups: Record<string, GenerativeGroupByResult<T>> = {};
+    const groups: Record<string, GenerativeGroupByResult<T, any>> = {};
     reply.groupByResults.forEach((result) => {
       const objs = result.objects.map((object) => {
         return {