Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/ChatScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default function ChatScreen({
if (!currConvId) return;
setCurrNodeId(msg.id);
scrollToBottom(true);
await replaceMessage(currConvId, msg, content, onChunk);
await replaceMessage({ msg, newContent: content, onChunk });
scrollToBottom(false, 10);
},
[replaceMessage, scrollToBottom, currConvId, onChunk]
Expand Down
39 changes: 14 additions & 25 deletions src/context/message.context.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ interface SendMessageProps {
system?: string;
onChunk: CallbackGeneratedChunk;
}
interface ReplaceMessageProps {
msg: Message;
newContent: string;
onChunk: CallbackGeneratedChunk;
}

interface MessageContextValue {
// canvas
Expand All @@ -38,12 +43,7 @@ interface MessageContextValue {
isGenerating: (convId: string) => boolean;
sendMessage: (props: SendMessageProps) => Promise<boolean>;
stopGenerating: (convId: string) => void;
replaceMessage: (
convId: string,
msg: Message,
content: string | null,
onChunk: CallbackGeneratedChunk
) => Promise<void>;
replaceMessage: (props: ReplaceMessageProps) => Promise<void>;
branchMessage: (msg: Message) => Promise<void>;
}

Expand Down Expand Up @@ -323,32 +323,21 @@ export const MessageContextProvider = ({
aborts[convId]?.abort();
};

const replaceMessage = async (
convId: string,
msg: Message,
content: string | null,
onChunk: CallbackGeneratedChunk
) => {
if (isGenerating(convId)) return;

if (content == null) {
onChunk(msg.parent);
return;
}
const replaceMessage = async ({
msg,
newContent,
onChunk,
}: ReplaceMessageProps) => {
if (isGenerating(msg.convId)) return;

const now = Date.now();
const currMsgId = now;
await StorageUtils.appendMsg(
{
...msg,
id: currMsgId,
convId,
type: msg.type,
role: msg.role,
content,
extra: msg.extra,
parent: msg.parent,
children: [],
timestamp: now,
content: newContent,
},
msg.parent
);
Expand Down