github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 19:34:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(commands): share provider config merge helper

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 05:21:11 +00:00
parent 0954618cfb
commit 2b52ded882
4 changed files with 100 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/commands/onboard-auth.config-core.ts
View File

@@ -48,6 +48,7 @@ export {
LITELLM_BASE_URL,
LITELLM_DEFAULT_MODEL_ID,
} from "./onboard-auth.config-litellm.js";
import { applyProviderConfigWithDefaultModel } from "./onboard-auth.config-shared.js";
import {
buildZaiModelDefinition,
buildMoonshotModelDefinition,
@@ -221,40 +222,16 @@ function applyMoonshotProviderConfigWithBaseUrl(
alias: models[MOONSHOT_DEFAULT_MODEL_REF]?.alias ?? "Kimi",
};
const providers = { ...cfg.models?.providers };
const existingProvider = providers.moonshot;
const existingModels = Array.isArray(existingProvider?.models) ? existingProvider.models : [];
const defaultModel = buildMoonshotModelDefinition();
const hasDefaultModel = existingModels.some((model) => model.id === MOONSHOT_DEFAULT_MODEL_ID);
const mergedModels = hasDefaultModel ? existingModels : [...existingModels, defaultModel];
const { apiKey: existingApiKey, ...existingProviderRest } = (existingProvider ?? {}) as Record<
string,
unknown
> as { apiKey?: string };
const resolvedApiKey = typeof existingApiKey === "string" ? existingApiKey : undefined;
const normalizedApiKey = resolvedApiKey?.trim();
providers.moonshot = {
...existingProviderRest,
baseUrl,
api: "openai-completions",
...(normalizedApiKey ? { apiKey: normalizedApiKey } : {}),
models: mergedModels.length > 0 ? mergedModels : [defaultModel],
};
return {
...cfg,
agents: {
...cfg.agents,
defaults: {
...cfg.agents?.defaults,
models,
},
},
models: {
mode: cfg.models?.mode ?? "merge",
providers,
},
};
return applyProviderConfigWithDefaultModel(cfg, {
agentModels: models,
providerId: "moonshot",
api: "openai-completions",
baseUrl,
defaultModel,
defaultModelId: MOONSHOT_DEFAULT_MODEL_ID,
});
}
export function applyMoonshotConfig(cfg: OpenClawConfig): OpenClawConfig {
@@ -714,40 +691,16 @@ export function applyXaiProviderConfig(cfg: OpenClawConfig): OpenClawConfig {
alias: models[XAI_DEFAULT_MODEL_REF]?.alias ?? "Grok",
};
const providers = { ...cfg.models?.providers };
const existingProvider = providers.xai;
const existingModels = Array.isArray(existingProvider?.models) ? existingProvider.models : [];
const defaultModel = buildXaiModelDefinition();
const hasDefaultModel = existingModels.some((model) => model.id === XAI_DEFAULT_MODEL_ID);
const mergedModels = hasDefaultModel ? existingModels : [...existingModels, defaultModel];
const { apiKey: existingApiKey, ...existingProviderRest } = (existingProvider ?? {}) as Record<
string,
unknown
> as { apiKey?: string };
const resolvedApiKey = typeof existingApiKey === "string" ? existingApiKey : undefined;
const normalizedApiKey = resolvedApiKey?.trim();
providers.xai = {
...existingProviderRest,
baseUrl: XAI_BASE_URL,
api: "openai-completions",
...(normalizedApiKey ? { apiKey: normalizedApiKey } : {}),
models: mergedModels.length > 0 ? mergedModels : [defaultModel],
};
return {
...cfg,
agents: {
...cfg.agents,
defaults: {
...cfg.agents?.defaults,
models,
},
},
models: {
mode: cfg.models?.mode ?? "merge",
providers,
},
};
return applyProviderConfigWithDefaultModel(cfg, {
agentModels: models,
providerId: "xai",
api: "openai-completions",
baseUrl: XAI_BASE_URL,
defaultModel,
defaultModelId: XAI_DEFAULT_MODEL_ID,
});
}
export function applyXaiConfig(cfg: OpenClawConfig): OpenClawConfig {