iod/page-assist
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor message appending logic in useMessageOption hook

Browse Source
This commit is contained in:
n4ze3m
2024-03-14 23:43:58 +05:30
parent 00bd19374a
commit 5b04e55a03
3 changed files with 130 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/hooks/useMessageOption.tsx
View File

@@ -148,27 +148,37 @@ export const useMessageOption = () => {
baseUrl: cleanUrl(url)
})
let newMessage: Message[] = [
...messages,
{
isBot: false,
name: "You",
message,
sources: [],
images: [image]
},
{
isBot: true,
name: selectedModel,
message: "▋",
sources: []
}
]
const appendingIndex = newMessage.length - 1
let newMessage: Message[] = []
if (!isRegenerate) {
setMessages(newMessage)
newMessage = [
...messages,
{
isBot: false,
name: "You",
message,
sources: [],
images: [image]
},
{
isBot: true,
name: selectedModel,
message: "▋",
sources: []
}
]
} else {
newMessage = [
...messages,
{
isBot: true,
name: selectedModel,
message: "▋",
sources: []
}
]
}
setMessages(newMessage)
const appendingIndex = newMessage.length - 1
try {
setIsSearchingInternet(true)
@@ -321,8 +331,6 @@ export const useMessageOption = () => {
setIsProcessing(false)
setStreaming(false)
} catch (e) {
e
if (e?.name === "AbortError") {
newMessage[appendingIndex].message = newMessage[
appendingIndex
@@ -393,27 +401,37 @@ export const useMessageOption = () => {
baseUrl: cleanUrl(url)
})
let newMessage: Message[] = [
...messages,
{
isBot: false,
name: "You",
message,
sources: [],
images: [image]
},
{
isBot: true,
name: selectedModel,
message: "▋",
sources: []
}
]
const appendingIndex = newMessage.length - 1
let newMessage: Message[] = []
if (!isRegenerate) {
setMessages(newMessage)
newMessage = [
...messages,
{
isBot: false,
name: "You",
message,
sources: [],
images: [image]
},
{
isBot: true,
name: selectedModel,
message: "▋",
sources: []
}
]
} else {
newMessage = [
...messages,
{
isBot: true,
name: selectedModel,
message: "▋",
sources: []
}
]
}
setMessages(newMessage)
const appendingIndex = newMessage.length - 1
try {
const prompt = await systemPromptForNonRagOption()
@@ -624,8 +642,12 @@ export const useMessageOption = () => {
const regenerateLastMessage = async () => {
if (history.length > 0) {
const lastMessage = history[history.length - 2]
setHistory(history.slice(0, -1))
setMessages(messages.slice(0, -1))
let newHistory = history
let mewMessages = messages
newHistory.pop()
mewMessages.pop()
setHistory(newHistory)
setMessages(mewMessages)
await removeMessageUsingHistoryId(historyId)
if (lastMessage.role === "user") {
await onSubmit({