@lobehub/chat 0.40.0 → 0.40.1

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.40.1](https://github.com/lobehub/lobe-chat/compare/v0.40.0...v0.40.1)
+
+<sup>Released on **2023-08-06**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: 优化 openai 接口的错误处理逻辑.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: 优化 openai 接口的错误处理逻辑 ([eae78fe](https://github.com/lobehub/lobe-chat/commit/eae78fe))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.40.0](https://github.com/lobehub/lobe-chat/compare/v0.39.4...v0.40.0)
 
 <sup>Released on **2023-08-05**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.40.0",
+  "version": "0.40.1",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",

package/src/pages/api/error.ts

@@ -10,6 +10,7 @@ const getStatus = (errorType: ErrorType) => {
       return 577;
     }
   }
+  return errorType;
 };
 
 export const createErrorResponse = (errorType: ErrorType, body?: any) => {

package/src/pages/api/openai.ts

@@ -65,20 +65,35 @@ export const createChatCompletion = async ({
 
   const requestParams = { functions, messages: formatMessages, stream: true, ...params };
 
+  let response: Response;
+
   try {
-    const response = await openai.createChatCompletion(requestParams);
+    response = await openai.createChatCompletion(requestParams);
+  } catch (error) {
+    // 如果 await 超时报错，说明是 OpenAI 服务端的问题
+    return createErrorResponse(ErrorType.GatewayTimeout, { message: error });
+  }
 
-    if (!response.ok) {
-      const error = await response.json();
+  // ============  4. 处理异常响应   ============ //
+  if (!response.ok) {
+    let error;
 
-      return createErrorResponse(ErrorType.OpenAIBizError, error);
-    }
+    try {
+      // 正常情况下应该是 OpenAI 的 JSON
+      error = await response.clone().json();
+    } catch {
+      // 如果不是 JSON，那么可能是其他接口端的响应，读 text 为结果
+      const result = await response.text();
 
-    const stream = OpenAIStream(response, callbacks?.(requestParams));
+      error = { message: result };
+    }
 
-    return new StreamingTextResponse(stream);
-  } catch (error) {
-    // 如果 await 超时报错，说明是 OpenAI 服务端的问题
-    return createErrorResponse(ErrorType.GatewayTimeout, { message: error });
+    return createErrorResponse(ErrorType.OpenAIBizError, { ...error, endpoint });
   }
+
+  // ============  5. 发送正常相应   ============ //
+
+  const stream = OpenAIStream(response, callbacks?.(requestParams));
+
+  return new StreamingTextResponse(stream);
 };