Backfill missing swipe_info (#4831) * Backfill missing swipe_info * Add type for SwipeInfo * Init SwipeInfo with empty extra

1af87ea165e8febb2fdbe2a5e827f692ebe5b61c

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 59ba22fa9e5cb1c0a9f58935408017d0bf05a52c

public/global.d.ts+11 -3 Viewed

     type TextCompletionSettings = typeof textgenerationwebui_settings;
     type MessageTimestamp = string | number | Date;
     type Character = import('./scripts/char-data').v1CharData;
+    type ChatMessageExtra = BaseMessageExtra & Partial<ReasoningMessageExtra> & Record<string, any>;
     interface Group {
         id: string;

         force_avatar?: string;
         original_avatar?: string;
         swipes?: string[];
-        swipe_info?: Record<string, any>;
+        swipe_info?: SwipeInfo[];
         swipe_id?: number;
-        extra?: ChatMessageExtra & Partial<ReasoningMessageExtra> & Record<string, any>;
+        extra?: ChatMessageExtra;
     };
-    interface ChatMessageExtra {
+    interface SwipeInfo {
+        send_date?: MessageTimestamp;
+        gen_started?: MessageTimestamp;
+        gen_finished?: MessageTimestamp;
+        extra?: ChatMessageExtra;
+    }
+    interface BaseMessageExtra {
         gen_id?: number;
         bias?: string;
         uses_system_ui?: boolean;

public/script.js+20 -12 Viewed

         updated = true;
+    }
-    for (let i = 0; i < message.swipes.length; i++) {
-        if (typeof message.swipes[i] !== 'string') {
-            updated = true;
-            console.warn('The message had a swipe that is not a string. It has has been set to \'\'.', message);
-            message.swipes[i] = '';
-        }
-    }
     if (typeof message.swipe_id !== 'number') {
         message.swipe_id = 0;
         updated = true;
+    }
-    if (!Array.isArray(message.swipe_info)) {
+    /** @type {() => SwipeInfo} */
-        message.swipe_info = message.swipes.map(_ => ({
+    const createSwipeInfo = () => ({
         send_date: message.send_date,
         gen_started: message.gen_started,
         gen_finished: message.gen_finished,
-            extra: structuredClone(message.extra) ?? {},
+        extra: {},
-        }));
+    });
+    if (!Array.isArray(message.swipe_info)) {
+        message.swipe_info = message.swipes.map(_ => createSwipeInfo());
+        updated = true;
+    }
+    for (let i = 0; i < message.swipes.length; i++) {
+        if (typeof message.swipes[i] !== 'string') {
+            updated = true;
+            console.warn('The message had a swipe that is not a string. It has has been set to \'\'.', message);
+            message.swipes[i] = '';
+        }
+        if (!message.swipe_info[i] || typeof message.swipe_info[i] !== 'object') {
             updated = true;
+            console.warn('The message had missing or invalid swipe_info for a swipe. It has been backfilled.', message);
+            message.swipe_info[i] = createSwipeInfo();
+        }
+    }
     return updated;

public/scripts/logprobs.js+1 -0 Viewed

     console.debug('cleanedPrompt: ', cleanedPrompt);
+    /** @type {SwipeInfo} */
     const newSwipeInfo = {
         send_date: msg.send_date,
         gen_started: msg.gen_started,