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: message from quick ask not get the selected model #2307

Merged
merged 1 commit into from
Mar 11, 2024
Merged

fix: message from quick ask not get the selected model #2307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 14 additions & 5 deletions web/hooks/useSendChatMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ export default function useSendChatMessage() {
const setIsGeneratingResponse = useSetAtom(isGeneratingResponseAtom)
const activeThreadRef = useRef<Thread | undefined>()

const selectedModelRef = useRef<Model | undefined>()

useEffect(() => {
modelRef.current = activeModel
}, [activeModel])
Expand All @@ -91,6 +93,10 @@ export default function useSendChatMessage() {
activeThreadRef.current = activeThread
}, [activeThread])

useEffect(() => {
selectedModelRef.current = selectedModel
}, [selectedModel])

const resendChatMessage = async (currentMessage: ThreadMessage) => {
if (!activeThreadRef.current) {
console.error('No active thread')
Expand Down Expand Up @@ -128,11 +134,13 @@ export default function useSendChatMessage() {
type: MessageRequestType.Thread,
messages: messages,
threadId: activeThreadRef.current.id,
model: activeThreadRef.current.assistants[0].model ?? selectedModel,
model:
activeThreadRef.current.assistants[0].model ?? selectedModelRef.current,
}

const modelId =
selectedModel?.id ?? activeThreadRef.current.assistants[0].model.id
selectedModelRef.current?.id ??
activeThreadRef.current.assistants[0].model.id

if (modelRef.current?.id !== modelId) {
setQueuedMessage(true)
Expand Down Expand Up @@ -213,7 +221,7 @@ export default function useSendChatMessage() {
{
role: ChatCompletionRole.User,
content:
selectedModel && base64Blob
selectedModelRef.current && base64Blob
? [
{
type: ChatCompletionMessageContentType.Text,
Expand Down Expand Up @@ -242,7 +250,7 @@ export default function useSendChatMessage() {
)

let modelRequest =
selectedModel ?? activeThreadRef.current.assistants[0].model
selectedModelRef?.current ?? activeThreadRef.current.assistants[0].model
if (runtimeParams.stream == null) {
runtimeParams.stream = true
}
Expand Down Expand Up @@ -344,7 +352,8 @@ export default function useSendChatMessage() {
?.addNewMessage(threadMessage)

const modelId =
selectedModel?.id ?? activeThreadRef.current.assistants[0].model.id
selectedModelRef.current?.id ??
activeThreadRef.current.assistants[0].model.id

if (modelRef.current?.id !== modelId) {
setQueuedMessage(true)
Expand Down
Loading