Merge pull request #3619 from H0llyW00dzZ/fix_llm_issue

app/utils/model.ts

@@ -10,24 +10,23 @@ export function collectModelTable(
       available: boolean;
       name: string;
       displayName: string;
-      provider: LLMModel["provider"];
+      provider?: LLMModel["provider"]; // Marked as optional
     }
   > = {};
 
   // default models
-  models.forEach(
+  models.forEach((m) => {
-    (m) =>
+    modelTable[m.name] = {
-      (modelTable[m.name] = {
+      ...m,
-        ...m,
+      displayName: m.name, // 'provider' is copied over if it exists
-        displayName: m.name,
+    };
-      }),
+  });
-  );
 
   // server custom models
   customModels
     .split(",")
     .filter((v) => !!v && v.length > 0)
-    .map((m) => {
+    .forEach((m) => {
       const available = !m.startsWith("-");
       const nameConfig =
         m.startsWith("+") || m.startsWith("-") ? m.slice(1) : m;
@@ -35,15 +34,15 @@ export function collectModelTable(
 
       // enable or disable all models
       if (name === "all") {
-        Object.values(modelTable).forEach((m) => (m.available = available));
+        Object.values(modelTable).forEach((model) => (model.available = available));
+      } else {
+        modelTable[name] = {
+          name,
+          displayName: displayName || name,
+          available,
+          provider: modelTable[name]?.provider, // Use optional chaining
+        };
       }
-
-      modelTable[name] = {
-        name,
-        displayName: displayName || name,
-        available,
-        provider: modelTable[name].provider,
-      };
     });
   return modelTable;
 }