fix: history parsing

toeverything · Apr 10, 2024 · eb0862b · eb0862b
1 parent 305c071
commit eb0862b
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/packages/backend/server/src/plugins/copilot/session.ts b/packages/backend/server/src/plugins/copilot/session.ts
@@ -11,6 +11,7 @@ import {
   ChatMessageSchema,
   getTokenEncoder,
   PromptMessage,
+  PromptMessageSchema,
   PromptParams,
 } from './types';
 
@@ -211,7 +212,7 @@ export class ChatSessionService {
   }
 
   private calculateTokenSize(
-    messages: ChatMessage[],
+    messages: PromptMessage[],
     model: AvailableModel
   ): number {
     const encoder = getTokenEncoder(model);
@@ -238,7 +239,7 @@ export class ChatSessionService {
           workspaceId,
           docId: workspaceId === options?.docId ? undefined : options?.docId,
           prompt: {
-            action: options?.action ? { not: null } : { equals: null },
+            action: options?.action ? { not: null } : null,
           },
         },
         select: { id: true },
@@ -259,7 +260,7 @@ export class ChatSessionService {
           workspaceId: workspaceId,
           docId: workspaceId === docId ? undefined : docId,
           prompt: {
-            action: options?.action ? { not: null } : { equals: null },
+            action: options?.action ? { not: null } : null,
           },
           id: options?.sessionId ? { equals: options.sessionId } : undefined,
         },
@@ -284,7 +285,7 @@ export class ChatSessionService {
         sessions
           .map(({ id, prompt, messages }) => {
             try {
-              const ret = ChatMessageSchema.array().safeParse(messages);
+              const ret = PromptMessageSchema.array().safeParse(messages);
               if (ret.success) {
                 const tokens = this.calculateTokenSize(
                   ret.data,
@@ -296,6 +297,10 @@ export class ChatSessionService {
                   tokens,
                   messages: ret.data,
                 };
+              } else {
+                this.logger.error(
+                  `Unexpected message schema: ${JSON.stringify(ret.error)}`
+                );
               }
             } catch (e) {
               this.logger.error('Unexpected error in listHistories', e);