From ba8e4e5d3e848e42981322ebc0878de4fa5a44e5 Mon Sep 17 00:00:00 2001
From: Timothy Carambat <rambat1010@gmail.com>
Date: Fri, 2 Aug 2024 12:23:39 -0700
Subject: [PATCH] handle OpenRouter exceptions on streaming (#2033)
---
server/utils/AiProviders/openRouter/index.js | 69 ++++++++++++--------
1 file changed, 41 insertions(+), 28 deletions(-)
diff --git a/server/utils/AiProviders/openRouter/index.js b/server/utils/AiProviders/openRouter/index.js
index d9b971b6f..00a176e1b 100644
--- a/server/utils/AiProviders/openRouter/index.js
+++ b/server/utils/AiProviders/openRouter/index.js
@@ -254,35 +254,48 @@ class OpenRouterLLM {
}
}, 500);
- for await (const chunk of stream) {
- const message = chunk?.choices?.[0];
- const token = message?.delta?.content;
- lastChunkTime = Number(new Date());
-
- if (token) {
- fullText += token;
- writeResponseChunk(response, {
- uuid,
- sources: [],
- type: "textResponseChunk",
- textResponse: token,
- close: false,
- error: false,
- });
- }
-
- if (message.finish_reason !== null) {
- writeResponseChunk(response, {
- uuid,
- sources,
- type: "textResponseChunk",
- textResponse: "",
- close: true,
- error: false,
- });
- response.removeListener("close", handleAbort);
- resolve(fullText);
+ try {
+ for await (const chunk of stream) {
+ const message = chunk?.choices?.[0];
+ const token = message?.delta?.content;
+ lastChunkTime = Number(new Date());
+
+ if (token) {
+ fullText += token;
+ writeResponseChunk(response, {
+ uuid,
+ sources: [],
+ type: "textResponseChunk",
+ textResponse: token,
+ close: false,
+ error: false,
+ });
+ }
+
+ if (message.finish_reason !== null) {
+ writeResponseChunk(response, {
+ uuid,
+ sources,
+ type: "textResponseChunk",
+ textResponse: "",
+ close: true,
+ error: false,
+ });
+ response.removeListener("close", handleAbort);
+ resolve(fullText);
+ }
}
+ } catch (e) {
+ writeResponseChunk(response, {
+ uuid,
+ sources,
+ type: "abort",
+ textResponse: null,
+ close: true,
+ error: e.message,
+ });
+ response.removeListener("close", handleAbort);
+ resolve(fullText);
}
});
}
--
GitLab