Merge branch 'master' into master
This commit is contained in:
@@ -1,24 +1,25 @@
|
||||
// LLM Factory — creates the configured provider or returns null
|
||||
|
||||
import { AnthropicProvider } from './anthropic.mjs';
|
||||
import { OpenAIProvider } from './openai.mjs';
|
||||
import { OpenRouterProvider } from './openrouter.mjs';
|
||||
import { GeminiProvider } from './gemini.mjs';
|
||||
import { CodexProvider } from './codex.mjs';
|
||||
import { MiniMaxProvider } from './minimax.mjs';
|
||||
import { MistralProvider } from './mistral.mjs';
|
||||
import { GrokProvider } from './grok.mjs';
|
||||
|
||||
export { LLMProvider } from './provider.mjs';
|
||||
export { AnthropicProvider } from './anthropic.mjs';
|
||||
export { OpenAIProvider } from './openai.mjs';
|
||||
export { OpenRouterProvider } from './openrouter.mjs';
|
||||
export { GeminiProvider } from './gemini.mjs';
|
||||
export { CodexProvider } from './codex.mjs';
|
||||
export { MiniMaxProvider } from './minimax.mjs';
|
||||
export { MistralProvider } from './mistral.mjs';
|
||||
export { GrokProvider } from './grok.mjs';
|
||||
import { AnthropicProvider } from "./anthropic.mjs";
|
||||
import { OpenAIProvider } from "./openai.mjs";
|
||||
import { OpenRouterProvider } from "./openrouter.mjs";
|
||||
import { GeminiProvider } from "./gemini.mjs";
|
||||
import { CodexProvider } from "./codex.mjs";
|
||||
import { MiniMaxProvider } from "./minimax.mjs";
|
||||
import { MistralProvider } from "./mistral.mjs";
|
||||
import { OllamaProvider } from "./ollama.mjs";
|
||||
import { GrokProvider } from "./grok.mjs";
|
||||
|
||||
export { LLMProvider } from "./provider.mjs";
|
||||
export { AnthropicProvider } from "./anthropic.mjs";
|
||||
export { OpenAIProvider } from "./openai.mjs";
|
||||
export { OpenRouterProvider } from "./openrouter.mjs";
|
||||
export { GeminiProvider } from "./gemini.mjs";
|
||||
export { CodexProvider } from "./codex.mjs";
|
||||
export { MiniMaxProvider } from "./minimax.mjs";
|
||||
export { MistralProvider } from "./mistral.mjs";
|
||||
export { OllamaProvider } from "./ollama.mjs";
|
||||
export { GrokProvider } from "./grok.mjs";
|
||||
|
||||
/**
|
||||
* Create an LLM provider based on config.
|
||||
@@ -31,24 +32,28 @@ export function createLLMProvider(llmConfig) {
|
||||
const { provider, apiKey, model } = llmConfig;
|
||||
|
||||
switch (provider.toLowerCase()) {
|
||||
case 'anthropic':
|
||||
case "anthropic":
|
||||
return new AnthropicProvider({ apiKey, model });
|
||||
case 'openai':
|
||||
case "openai":
|
||||
return new OpenAIProvider({ apiKey, model });
|
||||
case 'openrouter':
|
||||
case "openrouter":
|
||||
return new OpenRouterProvider({ apiKey, model });
|
||||
case 'gemini':
|
||||
case "gemini":
|
||||
return new GeminiProvider({ apiKey, model });
|
||||
case 'codex':
|
||||
case "codex":
|
||||
return new CodexProvider({ model });
|
||||
case 'minimax':
|
||||
case "minimax":
|
||||
return new MiniMaxProvider({ apiKey, model });
|
||||
case 'mistral':
|
||||
case "mistral":
|
||||
return new MistralProvider({ apiKey, model });
|
||||
case "ollama":
|
||||
return new OllamaProvider({ model, baseUrl: llmConfig.baseUrl });
|
||||
case 'grok':
|
||||
return new GrokProvider({ apiKey, model });
|
||||
default:
|
||||
console.warn(`[LLM] Unknown provider "${provider}". LLM features disabled.`);
|
||||
console.warn(
|
||||
`[LLM] Unknown provider "${provider}". LLM features disabled.`,
|
||||
);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
49
lib/llm/ollama.mjs
Normal file
49
lib/llm/ollama.mjs
Normal file
@@ -0,0 +1,49 @@
|
||||
// Ollama Provider — raw fetch, no SDK
|
||||
// Uses Ollama's OpenAI-compatible Chat Completions API
|
||||
// No API key required — fully local inference
|
||||
|
||||
import { LLMProvider } from './provider.mjs';
|
||||
|
||||
export class OllamaProvider extends LLMProvider {
|
||||
constructor(config) {
|
||||
super(config);
|
||||
this.name = 'ollama';
|
||||
this.baseUrl = (config.baseUrl || 'http://localhost:11434').replace(/\/+$/, '');
|
||||
this.model = config.model || 'llama3.1:8b';
|
||||
}
|
||||
|
||||
get isConfigured() { return !!this.model; }
|
||||
|
||||
async complete(systemPrompt, userMessage, opts = {}) {
|
||||
const res = await fetch(`${this.baseUrl}/v1/chat/completions`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
model: this.model,
|
||||
max_tokens: opts.maxTokens || 4096,
|
||||
messages: [
|
||||
{ role: 'system', content: systemPrompt },
|
||||
{ role: 'user', content: userMessage },
|
||||
],
|
||||
}),
|
||||
signal: AbortSignal.timeout(opts.timeout || 120000),
|
||||
});
|
||||
|
||||
if (!res.ok) {
|
||||
const err = await res.text().catch(() => '');
|
||||
throw new Error(`Ollama API ${res.status}: ${err.substring(0, 200)}`);
|
||||
}
|
||||
|
||||
const data = await res.json();
|
||||
const text = data.choices?.[0]?.message?.content || '';
|
||||
|
||||
return {
|
||||
text,
|
||||
usage: {
|
||||
inputTokens: data.usage?.prompt_tokens || 0,
|
||||
outputTokens: data.usage?.completion_tokens || 0,
|
||||
},
|
||||
model: data.model || this.model,
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user