Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web

2025-11-15 21:43:45 +08:00 · 2024-10-11 01:07:41 +00:00
parent 98ab561607 c5074f0aa4
commit f80da8a263
8 changed files with 2078 additions and 145 deletions
--- a/app/utils/chat.ts
+++ b/app/utils/chat.ts
@@ -223,6 +223,11 @@ export function stream(
            )
              .then((res) => {
                let content = res.data || res?.statusText;
+                // hotfix #5614
+                content =
+                  typeof content === "string"
+                    ? content
+                    : JSON.stringify(content);
                if (res.status >= 300) {
                  return Promise.reject(content);
                }
@@ -245,6 +250,7 @@ export function stream(
                return e.toString();
              })
              .then((content) => ({
+                name: tool.function.name,
                role: "tool",
                content,
                tool_call_id: tool.id,