An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
chore: Refactor chat route to generate and send related questions
Yoshiki Miurad7e7ba0f424b
diff --git a/app/api/chat/route.ts b/app/api/chat/route.tsindex f01b25fc..8b8d6fb3 100644--- a/app/api/chat/route.ts+++ b/app/api/chat/route.ts@@ -1,17 +1,50 @@+import { streamText, createDataStreamResponse } from 'ai'import { chatResearcher } from '@/lib/agents/chat-researcher'-import { streamText } from 'ai'+import { generateRelatedQuestions } from '@/lib/agents/generate-related-questions'export const maxDuration = 30export async function POST(req: Request) {const { messages, model } = await req.json()- const researcherConfig = await chatResearcher({- messages,- model- })+ return createDataStreamResponse({+ execute: dataStream => {+ const researcherConfig = chatResearcher({+ messages,+ model+ })++ const result = streamText({+ ...researcherConfig,+ onFinish: async event => {+ // Notify the client that related queries are coming+ dataStream.writeMessageAnnotation({+ type: 'related-queries',+ relatedQueries: {+ items: []+ }+ })- const result = streamText(researcherConfig)+ // Generate related queries+ const responseMessages = event.response.messages+ const relatedQueries = await generateRelatedQuestions(+ responseMessages,+ model+ )- return result.toDataStreamResponse()+ // Notify the client with the generated related queries+ dataStream.writeMessageAnnotation({+ type: 'related-queries',+ relatedQueries: relatedQueries.object+ })+ }+ })++ result.mergeIntoDataStream(dataStream)+ },+ onError: error => {+ console.error('Error:', error)+ return error instanceof Error ? error.message : String(error)+ }+ })}diff --git a/lib/agents/chat-researcher.ts b/lib/agents/chat-researcher.tsindex e61d074a..8d1428e0 100644--- a/lib/agents/chat-researcher.ts+++ b/lib/agents/chat-researcher.ts@@ -16,13 +16,13 @@ When asked a question, you should:type ChatResearcherReturn = Parameters<typeof streamText>[0]-export async function chatResearcher({+export function chatResearcher({messages,model}: {messages: CoreMessage[]model: string-}): Promise<ChatResearcherReturn> {+}): ChatResearcherReturn {try {const currentDate = new Date().toLocaleString()diff --git a/lib/agents/query-suggestor.tsx b/lib/agents/generate-related-questions.tssimilarity index 50%rename from lib/agents/query-suggestor.tsxrename to lib/agents/generate-related-questions.tsindex 79d57482..86ddfd56 100644--- a/lib/agents/query-suggestor.tsx+++ b/lib/agents/generate-related-questions.ts@@ -1,26 +1,17 @@-import { createStreamableUI, createStreamableValue } from 'ai/rsc'-import { CoreMessage, streamObject } from 'ai'-import { PartialRelated, relatedSchema } from '@/lib/schema/related'-import SearchRelated from '@/components/search-related'+import { CoreMessage, generateObject } from 'ai'+import { relatedSchema } from '@/lib/schema/related'import { getModel } from '../utils/registry'-export async function querySuggestor(- uiStream: ReturnType<typeof createStreamableUI>,+export async function generateRelatedQuestions(messages: CoreMessage[],model: string) {- const objectStream = createStreamableValue<PartialRelated>()- uiStream.append(<SearchRelated relatedQueries={objectStream.value} />)+ const lastMessages = messages.slice(-1).map(message => ({+ ...message,+ role: 'user'+ })) as CoreMessage[]- const lastMessages = messages.slice(-1).map(message => {- return {- ...message,- role: 'user'- }- }) as CoreMessage[]-- let finalRelatedQueries: PartialRelated = {}- const result = await streamObject({+ const result = await generateObject({model: getModel(model),system: `As a professional web researcher, your task is to generate a set of three queries that explore the subject matter more deeply, building upon the initial query and the information uncovered in its search results.@@ -32,12 +23,5 @@ export async function querySuggestor(schema: relatedSchema})- for await (const obj of result.partialObjectStream) {- if (obj.items) {- objectStream.update(obj)- finalRelatedQueries = obj- }- }-- return finalRelatedQueries+ return result}diff --git a/lib/agents/index.tsx b/lib/agents/index.tsxindex e47c0492..6d706b49 100644--- a/lib/agents/index.tsx+++ b/lib/agents/index.tsx@@ -1,4 +1,4 @@export * from './task-manager'export * from './inquire'-export * from './query-suggestor'+export * from './generate-related-questions'export * from './researcher'