mirror of
https://github.com/ollama/ollama
synced 2026-04-23 08:45:14 +00:00
app/ui: fix model picker showing stale model after switching chats (#15280)
* app/ui: fix model picker showing stale model after switching chats Optimistic messages created during streaming were storing the full Model object instead of the model name string. When switching back to a chat with cached streaming data, the restore effect read an object where it expected a string, causing the model picker to fail matching and remain stuck on the previous chat's model. * app/ui: fix two more instances of Model object passed as model name Fix the same bug at lines 523 and 536 in the assistant_with_tools event handler, where selectedModel (object) was used instead of selectedModel.model (string).
This commit is contained in:
parent
0c65ed33bc
commit
fb36a01ffe
|
|
@ -381,7 +381,7 @@ export const useSendMessage = (chatId: string) => {
|
|||
role: "assistant",
|
||||
content: "",
|
||||
thinking: "",
|
||||
model: effectiveModel,
|
||||
model: effectiveModel.model,
|
||||
}),
|
||||
);
|
||||
lastMessage = newMessages[newMessages.length - 1];
|
||||
|
|
@ -433,7 +433,7 @@ export const useSendMessage = (chatId: string) => {
|
|||
role: "assistant",
|
||||
content: "",
|
||||
thinking: "",
|
||||
model: effectiveModel,
|
||||
model: effectiveModel.model,
|
||||
}),
|
||||
);
|
||||
lastMessage = newMessages[newMessages.length - 1];
|
||||
|
|
@ -520,7 +520,7 @@ export const useSendMessage = (chatId: string) => {
|
|||
thinkingTimeStart:
|
||||
lastMessage.thinkingTimeStart || event.thinkingTimeStart,
|
||||
thinkingTimeEnd: event.thinkingTimeEnd,
|
||||
model: selectedModel,
|
||||
model: selectedModel.model,
|
||||
});
|
||||
newMessages[newMessages.length - 1] = updatedMessage;
|
||||
} else {
|
||||
|
|
@ -533,7 +533,7 @@ export const useSendMessage = (chatId: string) => {
|
|||
tool_calls: event.toolCalls,
|
||||
thinkingTimeStart: event.thinkingTimeStart,
|
||||
thinkingTimeEnd: event.thinkingTimeEnd,
|
||||
model: selectedModel,
|
||||
model: selectedModel.model,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
|
@ -699,7 +699,7 @@ export const useSendMessage = (chatId: string) => {
|
|||
queryClient.setQueryData(["chat", newId], {
|
||||
chat: new Chat({
|
||||
id: newId,
|
||||
model: effectiveModel,
|
||||
model: effectiveModel.model,
|
||||
messages: [
|
||||
new Message({
|
||||
role: "user",
|
||||
|
|
|
|||
Loading…
Reference in a new issue