Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ai-brain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ export class AIBrain {
ollama: 'http://localhost:11434/v1',
kimi: 'https://api.moonshot.cn/v1',
openai: 'https://api.openai.com/v1',
gemini: 'https://generativelanguage.googleapis.com/v1beta/openai',
};

private async callLLM(systemPrompt: string): Promise<string> {
Expand Down
10 changes: 8 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ program
baseUrl: opts.baseUrl,
});

// Read saved pipeline config for model name fallbacks
const { loadPipelineConfig } = await import('./doctor');
const savedPipeline = loadPipelineConfig();
const pipelineTextModel = savedPipeline?.layer2?.model || '';
const pipelineVisionModel = savedPipeline?.layer3?.model || '';

const config: ClawdConfig = {
...DEFAULT_CONFIG,
server: {
Expand All @@ -117,8 +123,8 @@ program
textApiKey: resolvedApi.textApiKey,
visionBaseUrl: resolvedApi.visionBaseUrl,
visionApiKey: resolvedApi.visionApiKey,
model: opts.textModel || resolvedApi.textModel || opts.model || DEFAULT_CONFIG.ai.model,
visionModel: opts.visionModel || resolvedApi.visionModel || opts.model || DEFAULT_CONFIG.ai.visionModel,
model: opts.textModel || resolvedApi.textModel || opts.model || pipelineTextModel || DEFAULT_CONFIG.ai.model,
visionModel: opts.visionModel || resolvedApi.visionModel || opts.model || pipelineVisionModel || DEFAULT_CONFIG.ai.visionModel,
},
debug: opts.debug || false,
};
Expand Down
5 changes: 3 additions & 2 deletions src/openclaw-credentials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ function inferProviderFromBaseUrl(baseUrl?: string): string | undefined {
if (url.includes('groq')) return 'groq';
if (url.includes('together')) return 'together';
if (url.includes('deepseek')) return 'deepseek';
if (url.includes('generativelanguage') || url.includes('gemini')) return 'gemini';
if (url.includes('nvidia') || url.includes('integrate.api')) return 'nvidia';
if (url.includes('mistral')) return 'mistral';
if (url.includes('fireworks')) return 'fireworks';
Expand Down Expand Up @@ -484,7 +485,7 @@ export function resolveApiConfig(opts?: {
if (localApiKey || localBaseUrl || localTextModel || localVisionModel || opts?.provider) {
return {
apiKey: localApiKey,
provider: normalizeProvider(opts?.provider) || inferProviderFromBaseUrl(localBaseUrl),
provider: normalizeProvider(opts?.provider) || inferProviderFromBaseUrl(localBaseUrl) || localProvider,
baseUrl: localBaseUrl,
textModel: localTextModel,
visionModel: localVisionModel,
Expand All @@ -498,7 +499,7 @@ export function resolveApiConfig(opts?: {

return {
apiKey: localApiKey,
provider: inferProviderFromBaseUrl(localBaseUrl),
provider: inferProviderFromBaseUrl(localBaseUrl) || localProvider,
baseUrl: localBaseUrl,
textModel: localTextModel,
visionModel: localVisionModel,
Expand Down
10 changes: 10 additions & 0 deletions src/providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ export const PROVIDERS: Record<string, ProviderProfile> = {
openaiCompat: true,
computerUse: false,
},
gemini: {
name: 'Google Gemini',
baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai',
authHeader: (key) => ({ 'Authorization': `Bearer ${key}` }),
textModel: 'gemini-2.0-flash',
visionModel: 'gemini-2.0-flash',
openaiCompat: true,
computerUse: false,
},
generic: {
name: 'OpenAI-Compatible',
baseUrl: '', // set from config
Expand Down Expand Up @@ -244,6 +253,7 @@ const PROVIDER_ENV_VARS: Record<string, string[]> = {
groq: ['GROQ_API_KEY'],
together: ['TOGETHER_API_KEY'],
deepseek: ['DEEPSEEK_API_KEY'],
gemini: ['GEMINI_API_KEY'],
};

/**
Expand Down