Skip to content
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

fix: delete message break the entire thread #869

Merged
merged 2 commits into from
Dec 6, 2023
Merged

fix: delete message break the entire thread #869

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
08383a6
fix: delete message break the entire thread
louis-menlo Dec 6, 2023
f21f68d
Merge branch 'main' into fix/delete-message-break-the-thread
louis-menlo Dec 6, 2023
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
20 changes: 15 additions & 5 deletions extensions/conversational-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import { join } from 'path'
* JSONConversationalExtension is a ConversationalExtension implementation that provides
* functionality for managing threads.
*/
export default class JSONConversationalExtension implements ConversationalExtension {
export default class JSONConversationalExtension
implements ConversationalExtension
{
private static readonly _homeDir = 'threads'
private static readonly _threadInfoFileName = 'thread.json'
private static readonly _threadMessagesFileName = 'messages.jsonl'
Expand Down Expand Up @@ -67,7 +69,10 @@ export default class JSONConversationalExtension implements ConversationalExtens
*/
async saveThread(thread: Thread): Promise<void> {
try {
const threadDirPath = join(JSONConversationalExtension._homeDir, thread.id)
const threadDirPath = join(
JSONConversationalExtension._homeDir,
thread.id
)
const threadJsonPath = join(
threadDirPath,
JSONConversationalExtension._threadInfoFileName
Expand Down Expand Up @@ -119,7 +124,7 @@ export default class JSONConversationalExtension implements ConversationalExtens
await fs.mkdir(threadDirPath)
await fs.writeFile(
threadMessagePath,
messages.map((msg) => JSON.stringify(msg)).join('\n')
messages.map((msg) => JSON.stringify(msg)).join('\n') + '\n'
)
Promise.resolve()
} catch (err) {
Expand Down Expand Up @@ -153,7 +158,10 @@ export default class JSONConversationalExtension implements ConversationalExtens

const threadDirs: string[] = []
for (let i = 0; i < fileInsideThread.length; i++) {
const path = join(JSONConversationalExtension._homeDir, fileInsideThread[i])
const path = join(
JSONConversationalExtension._homeDir,
fileInsideThread[i]
)
const isDirectory = await fs.isDirectory(path)
if (!isDirectory) {
console.debug(`Ignore ${path} because it is not a directory`)
Expand Down Expand Up @@ -182,7 +190,9 @@ export default class JSONConversationalExtension implements ConversationalExtens
}

const files: string[] = await fs.listFiles(threadDirPath)
if (!files.includes(JSONConversationalExtension._threadMessagesFileName)) {
if (
!files.includes(JSONConversationalExtension._threadMessagesFileName)
) {
throw Error(`${threadDirPath} not contains message file`)
}

Expand Down
16 changes: 11 additions & 5 deletions web/hooks/useSendChatMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function useSendChatMessage() {
modelRef.current = activeModel
}, [activeModel])

const resendChatMessage = async () => {
const resendChatMessage = async (currentMessage: ThreadMessage) => {
if (!activeThread) {
console.error('No active thread')
return
Expand All @@ -75,10 +75,16 @@ export default function useSendChatMessage() {
return systemMessage
})
.concat(
currentMessages.map<ChatCompletionMessage>((msg) => ({
role: msg.role,
content: msg.content[0]?.text.value ?? '',
}))
currentMessages
.filter(
(e) =>
currentMessage.role === ChatCompletionRole.User ||
e.id !== currentMessage.id
)
.map<ChatCompletionMessage>((msg) => ({
role: msg.role,
content: msg.content[0]?.text.value ?? '',
}))
)

const messageRequest: MessageRequest = {
Expand Down
11 changes: 10 additions & 1 deletion web/screens/Chat/MessageToolbar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
ExtensionType,
ThreadMessage,
events,
ChatCompletionRole,
} from '@janhq/core'
import { ConversationalExtension, InferenceExtension } from '@janhq/core'
import { useAtomValue, useSetAtom } from 'jotai'
Expand Down Expand Up @@ -52,6 +53,14 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
}
}

const onRegenerateClick = async () => {
if (message.role !== ChatCompletionRole.User) {
// Delete last response before regenerating
await onDeleteClick()
}
resendChatMessage(message)
}

return (
<div className={twMerge('flex flex-row items-center')}>
<div className="flex overflow-hidden rounded-md border border-border bg-background/20">
Expand All @@ -67,7 +76,7 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
message.id === messages[messages.length - 1]?.id && (
<div
className="cursor-pointer border-r border-border px-2 py-2 hover:bg-background/80"
onClick={resendChatMessage}
onClick={onRegenerateClick}
>
<RefreshCcw size={14} />
</div>
Expand Down
Loading