Merge pull request #1436 from Oneirocom/benbot/gemini-pro

adds geminni-pro and gpt-4-1106

Author: benbot

packages/plugins/googleai/server/src/constants.ts

@@ -8,4 +8,4 @@ export const GOOGLEAI_ENDPOINT =
   process.env['NEXT_GOOGLEAI_ENDPOINT'] ||
   process.env['REACT_APP_GOOGLEAI_ENDPOINT'] ||
   process.env['GOOGLEAI_ENDPOINT'] ||
-  'https://generativelanguage.googleapis.com/v1beta2/models'
+  'https://generativelanguage.googleapis.com/v1beta/models'

packages/plugins/googleai/server/src/functions/makeChatCompletion.ts

@@ -10,24 +10,52 @@ type ChatMessage = {
   content: string
 }
 
-/**
- * Generate a completion text based on prior chat conversation input.
- * @param data - CompletionHandlerInputData object.
- * @returns An object with success status and either a result or an error message.
- */
-export async function makeChatCompletion(
-  data: CompletionHandlerInputData
-): Promise<{
-  success: boolean
-  result?: string | null
-  error?: string | null
-}> {
-  const { node, inputs, context } = data
+interface Content  {
+  parts: { text: string }[]
+  role: string
+}
+
+async function makeGeminiChatCompletion(data: CompletionHandlerInputData): Promise<any> {
+  const { node, inputs } = data
 
   // Get the system message and conversation inputs
   const system = inputs['system']?.[0] as ChatMessage
   const conversation = inputs['conversation']?.[0] as any
 
+
+  // Initialize conversationMessages array
+  const conversationMessages: Content[] = []
+
+  conversationMessages.push({role: 'user', parts: [{text: system.content}]})
+
+  // Add elements to conversationMessages
+  conversation?.forEach(event => {
+    conversationMessages.push({ role: event.observer === event.sender ? 'model' : 'user', parts: [{ text: event.content }] })
+  });
+  // Get the user input
+  const input = inputs['input']?.[0] as string
+
+  conversationMessages.push({ role: 'user', parts: [{text: input}]})
+
+  // Get or set default settings
+  const request = {
+    contents: conversationMessages,
+    generationConfig: {
+      temperature: parseFloat((node?.data?.temperature as string) ?? '0.0'),
+      top_p: parseFloat((node?.data?.top_p as string) ?? '0.95'),
+      top_k: parseFloat((node?.data?.top_k as string) ?? '40'),
+    }
+  }
+
+  return request;
+}
+
+async function makePalmChatCompletion(data: CompletionHandlerInputData): Promise<any> {
+  const { node, inputs } = data
+  // Get the system message and conversation inputs
+  const system = inputs['system']?.[0] as ChatMessage
+  const conversation = inputs['conversation']?.[0] as any
+
   // Initialize conversationMessages array
   const conversationMessages: ChatMessage[] = []
 
@@ -56,6 +84,30 @@ export async function makeChatCompletion(
     top_k: parseFloat((node?.data?.top_k as string) ?? '40'),
   } as any
 
+  return settings;
+}
+
+/**
+ * Generate a completion text based on prior chat conversation input.
+ * @param data - CompletionHandlerInputData object.
+ * @returns An object with success status and either a result or an error message.
+ */
+export async function makeChatCompletion(
+  data: CompletionHandlerInputData
+): Promise<{
+  success: boolean
+  result?: string | null
+  error?: string | null
+}> {
+  const { node, context } = data
+
+  let requestData: any = null;
+  if ((node?.data?.model as string).includes('gemini')) {
+    requestData = await makeGeminiChatCompletion(data);
+  } else {
+    requestData = await makePalmChatCompletion(data);
+  }
+
   const apiKey =
     (context?.module?.secrets &&
       context?.module?.secrets['googleai_api_key']) ||
@@ -70,18 +122,27 @@ export async function makeChatCompletion(
   }
 
   try {
+
+    let commandType = 'generateMessage';
+
+    // palm generates "messages" but gemini generates "content"
+    if ((node?.data?.model as string).includes('gemini')) {
+      commandType = 'generateContent';
+    }
+
     const start = Date.now()
-    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:generateMessage?key=${apiKey}`
+    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:${commandType}?key=${apiKey}`
     // Make the API call to GoogleAI
     const completion = await fetch(endpoint, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify(settings),
+      body: JSON.stringify(requestData),
     })
 
     const completionData = await completion.json()
+    console.log(completionData)
 
     if (completionData.error) {
       console.error('GoogleAI Error', completionData.error)
@@ -97,13 +158,13 @@ export async function makeChatCompletion(
     saveRequest({
       projectId: context.projectId,
       agentId: context.agent?.id || 'preview',
-      requestData: JSON.stringify(settings),
+      requestData: JSON.stringify(requestData),
       responseData: JSON.stringify(completionData),
       startTime: start,
       statusCode: completion.status,
       status: completion.statusText,
       model: node?.data?.model as string,
-      parameters: JSON.stringify(settings),
+      parameters: JSON.stringify(requestData),
       type: 'completion',
       provider: 'googleai',
       totalTokens: 0, // usage.total_tokens,

packages/plugins/googleai/shared/src/index.ts

@@ -60,7 +60,7 @@ const completionProviders: CompletionProvider[] = [
         type: stringSocket,
       },
     ],
-    models: ['chat-bison-001'],
+    models: ['chat-bison-001', 'gemini-pro'],
   },
   {
     type: 'text',

packages/plugins/openai/shared/src/index.ts

@@ -8,7 +8,7 @@ import {
   stringSocket,
 } from 'shared/core'
 
-export const GPT4_MODELS = ['gpt-4', 'gpt-4-0613']
+export const GPT4_MODELS = ['gpt-4', 'gpt-4-0613', 'gpt-4-1106-preview']
 
 /**
  * An array of PluginSecret objects containing information about API key secrets.
@@ -141,7 +141,7 @@ const completionProviders: CompletionProvider[] = [
         type: stringSocket,
       },
     ],
-    models: ['gpt-3.5-turbo', 'gpt-4'],
+    models: ['gpt-3.5-turbo', ...GPT4_MODELS],
   },
 ]