mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* refactor: replace lodash import with specific function import fix(api): esm imports to cjs * refactor(Messages.tsx): convert to TS, out-source scrollToDiv logic to a custom hook fix(ScreenshotContext.tsx): change Ref to RefObject in ScreenshotContextType feat(useScrollToRef.ts): add useScrollToRef hook for scrolling to a ref with throttle fix(Chat.tsx): update import path for Messages component fix(Search.tsx): update import path for Messages component * chore(types.ts): add TAskProps and TOptions types refactor(useMessageHandler.ts): use TAskFunction type for ask function signature * refactor(Message/Content): convert to TS, move Plugin component to Content dir * feat(MessageContent.tsx): add MessageContent component for displaying and editing message content feat(index.ts): export MessageContent component from Messages/Content directory * wip(Message.jsx): conversion and use of new component in progress * refactor: convert Message.jsx to TS and fix typing/imports based on changes * refactor: add typed props and refactor MultiMessage to TS, fix typing issues resulting from the conversion * edit message in progress * feat: complete edit AI message logic, refactor continue logic * feat(middleware): add validateMessageReq middleware feat(routes): add validation for message requests using validateMessageReq middleware feat(routes): add create, read, update, and delete routes for messages * feat: complete frontend logic for editing messages in place feat(messages.js): update route for updating a specific message - Change the route for updating a message to include the messageId in the URL - Update the request handler to use the messageId from the request parameters and the text from the request body - Call the updateMessage function with the updated parameters feat(MessageContent.tsx): add functionality to update a message - Import the useUpdateMessageMutation hook from the data provider - Destructure the conversationId, parentMessageId, and messageId from the message object - Create a mutation function using the useUpdateMessageMutation hook - Implement the updateMessage function to call the mutation function with the updated message parameters - Update the messages state to reflect the updated message text feat(api-endpoints.ts): update messages endpoint to include messageId - Update the messages endpoint to include the messageId as an optional parameter feat(data-service.ts): add updateMessage function - Implement the updateMessage function to make a PUT request to * fix(messages.js): make updateMessage function asynchronous and await its execution * style(EditIcon): make icon active for AI message * feat(gptPlugins/anthropic): add edit support * fix(validateMessageReq.js): handle case when conversationId is 'new' and return empty array feat(Message.tsx): pass message prop to SiblingSwitch component refactor(SiblingSwitch.tsx): convert to TS * fix(useMessageHandler.ts): remove message from currentMessages if isContinued is true feat(useMessageHandler.ts): add support for submission messages in setMessages fix(useServerStream.ts): remove unnecessary conditional in setMessages fix(useServerStream.ts): remove isContinued variable from submission * fix(continue): switch to continued message generation when continuing an earlier branch in conversation * fix(abortMiddleware.js): fix condition to check partialText length chore(abortMiddleware.js): add error logging when abortMessage fails * refactor(MessageHeader.tsx): convert to TS fix(Plugin.tsx): add default value for className prop in Plugin component * refactor(MultiMessage.tsx): remove commented out code docs(MultiMessage.tsx): update comment to clarify when siblingIdx is reset * fix(GenerationButtons): optimistic state for continue button * fix(MessageContent.tsx): add data-testid attribute to message text editor fix(messages.spec.ts): update waitForServerStream function to include edit endpoint check feat(messages.spec.ts): add test case for editing messages * fix(HoverButtons & Message & useGenerations): Refactor edit functionality and related conditions - Update enterEdit function signature and prop - Create and utilize hideEditButton variable - Enhance conditions for edit button visibility and active state - Update button event handlers - Introduce isEditableEndpoint in useGenerations and refine continueSupported condition. * fix(useGenerations.ts): fix condition for hideEditButton to include error and searchResult chore(data-provider): bump version to 0.1.6 fix(types.ts): add status property to TError type * chore: bump @dqbd/tiktoken to 1.0.7 * fix(abortMiddleware.js): add required isCreatedByUser property to the error response object * refactor(Message.tsx): remove unnecessary props from SiblingSwitch component, as setLatestMessage is firing on every switch already refactor(SiblingSwitch.tsx): remove unused imports and code * chore(BaseClient.js): move console.debug statements back inside if block
161 lines
4.2 KiB
JavaScript
161 lines
4.2 KiB
JavaScript
const partialRight = require('lodash/partialRight');
|
|
const citationRegex = /\[\^\d+?\^]/g;
|
|
const { getCitations, citeText } = require('./citations');
|
|
const cursor = '<span className="result-streaming">█</span>';
|
|
|
|
const addSpaceIfNeeded = (text) => (text.length > 0 && !text.endsWith(' ') ? text + ' ' : text);
|
|
|
|
const handleError = (res, message) => {
|
|
res.write(`event: error\ndata: ${JSON.stringify(message)}\n\n`);
|
|
res.end();
|
|
};
|
|
|
|
const sendMessage = (res, message, event = 'message') => {
|
|
if (message.length === 0) {
|
|
return;
|
|
}
|
|
res.write(`event: ${event}\ndata: ${JSON.stringify(message)}\n\n`);
|
|
};
|
|
|
|
const createOnProgress = ({ generation = '', onProgress: _onProgress }) => {
|
|
let i = 0;
|
|
let code = '';
|
|
let precode = '';
|
|
let codeBlock = false;
|
|
let tokens = addSpaceIfNeeded(generation);
|
|
|
|
const progressCallback = async (partial, { res, text, plugin, bing = false, ...rest }) => {
|
|
let chunk = partial === text ? '' : partial;
|
|
tokens += chunk;
|
|
precode += chunk;
|
|
tokens = tokens.replaceAll('[DONE]', '');
|
|
|
|
if (codeBlock) {
|
|
code += chunk;
|
|
}
|
|
|
|
if (precode.includes('```') && codeBlock) {
|
|
codeBlock = false;
|
|
precode = precode.replace(/```/g, '');
|
|
code = '';
|
|
}
|
|
|
|
if (precode.includes('```') && code === '') {
|
|
precode = precode.replace(/```/g, '');
|
|
codeBlock = true;
|
|
}
|
|
|
|
if (tokens.match(/^\n/)) {
|
|
tokens = tokens.replace(/^\n/, '');
|
|
}
|
|
|
|
if (bing) {
|
|
tokens = citeText(tokens, true);
|
|
}
|
|
|
|
const payload = { text: tokens, message: true, initial: i === 0, ...rest };
|
|
if (plugin) {
|
|
payload.plugin = plugin;
|
|
}
|
|
sendMessage(res, { ...payload, text: tokens });
|
|
_onProgress && _onProgress(payload);
|
|
i++;
|
|
};
|
|
|
|
const sendIntermediateMessage = (res, payload) => {
|
|
sendMessage(res, {
|
|
text: tokens?.length === 0 ? cursor : tokens,
|
|
message: true,
|
|
initial: i === 0,
|
|
...payload,
|
|
});
|
|
i++;
|
|
};
|
|
|
|
const onProgress = (opts) => {
|
|
return partialRight(progressCallback, opts);
|
|
};
|
|
|
|
const getPartialText = () => {
|
|
return tokens;
|
|
};
|
|
|
|
return { onProgress, getPartialText, sendIntermediateMessage };
|
|
};
|
|
|
|
const handleText = async (response, bing = false) => {
|
|
let { text } = response;
|
|
response.text = text;
|
|
|
|
if (bing) {
|
|
const links = getCitations(response);
|
|
if (response.text.match(citationRegex)?.length > 0) {
|
|
text = citeText(response);
|
|
}
|
|
text += links?.length > 0 ? `\n- ${links}` : '';
|
|
}
|
|
|
|
return text;
|
|
};
|
|
|
|
const isObject = (item) => item && typeof item === 'object' && !Array.isArray(item);
|
|
const getString = (input) => (isObject(input) ? JSON.stringify(input) : input);
|
|
|
|
function formatSteps(steps) {
|
|
let output = '';
|
|
|
|
for (let i = 0; i < steps.length; i++) {
|
|
const step = steps[i];
|
|
const actionInput = getString(step.action.toolInput);
|
|
const observation = step.observation;
|
|
|
|
if (actionInput === 'N/A' || observation?.trim()?.length === 0) {
|
|
continue;
|
|
}
|
|
|
|
output += `Input: ${actionInput}\nOutput: ${getString(observation)}`;
|
|
|
|
if (steps.length > 1 && i !== steps.length - 1) {
|
|
output += '\n---\n';
|
|
}
|
|
}
|
|
|
|
return output;
|
|
}
|
|
|
|
function formatAction(action) {
|
|
const formattedAction = {
|
|
plugin: action.tool,
|
|
input: getString(action.toolInput),
|
|
thought: action.log.includes('Thought: ')
|
|
? action.log.split('\n')[0].replace('Thought: ', '')
|
|
: action.log.split('\n')[0],
|
|
};
|
|
|
|
formattedAction.thought = getString(formattedAction.thought);
|
|
|
|
if (action.tool.toLowerCase() === 'self-reflection' || formattedAction.plugin === 'N/A') {
|
|
formattedAction.inputStr = `{\n\tthought: ${formattedAction.input}${
|
|
!formattedAction.thought.includes(formattedAction.input)
|
|
? ' - ' + formattedAction.thought
|
|
: ''
|
|
}\n}`;
|
|
formattedAction.inputStr = formattedAction.inputStr.replace('N/A - ', '');
|
|
} else {
|
|
const hasThought = formattedAction.thought.length > 0;
|
|
const thought = hasThought ? `\n\tthought: ${formattedAction.thought}` : '';
|
|
formattedAction.inputStr = `{\n\tplugin: ${formattedAction.plugin}\n\tinput: ${formattedAction.input}\n${thought}}`;
|
|
}
|
|
|
|
return formattedAction;
|
|
}
|
|
|
|
module.exports = {
|
|
handleError,
|
|
sendMessage,
|
|
createOnProgress,
|
|
handleText,
|
|
formatSteps,
|
|
formatAction,
|
|
addSpaceIfNeeded,
|
|
};
|