Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-19 09:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🚧 chore: merge latest dev build (#4288)

Browse source 
* fix: agent initialization, add `collectedUsage` handling

* style: improve side panel styling

* refactor(loadAgent): Optimize order agent project ID retrieval

* feat: code execution

* fix: typing issues

* feat: ExecuteCode content part

* refactor: use local state for default collapsed state of analysis content parts

* fix: code parsing in ExecuteCode component

* chore: bump agents package, export loadAuthValues

* refactor: Update handleTools.js to use EnvVar for code execution tool authentication

* WIP

* feat: download code outputs

* fix(useEventHandlers): type issues

* feat: backend handling for code outputs

* Refactor: Remove console.log statement in Part.tsx

* refactor: add attachments to TMessage/messageSchema

* WIP: prelim handling for code outputs

* feat: attachments rendering

* refactor: improve attachments rendering

* fix: attachments, nullish edge case, handle attachments from event stream, bump agents package

* fix filename download

* fix: tool assignment for 'run code' on agent creation

* fix: image handling by adding attachments

* refactor: prevent agent creation without provider/model

* refactor: remove unnecessary space in agent creation success message

* refactor: select first model if selecting provider from empty on form

* fix: Agent avatar bug

* fix: `defaultAgentFormValues` causing boolean typing issue and typeerror

* fix: capabilities counting as tools, causing duplication of them

* fix: formatted messages edge case where consecutive content text type parts with the latter having tool_call_ids would cause consecutive AI messages to be created. furthermore, content could not be an array for tool_use messages (anthropic limitation)

* chore: bump @librechat/agents dependency to version 1.6.9

* feat: bedrock agents

* feat: new Agents icon

* feat: agent titling

* feat: agent landing

* refactor: allow sharing agent globally only if user is admin or author

* feat: initial AgentPanelSkeleton

* feat: AgentPanelSkeleton

* feat: collaborative agents

* chore: add potential authorName as part of schema

* chore: Remove unnecessary console.log statement

* WIP: agent model parameters

* chore: ToolsDialog typing and tool related localization chnages

* refactor: update tool instance type (latest langchain class), and rename google tool to 'google' proper

* chore: add back tools

* feat: Agent knowledge files upload

* refactor: better verbiage for disabled knowledge

* chore: debug logs for file deletions

* chore: debug logs for file deletions

* feat: upload/delete agent knowledge/file-search files

* feat: file search UI for agents

* feat: first pass, file search tool

* chore: update default agent capabilities and info
This commit is contained in:
Danny Avila 2024-09-30 17:17:57 -04:00 • committed by GitHub
parent f33e75e2ee
commit ad74350036
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
123 changed files with 3611 additions and 1541 deletions
Download patch file Download diff file Expand all files Collapse all files

52
client/src/hooks/SSE/useEventHandlers.ts
View file

@ -28,6 +28,7 @@ import {
updateConversation,
getConversationById,
} from '~/utils';
import useAttachmentHandler from '~/hooks/SSE/useAttachmentHandler';
import useContentHandler from '~/hooks/SSE/useContentHandler';
import useStepHandler from '~/hooks/SSE/useStepHandler';
import { useAuthContext } from '~/hooks/AuthContext';
@ -62,7 +63,7 @@ export default function useEventHandlers({
setMessages,
getMessages,
setCompleted,
isAddedRequest,
isAddedRequest = false,
setConversation,
setIsSubmitting,
newConversation,
@ -85,6 +86,7 @@ export default function useEventHandlers({
setIsSubmitting,
lastAnnouncementTimeRef,
});
const attachmentHandler = useAttachmentHandler();
const messageHandler = useCallback(
(data: string | undefined, submission: EventSubmission) => {
@ -138,15 +140,20 @@ export default function useEventHandlers({
const { requestMessage, responseMessage, conversation } = data;
const { messages, isRegenerate = false } = submission;
const convoUpdate = conversation ?? submission.conversation;
const convoUpdate =
(conversation as TConversation | null) ?? (submission.conversation as TConversation);
// update the messages
if (isRegenerate) {
const messagesUpdate = [...messages, responseMessage].filter((msg) => msg);
setMessages(messagesUpdate);
const messagesUpdate = (
[...messages, responseMessage] as Array<TMessage | undefined>
).filter((msg) => msg);
setMessages(messagesUpdate as TMessage[]);
} else {
const messagesUpdate = [...messages, requestMessage, responseMessage].filter((msg) => msg);
setMessages(messagesUpdate);
const messagesUpdate = (
[...messages, requestMessage, responseMessage] as Array<TMessage | undefined>
).filter((msg) => msg);
setMessages(messagesUpdate as TMessage[]);
}
const isNewConvo = conversation.conversationId !== submission.conversation.conversationId;
@ -208,7 +215,10 @@ export default function useEventHandlers({
setConversation((prevState) => {
let title = prevState?.title;
const parentId = requestMessage.parentMessageId;
if (parentId !== Constants.NO_PARENT && title?.toLowerCase()?.includes('new chat')) {
if (
parentId !== Constants.NO_PARENT &&
(title?.toLowerCase()?.includes('new chat') ?? false)
) {
const convos = queryClient.getQueryData<ConversationData>([QueryKeys.allConversations]);
const cachedConvo = getConversationById(convos, conversationId);
title = cachedConvo?.title;
@ -289,7 +299,10 @@ export default function useEventHandlers({
setConversation((prevState) => {
let title = prevState?.title;
const parentId = isRegenerate ? userMessage.overrideParentMessageId : parentMessageId;
if (parentId !== Constants.NO_PARENT && title?.toLowerCase()?.includes('new chat')) {
if (
parentId !== Constants.NO_PARENT &&
(title?.toLowerCase()?.includes('new chat') ?? false)
) {
const convos = queryClient.getQueryData<ConversationData>([QueryKeys.allConversations]);
const cachedConvo = getConversationById(convos, conversationId);
title = cachedConvo?.title;
@ -437,7 +450,7 @@ export default function useEventHandlers({
setCompleted((prev) => new Set(prev.add(initialResponse.messageId)));
const conversationId = userMessage.conversationId ?? submission.conversationId;
const conversationId = userMessage.conversationId ?? submission.conversationId ?? '';
const parseErrorResponse = (data: TResData | Partial<TMessage>) => {
const metadata = data['responseMessage'] ?? data;
@ -456,7 +469,7 @@ export default function useEventHandlers({
};
if (!data) {
const convoId = conversationId ?? v4();
const convoId = conversationId || v4();
const errorResponse = parseErrorResponse({
text: 'Error connecting to server, try refreshing the page.',
...submission,
@ -473,7 +486,8 @@ export default function useEventHandlers({
return;
}
if (!conversationId && !data.conversationId) {
const receivedConvoId = data.conversationId ?? '';
if (!conversationId && !receivedConvoId) {
const convoId = v4();
const errorResponse = parseErrorResponse(data);
setMessages([...messages, userMessage, errorResponse]);
@ -485,7 +499,7 @@ export default function useEventHandlers({
}
setIsSubmitting(false);
return;
} else if (!data.conversationId) {
} else if (!receivedConvoId) {
const errorResponse = parseErrorResponse(data);
setMessages([...messages, userMessage, errorResponse]);
setIsSubmitting(false);
@ -500,9 +514,9 @@ export default function useEventHandlers({
});
setMessages([...messages, userMessage, errorResponse]);
if (data.conversationId && paramId === 'new' && newConversation) {
if (receivedConvoId && paramId === 'new' && newConversation) {
newConversation({
template: { conversationId: data.conversationId },
template: { conversationId: receivedConvoId },
preset: tPresetSchema.parse(submission.conversation),
});
}
@ -517,7 +531,8 @@ export default function useEventHandlers({
async (conversationId = '', submission: EventSubmission, messages?: TMessage[]) => {
const runAbortKey = `${conversationId}:${messages?.[messages.length - 1]?.messageId ?? ''}`;
console.log({ conversationId, submission, messages, runAbortKey });
const { endpoint: _endpoint, endpointType } = submission.conversation || {};
const { endpoint: _endpoint, endpointType } =
(submission.conversation as TConversation | null) ?? {};
const endpoint = endpointType ?? _endpoint;
try {
const response = await fetch(`${EndpointURLs[endpoint ?? '']}/abort`, {
@ -541,7 +556,7 @@ export default function useEventHandlers({
setIsSubmitting(false);
return;
}
if (data.final) {
if (data.final === true) {
finalHandler(data, submission);
} else {
cancelHandler(data, submission);
@ -569,13 +584,13 @@ export default function useEventHandlers({
} catch (error) {
console.error('Error cancelling request');
console.error(error);
const convoId = conversationId ?? v4();
const convoId = conversationId || v4();
const text =
submission.initialResponse.text.length > 45 ? submission.initialResponse.text : '';
const errorMessage = {
...submission,
...submission.initialResponse,
text: text ?? (error as Error).message ?? 'Error cancelling request',
text: (text || (error as Error | undefined)?.message) ?? 'Error cancelling request',
unfinished: !!text.length,
error: true,
};
@ -601,6 +616,7 @@ export default function useEventHandlers({
messageHandler,
contentHandler,
createdHandler,
attachmentHandler,
abortConversation,
};
}