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

* fix: Update @librechat/agents to version 1.9.98 * feat: o1 tool calling * fix: Improve error logging in RouteErrorBoundary * refactor: Move extractContent function to utils and clean up Artifact component * refactor: optimize reasoning UI post-streaming and deprecate plugins rendering * feat: reasoning_effort support * fix: update request content type handling in openapiToFunction to remove default 'application/x-www-form-urlencoded' * chore: bump v0.7.696 data-provider
174 lines
5.2 KiB
TypeScript
174 lines
5.2 KiB
TypeScript
import { memo, Suspense, useMemo } from 'react';
|
|
import { useRecoilValue } from 'recoil';
|
|
import type { TMessage } from 'librechat-data-provider';
|
|
import type { TMessageContentProps, TDisplayProps } from '~/common';
|
|
import Error from '~/components/Messages/Content/Error';
|
|
import Thinking from '~/components/Artifacts/Thinking';
|
|
import { DelayedRender } from '~/components/ui';
|
|
import { useChatContext } from '~/Providers';
|
|
import MarkdownLite from './MarkdownLite';
|
|
import EditMessage from './EditMessage';
|
|
import { useLocalize } from '~/hooks';
|
|
import Container from './Container';
|
|
import Markdown from './Markdown';
|
|
import { cn } from '~/utils';
|
|
import store from '~/store';
|
|
|
|
export const ErrorMessage = ({
|
|
text,
|
|
message,
|
|
className = '',
|
|
}: Pick<TDisplayProps, 'text' | 'className'> & {
|
|
message?: TMessage;
|
|
}) => {
|
|
const localize = useLocalize();
|
|
if (text === 'Error connecting to server, try refreshing the page.') {
|
|
console.log('error message', message);
|
|
return (
|
|
<Suspense
|
|
fallback={
|
|
<div className="text-message mb-[0.625rem] flex min-h-[20px] flex-col items-start gap-3 overflow-visible">
|
|
<div className="markdown prose dark:prose-invert light w-full break-words dark:text-gray-100">
|
|
<div className="absolute">
|
|
<p className="submitting relative">
|
|
<span className="result-thinking" />
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
}
|
|
>
|
|
<DelayedRender delay={5500}>
|
|
<Container message={message}>
|
|
<div
|
|
className={cn(
|
|
'rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200',
|
|
className,
|
|
)}
|
|
>
|
|
{localize('com_ui_error_connection')}
|
|
</div>
|
|
</Container>
|
|
</DelayedRender>
|
|
</Suspense>
|
|
);
|
|
}
|
|
return (
|
|
<Container message={message}>
|
|
<div
|
|
role="alert"
|
|
aria-live="assertive"
|
|
className={cn(
|
|
'rounded-xl border border-red-500/20 bg-red-500/5 px-3 py-2 text-sm text-gray-600 dark:text-gray-200',
|
|
className,
|
|
)}
|
|
>
|
|
<Error text={text} />
|
|
</div>
|
|
</Container>
|
|
);
|
|
};
|
|
|
|
const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplayProps) => {
|
|
const { isSubmitting, latestMessage } = useChatContext();
|
|
const enableUserMsgMarkdown = useRecoilValue(store.enableUserMsgMarkdown);
|
|
const showCursorState = useMemo(
|
|
() => showCursor === true && isSubmitting,
|
|
[showCursor, isSubmitting],
|
|
);
|
|
const isLatestMessage = useMemo(
|
|
() => message.messageId === latestMessage?.messageId,
|
|
[message.messageId, latestMessage?.messageId],
|
|
);
|
|
|
|
let content: React.ReactElement;
|
|
if (!isCreatedByUser) {
|
|
content = (
|
|
<Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />
|
|
);
|
|
} else if (enableUserMsgMarkdown) {
|
|
content = <MarkdownLite content={text} />;
|
|
} else {
|
|
content = <>{text}</>;
|
|
}
|
|
|
|
return (
|
|
<Container message={message}>
|
|
<div
|
|
className={cn(
|
|
isSubmitting ? 'submitting' : '',
|
|
showCursorState && !!text.length ? 'result-streaming' : '',
|
|
'markdown prose message-content dark:prose-invert light w-full break-words',
|
|
isCreatedByUser && !enableUserMsgMarkdown && 'whitespace-pre-wrap',
|
|
isCreatedByUser ? 'dark:text-gray-20' : 'dark:text-gray-100',
|
|
)}
|
|
>
|
|
{content}
|
|
</div>
|
|
</Container>
|
|
);
|
|
};
|
|
|
|
// Unfinished Message Component
|
|
export const UnfinishedMessage = ({ message }: { message: TMessage }) => (
|
|
<ErrorMessage
|
|
message={message}
|
|
text="The response is incomplete; it's either still processing, was cancelled, or censored. Refresh or try a different prompt."
|
|
/>
|
|
);
|
|
|
|
const MessageContent = ({
|
|
text,
|
|
edit,
|
|
error,
|
|
unfinished,
|
|
isSubmitting,
|
|
isLast,
|
|
...props
|
|
}: TMessageContentProps) => {
|
|
const { message } = props;
|
|
const { messageId } = message;
|
|
|
|
const { thinkingContent, regularContent } = useMemo(() => {
|
|
const thinkingMatch = text.match(/:::thinking([\s\S]*?):::/);
|
|
return {
|
|
thinkingContent: thinkingMatch ? thinkingMatch[1].trim() : '',
|
|
regularContent: thinkingMatch ? text.replace(/:::thinking[\s\S]*?:::/, '').trim() : text,
|
|
};
|
|
}, [text]);
|
|
|
|
const showRegularCursor = useMemo(() => isLast && isSubmitting, [isLast, isSubmitting]);
|
|
|
|
const unfinishedMessage = useMemo(
|
|
() =>
|
|
!isSubmitting && unfinished ? (
|
|
<Suspense>
|
|
<DelayedRender delay={250}>
|
|
<UnfinishedMessage message={message} />
|
|
</DelayedRender>
|
|
</Suspense>
|
|
) : null,
|
|
[isSubmitting, unfinished, message],
|
|
);
|
|
|
|
if (error) {
|
|
return <ErrorMessage message={props.message} text={text} />;
|
|
} else if (edit) {
|
|
return <EditMessage text={text} isSubmitting={isSubmitting} {...props} />;
|
|
}
|
|
|
|
return (
|
|
<>
|
|
{thinkingContent && <Thinking key={`thinking-${messageId}`}>{thinkingContent}</Thinking>}
|
|
<DisplayMessage
|
|
key={`display-${messageId}`}
|
|
showCursor={showRegularCursor}
|
|
text={regularContent}
|
|
{...props}
|
|
/>
|
|
{unfinishedMessage}
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default memo(MessageContent);
|