An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
Merge remote-tracking branch 'upstream/main' into feat/ollama-support
Giulio De Pasquale672067803087
diff --cc bun.lockbindex 92ebd3e6,fcbb3f9d..00000000deleted file mode 100755,100755Binary files differdiff --cc lib/utils/index.tsindex c2a9b88e,fe3b8781..b69fec16--- a/lib/utils/index.ts+++ b/lib/utils/index.ts@@@ -1,42 -1,44 +1,70 @@@import { type ClassValue, clsx } from 'clsx'import { twMerge } from 'tailwind-merge'import { OpenAI } from '@ai-sdk/openai'+import { createOllama } from 'ollama-ai-provider';+ import { google } from '@ai-sdk/google'+ import { AIMessage } from '../types'+ import { CoreMessage } from 'ai'export function cn(...inputs: ClassValue[]) {return twMerge(clsx(inputs))}export function getModel() {+ 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 (+ !(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);+ }++ if (process.env.GOOGLE_GENERATIVE_AI_API_KEY) {+ return google('models/gemini-1.5-pro-latest')+ }++ // Fallback to OpenAI instead+const 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)}++ /**+ * Takes an array of AIMessage and modifies each message where the role is 'tool'.+ * Changes the role to 'assistant' and converts the content to a JSON string.+ * Returns the modified messages as an array of CoreMessage.+ *+ * @param aiMessages - Array of AIMessage+ * @returns modifiedMessages - Array of modified messages+ */+ export function transformToolMessages(aiMessages: AIMessage[]): CoreMessage[] {+ return aiMessages.map(message =>+ message.role === 'tool'+ ? {+ ...message,+ role: 'assistant',+ content: JSON.stringify(message.content),+ type: 'tool'+ }+ : message+ ) as CoreMessage[]+ }