Fixed property names & added ContextualAIGRPC

Author: Jinash Rouniyar

src/collections/config/integration.test.ts

@@ -814,9 +814,9 @@ describe('Testing of the collection.config namespace', () => {
     await collection.config.update({
       generative: weaviate.reconfigure.generative.contextualai({
         model: 'v2',
-        maxNewTokens: 100,
         temperature: 0.7,
         topP: 0.9,
+        maxNewTokens: 100,
         systemPrompt: 'sys',
         avoidCommentary: false,
       }),
@@ -827,11 +827,11 @@ describe('Testing of the collection.config namespace', () => {
       name: 'generative-contextualai',
       config: {
         model: 'v2',
-        maxNewTokensProperty: 100,
-        temperatureProperty: 0.7,
-        topPProperty: 0.9,
-        systemPromptProperty: 'sys',
-        avoidCommentaryProperty: false,
+        temperature: 0.7,
+        topP: 0.9,
+        maxNewTokens: 100,
+        systemPrompt: 'sys',
+        avoidCommentary: false,
       },
     });
   });

src/collections/config/types/generative.ts

@@ -108,11 +108,11 @@ export type GenerativeXAIConfig = {
 
 export type GenerativeContextualAIConfig = {
   model?: string;
-  maxNewTokensProperty?: number;
-  temperatureProperty?: number;
-  topPProperty?: number;
-  systemPromptProperty?: string;
-  avoidCommentaryProperty?: boolean;
+  temperature?: number;
+  topP?: number;
+  maxNewTokens?: number;
+  systemPrompt?: string;
+  avoidCommentary?: boolean;
 };
 
 export type GenerativeConfig =

src/collections/configure/generative.ts

@@ -66,11 +66,11 @@ export default {
       config: config
         ? {
             model: config.model,
-            maxNewTokensProperty: config.maxNewTokens,
-            temperatureProperty: config.temperature,
-            topPProperty: config.topP,
-            systemPromptProperty: config.systemPrompt,
-            avoidCommentaryProperty: config.avoidCommentary,
+            temperature: config.temperature,
+            topP: config.topP,
+            maxNewTokens: config.maxNewTokens,
+            systemPrompt: config.systemPrompt,
+            avoidCommentary: config.avoidCommentary,
           }
         : undefined,
     };

src/collections/configure/types/generative.ts

@@ -61,9 +61,9 @@ export type GenerativeXAIConfigCreate = GenerativeXAIConfig;
 
 export type GenerativeContextualAIConfigCreate = {
   model?: string;
-  maxNewTokens?: number;
   temperature?: number;
   topP?: number;
+  maxNewTokens?: number;
   systemPrompt?: string;
   avoidCommentary?: boolean;
 };

src/collections/configure/unit.test.ts

@@ -1952,9 +1952,9 @@ describe('Unit testing of the generative factory class', () => {
   it('should create the correct GenerativeContextualAIConfig type with all values', () => {
     const config = configure.generative.contextualai({
       model: 'v2',
-      maxNewTokens: 100,
       temperature: 0.7,
       topP: 0.9,
+      maxNewTokens: 100,
       systemPrompt:
         'You are a helpful assistant that provides accurate and informative responses based on the given context.',
       avoidCommentary: false,
@@ -1963,12 +1963,12 @@ describe('Unit testing of the generative factory class', () => {
       name: 'generative-contextualai',
       config: {
         model: 'v2',
-        maxNewTokensProperty: 100,
-        temperatureProperty: 0.7,
-        topPProperty: 0.9,
-        systemPromptProperty:
+        temperature: 0.7,
+        topP: 0.9,
+        maxNewTokens: 100,
+        systemPrompt:
           'You are a helpful assistant that provides accurate and informative responses based on the given context.',
-        avoidCommentaryProperty: false,
+        avoidCommentary: false,
       },
     });
   });

src/collections/generate/config.ts

@@ -308,18 +308,13 @@ export const generativeParameters = {
     'generative-contextualai',
     GenerativeConfigRuntimeType<'generative-contextualai'> | undefined
   > {
-    // Contextual AI does not require special GRPC wrappers; pass primitives directly
+    const { knowledge, ...rest } = config || {};
     return {
       name: 'generative-contextualai',
       config: config
         ? {
-            model: config.model,
-            maxNewTokens: config.maxNewTokens,
-            temperature: config.temperature,
-            topP: config.topP,
-            systemPrompt: config.systemPrompt,
-            avoidCommentary: config.avoidCommentary,
-            knowledge: config.knowledge,
+            ...rest,
+            knowledge: knowledge ? TextArray.fromPartial({ values: knowledge }) : undefined,
           }
         : undefined,
     };

src/collections/generate/integration.test.ts

@@ -603,9 +603,9 @@ maybeContextualAI('Testing of the collection.generate methods with Contextual AI
         vectorizers: weaviate.configure.vectors.text2VecOpenAI(),
         generative: weaviate.configure.generative.contextualai({
           model: 'v2',
-          maxNewTokens: 100,
           temperature: 0.7,
           topP: 0.9,
+          maxNewTokens: 100,
           systemPrompt: 'You are a helpful AI assistant.',
           avoidCommentary: false,
         }),
@@ -664,9 +664,9 @@ maybeContextualAI('Testing of the collection.generate methods with Contextual AI
         singlePrompt: 'Translate this title to French: {title}',
         config: generativeParameters.contextualai({
           model: 'v2',
-          maxNewTokens: 50,
           temperature: 0.5,
           topP: 0.8,
+          maxNewTokens: 50,
           systemPrompt: 'You are a translation assistant.',
           avoidCommentary: true,
         }),
@@ -689,8 +689,8 @@ maybeContextualAI('Testing of the collection.generate methods with Contextual AI
         singlePrompt: 'What is the custom knowledge?',
         config: generativeParameters.contextualai({
           model: 'v2',
-          maxNewTokens: 100,
           temperature: 0.7,
+          maxNewTokens: 100,
           knowledge: ['Custom knowledge override', 'Additional context for testing'],
         }),
       },

src/collections/generate/unit.test.ts

@@ -343,12 +343,12 @@ describe('Unit testing of the generativeParameters factory methods', () => {
         name: 'generative-contextualai',
         config: {
           model: 'v2',
-          maxNewTokens: 512,
           temperature: 0.7,
           topP: 0.9,
+          maxNewTokens: 512,
           systemPrompt: 'sys',
           avoidCommentary: false,
-          knowledge: ['knowledge1', 'knowledge2'],
+          knowledge: { values: ['knowledge1', 'knowledge2'] },
         },
       });
     });

src/collections/types/generate.ts

@@ -7,6 +7,7 @@ import {
   GenerativeAnyscaleMetadata,
   GenerativeCohere as GenerativeCohereGRPC,
   GenerativeCohereMetadata,
+  GenerativeContextualAI as GenerativeContextualAIGRPC,
   GenerativeDatabricks as GenerativeDatabricksGRPC,
   GenerativeDatabricksMetadata,
   GenerativeDebug,
@@ -175,15 +176,7 @@ export type GenerativeConfigRuntimeType<G> = G extends 'generative-anthropic'
   : G extends 'generative-xai'
   ? Omit<GenerativeXAIGRPC, omitFields>
   : G extends 'generative-contextualai'
-  ? {
-      model?: string;
-      maxNewTokens?: number;
-      temperature?: number;
-      topP?: number;
-      systemPrompt?: string;
-      avoidCommentary?: boolean;
-      knowledge?: string[];
-    }
+  ? Omit<GenerativeContextualAIGRPC, omitFields>
   : G extends 'none'
   ? undefined
   : Record<string, any> | undefined;
@@ -343,9 +336,9 @@ export type GenerativeXAIConfigRuntime = GenerativeXAIConfig;
 
 export type GenerativeContextualAIConfigRuntime = {
   model?: string | undefined;
-  maxNewTokens?: number | undefined;
   temperature?: number | undefined;
   topP?: number | undefined;
+  maxNewTokens?: number | undefined;
   systemPrompt?: string | undefined;
   avoidCommentary?: boolean | undefined;
   knowledge?: string[] | undefined;