Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: thread title not persisted (#2765)

Browse Source 
* fix: thread title not persisted

* remove unnecessary system message

---------

Co-authored-by: James <james@jan.ai>
This commit is contained in:
NamH 2024-04-21 18:47:35 +07:00 committed by GitHub
parent 7725347cdb
commit b058dda8bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 120 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
web/containers/Providers/EventHandler.tsx
View File

@ -34,6 +34,9 @@ import {
updateThreadAtom,
} from '@/helpers/atoms/Thread.atom'
const maxWordForThreadTitle = 10
const defaultThreadTitle = 'New Thread'
export default function EventHandler({ children }: { children: ReactNode }) {
const messages = useAtomValue(getCurrentChatMessagesAtom)
const addNewMessage = useSetAtom(addNewMessageAtom)
@ -90,34 +93,64 @@ export default function EventHandler({ children }: { children: ReactNode }) {
}
const thread = threadsRef.current?.find((e) => e.id == message.thread_id)
if (!thread) {
console.warn(
`Failed to update title for thread ${message.thread_id}: Thread not found!`
)
return
}
const messageContent = message.content[0]?.text?.value
if (!messageContent) {
console.warn(
`Failed to update title for thread ${message.thread_id}: Responded content is null!`
)
return
}
// The thread title should not be updated if the message is less than 10 words
// And no new line character is present
// And non-alphanumeric characters should be removed
if (thread && messageContent && !messageContent.includes('\n')) {
if (messageContent.includes('\n')) {
console.warn(
`Failed to update title for thread ${message.thread_id}: Title can't contain new line character!`
)
return
}
// Remove non-alphanumeric characters
const cleanedMessageContent = messageContent
.replace(/[^a-z0-9\s]/gi, '')
.trim()
// Split the message into words
const words = cleanedMessageContent.split(' ')
// Check if the message is less than 10 words
if (words.length < 10) {
// Update the Thread title with the response of the inference on the 1st prompt
updateThread({
if (words.length >= maxWordForThreadTitle) {
console.warn(
`Failed to update title for thread ${message.thread_id}: Title can't be greater than ${maxWordForThreadTitle} words!`
)
return
}
const updatedThread: Thread = {
...thread,
title: cleanedMessageContent,
metadata: thread.metadata,
})
}
extensionManager
.get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
?.saveThread({
...thread,
...updatedThread,
})
.then(() => {
// Update the Thread title with the response of the inference on the 1st prompt
updateThread({
...updatedThread,
})
})
}
}
},
[updateThread]
)
@ -142,7 +175,7 @@ export default function EventHandler({ children }: { children: ReactNode }) {
setIsGeneratingResponse(false)
const thread = threadsRef.current?.find((e) => e.id == message.thread_id)
if (thread) {
if (!thread) return
const messageContent = message.content[0]?.text?.value
const metadata = {
...thread.metadata,
@ -168,7 +201,6 @@ export default function EventHandler({ children }: { children: ReactNode }) {
// Attempt to generate the title of the Thread when needed
generateThreadTitle(message, thread)
}
},
[setIsGeneratingResponse, updateMessage, updateThread, updateThreadWaiting]
)
@ -181,6 +213,7 @@ export default function EventHandler({ children }: { children: ReactNode }) {
break
default:
updateThreadMessage(message)
break
}
},
[updateThreadMessage, updateThreadTitle]
@ -188,11 +221,14 @@ export default function EventHandler({ children }: { children: ReactNode }) {
const generateThreadTitle = (message: ThreadMessage, thread: Thread) => {
// If this is the first ever prompt in the thread
if (
thread &&
thread.title?.trim() === 'New Thread' &&
activeModelRef.current
) {
if (thread.title?.trim() !== defaultThreadTitle) {
return
}
if (!activeModelRef.current) {
return
}
// This is the first time message comes in on a new thread
// Summarize the first message, and make that the title of the Thread
// 1. Get the summary of the first prompt using whatever engine user is currently using
@ -200,15 +236,11 @@ export default function EventHandler({ children }: { children: ReactNode }) {
if (!threadMessages || threadMessages.length === 0) return
const summarizeFirstPrompt = `Summarize in a 5-word Title. Give the title only. "${threadMessages[0].content[0].text.value}"`
// Prompt: Given this query from user {query}, return to me the summary in 5 words as the title
const summarizeFirstPrompt = `Summarize in a ${maxWordForThreadTitle}-word Title. Give the title only. "${threadMessages[0].content[0].text.value}"`
// Prompt: Given this query from user {query}, return to me the summary in 10 words as the title
const msgId = ulid()
const messages: ChatCompletionMessage[] = [
{
role: ChatCompletionRole.System,
content:
'The conversation below is for a text summarization, user asks assistant to summarize a text and assistant should response in just less than 10 words',
},
{
role: ChatCompletionRole.User,
content: summarizeFirstPrompt,
@ -236,7 +268,6 @@ export default function EventHandler({ children }: { children: ReactNode }) {
engine?.inference(messageRequest)
}, 1000)
}
}
useEffect(() => {
if (window.core?.events) {
@ -244,14 +275,13 @@ export default function EventHandler({ children }: { children: ReactNode }) {
events.on(MessageEvent.OnMessageUpdate, onMessageResponseUpdate)
events.on(ModelEvent.OnModelStopped, onModelStopped)
}
}, [onNewMessageResponse, onMessageResponseUpdate, onModelStopped])
useEffect(() => {
return () => {
events.off(MessageEvent.OnMessageResponse, onNewMessageResponse)
events.off(MessageEvent.OnMessageUpdate, onMessageResponseUpdate)
events.off(ModelEvent.OnModelStopped, onModelStopped)
}
}, [onNewMessageResponse, onMessageResponseUpdate, onModelStopped])
return <Fragment>{children}</Fragment>
}