From f98664921a777da6f6ae16ecf4d20ca9845a9296 Mon Sep 17 00:00:00 2001 From: Henry Estela Date: Thu, 12 Mar 2026 22:39:52 -0700 Subject: [PATCH] feat(ai-chat): Add support for OpenAI API Exisiting Ollama API support still functions as before. OpenAI vs Ollama API mostly have the same features, however model file size is not support with OpenAI's API so when a user chooses one of those then the models will just show up as the model name without the size. `npm install openai` triggered some updates in admin/package-lock.json such as adding many instances of "dev: true". This further enhances the user's ability to run the LLM on a different host. --- admin/app/controllers/ollama_controller.ts | 10 +- admin/app/services/ollama_service.ts | 347 +++++++++++++++------ admin/app/services/rag_service.ts | 14 +- admin/inertia/components/chat/index.tsx | 2 +- admin/inertia/lib/api.ts | 7 +- admin/inertia/pages/settings/models.tsx | 10 +- admin/package-lock.json | 22 ++ admin/package.json | 1 + admin/types/ollama.ts | 13 + 9 files changed, 301 insertions(+), 125 deletions(-) diff --git a/admin/app/controllers/ollama_controller.ts b/admin/app/controllers/ollama_controller.ts index 5ec3976..a43f445 100644 --- a/admin/app/controllers/ollama_controller.ts +++ b/admin/app/controllers/ollama_controller.ts @@ -11,7 +11,7 @@ import type { HttpContext } from '@adonisjs/core/http' import { DEFAULT_QUERY_REWRITE_MODEL, RAG_CONTEXT_LIMITS, SYSTEM_PROMPTS } from '../../constants/ollama.js' import { SERVICE_NAMES } from '../../constants/service_names.js' import logger from '@adonisjs/core/services/logger' -import type { Message } from 'ollama' +type Message = { role: 'system' | 'user' | 'assistant'; content: string } @inject() export default class OllamaController { @@ -201,21 +201,21 @@ export default class OllamaController { }) } - // Test connectivity + // Test connectivity via OpenAI-compatible /v1/models endpoint (works with Ollama, LM Studio, llama.cpp, etc.) try { - const testResponse = await fetch(`${remoteUrl.replace(/\/$/, '')}/api/tags`, { + const testResponse = await fetch(`${remoteUrl.replace(/\/$/, '')}/v1/models`, { signal: AbortSignal.timeout(5000), }) if (!testResponse.ok) { return response.status(400).send({ success: false, - message: `Could not connect to Ollama at ${remoteUrl} (HTTP ${testResponse.status}). Make sure Ollama is running with OLLAMA_HOST=0.0.0.0.`, + message: `Could not connect to ${remoteUrl} (HTTP ${testResponse.status}). Make sure the server is running and accessible. For Ollama, start it with OLLAMA_HOST=0.0.0.0.`, }) } } catch (error) { return response.status(400).send({ success: false, - message: `Could not connect to Ollama at ${remoteUrl}. Make sure the host is reachable and Ollama is running with OLLAMA_HOST=0.0.0.0.`, + message: `Could not connect to ${remoteUrl}. Make sure the server is running and reachable. For Ollama, start it with OLLAMA_HOST=0.0.0.0.`, }) } diff --git a/admin/app/services/ollama_service.ts b/admin/app/services/ollama_service.ts index fa7b9f9..e4aa72a 100644 --- a/admin/app/services/ollama_service.ts +++ b/admin/app/services/ollama_service.ts @@ -1,5 +1,7 @@ import { inject } from '@adonisjs/core' -import { ChatRequest, Ollama } from 'ollama' +import OpenAI from 'openai' +import type { ChatCompletionChunk, ChatCompletionMessageParam } from 'openai/resources/chat/completions.js' +import type { Stream } from 'openai/streaming.js' import { NomadOllamaModel } from '../../types/ollama.js' import { FALLBACK_RECOMMENDED_OLLAMA_MODELS } from '../../constants/ollama.js' import fs from 'node:fs/promises' @@ -13,51 +15,91 @@ import Fuse, { IFuseOptions } from 'fuse.js' import { BROADCAST_CHANNELS } from '../../constants/broadcast.js' import env from '#start/env' import { NOMAD_API_DEFAULT_BASE_URL } from '../../constants/misc.js' +import KVStore from '#models/kv_store' const NOMAD_MODELS_API_PATH = '/api/v1/ollama/models' const MODELS_CACHE_FILE = path.join(process.cwd(), 'storage', 'ollama-models-cache.json') const CACHE_MAX_AGE_MS = 24 * 60 * 60 * 1000 // 24 hours +export type NomadInstalledModel = { + name: string + size: number + digest?: string + details?: Record +} + +export type NomadChatResponse = { + message: { content: string; thinking?: string } + done: boolean + model: string +} + +export type NomadChatStreamChunk = { + message: { content: string; thinking?: string } + done: boolean +} + +type ChatInput = { + model: string + messages: Array<{ role: 'system' | 'user' | 'assistant'; content: string }> + think?: boolean | 'medium' + stream?: boolean +} + @inject() export class OllamaService { - private ollama: Ollama | null = null - private ollamaInitPromise: Promise | null = null + private openai: OpenAI | null = null + private baseUrl: string | null = null + private initPromise: Promise | null = null - constructor() { } + constructor() {} - private async _initializeOllamaClient() { - if (!this.ollamaInitPromise) { - this.ollamaInitPromise = (async () => { - const dockerService = new (await import('./docker_service.js')).DockerService() - const qdrantUrl = await dockerService.getServiceURL(SERVICE_NAMES.OLLAMA) - if (!qdrantUrl) { - throw new Error('Ollama service is not installed or running.') + private async _initialize() { + if (!this.initPromise) { + this.initPromise = (async () => { + // Check KVStore for a custom base URL (remote Ollama, LM Studio, llama.cpp, etc.) + const customUrl = (await KVStore.getValue('ai.remoteOllamaUrl')) as string | null + if (customUrl && customUrl.trim()) { + this.baseUrl = customUrl.trim().replace(/\/$/, '') + } else { + // Fall back to the local Ollama container managed by Docker + const dockerService = new (await import('./docker_service.js')).DockerService() + const ollamaUrl = await dockerService.getServiceURL(SERVICE_NAMES.OLLAMA) + if (!ollamaUrl) { + throw new Error('Ollama service is not installed or running.') + } + this.baseUrl = ollamaUrl.trim().replace(/\/$/, '') } - this.ollama = new Ollama({ host: qdrantUrl }) + + this.openai = new OpenAI({ + apiKey: 'nomad', // Required by SDK; not validated by Ollama/LM Studio/llama.cpp + baseURL: `${this.baseUrl}/v1`, + }) })() } - return this.ollamaInitPromise + return this.initPromise } private async _ensureDependencies() { - if (!this.ollama) { - await this._initializeOllamaClient() + if (!this.openai) { + await this._initialize() } } /** - * Downloads a model from the Ollama service with progress tracking. Where possible, - * one should dispatch a background job instead of calling this method directly to avoid long blocking. - * @param model Model name to download - * @returns Success status and message + * Downloads a model from Ollama with progress tracking. Only works with Ollama backends. + * Use dispatchModelDownload() for background job processing where possible. */ - async downloadModel(model: string, progressCallback?: (percent: number) => void): Promise<{ success: boolean; message: string; retryable?: boolean }> { - try { - await this._ensureDependencies() - if (!this.ollama) { - throw new Error('Ollama client is not initialized.') - } + async downloadModel( + model: string, + progressCallback?: (percent: number) => void + ): Promise<{ success: boolean; message: string; retryable?: boolean }> { + await this._ensureDependencies() + if (!this.baseUrl) { + return { success: false, message: 'AI service is not initialized.' } + } + try { // See if model is already installed const installedModels = await this.getModels() if (installedModels && installedModels.some((m) => m.name === model)) { @@ -65,23 +107,36 @@ export class OllamaService { return { success: true, message: 'Model is already installed.' } } - // Returns AbortableAsyncIterator - const downloadStream = await this.ollama.pull({ - model, - stream: true, - }) + // Stream pull via Ollama native API + const pullResponse = await axios.post( + `${this.baseUrl}/api/pull`, + { model, stream: true }, + { responseType: 'stream', timeout: 0 } + ) - for await (const chunk of downloadStream) { - if (chunk.completed && chunk.total) { - const percent = ((chunk.completed / chunk.total) * 100).toFixed(2) - const percentNum = parseFloat(percent) - - this.broadcastDownloadProgress(model, percentNum) - if (progressCallback) { - progressCallback(percentNum) + await new Promise((resolve, reject) => { + let buffer = '' + pullResponse.data.on('data', (chunk: Buffer) => { + buffer += chunk.toString() + const lines = buffer.split('\n') + buffer = lines.pop() || '' + for (const line of lines) { + if (!line.trim()) continue + try { + const parsed = JSON.parse(line) + if (parsed.completed && parsed.total) { + const percent = parseFloat(((parsed.completed / parsed.total) * 100).toFixed(2)) + this.broadcastDownloadProgress(model, percent) + if (progressCallback) progressCallback(percent) + } + } catch { + // ignore parse errors on partial lines + } } - } - } + }) + pullResponse.data.on('end', resolve) + pullResponse.data.on('error', reject) + }) logger.info(`[OllamaService] Model "${model}" downloaded successfully.`) return { success: true, message: 'Model downloaded successfully.' } @@ -128,88 +183,192 @@ export class OllamaService { } } - public async getClient() { + public async chat(chatRequest: ChatInput): Promise { await this._ensureDependencies() - return this.ollama! - } - - public async chat(chatRequest: ChatRequest & { stream?: boolean }) { - await this._ensureDependencies() - if (!this.ollama) { - throw new Error('Ollama client is not initialized.') + if (!this.openai) { + throw new Error('AI client is not initialized.') } - return await this.ollama.chat({ - ...chatRequest, + + const params: any = { + model: chatRequest.model, + messages: chatRequest.messages as ChatCompletionMessageParam[], stream: false, - }) + } + if (chatRequest.think) { + params.think = chatRequest.think + } + + const response = await this.openai.chat.completions.create(params) + const choice = response.choices[0] + + return { + message: { + content: choice.message.content ?? '', + thinking: (choice.message as any).thinking ?? undefined, + }, + done: true, + model: response.model, + } } - public async chatStream(chatRequest: ChatRequest) { + public async chatStream(chatRequest: ChatInput): Promise> { await this._ensureDependencies() - if (!this.ollama) { - throw new Error('Ollama client is not initialized.') + if (!this.openai) { + throw new Error('AI client is not initialized.') } - return await this.ollama.chat({ - ...chatRequest, + + const params: any = { + model: chatRequest.model, + messages: chatRequest.messages as ChatCompletionMessageParam[], stream: true, - }) + } + if (chatRequest.think) { + params.think = chatRequest.think + } + + const stream = (await this.openai.chat.completions.create(params)) as unknown as Stream + + async function* normalize(): AsyncGenerator { + for await (const chunk of stream) { + const delta = chunk.choices[0]?.delta + yield { + message: { + content: delta?.content ?? '', + thinking: (delta as any)?.thinking ?? '', + }, + done: chunk.choices[0]?.finish_reason !== null && chunk.choices[0]?.finish_reason !== undefined, + } + } + } + + return normalize() } public async checkModelHasThinking(modelName: string): Promise { await this._ensureDependencies() - if (!this.ollama) { - throw new Error('Ollama client is not initialized.') + if (!this.baseUrl) return false + + try { + const response = await axios.post( + `${this.baseUrl}/api/show`, + { model: modelName }, + { timeout: 5000 } + ) + return Array.isArray(response.data?.capabilities) && response.data.capabilities.includes('thinking') + } catch { + // Non-Ollama backends don't expose /api/show — assume no thinking support + return false } - - const modelInfo = await this.ollama.show({ - model: modelName, - }) - - return modelInfo.capabilities.includes('thinking') } - public async deleteModel(modelName: string) { + public async deleteModel(modelName: string): Promise<{ success: boolean; message: string }> { await this._ensureDependencies() - if (!this.ollama) { - throw new Error('Ollama client is not initialized.') + if (!this.baseUrl) { + return { success: false, message: 'AI service is not initialized.' } } - return await this.ollama.delete({ - model: modelName, - }) + try { + await axios.delete(`${this.baseUrl}/api/delete`, { + data: { model: modelName }, + timeout: 10000, + }) + return { success: true, message: `Model "${modelName}" deleted.` } + } catch (error) { + logger.error( + `[OllamaService] Failed to delete model "${modelName}": ${error instanceof Error ? error.message : error}` + ) + return { success: false, message: 'Failed to delete model. This may not be an Ollama backend.' } + } } - public async getModels(includeEmbeddings = false) { + /** + * Generate embeddings for the given input strings. + * Tries the Ollama native /api/embed endpoint first, falls back to /v1/embeddings. + */ + public async embed(model: string, input: string[]): Promise<{ embeddings: number[][] }> { await this._ensureDependencies() - if (!this.ollama) { - throw new Error('Ollama client is not initialized.') + if (!this.baseUrl || !this.openai) { + throw new Error('AI service is not initialized.') } - const response = await this.ollama.list() - if (includeEmbeddings) { - return response.models + + try { + // Prefer Ollama native endpoint (supports batch input natively) + const response = await axios.post( + `${this.baseUrl}/api/embed`, + { model, input }, + { timeout: 60000 } + ) + return { embeddings: response.data.embeddings } + } catch { + // Fall back to OpenAI-compatible /v1/embeddings (processes one at a time then batches) + logger.info('[OllamaService] /api/embed unavailable, falling back to /v1/embeddings') + const results = await this.openai.embeddings.create({ model, input }) + return { embeddings: results.data.map((e) => e.embedding) } + } + } + + public async getModels(includeEmbeddings = false): Promise { + await this._ensureDependencies() + if (!this.baseUrl) { + throw new Error('AI service is not initialized.') + } + + try { + // Prefer the Ollama native endpoint which includes size and metadata + const response = await axios.get(`${this.baseUrl}/api/tags`, { timeout: 5000 }) + // LM Studio returns HTTP 200 for unknown endpoints with an incompatible body — validate explicitly + if (!Array.isArray(response.data?.models)) { + throw new Error('Not an Ollama-compatible /api/tags response') + } + const models: NomadInstalledModel[] = response.data.models + if (includeEmbeddings) return models + return models.filter((m) => !m.name.includes('embed')) + } catch { + // Fall back to the OpenAI-compatible /v1/models endpoint (LM Studio, llama.cpp, etc.) + logger.info('[OllamaService] /api/tags unavailable, falling back to /v1/models') + try { + const modelList = await this.openai!.models.list() + const models: NomadInstalledModel[] = modelList.data.map((m) => ({ name: m.id, size: 0 })) + if (includeEmbeddings) return models + return models.filter((m) => !m.name.includes('embed')) + } catch (err) { + logger.error( + `[OllamaService] Failed to list models: ${err instanceof Error ? err.message : err}` + ) + return [] + } } - // Filter out embedding models - return response.models.filter((model) => !model.name.includes('embed')) } async getAvailableModels( - { sort, recommendedOnly, query, limit, force }: { sort?: 'pulls' | 'name'; recommendedOnly?: boolean, query: string | null, limit?: number, force?: boolean } = { + { + sort, + recommendedOnly, + query, + limit, + force, + }: { + sort?: 'pulls' | 'name' + recommendedOnly?: boolean + query: string | null + limit?: number + force?: boolean + } = { sort: 'pulls', recommendedOnly: false, query: null, limit: 15, } - ): Promise<{ models: NomadOllamaModel[], hasMore: boolean } | null> { + ): Promise<{ models: NomadOllamaModel[]; hasMore: boolean } | null> { try { const models = await this.retrieveAndRefreshModels(sort, force) if (!models) { - // If we fail to get models from the API, return the fallback recommended models logger.warn( '[OllamaService] Returning fallback recommended models due to failure in fetching available models' ) return { models: FALLBACK_RECOMMENDED_OLLAMA_MODELS, - hasMore: false + hasMore: false, } } @@ -217,15 +376,13 @@ export class OllamaService { const filteredModels = query ? this.fuseSearchModels(models, query) : models return { models: filteredModels.slice(0, limit || 15), - hasMore: filteredModels.length > (limit || 15) + hasMore: filteredModels.length > (limit || 15), } } - // If recommendedOnly is true, only return the first three models (if sorted by pulls, these will be the top 3) const sortedByPulls = sort === 'pulls' ? models : this.sortModels(models, 'pulls') const firstThree = sortedByPulls.slice(0, 3) - // Only return the first tag of each of these models (should be the most lightweight variant) const recommendedModels = firstThree.map((model) => { return { ...model, @@ -237,13 +394,13 @@ export class OllamaService { const filteredRecommendedModels = this.fuseSearchModels(recommendedModels, query) return { models: filteredRecommendedModels, - hasMore: filteredRecommendedModels.length > (limit || 15) + hasMore: filteredRecommendedModels.length > (limit || 15), } } return { models: recommendedModels, - hasMore: recommendedModels.length > (limit || 15) + hasMore: recommendedModels.length > (limit || 15), } } catch (error) { logger.error( @@ -283,7 +440,6 @@ export class OllamaService { const rawModels = response.data.models as NomadOllamaModel[] - // Filter out tags where cloud is truthy, then remove models with no remaining tags const noCloud = rawModels .map((model) => ({ ...model, @@ -295,8 +451,7 @@ export class OllamaService { return this.sortModels(noCloud, sort) } catch (error) { logger.error( - `[OllamaService] Failed to retrieve models from Nomad API: ${error instanceof Error ? error.message : error - }` + `[OllamaService] Failed to retrieve models from Nomad API: ${error instanceof Error ? error.message : error}` ) return null } @@ -322,7 +477,6 @@ export class OllamaService { return models } catch (error) { - // Cache doesn't exist or is invalid if ((error as NodeJS.ErrnoException).code !== 'ENOENT') { logger.warn( `[OllamaService] Error reading cache: ${error instanceof Error ? error.message : error}` @@ -346,7 +500,6 @@ export class OllamaService { private sortModels(models: NomadOllamaModel[], sort?: 'pulls' | 'name'): NomadOllamaModel[] { if (sort === 'pulls') { - // Sort by estimated pulls (it should be a string like "1.2K", "500", "4M" etc.) models.sort((a, b) => { const parsePulls = (pulls: string) => { const multiplier = pulls.endsWith('K') @@ -364,8 +517,6 @@ export class OllamaService { models.sort((a, b) => a.name.localeCompare(b.name)) } - // Always sort model.tags by the size field in descending order - // Size is a string like '75GB', '8.5GB', '2GB' etc. Smaller models first models.forEach((model) => { if (model.tags && Array.isArray(model.tags)) { model.tags.sort((a, b) => { @@ -378,7 +529,7 @@ export class OllamaService { ? 1 : size.endsWith('TB') ? 1_000 - : 0 // Unknown size format + : 0 return parseFloat(size) * multiplier } return parseSize(a.size) - parseSize(b.size) @@ -411,11 +562,11 @@ export class OllamaService { const options: IFuseOptions = { ignoreDiacritics: true, keys: ['name', 'description', 'tags.name'], - threshold: 0.3, // lower threshold for stricter matching + threshold: 0.3, } const fuse = new Fuse(models, options) - return fuse.search(query).map(result => result.item) + return fuse.search(query).map((result) => result.item) } } diff --git a/admin/app/services/rag_service.ts b/admin/app/services/rag_service.ts index e6ac043..167be35 100644 --- a/admin/app/services/rag_service.ts +++ b/admin/app/services/rag_service.ts @@ -285,8 +285,6 @@ export class RagService { // Extract text from chunk results const chunks = chunkResults.map((chunk) => chunk.text) - const ollamaClient = await this.ollamaService.getClient() - // Prepare all chunk texts with prefix and truncation const prefixedChunks: string[] = [] for (let i = 0; i < chunks.length; i++) { @@ -320,10 +318,7 @@ export class RagService { logger.debug(`[RAG] Embedding batch ${batchIdx + 1}/${totalBatches} (${batch.length} chunks)`) - const response = await ollamaClient.embed({ - model: RagService.EMBEDDING_MODEL, - input: batch, - }) + const response = await this.ollamaService.embed(RagService.EMBEDDING_MODEL, batch) embeddings.push(...response.embeddings) @@ -710,8 +705,6 @@ export class RagService { logger.debug(`[RAG] Extracted keywords: [${keywords.join(', ')}]`) // Generate embedding for the query with search_query prefix - const ollamaClient = await this.ollamaService.getClient() - // Ensure query doesn't exceed token limit const prefixTokens = this.estimateTokenCount(RagService.SEARCH_QUERY_PREFIX) const maxQueryTokens = RagService.MAX_SAFE_TOKENS - prefixTokens @@ -729,10 +722,7 @@ export class RagService { return [] } - const response = await ollamaClient.embed({ - model: RagService.EMBEDDING_MODEL, - input: [prefixedQuery], - }) + const response = await this.ollamaService.embed(RagService.EMBEDDING_MODEL, [prefixedQuery]) // Perform semantic search with a higher limit to enable reranking const searchLimit = limit * 3 // Get more results for reranking diff --git a/admin/inertia/components/chat/index.tsx b/admin/inertia/components/chat/index.tsx index eaf5dc8..2c1a983 100644 --- a/admin/inertia/components/chat/index.tsx +++ b/admin/inertia/components/chat/index.tsx @@ -380,7 +380,7 @@ export default function Chat({ > {installedModels.map((model) => ( ))} diff --git a/admin/inertia/lib/api.ts b/admin/inertia/lib/api.ts index 47ad60d..8b865a7 100644 --- a/admin/inertia/lib/api.ts +++ b/admin/inertia/lib/api.ts @@ -7,8 +7,7 @@ import { DownloadJobWithProgress, WikipediaState } from '../../types/downloads' import { EmbedJobWithProgress } from '../../types/rag' import type { CategoryWithStatus, CollectionWithStatus, ContentUpdateCheckResult, ResourceUpdateInfo } from '../../types/collections' import { catchInternal } from './util' -import { NomadOllamaModel, OllamaChatRequest } from '../../types/ollama' -import { ChatResponse, ModelResponse } from 'ollama' +import { NomadChatResponse, NomadInstalledModel, NomadOllamaModel, OllamaChatRequest } from '../../types/ollama' import BenchmarkResult from '#models/benchmark_result' import { BenchmarkType, RunBenchmarkResponse, SubmitBenchmarkResponse, UpdateBuilderTagResponse } from '../../types/benchmark' @@ -249,7 +248,7 @@ class API { async getInstalledModels() { return catchInternal(async () => { - const response = await this.client.get('/ollama/installed-models') + const response = await this.client.get('/ollama/installed-models') return response.data })() } @@ -268,7 +267,7 @@ class API { async sendChatMessage(chatRequest: OllamaChatRequest) { return catchInternal(async () => { - const response = await this.client.post('/ollama/chat', chatRequest) + const response = await this.client.post('/ollama/chat', chatRequest) return response.data })() } diff --git a/admin/inertia/pages/settings/models.tsx b/admin/inertia/pages/settings/models.tsx index 405d2d6..d22155a 100644 --- a/admin/inertia/pages/settings/models.tsx +++ b/admin/inertia/pages/settings/models.tsx @@ -10,7 +10,7 @@ import { useNotifications } from '~/context/NotificationContext' import api from '~/lib/api' import { useModals } from '~/context/ModalContext' import StyledModal from '~/components/StyledModal' -import { ModelResponse } from 'ollama' +import type { NomadInstalledModel } from '../../../types/ollama' import { SERVICE_NAMES } from '../../../constants/service_names' import Switch from '~/components/inputs/Switch' import StyledSectionHeader from '~/components/StyledSectionHeader' @@ -24,7 +24,7 @@ import { useSystemInfo } from '~/hooks/useSystemInfo' export default function ModelsPage(props: { models: { availableModels: NomadOllamaModel[] - installedModels: ModelResponse[] + installedModels: NomadInstalledModel[] settings: { chatSuggestionsEnabled: boolean; aiAssistantCustomName: string; remoteOllamaUrl: string } } }) { @@ -326,8 +326,8 @@ export default function ModelsPage(props: {

- Connect to an Ollama instance running on another machine in your local network. - The remote host must be started with OLLAMA_HOST=0.0.0.0. + Connect to any OpenAI-compatible API server — Ollama, LM Studio, llama.cpp, and others are all supported. + For remote Ollama instances, the host must be started with OLLAMA_HOST=0.0.0.0.

{props.models.settings.remoteOllamaUrl && (

@@ -339,7 +339,7 @@ export default function ModelsPage(props: { { setRemoteOllamaUrl(e.target.value) diff --git a/admin/package-lock.json b/admin/package-lock.json index ac4b5b9..432db09 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -50,6 +50,7 @@ "maplibre-gl": "^4.7.1", "mysql2": "^3.14.1", "ollama": "^0.6.3", + "openai": "^6.27.0", "pdf-parse": "^2.4.5", "pdf2pic": "^3.2.0", "pino-pretty": "^13.0.0", @@ -12640,6 +12641,27 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/openai": { + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/openai/-/openai-6.27.0.tgz", + "integrity": "sha512-osTKySlrdYrLYTt0zjhY8yp0JUBmWDCN+Q+QxsV4xMQnnoVFpylgKGgxwN8sSdTNw0G4y+WUXs4eCMWpyDNWZQ==", + "license": "Apache-2.0", + "bin": { + "openai": "bin/cli" + }, + "peerDependencies": { + "ws": "^8.18.0", + "zod": "^3.25 || ^4.0" + }, + "peerDependenciesMeta": { + "ws": { + "optional": true + }, + "zod": { + "optional": true + } + } + }, "node_modules/opencollective-postinstall": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", diff --git a/admin/package.json b/admin/package.json index fc01737..0edf4dc 100644 --- a/admin/package.json +++ b/admin/package.json @@ -102,6 +102,7 @@ "maplibre-gl": "^4.7.1", "mysql2": "^3.14.1", "ollama": "^0.6.3", + "openai": "^6.27.0", "pdf-parse": "^2.4.5", "pdf2pic": "^3.2.0", "pino-pretty": "^13.0.0", diff --git a/admin/types/ollama.ts b/admin/types/ollama.ts index 27b7e86..0aff783 100644 --- a/admin/types/ollama.ts +++ b/admin/types/ollama.ts @@ -44,3 +44,16 @@ export type OllamaChatResponse = { } done: boolean } + +export type NomadInstalledModel = { + name: string + size: number + digest?: string + details?: Record +} + +export type NomadChatResponse = { + message: { content: string; thinking?: string } + done: boolean + model: string +}