Skip to content

An AI-powered search engine with a generative UI

refactor: Update saveMessage functions to use UIMessage with parts and fix tests

Yoshiki Miurafbf35ec1fb81
diff --git a/lib/actions/__tests__/chat-db.test.ts b/lib/actions/__tests__/chat-db.test.ts
index 42a50b23..f52f34b2 100644
--- a/lib/actions/__tests__/chat-db.test.ts
+++ b/lib/actions/__tests__/chat-db.test.ts
@@ -326,7 +326,11 @@ describe('Chat Actions - getChat', () => {
// --- Tests for saveSingleMessage ---
describe('Chat Actions - saveSingleMessage', () => {
let chatId: string
- let messageInput: any
+ let messageInput: {
+ id: string
+ role: 'user' | 'assistant'
+ parts: Array<{ type: 'text'; text: string }>
+ }
let savedMessageOutput: DBMessage
beforeEach(() => {
@@ -334,9 +338,9 @@ describe('Chat Actions - saveSingleMessage', () => {
chatId = generateUUID()
const messageId = generateUUID()
messageInput = {
- chatId: chatId,
+ id: messageId,
role: 'user' as const,
- parts: [{ type: 'text' as const, content: 'Test message' }]
+ parts: [{ type: 'text' as const, text: 'Test message' }]
}
savedMessageOutput = {
...testMessageData,
@@ -349,18 +353,32 @@ describe('Chat Actions - saveSingleMessage', () => {
it('should save a single message and return the saved message', async () => {
mockAddMessageDb.mockResolvedValue(savedMessageOutput)
- const result = await saveSingleMessage(messageInput)
- expect(mockAddMessageDb).toHaveBeenCalledWith(messageInput)
+ const result = await saveSingleMessage(chatId, messageInput as any)
+ expect(mockAddMessageDb).toHaveBeenCalledWith(
+ expect.objectContaining({
+ id: messageInput.id,
+ chatId: chatId,
+ role: messageInput.role,
+ parts: messageInput.parts
+ })
+ )
expect(result).toEqual(savedMessageOutput)
})
it('should throw an error if db operation fails', async () => {
const dbError = new Error('DB save failed')
mockAddMessageDb.mockRejectedValue(dbError)
- await expect(saveSingleMessage(messageInput)).rejects.toThrow(
- 'DB save failed'
+ await expect(
+ saveSingleMessage(chatId, messageInput as any)
+ ).rejects.toThrow('DB save failed')
+ expect(mockAddMessageDb).toHaveBeenCalledWith(
+ expect.objectContaining({
+ id: messageInput.id,
+ chatId: chatId,
+ role: messageInput.role,
+ parts: messageInput.parts
+ })
)
- expect(mockAddMessageDb).toHaveBeenCalledWith(messageInput)
})
})
@@ -368,9 +386,7 @@ describe('Chat Actions - saveSingleMessage', () => {
describe('Chat Actions - saveChatMessage', () => {
let userId: string
let chatId: string
- let messageId: string
- let messageContent: any[]
- let messageRole: string
+ let userMessageInput: { id: string; role: string; parts: any[] }
let newChatData: DBChat
let newMessageData: DBMessage
@@ -378,21 +394,24 @@ describe('Chat Actions - saveChatMessage', () => {
vi.resetAllMocks()
userId = generateUUID()
chatId = generateUUID()
- messageId = generateUUID()
- messageContent = [{ type: 'text', content: 'Saving this message' }]
- messageRole = 'user'
+ const messageId = generateUUID()
+ userMessageInput = {
+ id: messageId,
+ role: 'user',
+ parts: [{ type: 'text', text: 'Saving this message' }]
+ }
newChatData = {
...testChatData,
id: chatId,
userId: userId,
- title: 'New Chat'
- } // Default title
+ title: 'Saving this message'
+ }
newMessageData = {
...testMessageData,
- id: messageId,
+ id: userMessageInput.id,
chatId: chatId,
- parts: messageContent,
- role: messageRole
+ parts: userMessageInput.parts,
+ role: userMessageInput.role
}
})
@@ -402,26 +421,24 @@ describe('Chat Actions - saveChatMessage', () => {
mockAddMessageDb.mockResolvedValue(newMessageData)
const result = await saveChatMessage(
chatId,
- messageId,
- messageContent,
- messageRole,
+ userMessageInput as any,
userId
)
expect(mockGetChatDb).toHaveBeenCalledWith(chatId, userId)
expect(mockSaveChatDb).toHaveBeenCalledWith(
expect.objectContaining({
id: chatId,
- title: 'New Chat',
+ title: newChatData.title,
userId: userId,
visibility: 'private'
}),
userId
)
expect(mockAddMessageDb).toHaveBeenCalledWith({
- id: messageId,
+ id: userMessageInput.id,
chatId: chatId,
- role: messageRole,
- parts: messageContent
+ role: userMessageInput.role,
+ parts: userMessageInput.parts
})
expect(result).toEqual({ chat: newChatData, message: newMessageData })
})
@@ -437,19 +454,17 @@ describe('Chat Actions - saveChatMessage', () => {
mockAddMessageDb.mockResolvedValue(newMessageData)
const result = await saveChatMessage(
chatId,
- messageId,
- messageContent,
- messageRole,
+ userMessageInput as any,
userId,
'Custom Title'
)
expect(mockGetChatDb).toHaveBeenCalledWith(chatId, userId)
expect(mockSaveChatDb).not.toHaveBeenCalled()
expect(mockAddMessageDb).toHaveBeenCalledWith({
- id: messageId,
+ id: userMessageInput.id,
chatId: chatId,
- role: messageRole,
- parts: messageContent
+ role: userMessageInput.role,
+ parts: userMessageInput.parts
})
expect(result).toEqual({ chat: existingChatData, message: newMessageData })
})
@@ -462,9 +477,7 @@ describe('Chat Actions - saveChatMessage', () => {
mockAddMessageDb.mockResolvedValue(newMessageData)
const result = await saveChatMessage(
chatId,
- messageId,
- messageContent,
- messageRole,
+ userMessageInput as any,
userId,
customTitle
)
@@ -485,16 +498,16 @@ describe('Chat Actions - saveChatMessage', () => {
mockGetChatDb.mockResolvedValue(null)
mockSaveChatDb.mockRejectedValue(dbError)
await expect(
- saveChatMessage(chatId, messageId, messageContent, messageRole, userId)
+ saveChatMessage(chatId, userMessageInput as any, userId)
).rejects.toThrow('Failed to save chat')
})
it('should throw an error if saving message fails', async () => {
const dbError = new Error('Failed to save message')
- mockGetChatDb.mockResolvedValue(newChatData) // Use newChatData for consistency, or a generic existing chat
+ mockGetChatDb.mockResolvedValue(newChatData)
mockAddMessageDb.mockRejectedValue(dbError)
await expect(
- saveChatMessage(chatId, messageId, messageContent, messageRole, userId)
+ saveChatMessage(chatId, userMessageInput as any, userId)
).rejects.toThrow('Failed to save message')
})
})
diff --git a/lib/actions/chat-db.ts b/lib/actions/chat-db.ts
index b24c01b7..a2d4f27e 100644
--- a/lib/actions/chat-db.ts
+++ b/lib/actions/chat-db.ts
@@ -3,6 +3,8 @@
import { getCurrentUserId } from '@/lib/auth/get-current-user' // Import getCurrentUserId
import * as chatDb from '@/lib/db/chat'
import { type Chat as DBChat, type Message as DBMessage } from '@/lib/db/schema' // Import DB schema types
+import { getTextFromParts } from '@/lib/utils/message-utils' // Corrected import path
+import { UIMessage } from '@ai-sdk/react' // Import UIMessage
// Get all chats for a user
export async function getChats(userId: string) {
@@ -140,22 +142,29 @@ interface ClientNewMessageInput {
parts: DBMessage['parts']
}
-// Interface for single message save
-interface SaveMessageInput {
- id?: string
- chatId: string
- role: string
- parts: any
-}
+// Interface for single message save - This will be effectively replaced by UIMessage type
+// interface SaveMessageInput {
+// id?: string
+// chatId: string
+// role: string
+// parts: any
+// }
// Save a single message
export async function saveSingleMessage(
- message: SaveMessageInput
+ chatId: string,
+ message: UIMessage
): Promise<DBMessage> {
try {
- return await chatDb.addMessage(message)
+ const messageToSave = {
+ id: message.id,
+ chatId: chatId,
+ role: message.role,
+ parts: message.parts // Use UIMessage.parts directly
+ }
+ return await chatDb.addMessage(messageToSave as any)
} catch (error) {
- console.error(`Error saving message for chat ID ${message.chatId}:`, error)
+ console.error(`Error saving message for chat ID ${chatId}:`, error)
throw error
}
}
@@ -163,45 +172,42 @@ export async function saveSingleMessage(
// Save or create a chat and add a user message
export async function saveChatMessage(
chatId: string,
- messageId: string,
- messageContent: any,
- messageRole: string,
+ userMessage: UIMessage,
userId: string,
title?: string
): Promise<{ chat: DBChat; message: DBMessage }> {
try {
- // 1. Check if chat exists
const existingChat = await chatDb.getChat(chatId, userId)
- // 2. Save or update chat if needed
let chat: DBChat
if (!existingChat) {
- // Create new chat
- const chatTitle =
- title ||
- (typeof messageContent === 'string' ? messageContent : 'New Chat')
+ // Use userMessage.parts for title generation
+ const messageTextForTitle = getTextFromParts(userMessage.parts as any[])
+ const chatTitle = title || messageTextForTitle || 'New Chat'
const chatDataForDb: Partial<DBChat> = {
id: chatId,
- title: chatTitle.substring(0, 255), // Limit title length
+ title: chatTitle.substring(0, 255),
userId: userId,
visibility: 'private'
}
-
const savedChats = await chatDb.saveChat(chatDataForDb as DBChat, userId)
+ if (!savedChats || savedChats.length === 0) {
+ throw new Error(`Failed to create chat with id: ${chatId}`)
+ }
chat = savedChats[0]
} else {
chat = existingChat
}
- // 3. Save message
- const message = await chatDb.addMessage({
- id: messageId,
+ const messageToSaveToDb = {
+ id: userMessage.id,
chatId,
- role: messageRole,
- parts: messageContent
- })
+ role: userMessage.role,
+ parts: userMessage.parts // Use UIMessage.parts directly
+ }
+ const dbSavedMessage = await chatDb.addMessage(messageToSaveToDb as any)
- return { chat, message }
+ return { chat, message: dbSavedMessage }
} catch (error) {
console.error(`Error in saveChatMessage for chat ID ${chatId}:`, error)
throw error
diff --git a/lib/streaming/create-tool-calling-stream.ts b/lib/streaming/create-tool-calling-stream.ts
index 7784ce09..abdbfb66 100644
--- a/lib/streaming/create-tool-calling-stream.ts
+++ b/lib/streaming/create-tool-calling-stream.ts
@@ -1,5 +1,6 @@
import { researcher } from '@/lib/agents/researcher'
import { openai } from '@ai-sdk/openai'
+import { UIMessage } from '@ai-sdk/react'
import {
appendClientMessage,
convertToModelMessages,
@@ -11,6 +12,7 @@ import {
import { saveChatMessage, saveSingleMessage } from '../actions/chat-db'
import { generateChatTitle } from '../agents/title-generator'
import { getChat, getChatMessages } from '../db/chat'
+import { generateUUID } from '../utils'
import { getTextFromParts } from '../utils/message-utils'
import { BaseStreamConfig } from './types'
@@ -23,20 +25,19 @@ export function createToolCallingStreamResponse(config: BaseStreamConfig) {
try {
const chat = await getChat(chatId, userId)
if (!chat) {
+ const userContent = getTextFromParts(message.parts)
const title = await generateChatTitle({
- userMessageContent: getTextFromParts(message.parts),
+ userMessageContent: userContent,
model: openai('gpt-4o-mini')
})
- // Save the chat and user message to the database using server action
- await saveChatMessage(
- chatId,
- message.id,
- message.parts,
- message.role,
- userId,
- title
- )
+ const userMessageToSave: UIMessage = {
+ id: message.id,
+ role: message.role,
+ parts: [{ type: 'text', text: message.content }]
+ }
+
+ await saveChatMessage(chatId, userMessageToSave, userId, title)
} else {
if (chat.userId !== userId) {
// TODO: Handle this
@@ -47,12 +48,7 @@ export function createToolCallingStreamResponse(config: BaseStreamConfig) {
}
// Save just the user message to an existing chat
- await saveSingleMessage({
- id: message.id,
- chatId,
- role: message.role,
- parts: message.parts
- })
+ await saveSingleMessage(chatId, message)
}
const previousMessages = await getChatMessages(chatId)
@@ -72,20 +68,19 @@ export function createToolCallingStreamResponse(config: BaseStreamConfig) {
...researcherConfig
})
- writer.merge(result.toUIMessageStream())
-
- const responseMessages = (await result.response).messages
- console.log('responseMessages', responseMessages)
-
- // Save the assistant message to the database using server action
- // if (assistantMessage) {
- // await saveSingleMessage({
- // id: assistantId,
- // chatId,
- // role: assistantMessage.role,
- // parts: assistantMessage.parts
- // })
- // }
+ writer.merge(
+ result.toUIMessageStream({
+ newMessageId: generateUUID(),
+ onFinish({ messages }) {
+ const assistantMessage = messages.find(
+ message => message.role === 'assistant'
+ )
+ if (assistantMessage) {
+ saveSingleMessage(chatId, assistantMessage)
+ }
+ }
+ })
+ )
} catch (error) {
console.error('Stream execution error:', error)
throw error