💄 style: add *_MODEL_LIST for Qwen and ZeroOne (lobehub#3704)

XuJiandong · Sep 1, 2024 · 05419dc · 05419dc
1 parent 4c761c9
commit 05419dc
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -137,7 +137,7 @@ ENV \
     # Perplexity
     PERPLEXITY_API_KEY="" PERPLEXITY_PROXY_URL="" \
     # Qwen
-    QWEN_API_KEY="" \
+    QWEN_API_KEY="" QWEN_MODEL_LIST="" \
     # SiliconCloud
     SILICONCLOUD_API_KEY="" SILICONCLOUD_MODEL_LIST="" SILICONCLOUD_PROXY_URL="" \
     # Stepfun
@@ -149,7 +149,7 @@ ENV \
     # Upstage
     UPSTAGE_API_KEY="" \
     # 01.AI
-    ZEROONE_API_KEY="" \
+    ZEROONE_API_KEY="" ZEROONE_MODEL_LIST="" \
     # Zhipu
     ZHIPU_API_KEY="" ZHIPU_MODEL_LIST=""
 

diff --git a/Dockerfile.database b/Dockerfile.database
@@ -169,7 +169,7 @@ ENV \
     # Perplexity
     PERPLEXITY_API_KEY="" PERPLEXITY_PROXY_URL="" \
     # Qwen
-    QWEN_API_KEY="" \
+    QWEN_API_KEY="" QWEN_MODEL_LIST="" \
     # SiliconCloud
     SILICONCLOUD_API_KEY="" SILICONCLOUD_MODEL_LIST="" SILICONCLOUD_PROXY_URL="" \
     # Stepfun
@@ -181,7 +181,7 @@ ENV \
     # Upstage
     UPSTAGE_API_KEY="" \
     # 01.AI
-    ZEROONE_API_KEY="" \
+    ZEROONE_API_KEY="" ZEROONE_MODEL_LIST="" \
     # Zhipu
     ZHIPU_API_KEY=""
 

diff --git a/src/config/llm.ts b/src/config/llm.ts
@@ -57,6 +57,7 @@ export const getLLMConfig = () => {
 
       ENABLED_ZEROONE: z.boolean(),
       ZEROONE_API_KEY: z.string().optional(),
+      ZEROONE_MODEL_LIST: z.string().optional(),
 
       ENABLED_TOGETHERAI: z.boolean(),
       TOGETHERAI_API_KEY: z.string().optional(),
@@ -73,6 +74,7 @@ export const getLLMConfig = () => {
 
       ENABLED_QWEN: z.boolean(),
       QWEN_API_KEY: z.string().optional(),
+      QWEN_MODEL_LIST: z.string().optional(),
 
       ENABLED_STEPFUN: z.boolean(),
       STEPFUN_API_KEY: z.string().optional(),
@@ -154,6 +156,7 @@ export const getLLMConfig = () => {
 
       ENABLED_ZEROONE: !!process.env.ZEROONE_API_KEY,
       ZEROONE_API_KEY: process.env.ZEROONE_API_KEY,
+      ZEROONE_MODEL_LIST: process.env.ZEROONE_MODEL_LIST,
 
       ENABLED_AWS_BEDROCK: process.env.ENABLED_AWS_BEDROCK === '1',
       AWS_REGION: process.env.AWS_REGION,
@@ -166,6 +169,7 @@ export const getLLMConfig = () => {
 
       ENABLED_QWEN: !!process.env.QWEN_API_KEY,
       QWEN_API_KEY: process.env.QWEN_API_KEY,
+      QWEN_MODEL_LIST: process.env.QWEN_MODEL_LIST,
 
       ENABLED_STEPFUN: !!process.env.STEPFUN_API_KEY,
       STEPFUN_API_KEY: process.env.STEPFUN_API_KEY,

diff --git a/src/server/globalConfig/index.ts b/src/server/globalConfig/index.ts
@@ -7,8 +7,10 @@ import {
   OllamaProviderCard,
   OpenAIProviderCard,
   OpenRouterProviderCard,
+  QwenProviderCard,
   SiliconCloudProviderCard,
   TogetherAIProviderCard,
+  ZeroOneProviderCard,
   ZhiPuProviderCard,
 } from '@/config/modelProviders';
 import { enableNextAuth } from '@/const/auth';
@@ -38,7 +40,10 @@ export const getServerGlobalConfig = () => {
     ENABLED_MINIMAX,
     ENABLED_MISTRAL,
     ENABLED_NOVITA,
+
     ENABLED_QWEN,
+    QWEN_MODEL_LIST,
+
     ENABLED_STEPFUN,
     ENABLED_BAICHUAN,
     ENABLED_TAICHU,
@@ -60,6 +65,8 @@ export const getServerGlobalConfig = () => {
     OPENROUTER_MODEL_LIST,
 
     ENABLED_ZEROONE,
+    ZEROONE_MODEL_LIST,
+
     ENABLED_TOGETHERAI,
     TOGETHERAI_MODEL_LIST,
   } = getLLMConfig();
@@ -120,7 +127,14 @@ export const getServerGlobalConfig = () => {
         }),
       },
       perplexity: { enabled: ENABLED_PERPLEXITY },
-      qwen: { enabled: ENABLED_QWEN },
+      qwen: {
+        enabled: ENABLED_QWEN,
+        enabledModels: extractEnabledModels(QWEN_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: QwenProviderCard.chatModels,
+          modelString: QWEN_MODEL_LIST,
+        }),
+      },
       siliconcloud: {
         enabled: ENABLED_SILICONCLOUD,
         enabledModels: extractEnabledModels(SILICONCLOUD_MODEL_LIST),
@@ -141,7 +155,14 @@ export const getServerGlobalConfig = () => {
         }),
       },
       upstage: { enabled: ENABLED_UPSTAGE },
-      zeroone: { enabled: ENABLED_ZEROONE },
+      zeroone: {
+        enabled: ENABLED_ZEROONE,
+        enabledModels: extractEnabledModels(ZEROONE_MODEL_LIST),
+        serverModelCards: transformToChatModelCards({
+          defaultChatModels: ZeroOneProviderCard.chatModels,
+          modelString: ZEROONE_MODEL_LIST,
+        }),
+      },
       zhipu: { 
         enabled: ENABLED_ZHIPU, 
         enabledModels: extractEnabledModels(ZHIPU_MODEL_LIST),