Merge pull request #13 from langchain-ai/brace/tool-calls-error-messages

feat: Add default tool call renderer, and error toasts
This commit is contained in:
Brace Sproul
2025-03-04 14:26:31 -08:00
committed by GitHub
10 changed files with 162 additions and 7 deletions

View File

@@ -34,12 +34,14 @@
"esbuild-plugin-tailwindcss": "^2.0.1", "esbuild-plugin-tailwindcss": "^2.0.1",
"framer-motion": "^12.4.9", "framer-motion": "^12.4.9",
"lucide-react": "^0.476.0", "lucide-react": "^0.476.0",
"next-themes": "^0.4.4",
"prettier": "^3.5.2", "prettier": "^3.5.2",
"react": "^19.0.0", "react": "^19.0.0",
"react-dom": "^19.0.0", "react-dom": "^19.0.0",
"react-markdown": "^10.0.1", "react-markdown": "^10.0.1",
"react-router-dom": "^6.17.0", "react-router-dom": "^6.17.0",
"remark-gfm": "^4.0.1", "remark-gfm": "^4.0.1",
"sonner": "^2.0.1",
"tailwind-merge": "^3.0.2", "tailwind-merge": "^3.0.2",
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"use-query-params": "^2.2.1", "use-query-params": "^2.2.1",

34
pnpm-lock.yaml generated
View File

@@ -78,6 +78,9 @@ importers:
lucide-react: lucide-react:
specifier: ^0.476.0 specifier: ^0.476.0
version: 0.476.0(react@19.0.0) version: 0.476.0(react@19.0.0)
next-themes:
specifier: ^0.4.4
version: 0.4.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
prettier: prettier:
specifier: ^3.5.2 specifier: ^3.5.2
version: 3.5.2 version: 3.5.2
@@ -96,6 +99,9 @@ importers:
remark-gfm: remark-gfm:
specifier: ^4.0.1 specifier: ^4.0.1
version: 4.0.1 version: 4.0.1
sonner:
specifier: ^2.0.1
version: 2.0.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
tailwind-merge: tailwind-merge:
specifier: ^3.0.2 specifier: ^3.0.2
version: 3.0.2 version: 3.0.2
@@ -3891,6 +3897,15 @@ packages:
integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==, integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==,
} }
next-themes@0.4.4:
resolution:
{
integrity: sha512-LDQ2qIOJF0VnuVrrMSMLrWGjRMkq+0mpgl6e0juCLqdJ+oo8Q84JRWT6Wh11VDQKkMMe+dVzDKLWs5n87T+PkQ==,
}
peerDependencies:
react: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
react-dom: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
node-domexception@1.0.0: node-domexception@1.0.0:
resolution: resolution:
{ {
@@ -4490,6 +4505,15 @@ packages:
integrity: sha512-xMO/8eNREtaROt7tJvWJqHBDTMFN4eiQ5I4JRMuilwfnFcV5W9u7RUkueNkdw0jPqGMX36iCywelS5yilTuOxg==, integrity: sha512-xMO/8eNREtaROt7tJvWJqHBDTMFN4eiQ5I4JRMuilwfnFcV5W9u7RUkueNkdw0jPqGMX36iCywelS5yilTuOxg==,
} }
sonner@2.0.1:
resolution:
{
integrity: sha512-FRBphaehZ5tLdLcQ8g2WOIRE+Y7BCfWi5Zyd8bCvBjiW8TxxAyoWZIxS661Yz6TGPqFQ4VLzOF89WEYhfynSFQ==,
}
peerDependencies:
react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
source-map-js@1.2.1: source-map-js@1.2.1:
resolution: resolution:
{ {
@@ -7508,6 +7532,11 @@ snapshots:
natural-compare@1.4.0: {} natural-compare@1.4.0: {}
next-themes@0.4.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
dependencies:
react: 19.0.0
react-dom: 19.0.0(react@19.0.0)
node-domexception@1.0.0: {} node-domexception@1.0.0: {}
node-fetch@2.7.0: node-fetch@2.7.0:
@@ -7899,6 +7928,11 @@ snapshots:
simple-wcswidth@1.0.1: {} simple-wcswidth@1.0.1: {}
sonner@2.0.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
dependencies:
react: 19.0.0
react-dom: 19.0.0(react@19.0.0)
source-map-js@1.2.1: {} source-map-js@1.2.1: {}
space-separated-tokens@2.0.2: {} space-separated-tokens@2.0.2: {}

View File

@@ -21,7 +21,7 @@ function ThreadList({
const [threadId, setThreadId] = useQueryParam("threadId", StringParam); const [threadId, setThreadId] = useQueryParam("threadId", StringParam);
return ( return (
<div className="h-full overflow-y-scroll flex flex-col gap-2 items-start justify-start [&::-webkit-scrollbar]:w-1.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-gray-300 [&::-webkit-scrollbar-track]:bg-transparent"> <div className="h-full flex flex-col gap-2 items-start justify-start overflow-y-scroll [&::-webkit-scrollbar]:w-1.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-gray-300 [&::-webkit-scrollbar-track]:bg-transparent">
{threads.map((t) => { {threads.map((t) => {
let itemText = t.thread_id; let itemText = t.thread_id;
if ( if (

View File

@@ -23,6 +23,7 @@ import {
import { BooleanParam, StringParam, useQueryParam } from "use-query-params"; import { BooleanParam, StringParam, useQueryParam } from "use-query-params";
import { StickToBottom, useStickToBottomContext } from "use-stick-to-bottom"; import { StickToBottom, useStickToBottomContext } from "use-stick-to-bottom";
import ThreadHistory from "./history"; import ThreadHistory from "./history";
import { toast } from "sonner";
function StickyToBottomContent(props: { function StickyToBottomContent(props: {
content: ReactNode; content: ReactNode;
@@ -75,6 +76,36 @@ export function Thread() {
const messages = stream.messages; const messages = stream.messages;
const isLoading = stream.isLoading; const isLoading = stream.isLoading;
const lastError = useRef<string | undefined>(undefined);
useEffect(() => {
if (!stream.error) {
lastError.current = undefined;
return;
}
try {
const message = (stream.error as any).message;
if (!message || lastError.current === message) {
// Message has already been logged. do not modify ref, return early.
return;
}
// Message is defined, and it has not been logged yet. Save it, and send the error
lastError.current = message;
toast.error("An error occurred. Please try again.", {
description: (
<p>
<strong>Error:</strong> <code>{message}</code>
</p>
),
richColors: true,
closeButton: true,
});
} catch {
// no-op
}
}, [stream.error]);
// TODO: this should be part of the useStream hook // TODO: this should be part of the useStream hook
const prevMessageLength = useRef(0); const prevMessageLength = useRef(0);
useEffect(() => { useEffect(() => {
@@ -178,7 +209,7 @@ export function Thread() {
<StickToBottom className="relative flex-1 overflow-hidden"> <StickToBottom className="relative flex-1 overflow-hidden">
<StickyToBottomContent <StickyToBottomContent
className={cn( className={cn(
"absolute inset-0 overflow-auto", "absolute inset-0 overflow-y-scroll [&::-webkit-scrollbar]:w-1.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-gray-300 [&::-webkit-scrollbar-track]:bg-transparent",
!threadId && "flex flex-col items-stretch mt-[25vh]", !threadId && "flex flex-col items-stretch mt-[25vh]",
threadId && "grid grid-rows-[1fr_auto]", threadId && "grid grid-rows-[1fr_auto]",
)} )}

View File

@@ -205,10 +205,7 @@ const defaultComponents = memoizeMarkdownComponents({
const isCodeBlock = useIsMarkdownCodeBlock(); const isCodeBlock = useIsMarkdownCodeBlock();
return ( return (
<code <code
className={cn( className={cn(!isCodeBlock && "rounded font-semibold", className)}
!isCodeBlock && "bg-muted rounded border font-semibold",
className,
)}
{...props} {...props}
/> />
); );

View File

@@ -6,6 +6,7 @@ import { Avatar, AvatarFallback } from "@/components/ui/avatar";
import { MarkdownText } from "../markdown-text"; import { MarkdownText } from "../markdown-text";
import { LoadExternalComponent } from "@langchain/langgraph-sdk/react-ui/client"; import { LoadExternalComponent } from "@langchain/langgraph-sdk/react-ui/client";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { ToolCalls } from "./tool-calls";
function CustomComponent({ function CustomComponent({
message, message,
@@ -56,12 +57,18 @@ export function AssistantMessage({
const meta = thread.getMessagesMetadata(message); const meta = thread.getMessagesMetadata(message);
const parentCheckpoint = meta?.firstSeenState?.parent_checkpoint; const parentCheckpoint = meta?.firstSeenState?.parent_checkpoint;
const hasToolCalls =
"tool_calls" in message &&
message.tool_calls &&
message.tool_calls.length > 0;
return ( return (
<div className="flex items-start mr-auto gap-2 group"> <div className="flex items-start mr-auto gap-2 group">
<Avatar> <Avatar>
<AvatarFallback>A</AvatarFallback> <AvatarFallback>A</AvatarFallback>
</Avatar> </Avatar>
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
{hasToolCalls && <ToolCalls toolCalls={message.tool_calls} />}
<CustomComponent message={message} thread={thread} /> <CustomComponent message={message} thread={thread} />
{contentString.length > 0 && ( {contentString.length > 0 && (
<div className="rounded-2xl bg-muted px-4 py-2"> <div className="rounded-2xl bg-muted px-4 py-2">

View File

@@ -0,0 +1,53 @@
import { AIMessage } from "@langchain/langgraph-sdk";
function isComplexValue(value: any): boolean {
return Array.isArray(value) || (typeof value === "object" && value !== null);
}
export function ToolCalls({
toolCalls,
}: {
toolCalls: AIMessage["tool_calls"];
}) {
if (!toolCalls || toolCalls.length === 0) return null;
return (
<div className="space-y-4">
{toolCalls.map((tc, idx) => {
const args = tc.args as Record<string, any>;
if (!tc.args || Object.keys(args).length === 0) return null;
return (
<div
key={idx}
className="border border-gray-200 rounded-lg overflow-hidden"
>
<div className="bg-gray-50 px-4 py-2 border-b border-gray-200">
<h3 className="text-lg font-medium text-gray-900">{tc.name}</h3>
</div>
<table className="min-w-full divide-y divide-gray-200">
<tbody className="divide-y divide-gray-200">
{Object.entries(args).map(([key, value], argIdx) => (
<tr key={argIdx}>
<td className="px-4 py-2 text-sm font-medium text-gray-900 whitespace-nowrap">
{key}
</td>
<td className="px-4 py-2 text-sm text-gray-500">
{isComplexValue(value) ? (
<code className="bg-gray-50 rounded px-2 py-1 font-mono text-sm">
{JSON.stringify(value, null, 2)}
</code>
) : (
String(value)
)}
</td>
</tr>
))}
</tbody>
</table>
</div>
);
})}
</div>
);
}

View File

@@ -0,0 +1,27 @@
import { useTheme } from "next-themes";
import { Toaster as Sonner, ToasterProps } from "sonner";
const Toaster = ({ ...props }: ToasterProps) => {
const { theme = "system" } = useTheme();
return (
<Sonner
theme={theme as ToasterProps["theme"]}
className="toaster group"
toastOptions={{
classNames: {
toast:
"group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg",
description: "group-[.toast]:text-muted-foreground",
actionButton:
"group-[.toast]:bg-primary group-[.toast]:text-primary-foreground font-medium",
cancelButton:
"group-[.toast]:bg-muted group-[.toast]:text-muted-foreground font-medium",
},
}}
{...props}
/>
);
};
export { Toaster };

View File

@@ -5,6 +5,7 @@ import { StreamProvider } from "./providers/Stream.tsx";
import { QueryParamProvider } from "use-query-params"; import { QueryParamProvider } from "use-query-params";
import { ReactRouter6Adapter } from "use-query-params/adapters/react-router-6"; import { ReactRouter6Adapter } from "use-query-params/adapters/react-router-6";
import { BrowserRouter } from "react-router-dom"; import { BrowserRouter } from "react-router-dom";
import { Toaster } from "@/components/ui/sonner";
createRoot(document.getElementById("root")!).render( createRoot(document.getElementById("root")!).render(
<BrowserRouter> <BrowserRouter>
@@ -13,5 +14,6 @@ createRoot(document.getElementById("root")!).render(
<App /> <App />
</StreamProvider> </StreamProvider>
</QueryParamProvider> </QueryParamProvider>
<Toaster />
</BrowserRouter>, </BrowserRouter>,
); );

View File

@@ -14,8 +14,10 @@ import { ArrowRight } from "lucide-react";
import { PasswordInput } from "@/components/ui/password-input"; import { PasswordInput } from "@/components/ui/password-input";
import { getApiKey } from "@/lib/api-key"; import { getApiKey } from "@/lib/api-key";
export type StateType = { messages: Message[]; ui?: UIMessage[] };
const useTypedStream = useStream< const useTypedStream = useStream<
{ messages: Message[]; ui?: UIMessage[] }, StateType,
{ {
UpdateType: { UpdateType: {
messages?: Message[] | Message | string; messages?: Message[] | Message | string;