Skip to content

Calls on confirms #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Calls on confirms #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e738fdf
fix: add calls while confirm is running
tylerslaton Jun 28, 2024
de6c184
fix: address issue where restarting script during call broke things
tylerslaton Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 55 additions & 52 deletions components/script/messages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,64 +29,67 @@ const abbreviate = (name: string) => {

const Messages = ({ messages, noAvatar }: { messages: Message[], noAvatar?: boolean }) => (
<div>
{messages.map((message, index) =>
message?.type === MessageType.User ? (
{messages.map((message, index) => {
if (!message) return;
return (
message?.type === MessageType.User ? (
<div key={index} className="flex flex-col items-end mb-10">
<p className="whitespace-pre-wrap rounded-2xl bg-blue-500 text-white py-2 px-4 max-w-full">
{messages[index].message}
</p>
</div>
) : (
<div key={index} className="flex flex-col items-start mb-10">
<div className="flex gap-2 w-full">
{ !noAvatar &&
<Tooltip
content={`Sent from ${message?.name || "Main"}`}
placement="bottom"
closeDelay={0.5}
>
<Avatar
showFallback
name={abbreviate(message?.name || 'Main')}
icon={!message?.name && <GoSquirrel className="text-xl" />}
className="w-[40px] cursor-default"
classNames={{base: "bg-white p-6 text-sm border dark:border-none dark:bg-zinc-900"}}
color={message?.error ? "danger": "default"}
/>
</Tooltip>
}
<div
className={`w-[93%] rounded-2xl text-black dark:text-white pt-1 px-4 border dark:border-none dark:bg-zinc-900 ${message.error ? "border-danger dark:border-danger" : ""}`}
>
{ messages[index].message &&
<Markdown className="!text-wrap prose overflow-x-auto dark:prose-invert p-4 !w-full !max-w-full prose-thead:text-left prose-img:rounded-xl prose-img:shadow-lg" remarkPlugins={[remarkGfm]}>
{messages[index].message}
</Markdown>
) : (
<div key={index} className="flex flex-col items-start mb-10">
<div className="flex gap-2 w-full">
{ !noAvatar &&
<Tooltip
content={`Sent from ${message?.name || "Main"}`}
placement="bottom"
closeDelay={0.5}
>
<Avatar
showFallback
name={abbreviate(message?.name || 'Main')}
icon={!message?.name && <GoSquirrel className="text-xl" />}
className="w-[40px] cursor-default"
classNames={{base: "bg-white p-6 text-sm border dark:border-none dark:bg-zinc-900"}}
color={message?.error ? "danger": "default"}
/>
</Tooltip>
}
{ messages[index].component }
{message?.error && (
<>
<p className="text-danger text-base pl-4 pb-6">{message?.error}</p>
<Button
startContent={<GoIssueReopened className="text-lg"/>}
color="danger"
className="ml-4 mb-6"
onPress={() => window.location.reload()}
>
Restart Script
</Button>
</>
)}
</div>
</div>
{ messages[index].calls &&
<div className="flex w-full justify-end mt-2">
<Calls calls={messages[index].calls!}/>
</div>
}
</div>
)
)}
<div
className={`w-[93%] rounded-2xl text-black dark:text-white pt-1 px-4 border dark:border-none dark:bg-zinc-900 ${message.error ? "border-danger dark:border-danger" : ""}`}
>
{ messages[index].message &&
<Markdown className="!text-wrap prose overflow-x-auto dark:prose-invert p-4 !w-full !max-w-full prose-thead:text-left prose-img:rounded-xl prose-img:shadow-lg" remarkPlugins={[remarkGfm]}>
{messages[index].message}
</Markdown>
}
{ messages[index].component }
{message?.error && (
<>
<p className="text-danger text-base pl-4 pb-6">{message?.error}</p>
<Button
startContent={<GoIssueReopened className="text-lg"/>}
color="danger"
className="ml-4 mb-6"
onPress={() => window.location.reload()}
>
Restart Script
</Button>
</>
)}
</div>
</div>
{ messages[index]?.calls &&
<div className="flex w-full justify-end mt-2">
<Calls calls={messages[index].calls!}/>
</div>
}
</div>
)
)
})}
</div>
);

Expand Down
18 changes: 9 additions & 9 deletions components/script/useChatSocket.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ const useChatSocket = () => {
updatedMessages[messagesRef.current.length - 1] = message;
}
return updatedMessages;

});
}

Expand All @@ -85,12 +84,12 @@ const useChatSocket = () => {
}
}, []);

const handlePromptRequest = useCallback((prompt: PromptFrame) => {
const handlePromptRequest = useCallback(({frame, state}: {frame: PromptFrame, state: Record<string, CallFrame>}) => {
setMessages((prevMessages) => {
const updatedMessages = [...prevMessages];
const form = (
<PromptForm
frame={prompt}
frame={frame}
onSubmit={(response: PromptResponse) => {
socketRef.current?.emit("promptResponse", response)
}}
Expand All @@ -99,17 +98,18 @@ const useChatSocket = () => {

if (latestBotMessageIndex.current !== -1) {
// Update the message content
updatedMessages[latestBotMessageIndex.current].message = prompt.message;
updatedMessages[latestBotMessageIndex.current].message = frame.message;
updatedMessages[latestBotMessageIndex.current].component = form;
updatedMessages[latestBotMessageIndex.current].calls = state;
} else {
// If there are no previous messages, create a new message
updatedMessages.push({ type: MessageType.Bot, message: prompt.message, component: form });
updatedMessages.push({ type: MessageType.Bot, message: frame.message, component: form, calls: state});
}
return updatedMessages;
});
}, []);

const handleConfirmRequest = useCallback((frame: CallFrame) => {
const handleConfirmRequest = useCallback(({frame, state}: {frame: CallFrame, state: Record<string, CallFrame>}) => {
if (!frame.tool) return;

if (alreadyAllowed(frame)) {
Expand Down Expand Up @@ -138,7 +138,7 @@ const useChatSocket = () => {
/>
);

let message: Message = { type: MessageType.Bot, name: frame.tool?.name, component: form};
let message: Message = { type: MessageType.Bot, name: frame.tool?.name, component: form, calls: state};
if (latestBotMessageIndex.current === -1) {
latestBotMessageIndex.current = messagesRef.current.length;
setMessages((prevMessages) => {
Expand Down Expand Up @@ -227,8 +227,8 @@ const useChatSocket = () => {
socket.on("disconnect", () => setConnected(false));
socket.on("progress", (data: {frame: CallFrame, state: any}) => handleProgress(data));
socket.on("error", (data: string) => handleError(data));
socket.on("promptRequest", (data: PromptFrame) => { handlePromptRequest(data) });
socket.on("confirmRequest", (data: CallFrame) => { handleConfirmRequest(data) });
socket.on("promptRequest", (data: {frame: PromptFrame, state: any }) => { handlePromptRequest(data) });
socket.on("confirmRequest", (data: {frame: CallFrame, state: any}) => { handleConfirmRequest(data) });

setSocket(socket);
}
Expand Down
8 changes: 4 additions & 4 deletions server.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ const streamExecFileWithEvents = async (file, tool, args, workspace, socket, gpt
runningScript.on(RunEventType.Event, data => socket.emit('progress', {frame: data, state: runningScript.calls}) );

// Handle prompt events
runningScript.on(RunEventType.Prompt, async (data) => socket.emit("promptRequest", data));
runningScript.on(RunEventType.Prompt, async (data) => socket.emit("promptRequest", {frame: data, state: runningScript.calls}));
socket.on("promptResponse", async (data) => await gptscript.promptResponse(data));

// Handle confirm events
runningScript.on(RunEventType.CallConfirm, (data) => socket.emit("confirmRequest", data));
runningScript.on(RunEventType.CallConfirm, (data) => socket.emit("confirmRequest", {frame: data, state: runningScript.calls}));
socket.on("confirmResponse", async (data) => await gptscript.confirm(data));

socket.on("interrupt", async() => {
Expand All @@ -87,11 +87,11 @@ const streamExecFileWithEvents = async (file, tool, args, workspace, socket, gpt
runningScript.on(RunEventType.Event, data => socket.emit('progress', {frame: data, state: runningScript.calls}));

// Handle prompt events
runningScript.on(RunEventType.Prompt, async (data) => socket.emit("promptRequest", data));
runningScript.on(RunEventType.Prompt, async (data) => socket.emit("promptRequest", {frame: data, state: runningScript.calls}));
socket.on("promptResponse", async (data) => await gptscript.promptResponse(data));

// Handle confirm events
runningScript.on(RunEventType.CallConfirm, (data) => socket.emit("confirmRequest", data));
runningScript.on(RunEventType.CallConfirm, (data) => socket.emit("confirmRequest", {frame: data, state: runningScript.calls}));
socket.on("confirmResponse", async (data) => await gptscript.confirm(data));
});
} catch (e) {
Expand Down