Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🪙 fix: Streaming Response Token Issue (#3323)

Danny Avila5ef71a7a368e
diff --git a/api/server/controllers/AskController.js b/api/server/controllers/AskController.js
index 81b6f9396d..2c07398f77 100644
--- a/api/server/controllers/AskController.js
+++ b/api/server/controllers/AskController.js
@@ -112,7 +112,6 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
progressCallback,
progressOptions: {
res,
- text,
// parentMessageId: overrideParentMessageId || userMessageId,
},
};
diff --git a/api/server/controllers/EditController.js b/api/server/controllers/EditController.js
index 269a80ed02..3315454d38 100644
--- a/api/server/controllers/EditController.js
+++ b/api/server/controllers/EditController.js
@@ -119,7 +119,6 @@ const EditController = async (req, res, next, initializeClient) => {
progressCallback,
progressOptions: {
res,
- text,
// parentMessageId: overrideParentMessageId || userMessageId,
},
});
diff --git a/api/server/middleware/abortMiddleware.js b/api/server/middleware/abortMiddleware.js
index 21f67d4db0..6b93bcac28 100644
--- a/api/server/middleware/abortMiddleware.js
+++ b/api/server/middleware/abortMiddleware.js
@@ -69,8 +69,10 @@ const createAbortController = (req, res, getAbortData, getReqData) => {
*/
const onStart = (userMessage, responseMessageId) => {
sendMessage(res, { message: userMessage, created: true });
+
const abortKey = userMessage?.conversationId ?? req.user.id;
const prevRequest = abortControllers.get(abortKey);
+
if (prevRequest && prevRequest?.abortController) {
const data = prevRequest.abortController.getAbortData();
getReqData({ userMessage: data?.userMessage });
@@ -81,6 +83,7 @@ const createAbortController = (req, res, getAbortData, getReqData) => {
});
return;
}
+
abortControllers.set(abortKey, { abortController, ...endpointOption });
res.on('finish', function () {
diff --git a/api/server/routes/ask/gptPlugins.js b/api/server/routes/ask/gptPlugins.js
index 6b95ceaba4..1db3e333dc 100644
--- a/api/server/routes/ask/gptPlugins.js
+++ b/api/server/routes/ask/gptPlugins.js
@@ -195,7 +195,6 @@ router.post(
progressCallback,
progressOptions: {
res,
- text,
// parentMessageId: overrideParentMessageId || userMessageId,
plugins,
},
diff --git a/api/server/routes/edit/gptPlugins.js b/api/server/routes/edit/gptPlugins.js
index 67c5aa2b68..4db05bd493 100644
--- a/api/server/routes/edit/gptPlugins.js
+++ b/api/server/routes/edit/gptPlugins.js
@@ -168,7 +168,6 @@ router.post(
progressCallback,
progressOptions: {
res,
- text,
plugin,
// parentMessageId: overrideParentMessageId || userMessageId,
},
diff --git a/api/server/utils/handleText.js b/api/server/utils/handleText.js
index f07a30f0a0..17ab569726 100644
--- a/api/server/utils/handleText.js
+++ b/api/server/utils/handleText.js
@@ -19,8 +19,7 @@ const createOnProgress = ({ generation = '', onProgress: _onProgress }) => {
const basePayload = Object.assign({}, base, { text: tokens || '' });
- const progressCallback = (partial, { res, text, ...rest }) => {
- let chunk = partial === text ? '' : partial;
+ const progressCallback = (chunk, { res, ...rest }) => {
basePayload.text = basePayload.text + chunk;
const payload = Object.assign({}, basePayload, rest);
diff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.ts
index 3a5e84beb6..1c69afe760 100644
--- a/client/src/hooks/Chat/useChatFunctions.ts
+++ b/client/src/hooks/Chat/useChatFunctions.ts
@@ -107,7 +107,7 @@ export default function useChatFunctions({
const intermediateId = overrideUserMessageId ?? v4();
parentMessageId = parentMessageId || latestMessage?.messageId || Constants.NO_PARENT;
- if (conversationId == 'new') {
+ if (conversationId == Constants.NEW_CONVO) {
parentMessageId = Constants.NO_PARENT;
currentMessages = [];
conversationId = null;