🪙 fix: Streaming Response Token Issue (#3323)

* chore: use NEW_CONVO constant

* fix: token object assign issue
This commit is contained in:
Danny Avila 2024-07-10 23:41:21 -04:00 committed by GitHub
parent 326069d7a6
commit 5ef71a7a36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 5 additions and 7 deletions

View file

@ -112,7 +112,6 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
progressCallback,
progressOptions: {
res,
text,
// parentMessageId: overrideParentMessageId || userMessageId,
},
};

View file

@ -119,7 +119,6 @@ const EditController = async (req, res, next, initializeClient) => {
progressCallback,
progressOptions: {
res,
text,
// parentMessageId: overrideParentMessageId || userMessageId,
},
});

View file

@ -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 () {

View file

@ -195,7 +195,6 @@ router.post(
progressCallback,
progressOptions: {
res,
text,
// parentMessageId: overrideParentMessageId || userMessageId,
plugins,
},

View file

@ -168,7 +168,6 @@ router.post(
progressCallback,
progressOptions: {
res,
text,
plugin,
// parentMessageId: overrideParentMessageId || userMessageId,
},

View file

@ -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);

View file

@ -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;