From 0bca44f8e03f45022d2c84c4657a6fd5fc351007 Mon Sep 17 00:00:00 2001 From: perf3ct Date: Tue, 15 Apr 2025 22:37:57 +0000 Subject: [PATCH] fix the table reference --- src/services/llm/chat_storage_service.ts | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/services/llm/chat_storage_service.ts b/src/services/llm/chat_storage_service.ts index 4d14a6ff7..578f75ab7 100644 --- a/src/services/llm/chat_storage_service.ts +++ b/src/services/llm/chat_storage_service.ts @@ -130,9 +130,9 @@ export class ChatStorageService { */ async getAllChats(): Promise { const chats = await sql.getRows<{noteId: string, title: string, dateCreated: string, dateModified: string, content: string}>( - `SELECT notes.noteId, notes.title, notes.dateCreated, notes.dateModified, note_contents.content + `SELECT notes.noteId, notes.title, notes.dateCreated, notes.dateModified, blobs.content FROM notes - JOIN note_contents ON notes.noteId = note_contents.noteId + JOIN blobs ON notes.blobId = blobs.blobId JOIN attributes ON notes.noteId = attributes.noteId WHERE attributes.name = ? AND attributes.value = ? ORDER BY notes.dateModified DESC`, @@ -144,12 +144,12 @@ export class ChatStorageService { let metadata: ChatMetadata = {}; let createdAt = new Date(chat.dateCreated); let updatedAt = new Date(chat.dateModified); - + try { const content = JSON.parse(chat.content); messages = content.messages || []; metadata = content.metadata || {}; - + // Use stored dates if available if (content.createdAt) { createdAt = new Date(content.createdAt); @@ -178,9 +178,9 @@ export class ChatStorageService { */ async getChat(chatId: string): Promise { const chat = await sql.getRow<{noteId: string, title: string, dateCreated: string, dateModified: string, content: string}>( - `SELECT notes.noteId, notes.title, notes.dateCreated, notes.dateModified, note_contents.content + `SELECT notes.noteId, notes.title, notes.dateCreated, notes.dateModified, blobs.content FROM notes - JOIN note_contents ON notes.noteId = note_contents.noteId + JOIN blobs ON notes.blobId = blobs.blobId WHERE notes.noteId = ?`, [chatId] ); @@ -193,12 +193,12 @@ export class ChatStorageService { let metadata: ChatMetadata = {}; let createdAt = new Date(chat.dateCreated); let updatedAt = new Date(chat.dateModified); - + try { const content = JSON.parse(chat.content); messages = content.messages || []; metadata = content.metadata || {}; - + // Use stored dates if available if (content.createdAt) { createdAt = new Date(content.createdAt); @@ -225,9 +225,9 @@ export class ChatStorageService { * Update messages in a chat */ async updateChat( - chatId: string, - messages: Message[], - title?: string, + chatId: string, + messages: Message[], + title?: string, metadata?: ChatMetadata ): Promise { const chat = await this.getChat(chatId); @@ -247,7 +247,7 @@ export class ChatStorageService { // Update content directly using SQL since we don't have a method for this in the notes service await sql.execute( - `UPDATE note_contents SET content = ? WHERE noteId = ?`, + `UPDATE blobs SET content = ? WHERE blobId = (SELECT blobId FROM notes WHERE noteId = ?)`, [JSON.stringify({ messages, metadata: updatedMetadata, @@ -296,7 +296,7 @@ export class ChatStorageService { */ async recordToolExecution( chatId: string, - toolName: string, + toolName: string, toolId: string, args: Record | string, result: string | Record, @@ -341,7 +341,7 @@ export class ChatStorageService { * This helps maintain a record of all tool calls even if messages are truncated */ private extractToolExecutionsFromMessages( - messages: Message[], + messages: Message[], existingToolExecutions: ToolExecution[] = [] ): ToolExecution[] { const toolExecutions = [...existingToolExecutions];