Fix merge conflicts with new llm providers

Author: lalalune

.env.example

@@ -14,6 +14,9 @@ GROQ_API_KEY= # Starts with gsk_
 OPENROUTER_API_KEY=
 GOOGLE_GENERATIVE_AI_API_KEY= # Gemini API key
 
+ALI_BAILIAN_API_KEY= # Ali Bailian API Key
+VOLENGINE_API_KEY=  # VolEngine API Key
+
 # Speech Synthesis
 ELEVENLABS_XI_API_KEY= # API key from elevenlabs
 

agent/src/index.ts

@@ -248,6 +248,16 @@ export function getTokenForProvider(
             return (
                 character.settings?.secrets?.FAL_API_KEY || settings.FAL_API_KEY
             );
+        case ModelProviderName.ALI_BAILIAN:
+            return (
+                character.settings?.secrets?.ALI_BAILIAN_API_KEY ||
+                settings.ALI_BAILIAN_API_KEY
+            );
+        case ModelProviderName.VOLENGINE:
+            return (
+                character.settings?.secrets?.VOLENGINE_API_KEY ||
+                settings.VOLENGINE_API_KEY
+            );
     }
 }
 

packages/core/src/generation.ts

@@ -118,6 +118,8 @@ export async function generateText({
             // OPENAI & LLAMACLOUD shared same structure.
             case ModelProviderName.OPENAI:
             case ModelProviderName.ETERNALAI:
+            case ModelProviderName.ALI_BAILIAN:
+            case ModelProviderName.VOLENGINE:
             case ModelProviderName.LLAMACLOUD: {
                 elizaLogger.debug("Initializing OpenAI model.");
                 const openai = createOpenAI({ apiKey, baseURL: endpoint });
@@ -1151,6 +1153,8 @@ export async function handleProvider(
     switch (provider) {
         case ModelProviderName.OPENAI:
         case ModelProviderName.ETERNALAI:
+        case ModelProviderName.ALI_BAILIAN:
+        case ModelProviderName.VOLENGINE:
         case ModelProviderName.LLAMACLOUD:
             return await handleOpenAI(options);
         case ModelProviderName.ANTHROPIC:

packages/core/src/models.ts

@@ -314,16 +314,47 @@ export const models: Models = {
         },
         endpoint: settings.GAIANET_SERVER_URL || "http://localhost:8080/v1",
         model: {
-            [ModelClass.SMALL]:
-                settings.GAIANET_MODEL || "llama3.2",
-            [ModelClass.MEDIUM]:
-                settings.GAIANET_MODEL || "llama3.2",
-            [ModelClass.LARGE]:
-                settings.GAIANET_MODEL || "llama3.2",
+            [ModelClass.SMALL]: settings.GAIANET_MODEL || "llama3.2",
+            [ModelClass.MEDIUM]: settings.GAIANET_MODEL || "llama3.2",
+            [ModelClass.LARGE]: settings.GAIANET_MODEL || "llama3.2",
             [ModelClass.EMBEDDING]:
                 settings.GAIANET_EMBEDDING_MODEL || "nomic-embed",
         },
-    }
+    },
+    [ModelProviderName.ALI_BAILIAN]: {
+        endpoint: "https://dashscope.aliyuncs.com/compatible-mode/v1",
+        settings: {
+            stop: [],
+            maxInputTokens: 128000,
+            maxOutputTokens: 8192,
+            frequency_penalty: 0.4,
+            presence_penalty: 0.4,
+            temperature: 0.6,
+        },
+        model: {
+            [ModelClass.SMALL]: "qwen-turbo",
+            [ModelClass.MEDIUM]: "qwen-plus",
+            [ModelClass.LARGE]: "qwen-max",
+            [ModelClass.IMAGE]: "wanx-v1",
+        },
+    },
+    [ModelProviderName.VOLENGINE]: {
+        endpoint: "https://open.volcengineapi.com/api/v3/",
+        settings: {
+            stop: [],
+            maxInputTokens: 128000,
+            maxOutputTokens: 8192,
+            frequency_penalty: 0.4,
+            presence_penalty: 0.4,
+            temperature: 0.6,
+        },
+        model: {
+            [ModelClass.SMALL]: "doubao-lite-128k",
+            [ModelClass.MEDIUM]: "doubao-pro-128k",
+            [ModelClass.LARGE]: "doubao-pro-128k",
+            [ModelClass.EMBEDDING]: "doubao-embedding",
+        },
+    },
 };
 
 export function getModel(provider: ModelProviderName, type: ModelClass) {

packages/core/src/types.ts

@@ -202,6 +202,8 @@ export type Models = {
     [ModelProviderName.GALADRIEL]: Model;
     [ModelProviderName.FAL]: Model;
     [ModelProviderName.GAIANET]: Model;
+    [ModelProviderName.ALI_BAILIAN]: Model;
+    [ModelProviderName.VOLENGINE]: Model;
 };
 
 /**
@@ -224,6 +226,8 @@ export enum ModelProviderName {
     GALADRIEL = "galadriel",
     FAL = "falai",
     GAIANET = "gaianet",
+    ALI_BAILIAN = "ali_bailian",
+    VOLENGINE = "volengine",
 }
 
 /**