rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Iinitial value from -1 to null, better calculation

Browse Source
This commit is contained in:
bmen25124
2025-03-04 13:46:57 +03:00
parent bdbddd4ed3
commit 73d4922d70
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/script.js
View File

@@ -2597,7 +2597,7 @@ export function formatCharacterAvatar(characterAvatar) {
* @param {Date} gen_started Date when generation was started * @param {Date} gen_started Date when generation was started
* @param {Date} gen_finished Date when generation was finished * @param {Date} gen_finished Date when generation was finished
* @param {number} tokenCount Number of tokens generated (0 if not available) * @param {number} tokenCount Number of tokens generated (0 if not available)
* @param {number} timeToFirstToken Time to first token * @param {number | null} timeToFirstToken Time to first token
* @param {number?} [reasoningDuration=null] Reasoning duration (null if no reasoning was done) * @param {number?} [reasoningDuration=null] Reasoning duration (null if no reasoning was done)
* @returns {Object} Object containing the formatted timer value and title * @returns {Object} Object containing the formatted timer value and title
* @example * @example
@@ -2619,7 +2619,7 @@ function formatGenerationTimer(gen_started, gen_finished, tokenCount, timeToFirs
`Generation queued: ${start.format(dateFormat)}`, `Generation queued: ${start.format(dateFormat)}`,
`Reply received: ${finish.format(dateFormat)}`, `Reply received: ${finish.format(dateFormat)}`,
`Time to generate: ${seconds} seconds`, `Time to generate: ${seconds} seconds`,
timeToFirstToken > 0 ? `Time to first token: ${(timeToFirstToken / 1000).toFixed(1)} seconds` : '', timeToFirstToken ? `Time to first token: ${(timeToFirstToken / 1000).toFixed(1)} seconds` : '',
reasoningDuration > 0 ? `Time to think: ${reasoningDuration / 1000} seconds` : '', reasoningDuration > 0 ? `Time to think: ${reasoningDuration / 1000} seconds` : '',
tokenCount > 0 ? `Token rate: ${Number(tokenCount / seconds).toFixed(1)} t/s` : '', tokenCount > 0 ? `Token rate: ${Number(tokenCount / seconds).toFixed(1)} t/s` : '',
].filter(x => x).join('\n').trim(); ].filter(x => x).join('\n').trim();
@@ -3160,7 +3160,10 @@ class StreamingProcessor {
this.abortController = new AbortController(); this.abortController = new AbortController();
this.firstMessageText = '...'; this.firstMessageText = '...';
this.timeStarted = timeStarted; this.timeStarted = timeStarted;
this.timeToFirstToken = -1; /**
* @type {number | null}
*/
this.timeToFirstToken = null;
this.createdAt = new Date(); this.createdAt = new Date();
this.continueMessage = type === 'continue' ? continueMessage : ''; this.continueMessage = type === 'continue' ? continueMessage : '';
this.swipes = []; this.swipes = [];
@@ -3199,8 +3202,6 @@ class StreamingProcessor {
} }
async onStartStreaming(text) { async onStartStreaming(text) {
this.timeToFirstToken = Date.now() - this.createdAt.getTime();
if (this.type === 'continue' && this.promptReasoning.prefixReasoning) { if (this.type === 'continue' && this.promptReasoning.prefixReasoning) {
this.reasoningHandler.initContinue(this.promptReasoning); this.reasoningHandler.initContinue(this.promptReasoning);
} }
@@ -3409,7 +3410,11 @@ class StreamingProcessor {
const sw = new Stopwatch(1000 / power_user.streaming_fps); const sw = new Stopwatch(1000 / power_user.streaming_fps);
const timestamps = []; const timestamps = [];
for await (const { text, swipes, logprobs, toolCalls, state } of this.generator()) { for await (const { text, swipes, logprobs, toolCalls, state } of this.generator()) {
timestamps.push(Date.now()); const now = Date.now();
timestamps.push(now);
if (!this.timeToFirstToken) {
this.timeToFirstToken = now - this.createdAt.getTime();
}
if (this.isStopped || this.abortController.signal.aborted) { if (this.isStopped || this.abortController.signal.aborted) {
return this.result; return this.result;
} }