Skip to content

The Open Standard for Generative UI

add onUpdateMessage hook in crayonchat, usethreadmanager and minor change in loader (#98)

abhithesys4e841898e7da
diff --git a/js/packages/react-core/src/hooks/useThreadActions.ts b/js/packages/react-core/src/hooks/useThreadActions.ts
index 61e81c959..38c55c35f 100644
--- a/js/packages/react-core/src/hooks/useThreadActions.ts
+++ b/js/packages/react-core/src/hooks/useThreadActions.ts
@@ -14,5 +14,6 @@ export const useThreadActions = (): ThreadActions => {
updateMessage: useStore(threadManager, (store) => store.updateMessage),
setMessages: useStore(threadManager, (store) => store.setMessages),
onCancel: useStore(threadManager, (store) => store.onCancel),
+ deleteMessage: useStore(threadManager, (store) => store.deleteMessage),
};
};
diff --git a/js/packages/react-core/src/internal/useThreadManagerStore.ts b/js/packages/react-core/src/internal/useThreadManagerStore.ts
index 715a394c1..3f1693f30 100644
--- a/js/packages/react-core/src/internal/useThreadManagerStore.ts
+++ b/js/packages/react-core/src/internal/useThreadManagerStore.ts
@@ -21,6 +21,7 @@ export const useThreadManagerStore = (inputThreadManager: ThreadManager) => {
updateMessage: (...props) => inputThreadManagerRef.current.updateMessage(...props),
appendMessages: (...props) => inputThreadManagerRef.current.appendMessages(...props),
setMessages: (...props) => inputThreadManagerRef.current.setMessages(...props),
+ deleteMessage: (...props) => inputThreadManagerRef.current.deleteMessage(...props),
})),
);
diff --git a/js/packages/react-core/src/types/chatManager.ts b/js/packages/react-core/src/types/chatManager.ts
index eb52cea66..2858e9168 100644
--- a/js/packages/react-core/src/types/chatManager.ts
+++ b/js/packages/react-core/src/types/chatManager.ts
@@ -26,9 +26,10 @@ export type Thread = {
export type ThreadActions = {
processMessage: (message: CreateMessage) => Promise<void>;
appendMessages: (...messages: Message[]) => void;
- updateMessage: (message: Message) => void;
+ updateMessage: (message: Message, shouldTriggerCallback?: boolean) => void;
onCancel: () => void;
setMessages: (messages: Message[]) => void;
+ deleteMessage: (messageId: string) => void;
};
/**
diff --git a/js/packages/react-core/src/useThreadManager.ts b/js/packages/react-core/src/useThreadManager.ts
index 48d0e6c69..40dd7f273 100644
--- a/js/packages/react-core/src/useThreadManager.ts
+++ b/js/packages/react-core/src/useThreadManager.ts
@@ -16,6 +16,7 @@ export type UseThreadManagerParams = {
threadManager: ThreadManager;
abortController: AbortController;
}) => Promise<Message[]>;
+ onUpdateMessage?: (props: { message: Message }) => void;
responseTemplates: ResponseTemplate[];
};
@@ -69,13 +70,18 @@ export const useThreadManager = (params: UseThreadManagerParams): ThreadManager
set({ abortController: null, isRunning: false });
}
},
- updateMessage: (message: Message) => {
+ updateMessage: (message: Message, shouldTriggerCallback?: boolean) => {
const messages = store.getState().messages.map((m) => {
if (m.id === message.id) {
return message;
}
return m;
});
+
+ if (shouldTriggerCallback) {
+ propsRef.current.onUpdateMessage?.({ message });
+ }
+
set({ messages });
},
onCancel: () => {
@@ -84,6 +90,10 @@ export const useThreadManager = (params: UseThreadManagerParams): ThreadManager
abortController.abort();
}
},
+ deleteMessage: (messageId: string) => {
+ const messages = store.getState().messages.filter((m) => m.id !== messageId);
+ set({ messages });
+ },
responseTemplates: propsRef.current.responseTemplates.reduce(
(acc, template) => {
acc[template.name] = template;
diff --git a/js/packages/react-ui/src/components/CopilotShell/Thread.tsx b/js/packages/react-ui/src/components/CopilotShell/Thread.tsx
index c7af079ee..d57d1f7ec 100644
--- a/js/packages/react-ui/src/components/CopilotShell/Thread.tsx
+++ b/js/packages/react-ui/src/components/CopilotShell/Thread.tsx
@@ -149,12 +149,6 @@ export const RenderMessage = memo(
);
export const MessageLoading = () => {
- const { isRunning } = useThreadState();
-
- if (!isRunning) {
- return null;
- }
-
return (
<div className="crayon-copilot-shell-thread-message-loading">
<MessageLoadingComponent />
@@ -169,7 +163,7 @@ export const Messages = ({
className?: string;
loader?: React.ReactNode;
}) => {
- const { messages } = useThreadState();
+ const { messages, isRunning } = useThreadState();
return (
<div className={clsx("crayon-copilot-shell-thread-messages", className)}>
@@ -183,7 +177,7 @@ export const Messages = ({
</MessageProvider>
);
})}
- {loader}
+ {isRunning && loader}
</div>
);
};
diff --git a/js/packages/react-ui/src/components/CrayonChat/ComposedCopilot.tsx b/js/packages/react-ui/src/components/CrayonChat/ComposedCopilot.tsx
index 3005f6cbd..10e14d086 100644
--- a/js/packages/react-ui/src/components/CrayonChat/ComposedCopilot.tsx
+++ b/js/packages/react-ui/src/components/CrayonChat/ComposedCopilot.tsx
@@ -11,18 +11,20 @@ import {
interface ComposedCopilotProps {
logoUrl?: string;
agentName?: string;
+ messageLoadingComponent?: () => React.ReactNode;
}
export const ComposedCopilot = ({
logoUrl = "https://crayonai.org/img/logo.png",
agentName = "My Agent",
+ messageLoadingComponent: MessageLoadingComponent = MessageLoading,
}: ComposedCopilotProps) => {
return (
<Container logoUrl={logoUrl} agentName={agentName}>
<ThreadContainer>
<Header />
<ScrollArea>
- <Messages loader={<MessageLoading />} />
+ <Messages loader={<MessageLoadingComponent />} />
</ScrollArea>
<Composer />
</ThreadContainer>
diff --git a/js/packages/react-ui/src/components/CrayonChat/ComposedStandalone.tsx b/js/packages/react-ui/src/components/CrayonChat/ComposedStandalone.tsx
index b7ca99a4d..7ef05fc69 100644
--- a/js/packages/react-ui/src/components/CrayonChat/ComposedStandalone.tsx
+++ b/js/packages/react-ui/src/components/CrayonChat/ComposedStandalone.tsx
@@ -17,11 +17,13 @@ import {
interface ComposedStandaloneProps {
logoUrl?: string;
agentName?: string;
+ messageLoadingComponent?: () => React.ReactNode;
}
export const ComposedStandalone = ({
logoUrl = "https://crayonai.org/img/logo.png",
agentName = "My Agent",
+ messageLoadingComponent: MessageLoadingComponent = MessageLoading,
}: ComposedStandaloneProps) => {
return (
<Container logoUrl={logoUrl} agentName={agentName}>
@@ -36,7 +38,7 @@ export const ComposedStandalone = ({
<ThreadContainer>
<MobileHeader />
<ScrollArea>
- <Messages loader={<MessageLoading />} />
+ <Messages loader={<MessageLoadingComponent />} />
</ScrollArea>
<Composer />
</ThreadContainer>
diff --git a/js/packages/react-ui/src/components/CrayonChat/CrayonChat.tsx b/js/packages/react-ui/src/components/CrayonChat/CrayonChat.tsx
index 21f71cb02..bb8d5b8eb 100644
--- a/js/packages/react-ui/src/components/CrayonChat/CrayonChat.tsx
+++ b/js/packages/react-ui/src/components/CrayonChat/CrayonChat.tsx
@@ -17,20 +17,29 @@ import { ThemeProvider } from "../ThemeProvider";
import { ComposedCopilot } from "./ComposedCopilot";
import { ComposedStandalone } from "./ComposedStandalone";
-interface CrayonChatProps {
+type CrayonChatProps = {
+ // options used when threadManager not provided
processMessage?: (params: {
threadId: string;
messages: Message[];
abortController: AbortController;
}) => Promise<Response>;
+ onUpdateMessage?: (props: { message: Message }) => void;
+ processStreamedMessage?: typeof processStreamedMessage;
+ responseTemplates?: ResponseTemplate[];
+
+ // options used when threadListManager is not provided
createThread?: (message: CreateMessage) => Promise<Thread>;
+
threadManager?: ThreadManager;
threadListManager?: ThreadListManager;
+
logoUrl?: string;
agentName?: string;
- responseTemplates?: ResponseTemplate[];
type?: "copilot" | "standalone";
-}
+
+ messageLoadingComponent?: () => React.ReactNode;
+};
export const CrayonChat = ({
processMessage,
@@ -40,6 +49,9 @@ export const CrayonChat = ({
agentName = "My Agent",
responseTemplates,
createThread,
+ onUpdateMessage,
+ processStreamedMessage: userProcessStreamedMessage,
+ messageLoadingComponent,
type = "standalone",
}: CrayonChatProps) => {
invariant(processMessage || userThreadManager, "processMessage or threadManager is required");
@@ -72,6 +84,7 @@ export const CrayonChat = ({
const messages = threadMessages.current[threadId] ?? [];
return Promise.resolve(messages);
},
+ onUpdateMessage: onUpdateMessage,
onProcessMessage: async ({ message, abortController, threadManager }) => {
const newMessage: UserMessage = {
id: crypto.randomUUID(),
@@ -95,14 +108,11 @@ export const CrayonChat = ({
messages: [...threadManager.messages, newMessage],
abortController,
});
- await processStreamedMessage({
+ await (userProcessStreamedMessage || processStreamedMessage)({
response,
createMessage: threadManager.appendMessages,
updateMessage: threadManager.updateMessage,
- deleteMessage: (messageId: string) => {
- const newMessages = threadManager.messages.filter((message) => message.id !== messageId);
- threadManager.setMessages(newMessages);
- },
+ deleteMessage: threadManager.deleteMessage,
});
return [];
@@ -122,9 +132,17 @@ export const CrayonChat = ({
<ThemeProvider>
<ChatProvider threadListManager={threadListManager} threadManager={threadManager}>
{type === "copilot" ? (
- <ComposedCopilot logoUrl={logoUrl} agentName={agentName} />
+ <ComposedCopilot
+ logoUrl={logoUrl}
+ agentName={agentName}
+ messageLoadingComponent={messageLoadingComponent}
+ />
) : (
- <ComposedStandalone logoUrl={logoUrl} agentName={agentName} />
+ <ComposedStandalone
+ logoUrl={logoUrl}
+ agentName={agentName}
+ messageLoadingComponent={messageLoadingComponent}
+ />
)}
</ChatProvider>
</ThemeProvider>
diff --git a/js/packages/react-ui/src/components/Shell/Thread.tsx b/js/packages/react-ui/src/components/Shell/Thread.tsx
index 498ee10f3..39aa60602 100644
--- a/js/packages/react-ui/src/components/Shell/Thread.tsx
+++ b/js/packages/react-ui/src/components/Shell/Thread.tsx
@@ -152,12 +152,6 @@ export const RenderMessage = memo(
);
export const MessageLoading = () => {
- const { isRunning } = useThreadState();
-
- if (!isRunning) {
- return null;
- }
-
return (
<div className="crayon-shell-thread-message-loading">
<MessageLoadingComponent />
@@ -172,7 +166,7 @@ export const Messages = ({
className?: string;
loader?: React.ReactNode;
}) => {
- const { messages } = useThreadState();
+ const { messages, isRunning } = useThreadState();
return (
<div className={clsx("crayon-shell-thread-messages", className)}>
@@ -186,7 +180,7 @@ export const Messages = ({
</MessageProvider>
);
})}
- {loader}
+ {isRunning && loader}
</div>
);
};