Merge pull request #22 from ai16z/main

merge from main
MarcoMandar · Nov 10, 2024 · 77dab6e · 77dab6e
2 parents 574da20 + 15f7ba8
commit 77dab6e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/packages/agent/src/index.ts b/packages/agent/src/index.ts
@@ -117,6 +117,17 @@ export function getTokenForProvider(
                 character.settings?.secrets?.OPENAI_API_KEY ||
                 settings.OPENAI_API_KEY
             );
+        case ModelProviderName.LLAMACLOUD:
+            return (
+                character.settings?.secrets?.LLAMACLOUD_API_KEY ||
+                settings.LLAMACLOUD_API_KEY ||
+                character.settings?.secrets?.TOGETHER_API_KEY ||
+                settings.TOGETHER_API_KEY ||
+                character.settings?.secrets?.XAI_API_KEY ||
+                settings.XAI_API_KEY ||
+                character.settings?.secrets?.OPENAI_API_KEY ||
+                settings.OPENAI_API_KEY
+            );
         case ModelProviderName.ANTHROPIC:
             return (
                 character.settings?.secrets?.ANTHROPIC_API_KEY ||

diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts
@@ -106,7 +106,7 @@ export async function generateText({
             }
 
             case ModelProviderName.GOOGLE:
-                const google = createGoogleGenerativeAI();
+                { const google = createGoogleGenerativeAI();
 
                 const { text: anthropicResponse } = await aiGenerateText({
                     model: google(model),
@@ -122,7 +122,7 @@ export async function generateText({
                 });
 
                 response = anthropicResponse;
-                break;
+                break; }
 
             case ModelProviderName.ANTHROPIC: {
                 elizaLogger.log("Initializing Anthropic model.");