Skip to content

Capture model name only after first token (streaming) or completed request #16405

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

Merged
merged 4 commits into from
Oct 3, 2025
Merged

Capture model name only after first token (streaming) or completed request #16405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce0cf49
feat: Capture model name only after first token (streaming) or comple…
allozaur Oct 3, 2025
d886359
chore: update webui build output
allozaur Oct 3, 2025
0d8ec54
Merge remote-tracking branch 'origin/master' into add-model-used-info…
allozaur Oct 3, 2025
9557d86
chore: update webui build output
allozaur Oct 3, 2025
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
Binary file modified tools/server/public/index.html.gz
View file
Open in desktop
Binary file not shown.
75 changes: 55 additions & 20 deletions tools/server/webui/src/lib/stores/chat.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,30 @@ class ChatStore {
onError?: (error: Error) => void
): Promise<void> {
let streamedContent = '';

let streamedReasoningContent = '';
let modelCaptured = false;

const captureModelIfNeeded = (updateDbImmediately = true): string | undefined => {
if (!modelCaptured) {
const currentModelName = serverStore.modelName;

if (currentModelName) {
if (updateDbImmediately) {
DatabaseStore.updateMessage(assistantMessage.id, { model: currentModelName }).catch(
console.error
);
}

const messageIndex = this.findMessageIndex(assistantMessage.id);

this.updateMessageAtIndex(messageIndex, { model: currentModelName });
modelCaptured = true;

return currentModelName;
}
}
return undefined;
};

slotsService.startStreaming();

Expand All @@ -319,6 +341,8 @@ class ChatStore {
streamedContent += chunk;
this.currentResponse = streamedContent;

captureModelIfNeeded();

const partialThinking = extractPartialThinking(streamedContent);
const messageIndex = this.findMessageIndex(assistantMessage.id);
this.updateMessageAtIndex(messageIndex, {
Expand All @@ -328,7 +352,11 @@ class ChatStore {

onReasoningChunk: (reasoningChunk: string) => {
streamedReasoningContent += reasoningChunk;

captureModelIfNeeded();

const messageIndex = this.findMessageIndex(assistantMessage.id);

this.updateMessageAtIndex(messageIndex, { thinking: streamedReasoningContent });
},

Expand All @@ -339,17 +367,36 @@ class ChatStore {
) => {
slotsService.stopStreaming();

await DatabaseStore.updateMessage(assistantMessage.id, {
const updateData: {
content: string;
thinking: string;
timings?: ChatMessageTimings;
model?: string;
} = {
content: finalContent || streamedContent,
thinking: reasoningContent || streamedReasoningContent,
timings: timings
});
};

const capturedModel = captureModelIfNeeded(false);

if (capturedModel) {
updateData.model = capturedModel;
}

await DatabaseStore.updateMessage(assistantMessage.id, updateData);

const messageIndex = this.findMessageIndex(assistantMessage.id);

this.updateMessageAtIndex(messageIndex, {
const localUpdateData: { timings?: ChatMessageTimings; model?: string } = {
timings: timings
});
};

if (updateData.model) {
localUpdateData.model = updateData.model;
}

this.updateMessageAtIndex(messageIndex, localUpdateData);

await DatabaseStore.updateCurrentNode(this.activeConversation!.id, assistantMessage.id);
this.activeConversation!.currNode = assistantMessage.id;
Expand Down Expand Up @@ -478,9 +525,6 @@ class ChatStore {
private async createAssistantMessage(parentId?: string): Promise<DatabaseMessage | null> {
if (!this.activeConversation) return null;

// Capture the current model name when creating the assistant message
const currentModelName = serverStore.modelName;

return await DatabaseStore.createMessageBranch(
{
convId: this.activeConversation.id,
Expand All @@ -489,8 +533,7 @@ class ChatStore {
content: '',
timestamp: Date.now(),
thinking: '',
children: [],
model: currentModelName || undefined
children: []
},
parentId || null
);
Expand Down Expand Up @@ -1287,9 +1330,6 @@ class ChatStore {
this.isLoading = true;
this.currentResponse = '';

// Capture the current model name when creating the assistant message
const currentModelName = serverStore.modelName;

const newAssistantMessage = await DatabaseStore.createMessageBranch(
{
convId: this.activeConversation.id,
Expand All @@ -1298,8 +1338,7 @@ class ChatStore {
role: 'assistant',
content: '',
thinking: '',
children: [],
model: currentModelName || undefined
children: []
},
parentMessage.id
);
Expand Down Expand Up @@ -1346,9 +1385,6 @@ class ChatStore {
false
) as DatabaseMessage[];

// Capture the current model name when creating the assistant message
const currentModelName = serverStore.modelName;

// Create new assistant message branch
const assistantMessage = await DatabaseStore.createMessageBranch(
{
Expand All @@ -1358,8 +1394,7 @@ class ChatStore {
role: 'assistant',
content: '',
thinking: '',
children: [],
model: currentModelName || undefined
children: []
},
userMessageId
);
Expand Down