hugo/bDS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ollama support

Browse Source
This commit is contained in:
hugo
2026-03-01 21:31:33 +01:00
parent 4daa5f450b
commit 9fdbccc687
15 changed files with 796 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/engine/ai/chat.ts
View File

@@ -16,7 +16,7 @@ import type { BrowserWindow } from 'electron';
import type { ChatEngine, ChatMessageData } from '../ChatEngine';
import { isRenderTool, generateFromToolCall } from '../../a2ui/generator';
import type { A2UIServerMessage } from '../../a2ui/types';
import { ProviderRegistry, detectProvider } from './providers';
import { ProviderRegistry } from './providers';
import { createBlogTools, type BlogToolDeps } from './blog-tools';
import { createA2UITools } from './a2ui-tools';
@@ -247,11 +247,11 @@ export class ChatService {
this.abortControllers.set(conversationId, abortController);
const modelId = conversation.model || 'claude-sonnet-4';
const provider = detectProvider(modelId);
const provider = this.providers.detectModelProvider(modelId);
// Verify provider key is available
if (!this.providers.isProviderKeySet(provider)) {
const providerLabel = provider === 'mistral' ? 'Mistral' : 'OpenCode';
const providerLabel = provider === 'mistral' ? 'Mistral' : provider === 'ollama' ? 'Ollama' : 'OpenCode';
return { success: false, error: `The model '${modelId}' requires a ${providerLabel} API key. Configure it in Settings.` };
}
@@ -271,10 +271,13 @@ export class ChatService {
const aiMessages = dbMessagesToAIMessages(dbMessages);
// Build tools
const blogTools = createBlogTools(this.blogToolDeps);
const a2uiToolsRaw = createA2UITools();
// Build tools (skip for Ollama models unless capability override is set)
const isOllama = this.providers.isOllamaModel(modelId);
const skipTools = isOllama && !this.providers.ollamaModelSupportsTools(modelId);
const blogTools = skipTools ? {} : createBlogTools(this.blogToolDeps);
const a2uiToolsRaw = skipTools ? {} : createA2UITools();
const allTools = { ...blogTools, ...a2uiToolsRaw };
const hasTools = Object.keys(allTools).length > 0;
// Get context window for truncation
const contextWindow = await this.providers.getModelCatalogEngine().getContextWindow(modelId) ?? 150_000;
@@ -301,12 +304,14 @@ export class ChatService {
try {
// --- streamText: the AI SDK replaces our entire SSE/accumulator/tool-loop ---
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- tools may be empty for Ollama models
const toolsOption = hasTools ? allTools : undefined as any;
const result = streamText({
model,
system: systemPrompt,
messages: truncatedMessages,
tools: allTools,
stopWhen: stepCountIs(MAX_TOOL_ROUNDS),
tools: toolsOption,
stopWhen: hasTools ? stepCountIs(MAX_TOOL_ROUNDS) : undefined,
abortSignal: abortController.signal,
maxRetries: 3,
providerOptions,
@@ -435,7 +440,7 @@ export class ChatService {
let titleModel = await this.chatEngine.getSetting('chat_title_model');
// Fallback chain: setting → haiku → mistral-small
if (!titleModel || !this.providers.isProviderKeySet(detectProvider(titleModel))) {
if (!titleModel || !this.providers.isProviderKeySet(this.providers.detectModelProvider(titleModel))) {
titleModel = this.providers.getOpencodeKey()
? 'claude-haiku-4-5'
: this.providers.getMistralKey()

147
src/main/engine/ai/providers.ts
View File

@@ -27,8 +27,11 @@ import type { ChatModel } from '../../shared/electronApi';
export const ZEN_BASE_URL = 'https://opencode.ai/zen/v1';
export const ZEN_MODELS_URL = 'https://opencode.ai/zen/v1/models';
export const MISTRAL_MODELS_URL = 'https://api.mistral.ai/v1/models';
export const OLLAMA_BASE_URL = 'http://localhost:11434/v1';
export const OLLAMA_TAGS_URL = 'http://localhost:11434/api/tags';
const MODEL_CACHE_TTL = 5 * 60 * 1000; // 5 minutes
const OLLAMA_FETCH_TIMEOUT = 3000; // 3 s — fail fast when Ollama isn't running
// ---------------------------------------------------------------------------
// Gateway factory
@@ -99,8 +102,12 @@ export function detectProvider(modelId: string): string {
export class ProviderRegistry {
private opencodeKey = '';
private mistralKey = '';
private ollamaEnabled = false;
private opencodeGateway: Provider | null = null;
private mistralProvider: ReturnType<typeof createMistral> | null = null;
private ollamaProvider: ReturnType<typeof createOpenAI> | null = null;
private ollamaModelIds = new Set<string>();
private ollamaCapabilities = new Map<string, { tools: boolean; vision: boolean }>();
private modelCatalogEngine = new ModelCatalogEngine();
// Model cache
@@ -129,22 +136,100 @@ export class ProviderRegistry {
return this.mistralKey;
}
// ---- Ollama management ----
setOllamaEnabled(enabled: boolean): void {
this.ollamaEnabled = enabled;
this.ollamaProvider = null;
this.invalidateModelCache();
}
isOllamaEnabled(): boolean {
return this.ollamaEnabled;
}
/** Register a model ID as belonging to Ollama. */
registerOllamaModel(modelId: string): void {
this.ollamaModelIds.add(modelId);
}
/** Check whether a model ID was registered as an Ollama model. */
isOllamaModel(modelId: string): boolean {
return this.ollamaModelIds.has(modelId);
}
/** Remove all registered Ollama model IDs. */
clearOllamaModels(): void {
this.ollamaModelIds.clear();
}
// ---- Ollama model capability overrides ----
/** Get capability overrides for a specific Ollama model (defaults to tools=false, vision=false). */
getOllamaModelCapabilities(modelId: string): { tools: boolean; vision: boolean } {
return this.ollamaCapabilities.get(modelId) ?? { tools: false, vision: false };
}
/** Set capability overrides for a specific Ollama model. */
setOllamaModelCapabilities(modelId: string, caps: { tools: boolean; vision: boolean }): void {
this.ollamaCapabilities.set(modelId, caps);
this.invalidateModelCache();
}
/** Get all stored capability overrides as a plain object. */
getAllOllamaModelCapabilities(): Record<string, { tools: boolean; vision: boolean }> {
const result: Record<string, { tools: boolean; vision: boolean }> = {};
for (const [id, caps] of this.ollamaCapabilities) {
result[id] = caps;
}
return result;
}
/** Load capability overrides from a serialized object (e.g. from settings DB). */
loadOllamaModelCapabilities(data: Record<string, { tools: boolean; vision: boolean }>): void {
this.ollamaCapabilities.clear();
for (const [id, caps] of Object.entries(data)) {
this.ollamaCapabilities.set(id, caps);
}
}
/** Check whether an Ollama model has tools capability enabled. */
ollamaModelSupportsTools(modelId: string): boolean {
return this.ollamaCapabilities.get(modelId)?.tools ?? false;
}
/** Check whether an Ollama model has vision capability enabled. */
ollamaModelSupportsVision(modelId: string): boolean {
return this.ollamaCapabilities.get(modelId)?.vision ?? false;
}
/**
* Detect the effective provider for a model ID, checking Ollama
* registration first, then falling back to prefix-based detection.
*/
detectModelProvider(modelId: string): string {
if (this.ollamaModelIds.has(modelId)) return 'ollama';
return detectProvider(modelId);
}
/** Check whether at least one provider key is configured. */
isReady(): boolean {
return !!(this.opencodeKey || this.mistralKey);
return !!(this.opencodeKey || this.mistralKey || this.ollamaEnabled);
}
/** Check whether the key for a specific provider is set. */
isProviderKeySet(provider: string): boolean {
if (provider === 'mistral') return !!this.mistralKey;
if (provider === 'ollama') return this.ollamaEnabled;
return !!this.opencodeKey;
}
/** Returns status of all configured providers. */
getProviderStatus(): { opencode: boolean; mistral: boolean } {
getProviderStatus(): { opencode: boolean; mistral: boolean; ollama: boolean } {
return {
opencode: !!this.opencodeKey,
mistral: !!this.mistralKey,
ollama: this.ollamaEnabled,
};
}
@@ -152,6 +237,20 @@ export class ProviderRegistry {
/** Resolve a model ID to an AI SDK LanguageModel. */
resolveModel(modelId: string): LanguageModel {
// Check if this is a registered Ollama model first
if (this.ollamaModelIds.has(modelId)) {
if (!this.ollamaEnabled) {
throw new Error(`Ollama not configured for model '${modelId}'`);
}
if (!this.ollamaProvider) {
this.ollamaProvider = createOpenAI({
baseURL: OLLAMA_BASE_URL,
apiKey: 'ollama', // Ollama doesn't need a real key
});
}
return this.ollamaProvider.chat(modelId);
}
const provider = detectProvider(modelId);
if (provider === 'mistral') {
@@ -229,6 +328,17 @@ export class ProviderRegistry {
}
}
// Fetch Ollama models
if (this.ollamaEnabled) {
try {
const models = await this.fetchOllamaModels();
allModels.push(...models);
if (models.length > 0) fetched = true;
} catch {
// Ollama not running — skip silently
}
}
if (fetched && allModels.length > 0) {
this.cachedModels = allModels;
this.cachedModelsAt = Date.now();
@@ -283,6 +393,39 @@ export class ProviderRegistry {
}
}
// ---- Ollama model listing ----
/**
* Fetch available models from Ollama's /api/tags endpoint.
* Returns ChatModel[] and registers the model IDs internally.
*/
async fetchOllamaModels(): Promise<ChatModel[]> {
try {
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(), OLLAMA_FETCH_TIMEOUT);
const response = await fetch(OLLAMA_TAGS_URL, { method: 'GET', signal: controller.signal });
clearTimeout(timeout);
if (!response.ok) return [];
const data = await response.json() as { models?: Array<{ name: string; details?: { family?: string } }> };
if (!data.models || !Array.isArray(data.models)) return [];
this.clearOllamaModels();
const models: ChatModel[] = data.models.map(m => {
this.registerOllamaModel(m.name);
return {
id: m.name,
name: m.name,
provider: 'ollama',
vision: this.ollamaModelSupportsVision(m.name),
};
});
return models;
} catch {
return [];
}
}
// ---- Private helpers ----
private async fetchModelsFromEndpoint(

8
src/main/engine/ai/tasks.ts
View File

@@ -8,7 +8,7 @@
import { generateText } from 'ai';
import type { ChatEngine } from '../ChatEngine';
import type { MediaEngine } from '../MediaEngine';
import { ProviderRegistry, detectProvider } from './providers';
import { ProviderRegistry } from './providers';
// ---------------------------------------------------------------------------
// Types
@@ -68,9 +68,9 @@ export class OneShotTasks {
tags: Array<{ name: string; slug: string; existsInProject: boolean }>,
modelId: string,
): Promise<TaxonomyAnalysisResult> {
const provider = detectProvider(modelId);
const provider = this.providers.detectModelProvider(modelId);
if (!this.providers.isProviderKeySet(provider)) {
const providerLabel = provider === 'mistral' ? 'Mistral' : 'OpenCode';
const providerLabel = provider === 'mistral' ? 'Mistral' : provider === 'ollama' ? 'Ollama' : 'OpenCode';
return { success: false, error: `${providerLabel} API key not set` };
}
@@ -187,7 +187,7 @@ Remember: Only suggest mappings from NEW items to EXISTING items. Consider langu
): Promise<ImageAnalysisResult> {
// Determine model with smart fallback
let modelId = await this.chatEngine.getSetting('chat_image_analysis_model');
if (!modelId || !this.providers.isProviderKeySet(detectProvider(modelId))) {
if (!modelId || !this.providers.isProviderKeySet(this.providers.detectModelProvider(modelId))) {
modelId = this.providers.getOpencodeKey()
? 'claude-sonnet-4-5'
: this.providers.getMistralKey()