修复模型错误

app/requests.ts

@@ -245,7 +245,7 @@ export async function requestChatStream(
     if (Bot == "Lemur"){
       const req = makeRevChatRequestParam(messages);
 
-      chatMessage(req.messages,"文字","user")
+      chatMessage(messages[messages.length - 1].content,"文字","user")
       console.log("[Request] ", req);
   
       const controller = new AbortController();
@@ -319,7 +319,7 @@ export async function requestChatStream(
       overrideModel: options?.overrideModel,
     });
 
-    chatMessage(JSON.stringify(req.messages),"文字","user")
+    chatMessage(messages[messages.length - 1].content,"文字","user")
     console.log("[Request] ", req);
 
     const controller = new AbortController();
@@ -516,76 +516,67 @@ export async function requestChatStream(
       options?.onMessage("请换一个问题试试吧", true);
     }
   }else{
-    const req = makeRequestParam(messages, {
-      stream: true,
-      overrideModel: options?.overrideModel,
-    });
-
-    chatMessage(JSON.stringify(req.messages),"文字","user")
-    console.log("[Request] ", req);
-
-    const controller = new AbortController();
-    const reqTimeoutId = setTimeout(() => controller.abort(), TIME_OUT_MS);
+    const req = makeRevChatRequestParam(messages);
 
-    try {
-      const openaiUrl = useAccessStore.getState().openaiUrl;
-      const res = await fetch(openaiUrl + "v1/chat/completions", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          ...getHeaders(),
-        },
-        body: JSON.stringify(req),
-        signal: controller.signal,
-      });
-
-      clearTimeout(reqTimeoutId);
-
-      let responseText = "";
-
-      const finish = () => {
-        options?.onMessage(responseText, true);
-        controller.abort();
-        chatMessage(responseText,"文字","system")
-      };
-
-      if (res.ok) {
-        const reader = res.body?.getReader();
-        const decoder = new TextDecoder();
-
-        options?.onController?.(controller);
-
-        while (true) {
-          const resTimeoutId = setTimeout(() => finish(), TIME_OUT_MS);
-          const content = await reader?.read();
-          clearTimeout(resTimeoutId);
-
-          if (!content || !content.value) {
-            break;
-          }
-
-          const text = decoder.decode(content.value, { stream: true });
-          responseText += text;
-
-          const done = content.done;
-          options?.onMessage(responseText, false);
-
-          if (done) {
-            break;
+      chatMessage(messages[messages.length - 1].content,"文字","user")
+      console.log("[Request] ", req);
+  
+      const controller = new AbortController();
+      const reqTimeoutId = setTimeout(() => controller.abort(), TIME_OUT_MS);
+  
+      try {
+        const res = await fetch("/api/lemur", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            ...getHeaders(),
+          },
+          body: JSON.stringify(req),
+          signal: controller.signal,
+        });
+        clearTimeout(reqTimeoutId);
+  
+        let responseText = "";
+  
+        const finish = () => {
+          options?.onMessage(responseText, true);
+          controller.abort();
+          chatMessage(responseText,"文字","system")
+        };
+  
+        if (res.ok) {
+          const reader = res.body?.getReader();
+          const decoder = new TextDecoder();
+  
+          options?.onController?.(controller);
+  
+          while (true) {
+            // handle time out, will stop if no response in 10 secs
+            const resTimeoutId = setTimeout(() => finish(), TIME_OUT_MS);
+            const content = await reader?.read();
+            clearTimeout(resTimeoutId);
+            const text = decoder.decode(content?.value);
+            responseText += text;
+  
+            const done = !content || content.done;
+            options?.onMessage(responseText, false);
+  
+            if (done) {
+              break;
+            }
           }
+          finish();
+        } else if (res.status === 401) {
+          console.error("Unauthorized");
+          options?.onError(new Error("Unauthorized"), res.status);
+        } else {
+          console.error("Stream Error", res.body);
+          options?.onError(new Error("Stream Error"), res.status);
         }
-        finish();
-      } else if (res.status === 401) {
-        console.error("Unauthorized");
-        options?.onError(new Error("Unauthorized"), res.status);
-      } else {
-        console.error("Stream Error", res.body);
-        options?.onError(new Error("Stream Error"), res.status);
+      } catch (err) {
+        console.error("NetWork Error", err);
+        options?.onError(err as Error);
       }
-    } catch (err) {
-      console.error("NetWork Error", err);
-      options?.onError(err as Error);
-    }
   }
 }