feat: Support a way to define default model from CUSTOM_MODELS env.

ChatGPTNextWeb · Jan 31, 2024 · 2c789d6 · 2c789d6
1 parent e1b065c
commit 2c789d6
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/app/components/chat.tsx b/app/components/chat.tsx
@@ -432,10 +432,17 @@ export function ChatActions(props: {
   // switch model
   const currentModel = chatStore.currentSession().mask.modelConfig.model;
   const allModels = useAllModels();
-  const models = useMemo(
-    () => allModels.filter((m) => m.available),
-    [allModels],
-  );
+  const models = useMemo(() => {
+    const filteredModels = allModels.filter((m) => m.available);
+    const defaultModel = filteredModels.find((m) => m.isDefault);
+    if (defaultModel) {
+      const arr = [defaultModel, ...filteredModels.filter((m) => m !== defaultModel)];
+      return arr;
+    } else {
+      return filteredModels;
+    }
+  }, [allModels]);
+
   const [showModelSelector, setShowModelSelector] = useState(false);
 
   useEffect(() => {

diff --git a/app/store/access.ts b/app/store/access.ts
@@ -8,6 +8,7 @@ import { getHeaders } from "../client/api";
 import { getClientConfig } from "../config/client";
 import { createPersistStore } from "../utils/store";
 import { ensure } from "../utils/clone";
+import { DEFAULT_CONFIG } from "./config";
 
 let fetchState = 0; // 0 not fetch, 1 fetching, 2 done
 
@@ -88,6 +89,14 @@ export const useAccessStore = createPersistStore(
         },
       })
         .then((res) => res.json())
+        .then((res) => {
+          // Set default model from env request
+          let custom_models = res.customModels ?? "";
+          const models = custom_models.split(",");
+          const model_default = models.find((model: string) => model.startsWith("+*"))?.substring(2) || "gpt-3.5-turbo";
+          DEFAULT_CONFIG.modelConfig.model = model_default;
+          return res
+        })
         .then((res: DangerConfig) => {
           console.log("[Config] got config from server", res);
           set(() => ({ ...res }));

diff --git a/app/utils/model.ts b/app/utils/model.ts
@@ -10,6 +10,7 @@ export function collectModelTable(
       available: boolean;
       name: string;
       displayName: string;
+      isDefault?: boolean;
       provider?: LLMModel["provider"]; // Marked as optional
     }
   > = {};
@@ -22,6 +23,8 @@ export function collectModelTable(
     };
   });
 
+
+
   // server custom models
   customModels
     .split(",")
@@ -32,8 +35,17 @@ export function collectModelTable(
         m.startsWith("+") || m.startsWith("-") ? m.slice(1) : m;
       const [name, displayName] = nameConfig.split("=");
 
-      // enable or disable all models
-      if (name === "all") {
+      if (name.startsWith("*")) { // Check if name starts with wildcard
+        let defaultName: string | null = null; // Add variable to store wildcard value
+        defaultName = displayName || name.slice(1); // Store wildcard value
+        modelTable[defaultName] = {
+          name : defaultName,
+          displayName: defaultName,
+          available,
+          isDefault : true,
+          provider: modelTable[defaultName]?.provider, // Use optional chaining
+        };
+      } else if (name === "all") {
         Object.values(modelTable).forEach((model) => (model.available = available));
       } else {
         modelTable[name] = {
@@ -44,6 +56,7 @@ export function collectModelTable(
         };
       }
     });
+
   return modelTable;
 }