Skip to content

An AI-powered search engine with a generative UI

Merge branch 'main' into feat/ollama-support-edit

Giulio De Pasquale4c13105fe288
diff --cc app/actions.tsx
index 55227eb9,6ccb56c8..32b88e07
--- a/app/actions.tsx
+++ b/app/actions.tsx
@@@ -191,10 -190,8 +196,11 @@@ async function submit
if (useGoogleProvider) {
processedMessages = transformToolMessages(messages)
}
+ if (useOllamaProvider) {
+ processedMessages = [{ role: 'assistant', content: answer }]
+ }
+ streamText.done()
aiState.update({
...aiState.get(),
messages: [
diff --cc bun.lockb
index a1670f37,6ff86d8f..67b18213
Binary files differ
diff --cc lib/agents/researcher.tsx
index a680b756,f339d34a..06754ce4
--- a/lib/agents/researcher.tsx
+++ b/lib/agents/researcher.tsx
@@@ -1,9 -1,8 +1,8 @@@
import { createStreamableUI, createStreamableValue } from 'ai/rsc'
import { CoreMessage, ToolCallPart, ToolResultPart, streamText } from 'ai'
- import { Section } from '@/components/section'
- import { BotMessage } from '@/components/message'
import { getTools } from './tools'
-import { getModel } from '../utils'
+import { getModel, transformToolMessages } from '../utils'
+ import { AnswerSection } from '@/components/answer-section'
export async function researcher(
uiStream: ReturnType<typeof createStreamableUI>,
@@@ -13,26 -12,10 +12,22 @@@
) {
let fullResponse = ''
let hasError = false
- const answerSection = (
- <Section title="Answer">
- <BotMessage content={streamableText.value} />
- </Section>
- )
+
+ // Transform the messages if using Ollama provider
+ let processedMessages = messages
+ const useOllamaProvider = !!(
+ process.env.OLLAMA_MODEL && process.env.OLLAMA_BASE_URL
+ )
+ if (useOllamaProvider) {
+ processedMessages = transformToolMessages(messages)
+ }
+ const includeToolResponses = messages.some(message => message.role === 'tool')
+ const useSubModel = useOllamaProvider && includeToolResponses
+
+ const answerSection = <AnswerSection result={streamableText.value} />
const currentDate = new Date().toLocaleString()
const result = await streamText({
- model: getModel(),
+ model: getModel(useSubModel),
maxTokens: 2500,
system: `As a professional search expert, you possess the ability to search for any information on the web.
or any information on the web.
diff --cc lib/utils/index.ts
index 9747bc56,5ab5e601..58747b71
--- a/lib/utils/index.ts
+++ b/lib/utils/index.ts
@@@ -1,9 -1,7 +1,8 @@@
import { type ClassValue, clsx } from 'clsx'
import { twMerge } from 'tailwind-merge'
- import { OpenAI } from '@ai-sdk/openai'
+import { createOllama } from 'ollama-ai-provider'
+ import { createOpenAI } from '@ai-sdk/openai'
import { google } from '@ai-sdk/google'
- import { AIMessage } from '../types'
import { CoreMessage } from 'ai'
export function cn(...inputs: ClassValue[]) {
@@@ -38,15 -13,12 +37,15 @@@ export function getModel(useSubModel =
return google('models/gemini-1.5-pro-latest')
}
+ // Fallback to OpenAI instead
+
- const openai = new OpenAI({
- baseUrl: openaiApiBase, // optional base URL for proxies etc.
- apiKey: openaiApiKey, // optional API key, default to env property OPENAI_API_KEY
+ const openai = createOpenAI({
+ baseUrl: process.env.OPENAI_API_BASE, // optional base URL for proxies etc.
+ apiKey: process.env.OPENAI_API_KEY, // optional API key, default to env property OPENAI_API_KEY
organization: '' // optional organization
})
- return openai.chat(process.env.OPENAI_API_MODEL || 'gpt-4o')
+
+ return openai.chat(openaiApiModel)
}
/**