An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
feat(utils): Add Ollama support and improve error handling for model initialization chore(env): added Ollama vars fix(utils): append /api to Ollama's base URL
Giulio De Pasquale137f1226aea7
diff --git a/.env.local.example b/.env.local.exampleindex 816934b0..7d56bbd6 100644--- a/.env.local.example+++ b/.env.local.example@@ -1,6 +1,10 @@# Required# The settings below are essential for the basic functionality of the system.+# Ollama variables+OLLAMA_MODEL=[YOUR_OLLAMA_MODEL]+OLLAMA_BASE_URL=[YOUR_OLLAMA_URL]+# OpenAI API key retrieved here: https://platform.openai.com/api-keysOPENAI_API_KEY=[YOUR_OPENAI_API_KEY]@@ -35,4 +39,4 @@ UPSTASH_REDIS_REST_TOKEN=[YOUR_UPSTASH_REDIS_REST_TOKEN]# enable the video search tool# Serper API Key retrieved here: https://serper.dev/api-key-# SERPER_API_KEY=[YOUR_SERPER_API_KEY]\ No newline at end of file+# SERPER_API_KEY=[YOUR_SERPER_API_KEY]diff --git a/bun.lockb b/bun.lockbindex d5d60d9e..92ebd3e6 100755Binary files a/bun.lockb and b/bun.lockb differdiff --git a/lib/utils/index.ts b/lib/utils/index.tsindex 7ef64012..c2a9b88e 100644--- a/lib/utils/index.ts+++ b/lib/utils/index.ts@@ -1,29 +1,42 @@import { type ClassValue, clsx } from 'clsx'import { twMerge } from 'tailwind-merge'import { OpenAI } from '@ai-sdk/openai'-import { createGoogleGenerativeAI } from '@ai-sdk/google'-import { createAnthropic } from '@ai-sdk/anthropic'+import { createOllama } from 'ollama-ai-provider';export function cn(...inputs: ClassValue[]) {return twMerge(clsx(inputs))}export function getModel() {- // Currently does not work with Google or Anthropic- // if (process.env.GOOGLE_GENERATIVE_AI_API_KEY) {- // const google = createGoogleGenerativeAI()- // return google('models/gemini-1.5-pro-latest')- // }+ const ollamaBaseUrl = process.env.OLLAMA_BASE_URL + "/api";+ const ollamaModel = process.env.OLLAMA_MODEL;+ const openaiApiBase = process.env.OPENAI_API_BASE;+ const openaiApiKey = process.env.OPENAI_API_KEY;+ let openaiApiModel = process.env.OPENAI_API_MODEL || 'gpt-4o';- // if (process.env.ANTHROPIC_API_KEY) {- // const anthropic = createAnthropic()- // return anthropic('claude-3-haiku-20240307')- // }+ if (+ !(ollamaBaseUrl && ollamaModel) &&+ !(openaiApiBase && openaiApiKey)+ ) {+ throw new Error('Missing environment variables for Ollama and OpenAI');+ }++ // Ollama++ if (ollamaBaseUrl && ollamaModel) {+ const ollama = createOllama({ baseURL: ollamaBaseUrl });++ return ollama(ollamaModel);+ }++ // Fallback to OpenAI insteadconst openai = new OpenAI({- 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+ baseUrl: openaiApiBase, // optional base URL for proxies etc.+ apiKey: openaiApiKey, // optional API key, default to env property OPENAI_API_KEYorganization: '' // optional organization})- return openai.chat(process.env.OPENAI_API_MODEL || 'gpt-4o')+++ return openai.chat(openaiApiModel)}diff --git a/package.json b/package.jsonindex 28c78f5c..38d0c2f1 100644--- a/package.json+++ b/package.json@@ -36,7 +36,7 @@"lucide-react": "^0.363.0","next": "^14.2.3","next-themes": "^0.3.0",- "react": "^18",+ "ollama-ai-provider": "^0.7.0","react-dom": "^18","react-icons": "^5.0.1","react-markdown": "^9.0.1",@@ -59,4 +59,4 @@"eslint": "^8","eslint-config-next": "^14.2.3"}-}+}\ No newline at end of file