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

fix: add back normalize message function (#3234)

Browse Source 
Signed-off-by: James <namnh0122@gmail.com>
This commit is contained in:
NamH 2024-08-02 16:23:12 +07:00 committed by GitHub
parent 4d3a97f1dc
commit 83579df3a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
web/hooks/useSendMessage.ts
View File

@ -22,6 +22,8 @@ import { inferenceErrorAtom } from '@/screens/HubScreen2/components/InferenceErr
import { showWarningMultipleModelModalAtom } from '@/screens/HubScreen2/components/WarningMultipleModelModal' import { showWarningMultipleModelModalAtom } from '@/screens/HubScreen2/components/WarningMultipleModelModal'
import { concurrentModelWarningThreshold } from '@/screens/Settings/MyModels/ModelItem' import { concurrentModelWarningThreshold } from '@/screens/Settings/MyModels/ModelItem'
import { Stack } from '@/utils/Stack'
import useCortex from './useCortex' import useCortex from './useCortex'
import useEngineInit from './useEngineInit' import useEngineInit from './useEngineInit'
@ -47,28 +49,29 @@ import {
updateThreadTitleAtom, updateThreadTitleAtom,
} from '@/helpers/atoms/Thread.atom' } from '@/helpers/atoms/Thread.atom'
// TODO: NamH add this back const normalizeMessages = (
// const normalizeMessages = (messages: Message[]): Message[] => { messages: ChatCompletionMessageParam[]
// const stack = new Stack<Message>() ): ChatCompletionMessageParam[] => {
// for (const message of messages) { const stack = new Stack<ChatCompletionMessageParam>()
// if (stack.isEmpty()) { for (const message of messages) {
// stack.push(message) if (stack.isEmpty()) {
// continue stack.push(message)
// } continue
// const topMessage = stack.peek() }
const topMessage = stack.peek()
// if (message.role === topMessage.role) { if (message.role === topMessage.role) {
// // add an empty message // add an empty message
// stack.push({ stack.push({
// role: topMessage.role === 'user' ? 'assistant' : 'user', role: topMessage.role === 'user' ? 'assistant' : 'user',
// content: '.', // some model requires not empty message content: '.', // some model requires not empty message
// }) })
// } }
// stack.push(message) stack.push(message)
// } }
// return stack.reverseOutput() return stack.reverseOutput()
// } }
const useSendMessage = () => { const useSendMessage = () => {
const createMessage = useMessageCreateMutation() const createMessage = useMessageCreateMutation()
@ -285,7 +288,7 @@ const useSendMessage = () => {
content: activeThread!.assistants[0].instructions ?? '', content: activeThread!.assistants[0].instructions ?? '',
} }
const messages: ChatCompletionMessageParam[] = currentMessages let messages: ChatCompletionMessageParam[] = currentMessages
.map((msg) => { .map((msg) => {
switch (msg.role) { switch (msg.role) {
case 'user': case 'user':
@ -305,7 +308,7 @@ const useSendMessage = () => {
}) })
.filter((msg) => msg != null) as ChatCompletionMessageParam[] .filter((msg) => msg != null) as ChatCompletionMessageParam[]
messages.unshift(systemMessage) messages.unshift(systemMessage)
messages = normalizeMessages(messages)
const modelOptions: Record<string, string | number> = {} const modelOptions: Record<string, string | number> = {}
if (selectedModel!.frequency_penalty) { if (selectedModel!.frequency_penalty) {
modelOptions.frequency_penalty = selectedModel!.frequency_penalty modelOptions.frequency_penalty = selectedModel!.frequency_penalty
@ -540,7 +543,7 @@ const useSendMessage = () => {
content: activeThread!.assistants[0].instructions ?? '', content: activeThread!.assistants[0].instructions ?? '',
} }
const messages: ChatCompletionMessageParam[] = currentMessages let messages: ChatCompletionMessageParam[] = currentMessages
.map((msg) => { .map((msg) => {
switch (msg.role) { switch (msg.role) {
case 'user': case 'user':
@ -564,6 +567,7 @@ const useSendMessage = () => {
content: message, content: message,
}) })
messages.unshift(systemMessage) messages.unshift(systemMessage)
messages = normalizeMessages(messages)
const modelOptions: Record<string, string | number> = {} const modelOptions: Record<string, string | number> = {}
if (selectedModel!.frequency_penalty) { if (selectedModel!.frequency_penalty) {
modelOptions.frequency_penalty = selectedModel!.frequency_penalty modelOptions.frequency_penalty = selectedModel!.frequency_penalty