An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
chore: Refactoring the agent's workflow
Yoshiki Miurafb89fe8e096e
diff --git a/app/actions.tsx b/app/actions.tsxindex a003a72b..934a5081 100644--- a/app/actions.tsx+++ b/app/actions.tsx@@ -21,6 +21,8 @@ import { VideoSearchSection } from '@/components/video-search-section'import { AnswerSection } from '@/components/answer-section'import { workflow } from '@/lib/actions/workflow'+const MAX_MESSAGES = 6+async function submit(formData?: FormData,skip?: boolean,@@ -48,13 +50,8 @@ async function submit(return { role, content } as CoreMessage})- const useSpecificAPI = process.env.USE_SPECIFIC_API_FOR_WRITER === 'true'- const useOllamaProvider = !!(- process.env.OLLAMA_MODEL && process.env.OLLAMA_BASE_URL- )- const maxMessages = useSpecificAPI ? 5 : useOllamaProvider ? 1 : 10// Limit the number of messages to the maximum- messages.splice(0, Math.max(messages.length - maxMessages, 0))+ messages.splice(0, Math.max(messages.length - MAX_MESSAGES, 0))// Get the user input from the form dataconst userInput = skip? `{"action": "skip"}`diff --git a/lib/actions/workflow.tsx b/lib/actions/workflow.tsxindex d75bd261..0a93c188 100644--- a/lib/actions/workflow.tsx+++ b/lib/actions/workflow.tsx@@ -4,21 +4,17 @@ import React from 'react'import { Spinner } from '@/components/ui/spinner'import { Section } from '@/components/section'import { FollowupPanel } from '@/components/followup-panel'-import { AnswerSection } from '@/components/answer-section'-import { ErrorCard } from '@/components/error-card'-import { transformToolMessages } from '@/lib/utils'import {querySuggestor,inquire,- researcher,taskManager,- ollamaResearcher+ researcherWithOllama,+ researcher} from '@/lib/agents'import { createStreamableValue, createStreamableUI } from 'ai/rsc'-import { CoreMessage, generateId, ToolResultPart } from 'ai'-import { writer } from '../agents/writer'+import { CoreMessage, generateId } from 'ai'-export async function defaultWorkflow(+export async function workflow(uiState: {uiStream: ReturnType<typeof createStreamableUI>isCollapsed: ReturnType<typeof createStreamableValue>@@ -29,11 +25,13 @@ export async function defaultWorkflow(skip: boolean) {const { uiStream, isCollapsed, isGenerating } = uiState- // Show the spinner+ const id = generateId()++ // Display spinneruiStream.append(<Spinner />)let action = { object: { next: 'proceed' } }- // If the user skips the task, we proceed to the search+ // If the user does not skip the task, run the task managerif (!skip) action = (await taskManager(messages)) ?? actionif (action.object.next === 'inquire') {@@ -55,197 +53,17 @@ export async function defaultWorkflow(isCollapsed.done(false)isGenerating.done(false)- uiStream.done()- return- }-- // Set the collapsed state to true- isCollapsed.done(true)-- // Generate the answer- let answer = ''- let stopReason = ''- let toolOutputs: ToolResultPart[] = []- let errorOccurred = false-- const streamText = createStreamableValue<string>()-- // If ANTHROPIC_API_KEY is set, update the UI with the answer- // If not, update the UI with a div- if (process.env.ANTHROPIC_API_KEY) {- uiStream.update(- <AnswerSection result={streamText.value} hasHeader={false} />- )- } else {- uiStream.update(<div />)- }-- // Determine the API usage based on environment variables- const useSpecificAPI = process.env.USE_SPECIFIC_API_FOR_WRITER === 'true'- const useOllamaProvider = !!(- process.env.OLLAMA_MODEL && process.env.OLLAMA_BASE_URL- )- const maxMessages = useSpecificAPI ? 5 : useOllamaProvider ? 1 : 10- // Limit the number of messages to the maximum- messages.splice(0, Math.max(messages.length - maxMessages, 0))-- // If useSpecificAPI is enabled, only function calls will be made- // If not using a tool, this model generates the answer- while (- useSpecificAPI- ? toolOutputs.length === 0 && answer.length === 0 && !errorOccurred- : (stopReason !== 'stop' || answer.length === 0) && !errorOccurred- ) {- // Search the web and generate the answer- const { fullResponse, hasError, toolResponses, finishReason } =- await researcher(uiStream, streamText, messages)- stopReason = finishReason || ''- answer = fullResponse- toolOutputs = toolResponses- errorOccurred = hasError-- if (toolOutputs.length > 0) {- toolOutputs.map(output => {- aiState.update({- ...aiState.get(),- messages: [- ...aiState.get().messages,- {- id: generateId(),- role: 'tool',- content: JSON.stringify(output.result),- name: output.toolName,- type: 'tool'- }- ]- })- })- }- }-- // If useSpecificAPI is enabled, generate the answer using the specific model- if (useSpecificAPI && answer.length === 0 && !errorOccurred) {- // Modify the messages to be used by the specific model- const modifiedMessages = transformToolMessages(messages)- const latestMessages = modifiedMessages.slice(maxMessages * -1)- const { response, hasError } = await writer(uiStream, latestMessages)- answer = response- errorOccurred = hasError- messages.push({- role: 'assistant',- content: answer- })- }-- if (!errorOccurred) {- const useGoogleProvider = process.env.GOOGLE_GENERATIVE_AI_API_KEY- const useOllamaProvider = !!(- process.env.OLLAMA_MODEL && process.env.OLLAMA_BASE_URL- )- let processedMessages = messages- // If using Google provider, we need to modify the messages- if (useGoogleProvider) {- processedMessages = transformToolMessages(messages)- }- if (useOllamaProvider) {- processedMessages = [{ role: 'assistant', content: answer }]- }-- streamText.done()- aiState.update({- ...aiState.get(),- messages: [- ...aiState.get().messages,- {- id: generateId(),- role: 'assistant',- content: answer,- type: 'answer'- }- ]- })-- // Generate related queries- const relatedQueries = await querySuggestor(uiStream, processedMessages)- // Add follow-up panel- uiStream.append(- <Section title="Follow-up">- <FollowupPanel />- </Section>- )-- aiState.done({- ...aiState.get(),- messages: [- ...aiState.get().messages,- {- id: generateId(),- role: 'assistant',- content: JSON.stringify(relatedQueries),- type: 'related'- },- {- id: generateId(),- role: 'assistant',- content: 'followup',- type: 'followup'- }- ]- })- } else {- aiState.done(aiState.get())- streamText.done()- uiStream.append(- <ErrorCard- errorMessage={answer || 'An error occurred. Please try again.'}- />- )- }-- isGenerating.done(false)- uiStream.done()-}--export const ollamaWorkflow = async (- uiState: {- uiStream: ReturnType<typeof createStreamableUI>- isCollapsed: ReturnType<typeof createStreamableValue>- isGenerating: ReturnType<typeof createStreamableValue>- },- aiState: any,- messages: CoreMessage[],- skip: boolean-) => {- const { uiStream, isCollapsed, isGenerating } = uiState- let action = { object: { next: 'proceed' } }- // If the user skips the task, we proceed to the search- if (!skip) action = (await taskManager(messages)) ?? action-- if (action.object.next === 'inquire') {- // Generate inquiry- const inquiry = await inquire(uiStream, messages)- isCollapsed.done(false)- isGenerating.done(false)- uiStream.done()- aiState.done({- ...aiState.get(),- messages: [- ...aiState.get().messages,- {- id: generateId(),- role: 'assistant',- content: `inquiry: ${inquiry?.question}`,- type: 'inquiry'- }- ]- })return}// Set the collapsed state to trueisCollapsed.done(true)- const { text, toolResults } = await ollamaResearcher(uiStream, messages)+ const useOllama = process.env.OLLAMA_MODEL && process.env.OLLAMA_BASE_URL+ // Select the appropriate researcher function based on the environment variables+ const { text, toolResults } = useOllama+ ? await researcherWithOllama(uiStream, messages)+ : await researcher(uiStream, messages)aiState.update({...aiState.get(),@@ -259,7 +77,7 @@ export const ollamaWorkflow = async (type: 'tool'})),{- id: generateId(),+ id,role: 'assistant',content: text,type: 'answer'@@ -267,8 +85,16 @@ export const ollamaWorkflow = async (]})+ const messagesWithAnswer: CoreMessage[] = [+ ...messages,+ {+ role: 'assistant',+ content: text+ }+ ]+// Generate related queries- const relatedQueries = await querySuggestor(uiStream, messages)+ const relatedQueries = await querySuggestor(uiStream, messagesWithAnswer)// Add follow-up paneluiStream.append(<Section title="Follow-up">@@ -295,20 +121,3 @@ export const ollamaWorkflow = async (]})}--export async function workflow(- uiState: {- uiStream: ReturnType<typeof createStreamableUI>- isCollapsed: ReturnType<typeof createStreamableValue>- isGenerating: ReturnType<typeof createStreamableValue>- },- aiState: any,- messages: CoreMessage[],- skip: boolean-) {- if (process.env.OLLAMA_MODEL && process.env.OLLAMA_BASE_URL) {- return ollamaWorkflow(uiState, aiState, messages, skip)- }-- return defaultWorkflow(uiState, aiState, messages, skip)-}diff --git a/lib/agents/researcher.tsx b/lib/agents/researcher.tsxindex 26a459e1..c95a62da 100644--- a/lib/agents/researcher.tsx+++ b/lib/agents/researcher.tsx@@ -1,13 +1,7 @@import { createStreamableUI, createStreamableValue } from 'ai/rsc'-import {- CoreMessage,- ToolCallPart,- ToolResultPart,- generateText,- streamText-} from 'ai'+import { CoreMessage, generateText, streamText } from 'ai'import { getTools } from './tools'-import { getModel, transformToolMessages } from '../utils'+import { getModel } from '../utils'import { AnswerSection } from '@/components/answer-section'const SYSTEM_PROMPT = `As a professional search expert, you possess the ability to search for any information on the web.@@ -17,134 +11,93 @@ Aim to directly address the user's question, augmenting your response with insigexport async function researcher(uiStream: ReturnType<typeof createStreamableUI>,- streamableText: ReturnType<typeof createStreamableValue<string>>,messages: CoreMessage[]) {- let fullResponse = ''- let hasError = false- let finishReason = ''+ try {+ let fullResponse = ''+ const streamableText = createStreamableValue<string>()+ let toolResults: any[] = []- // Transform the messages if using Ollama provider- let processedMessages = messages- const useOllamaProvider = !!(- process.env.OLLAMA_MODEL && process.env.OLLAMA_BASE_URL- )- const useAnthropicProvider = !!process.env.ANTHROPIC_API_KEY- if (useOllamaProvider) {- processedMessages = transformToolMessages(messages)- }- const includeToolResponses = messages.some(message => message.role === 'tool')- const useSubModel = useOllamaProvider && includeToolResponses-- const streamableAnswer = createStreamableValue<string>('')- const answerSection = <AnswerSection result={streamableAnswer.value} />-- const currentDate = new Date().toLocaleString()- const result = await streamText({- model: getModel(useSubModel),- maxTokens: 2500,- system: `${SYSTEM_PROMPT} Current date and time: ${currentDate}`,- messages: processedMessages,- tools: getTools({- uiStream,- fullResponse- }),- onFinish: async event => {- finishReason = event.finishReason- fullResponse = event.text- streamableAnswer.done()- }- }).catch(err => {- hasError = true- fullResponse = 'Error: ' + err.message- streamableText.update(fullResponse)- })-- // If the result is not available, return an error response- if (!result) {- return { result, fullResponse, hasError, toolResponses: [] }- }-- const hasToolResult = messages.some(message => message.role === 'tool')- if (!useAnthropicProvider || hasToolResult) {- uiStream.append(answerSection)- }-- // Process the response- const toolCalls: ToolCallPart[] = []- const toolResponses: ToolResultPart[] = []- for await (const delta of result.fullStream) {- switch (delta.type) {- case 'text-delta':- if (delta.textDelta) {- fullResponse += delta.textDelta- if (useAnthropicProvider && !hasToolResult) {- streamableText.update(fullResponse)+ const currentDate = new Date().toLocaleString()+ const result = await streamText({+ model: getModel(),+ system: `${SYSTEM_PROMPT} Current date and time: ${currentDate}`,+ messages: messages,+ tools: getTools({+ uiStream,+ fullResponse+ }),+ maxSteps: 5,+ onStepFinish: async event => {+ if (event.stepType === 'initial') {+ if (event.toolCalls && event.toolCalls.length > 0) {+ uiStream.append(<AnswerSection result={streamableText.value} />)+ toolResults = event.toolResults} else {- streamableAnswer.update(fullResponse)+ uiStream.update(<AnswerSection result={streamableText.value} />)}}- break- case 'tool-call':- toolCalls.push(delta)- break- case 'tool-result':- if (!delta.result) {- hasError = true- }- toolResponses.push(delta)- break- case 'error':- console.log('Error: ' + delta.error)- hasError = true- fullResponse += `\nError occurred while executing the tool`- break+ }+ })++ for await (const delta of result.fullStream) {+ if (delta.type === 'text-delta' && delta.textDelta) {+ fullResponse += delta.textDelta+ streamableText.update(fullResponse)+ }}- }- messages.push({- role: 'assistant',- content: [{ type: 'text', text: fullResponse }, ...toolCalls]- })- if (toolResponses.length > 0) {- // Add tool responses to the messages- messages.push({ role: 'tool', content: toolResponses })- }+ streamableText.done(fullResponse)- return { result, fullResponse, hasError, toolResponses, finishReason }+ return { text: fullResponse, toolResults }+ } catch (error) {+ console.error('Error in researcher:', error)+ return {+ text: 'An error has occurred. Please try again.',+ toolResults: []+ }+ }}-export async function ollamaResearcher(+export async function researcherWithOllama(uiStream: ReturnType<typeof createStreamableUI>,messages: CoreMessage[]) {- const fullResponse = ''- const streamableText = createStreamableValue<string>()- let toolResults: any[] = []+ try {+ const fullResponse = ''+ const streamableText = createStreamableValue<string>()+ let toolResults: any[] = []- const currentDate = new Date().toLocaleString()- const result = await generateText({- model: getModel(),- system: `${SYSTEM_PROMPT} Current date and time: ${currentDate}`,- messages: messages,- tools: getTools({- uiStream,- fullResponse- }),- maxSteps: 5,- onStepFinish: async event => {- if (event.stepType === 'initial') {- if (event.toolCalls) {- uiStream.append(<AnswerSection result={streamableText.value} />)- toolResults = event.toolResults- } else {- uiStream.update(<AnswerSection result={streamableText.value} />)+ const currentDate = new Date().toLocaleString()+ const result = await generateText({+ model: getModel(),+ system: `${SYSTEM_PROMPT} Current date and time: ${currentDate}`,+ messages: messages,+ tools: getTools({+ uiStream,+ fullResponse+ }),+ maxSteps: 5,+ onStepFinish: async event => {+ if (event.stepType === 'initial') {+ if (event.toolCalls) {+ uiStream.append(<AnswerSection result={streamableText.value} />)+ toolResults = event.toolResults+ } else {+ uiStream.update(<AnswerSection result={streamableText.value} />)+ }}}- }- })+ })- streamableText.done(result.text)+ streamableText.done(result.text)- return { text: result.text, toolResults }+ return { text: result.text, toolResults }+ } catch (error) {+ console.error('Error in researcherWithOllama:', error)+ return {+ text: 'An error has occurred. Please try again.',+ toolResults: []+ }+ }}diff --git a/lib/utils/index.ts b/lib/utils/index.tsindex a76bab99..fcd4a7ae 100644--- a/lib/utils/index.ts+++ b/lib/utils/index.ts@@ -47,7 +47,7 @@ export function getModel(useSubModel = false) {}if (googleApiKey) {- return google('models/gemini-1.5-pro-latest')+ return google('gemini-1.5-pro-002')}if (anthropicApiKey) {