Merge pull request #1369 from Oneirocom/palm-api-fallback

Palm api fallback
Oneirocom · Oct 28, 2023 · 5f9e5c9 · 5f9e5c9
2 parents 1f68c1c + 4cf8d45
commit 5f9e5c9
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 7 deletions.
diff --git a/packages/config/src/config.ts b/packages/config/src/config.ts
@@ -38,6 +38,9 @@ export const DEFAULT_USER_TOKEN =
 export const STANDALONE = getVarForEnvironment('STANDALONE') === 'true' || false
 export const PRODUCTION = getVarForEnvironment('PRODUCTION') === 'true'
 export const DEFAULT_OPENAI_KEY = getVarForEnvironment('DEFAULT_OPENAI_KEY')
+export const DEFAULT_GOOGLEAI_API_KEY = getVarForEnvironment(
+  'DEFAULT_GOOGLEAI_API_KEY'
+)
 export const DONT_CRASH_ON_ERROR =
   getVarForEnvironment('DONT_CRASH_ON_ERROR') === 'true'
 export const SERVER_PORT = getVarForEnvironment('PORT') || '3030'
@@ -138,3 +141,9 @@ export const MANAGER_WARM_UP_MSEC =
   Number(getVarForEnvironment('MANAGER_WARM_UP_MSEC')) || 5000
 
 export const API_ACCESS_KEY = getVarForEnvironment('API_ACCESS_KEY') || 'apiKey'
+
+export const SPELLRUNNER_BUSY_TIMEOUT_MSEC = getVarForEnvironment(
+  'SPELLRUNNER_BUSY_TIMEOUT_MS'
+)
+  ? Number(getVarForEnvironment('SPELLRUNNER_BUSY_TIMEOUT_MS'))
+  : 120000
diff --git a/packages/core/shared/src/spellManager/SpellManager.ts b/packages/core/shared/src/spellManager/SpellManager.ts
@@ -90,7 +90,7 @@ export default class SpellManager {
       this.logger.debug(`Reloading spell ${spellId}`)
       return this.load(spell)
     } catch (error) {
-      this.logger.error(`Error loading spell ${spellId}`, error)
+      this.logger.error(`Error loading spell ${spellId}: %o`, error)
       return
     }
   }

diff --git a/packages/core/shared/src/spellManager/SpellRunner.ts b/packages/core/shared/src/spellManager/SpellRunner.ts
@@ -15,6 +15,7 @@ import { extractModuleInputKeys } from './graphHelpers'
 import SpellManager from './SpellManager'
 import { getLogger } from '../logger'
 import { NodeData } from 'rete/types/core/data'
+import { SPELLRUNNER_BUSY_TIMEOUT_MSEC } from '@magickml/config'
 
 export type RunComponentArgs = {
   inputs: MagickSpellInput
@@ -269,7 +270,7 @@ class SpellRunner {
   }
   error(message: string, error: unknown | null = null) {
     this.busy = false
-    this.logger.error(message, error)
+    this.logger.error(message, 'error: %o', error)
     if (error) throw error
     throw new Error(message)
   }
@@ -359,6 +360,8 @@ class SpellRunner {
           this.logger.warn(`No suitable fallback found for ${firstInput}.`)
         }
 
+        this.logger.info('fallback: %o', fallback)
+
         const [node, name] = fallback
         triggeredNode = node
 
@@ -375,7 +378,7 @@ class SpellRunner {
       // A run shouldnt take this long.  This is a hacl but we are replacing all this soon.
       setTimeout(() => {
         this.busy = false
-      }, 10000)
+      }, SPELLRUNNER_BUSY_TIMEOUT_MSEC)
 
       // this running is where the main "work" happens.
       // I do wonder whether we could make this even more elegant by having the node
@@ -388,7 +391,7 @@ class SpellRunner {
       this.busy = false
       return this.outputData
     } catch (error) {
-      this.error(`Error loading spell ${this.currentSpell.id}`, error)
+      this.error(`Error running spell ${this.currentSpell.id} %o`, error)
     }
   }
 }

diff --git a/packages/plugins/googleai/server/src/functions/makeChatCompletion.ts b/packages/plugins/googleai/server/src/functions/makeChatCompletion.ts
@@ -3,6 +3,7 @@ import { CompletionHandlerInputData, saveRequest } from '@magickml/core'
 import { GOOGLEAI_ENDPOINT } from '../constants'
 import { trackGoogleAIUsage } from '@magickml/server-core'
 import { wordCount } from './shared'
+import { DEFAULT_GOOGLEAI_API_KEY } from '@magickml/config'
 
 type ChatMessage = {
   author?: string
@@ -55,9 +56,22 @@ export async function makeChatCompletion(
     top_k: parseFloat((node?.data?.top_k as string) ?? '40'),
   } as any
 
+  const apiKey =
+    (context?.module?.secrets &&
+      context?.module?.secrets['googleai_api_key']) ||
+    DEFAULT_GOOGLEAI_API_KEY ||
+    null
+
+  if (!apiKey) {
+    return {
+      success: false,
+      error: 'GoogleAI API key is required to make a chat completion',
+    }
+  }
+
   try {
     const start = Date.now()
-    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:generateMessage?key=${context.module?.secrets?.['googleai_api_key']}`
+    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:generateMessage?key=${apiKey}`
     // Make the API call to GoogleAI
     const completion = await fetch(endpoint, {
       method: 'POST',

diff --git a/packages/plugins/googleai/server/src/functions/makeTextCompletion.ts b/packages/plugins/googleai/server/src/functions/makeTextCompletion.ts
@@ -3,6 +3,7 @@ import { CompletionHandlerInputData, saveRequest } from '@magickml/core'
 import { GOOGLEAI_ENDPOINT } from '../constants'
 import { trackGoogleAIUsage } from '@magickml/server-core'
 import { wordCount } from './shared'
+import { DEFAULT_GOOGLEAI_API_KEY } from '@magickml/config'
 
 /**
  * Makes an API request to an AI text completion service.
@@ -50,8 +51,21 @@ export async function makeTextCompletion(
   // Make the API request and handle the response.
   const start = Date.now()
 
+  const apiKey =
+    (context?.module?.secrets &&
+      context?.module?.secrets['googleai_api_key']) ||
+    DEFAULT_GOOGLEAI_API_KEY ||
+    null
+
+  if (!apiKey) {
+    return {
+      success: false,
+      error: 'GoogleAI API key is required to make a text completion',
+    }
+  }
+
   try {
-    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:generateText?key=${context.module?.secrets?.['googleai_api_key']}`
+    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:generateText?key=${apiKey}`
     // Make the API call to GoogleAI
     const completion = await fetch(endpoint, {
       method: 'POST',

diff --git a/packages/plugins/googleai/server/src/functions/makeTextEmbedding.ts b/packages/plugins/googleai/server/src/functions/makeTextEmbedding.ts
@@ -7,6 +7,7 @@ import {
 import { GOOGLEAI_ENDPOINT } from '../constants'
 import { trackGoogleAIUsage } from '@magickml/server-core'
 import { wordCount } from './shared'
+import { DEFAULT_GOOGLEAI_API_KEY } from '@magickml/config'
 
 /**
  * A function that makes a request to create a text embedding using GoogleAI's
@@ -40,6 +41,7 @@ export async function makeTextEmbedding(
   const apiKey =
     (context?.module?.secrets &&
       context?.module?.secrets['googleai_api_key']) ||
+    DEFAULT_GOOGLEAI_API_KEY ||
     null
 
   if (!apiKey) {
@@ -57,7 +59,7 @@ export async function makeTextEmbedding(
       text: input,
     }
 
-    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:embedText?key=${context.module?.secrets?.['googleai_api_key']}`
+    const endpoint = `${GOOGLEAI_ENDPOINT}/${node?.data?.model}:embedText?key=${apiKey}`
     // Make the API call to GoogleAI
     const completion = await fetch(endpoint, {
       method: 'POST',