From c4334d4e5fcca05b92bd6c8a6b5b25f187f1f540 Mon Sep 17 00:00:00 2001
From: "Mr. Z" <112755085+ZTH7@users.noreply.github.com>
Date: Thu, 25 Jul 2024 20:03:54 +0800
Subject: [PATCH] Update model.ts

---
 app/utils/model.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/utils/model.ts b/app/utils/model.ts
index cc924f40f..4de0eb8d9 100644
--- a/app/utils/model.ts
+++ b/app/utils/model.ts
@@ -99,20 +99,13 @@ export function collectModelTableWithDefaultModel(
 ) {
   let modelTable = collectModelTable(models, customModels);
   if (defaultModel && defaultModel !== "") {
-    const [modelName, providerName] = defaultModel.split("@");
-    if (providerName && providerName != "") {
-      modelTable[defaultModel] = {
-        ...modelTable[defaultModel],
-        name: modelTable[defaultModel]?.name ?? modelName,
-        displayName:
-          modelTable[defaultModel]?.displayName ??
-          modelName + "(" + providerName + ")",
-        available: true,
-        isDefault: true,
-      };
+    if (defaultModel.includes('@')) {
+      if (defaultModel in modelTable) {
+        modelTable[defaultModel].isDefault = true;
+      }
     } else {
       for (const key of Object.keys(modelTable)) {
-        if (modelTable[key].available && key.startsWith(modelName)) {
+        if (modelTable[key].available && key.split('@').shift() == defaultModel) {
           modelTable[key].isDefault = true;
           break;
         }