mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-12 07:20:45 +00:00
refactor: rename bailian to modelstudio and fix review issues
- Rename provider ID, constants, functions, CLI flags, and types from "bailian" to "modelstudio" to match the official English name "Alibaba Cloud Model Studio". - Fix P2 bug: global endpoint variant now always overwrites baseUrl instead of silently preserving a stale CN URL. - Fix P1 bug: add modelstudio entry to PROVIDER_ENV_VARS so secret-input-mode=ref no longer throws. - Move Model Studio imports to top of onboard-auth.config-core.ts. - Remove unused BAILIAN_BASE_URL export. Made-with: Cursor
This commit is contained in:
committed by
Peter Steinberger
parent
77a35025e8
commit
95eaa08781
@@ -160,8 +160,8 @@ export function registerOnboardCommand(program: Command) {
|
||||
zaiApiKey: opts.zaiApiKey as string | undefined,
|
||||
xiaomiApiKey: opts.xiaomiApiKey as string | undefined,
|
||||
qianfanApiKey: opts.qianfanApiKey as string | undefined,
|
||||
bailianApiKeyCn: opts.bailianApiKeyCn as string | undefined,
|
||||
bailianApiKey: opts.bailianApiKey as string | undefined,
|
||||
modelstudioApiKeyCn: opts.modelstudioApiKeyCn as string | undefined,
|
||||
modelstudioApiKey: opts.modelstudioApiKey as string | undefined,
|
||||
minimaxApiKey: opts.minimaxApiKey as string | undefined,
|
||||
syntheticApiKey: opts.syntheticApiKey as string | undefined,
|
||||
veniceApiKey: opts.veniceApiKey as string | undefined,
|
||||
|
||||
@@ -120,10 +120,10 @@ const AUTH_CHOICE_GROUP_DEFS: {
|
||||
choices: ["qianfan-api-key"],
|
||||
},
|
||||
{
|
||||
value: "bailian",
|
||||
label: "Alibaba Bailian",
|
||||
value: "modelstudio",
|
||||
label: "Alibaba Cloud Model Studio",
|
||||
hint: "Coding Plan API key (CN / Global)",
|
||||
choices: ["bailian-api-key-cn", "bailian-api-key"],
|
||||
choices: ["modelstudio-api-key-cn", "modelstudio-api-key"],
|
||||
},
|
||||
{
|
||||
value: "copilot",
|
||||
@@ -305,12 +305,12 @@ const BASE_AUTH_CHOICE_OPTIONS: ReadonlyArray<AuthChoiceOption> = [
|
||||
},
|
||||
{ value: "qianfan-api-key", label: "Qianfan API key" },
|
||||
{
|
||||
value: "bailian-api-key-cn",
|
||||
value: "modelstudio-api-key-cn",
|
||||
label: "Coding Plan API Key for China (subscription)",
|
||||
hint: "Endpoint: coding.dashscope.aliyuncs.com",
|
||||
},
|
||||
{
|
||||
value: "bailian-api-key",
|
||||
value: "modelstudio-api-key",
|
||||
label: "Coding Plan API Key for Global/Intl (subscription)",
|
||||
hint: "Endpoint: coding-intl.dashscope.aliyuncs.com",
|
||||
},
|
||||
|
||||
@@ -76,12 +76,12 @@ import {
|
||||
setXiaomiApiKey,
|
||||
setZaiApiKey,
|
||||
ZAI_DEFAULT_MODEL_REF,
|
||||
BAILIAN_DEFAULT_MODEL_REF,
|
||||
applyBailianConfig,
|
||||
applyBailianConfigCn,
|
||||
applyBailianProviderConfig,
|
||||
applyBailianProviderConfigCn,
|
||||
setBailianApiKey,
|
||||
MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
applyModelStudioConfig,
|
||||
applyModelStudioConfigCn,
|
||||
applyModelStudioProviderConfig,
|
||||
applyModelStudioProviderConfigCn,
|
||||
setModelStudioApiKey,
|
||||
} from "./onboard-auth.js";
|
||||
import type { AuthChoice, SecretInputMode } from "./onboard-types.js";
|
||||
import { OPENCODE_ZEN_DEFAULT_MODEL } from "./opencode-zen-model-default.js";
|
||||
@@ -301,43 +301,43 @@ const SIMPLE_API_KEY_PROVIDER_FLOWS: Partial<Record<AuthChoice, SimpleApiKeyProv
|
||||
applyProviderConfig: applyKilocodeProviderConfig,
|
||||
noteDefault: KILOCODE_DEFAULT_MODEL_REF,
|
||||
},
|
||||
"bailian-api-key-cn": {
|
||||
provider: "bailian",
|
||||
profileId: "bailian:default",
|
||||
expectedProviders: ["bailian"],
|
||||
envLabel: "BAILIAN_API_KEY",
|
||||
promptMessage: "Enter Alibaba Bailian Coding Plan API key (China)",
|
||||
setCredential: setBailianApiKey,
|
||||
defaultModel: BAILIAN_DEFAULT_MODEL_REF,
|
||||
applyDefaultConfig: applyBailianConfigCn,
|
||||
applyProviderConfig: applyBailianProviderConfigCn,
|
||||
noteDefault: BAILIAN_DEFAULT_MODEL_REF,
|
||||
"modelstudio-api-key-cn": {
|
||||
provider: "modelstudio",
|
||||
profileId: "modelstudio:default",
|
||||
expectedProviders: ["modelstudio"],
|
||||
envLabel: "MODELSTUDIO_API_KEY",
|
||||
promptMessage: "Enter Alibaba Cloud Model Studio Coding Plan API key (China)",
|
||||
setCredential: setModelStudioApiKey,
|
||||
defaultModel: MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
applyDefaultConfig: applyModelStudioConfigCn,
|
||||
applyProviderConfig: applyModelStudioProviderConfigCn,
|
||||
noteDefault: MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
noteMessage: [
|
||||
"Get your API key at: https://bailian.console.aliyun.com/",
|
||||
"Endpoint: coding.dashscope.aliyuncs.com",
|
||||
"Models: qwen3.5-plus, glm-4.7, kimi-k2.5, MiniMax-M2.5, etc.",
|
||||
].join("\n"),
|
||||
noteTitle: "Alibaba Bailian Coding Plan (China)",
|
||||
noteTitle: "Alibaba Cloud Model Studio Coding Plan (China)",
|
||||
normalize: (value) => String(value ?? "").trim(),
|
||||
validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
|
||||
},
|
||||
"bailian-api-key": {
|
||||
provider: "bailian",
|
||||
profileId: "bailian:default",
|
||||
expectedProviders: ["bailian"],
|
||||
envLabel: "BAILIAN_API_KEY",
|
||||
promptMessage: "Enter Alibaba Bailian Coding Plan API key (Global/Intl)",
|
||||
setCredential: setBailianApiKey,
|
||||
defaultModel: BAILIAN_DEFAULT_MODEL_REF,
|
||||
applyDefaultConfig: applyBailianConfig,
|
||||
applyProviderConfig: applyBailianProviderConfig,
|
||||
noteDefault: BAILIAN_DEFAULT_MODEL_REF,
|
||||
"modelstudio-api-key": {
|
||||
provider: "modelstudio",
|
||||
profileId: "modelstudio:default",
|
||||
expectedProviders: ["modelstudio"],
|
||||
envLabel: "MODELSTUDIO_API_KEY",
|
||||
promptMessage: "Enter Alibaba Cloud Model Studio Coding Plan API key (Global/Intl)",
|
||||
setCredential: setModelStudioApiKey,
|
||||
defaultModel: MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
applyDefaultConfig: applyModelStudioConfig,
|
||||
applyProviderConfig: applyModelStudioProviderConfig,
|
||||
noteDefault: MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
noteMessage: [
|
||||
"Get your API key at: https://bailian.console.aliyun.com/",
|
||||
"Endpoint: coding-intl.dashscope.aliyuncs.com",
|
||||
"Models: qwen3.5-plus, glm-4.7, kimi-k2.5, MiniMax-M2.5, etc.",
|
||||
].join("\n"),
|
||||
noteTitle: "Alibaba Bailian Coding Plan (Global/Intl)",
|
||||
noteTitle: "Alibaba Cloud Model Studio Coding Plan (Global/Intl)",
|
||||
normalize: (value) => String(value ?? "").trim(),
|
||||
validate: (value) => (String(value ?? "").trim() ? undefined : "Required"),
|
||||
},
|
||||
|
||||
@@ -65,6 +65,7 @@ import {
|
||||
buildZaiModelDefinition,
|
||||
buildMoonshotModelDefinition,
|
||||
buildXaiModelDefinition,
|
||||
buildModelStudioModelDefinition,
|
||||
MISTRAL_BASE_URL,
|
||||
MISTRAL_DEFAULT_MODEL_ID,
|
||||
QIANFAN_BASE_URL,
|
||||
@@ -79,6 +80,9 @@ import {
|
||||
resolveZaiBaseUrl,
|
||||
XAI_BASE_URL,
|
||||
XAI_DEFAULT_MODEL_ID,
|
||||
MODELSTUDIO_CN_BASE_URL,
|
||||
MODELSTUDIO_GLOBAL_BASE_URL,
|
||||
MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
} from "./onboard-auth.models.js";
|
||||
|
||||
export function applyZaiProviderConfig(
|
||||
@@ -574,21 +578,15 @@ export function applyQianfanConfig(cfg: OpenClawConfig): OpenClawConfig {
|
||||
return applyAgentDefaultModelPrimary(next, QIANFAN_DEFAULT_MODEL_REF);
|
||||
}
|
||||
|
||||
// Alibaba Cloud Model Studio (Bailian) Coding Plan
|
||||
import {
|
||||
BAILIAN_CN_BASE_URL,
|
||||
BAILIAN_GLOBAL_BASE_URL,
|
||||
BAILIAN_DEFAULT_MODEL_REF,
|
||||
buildBailianModelDefinition,
|
||||
} from "./onboard-auth.models.js";
|
||||
// Alibaba Cloud Model Studio Coding Plan
|
||||
|
||||
function applyBailianProviderConfigWithBaseUrl(
|
||||
function applyModelStudioProviderConfigWithBaseUrl(
|
||||
cfg: OpenClawConfig,
|
||||
baseUrl: string,
|
||||
): OpenClawConfig {
|
||||
const models = { ...cfg.agents?.defaults?.models };
|
||||
|
||||
const bailianModelIds = [
|
||||
const modelStudioModelIds = [
|
||||
"qwen3.5-plus",
|
||||
"qwen3-max-2026-01-23",
|
||||
"qwen3-coder-next",
|
||||
@@ -598,30 +596,30 @@ function applyBailianProviderConfigWithBaseUrl(
|
||||
"glm-4.7",
|
||||
"kimi-k2.5",
|
||||
];
|
||||
for (const modelId of bailianModelIds) {
|
||||
const modelRef = `bailian/${modelId}`;
|
||||
for (const modelId of modelStudioModelIds) {
|
||||
const modelRef = `modelstudio/${modelId}`;
|
||||
if (!models[modelRef]) {
|
||||
models[modelRef] = {};
|
||||
}
|
||||
}
|
||||
models[BAILIAN_DEFAULT_MODEL_REF] = {
|
||||
...models[BAILIAN_DEFAULT_MODEL_REF],
|
||||
alias: models[BAILIAN_DEFAULT_MODEL_REF]?.alias ?? "Qwen",
|
||||
models[MODELSTUDIO_DEFAULT_MODEL_REF] = {
|
||||
...models[MODELSTUDIO_DEFAULT_MODEL_REF],
|
||||
alias: models[MODELSTUDIO_DEFAULT_MODEL_REF]?.alias ?? "Qwen",
|
||||
};
|
||||
|
||||
const providers = { ...cfg.models?.providers };
|
||||
const existingProvider = providers.bailian;
|
||||
const existingProvider = providers.modelstudio;
|
||||
const existingModels = Array.isArray(existingProvider?.models) ? existingProvider.models : [];
|
||||
|
||||
const defaultModels = [
|
||||
buildBailianModelDefinition({ id: "qwen3.5-plus" }),
|
||||
buildBailianModelDefinition({ id: "qwen3-max-2026-01-23" }),
|
||||
buildBailianModelDefinition({ id: "qwen3-coder-next" }),
|
||||
buildBailianModelDefinition({ id: "qwen3-coder-plus" }),
|
||||
buildBailianModelDefinition({ id: "MiniMax-M2.5" }),
|
||||
buildBailianModelDefinition({ id: "glm-5" }),
|
||||
buildBailianModelDefinition({ id: "glm-4.7" }),
|
||||
buildBailianModelDefinition({ id: "kimi-k2.5" }),
|
||||
buildModelStudioModelDefinition({ id: "qwen3.5-plus" }),
|
||||
buildModelStudioModelDefinition({ id: "qwen3-max-2026-01-23" }),
|
||||
buildModelStudioModelDefinition({ id: "qwen3-coder-next" }),
|
||||
buildModelStudioModelDefinition({ id: "qwen3-coder-plus" }),
|
||||
buildModelStudioModelDefinition({ id: "MiniMax-M2.5" }),
|
||||
buildModelStudioModelDefinition({ id: "glm-5" }),
|
||||
buildModelStudioModelDefinition({ id: "glm-4.7" }),
|
||||
buildModelStudioModelDefinition({ id: "kimi-k2.5" }),
|
||||
];
|
||||
|
||||
const mergedModels = [...existingModels];
|
||||
@@ -640,7 +638,7 @@ function applyBailianProviderConfigWithBaseUrl(
|
||||
const resolvedApiKey = typeof existingApiKey === "string" ? existingApiKey : undefined;
|
||||
const normalizedApiKey = resolvedApiKey?.trim();
|
||||
|
||||
providers.bailian = {
|
||||
providers.modelstudio = {
|
||||
...existingProviderRest,
|
||||
baseUrl,
|
||||
api: "openai-completions",
|
||||
@@ -651,23 +649,20 @@ function applyBailianProviderConfigWithBaseUrl(
|
||||
return applyOnboardAuthAgentModelsAndProviders(cfg, { agentModels: models, providers });
|
||||
}
|
||||
|
||||
export function applyBailianProviderConfig(cfg: OpenClawConfig): OpenClawConfig {
|
||||
const existingBaseUrl = cfg.models?.providers?.bailian?.baseUrl;
|
||||
const resolvedBaseUrl =
|
||||
typeof existingBaseUrl === "string" ? existingBaseUrl : BAILIAN_GLOBAL_BASE_URL;
|
||||
return applyBailianProviderConfigWithBaseUrl(cfg, resolvedBaseUrl);
|
||||
export function applyModelStudioProviderConfig(cfg: OpenClawConfig): OpenClawConfig {
|
||||
return applyModelStudioProviderConfigWithBaseUrl(cfg, MODELSTUDIO_GLOBAL_BASE_URL);
|
||||
}
|
||||
|
||||
export function applyBailianProviderConfigCn(cfg: OpenClawConfig): OpenClawConfig {
|
||||
return applyBailianProviderConfigWithBaseUrl(cfg, BAILIAN_CN_BASE_URL);
|
||||
export function applyModelStudioProviderConfigCn(cfg: OpenClawConfig): OpenClawConfig {
|
||||
return applyModelStudioProviderConfigWithBaseUrl(cfg, MODELSTUDIO_CN_BASE_URL);
|
||||
}
|
||||
|
||||
export function applyBailianConfig(cfg: OpenClawConfig): OpenClawConfig {
|
||||
const next = applyBailianProviderConfig(cfg);
|
||||
return applyAgentDefaultModelPrimary(next, BAILIAN_DEFAULT_MODEL_REF);
|
||||
export function applyModelStudioConfig(cfg: OpenClawConfig): OpenClawConfig {
|
||||
const next = applyModelStudioProviderConfig(cfg);
|
||||
return applyAgentDefaultModelPrimary(next, MODELSTUDIO_DEFAULT_MODEL_REF);
|
||||
}
|
||||
|
||||
export function applyBailianConfigCn(cfg: OpenClawConfig): OpenClawConfig {
|
||||
const next = applyBailianProviderConfigCn(cfg);
|
||||
return applyAgentDefaultModelPrimary(next, BAILIAN_DEFAULT_MODEL_REF);
|
||||
export function applyModelStudioConfigCn(cfg: OpenClawConfig): OpenClawConfig {
|
||||
const next = applyModelStudioProviderConfigCn(cfg);
|
||||
return applyAgentDefaultModelPrimary(next, MODELSTUDIO_DEFAULT_MODEL_REF);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ export { CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF } from "../agents/cloudflare-ai
|
||||
export {
|
||||
MISTRAL_DEFAULT_MODEL_REF,
|
||||
XAI_DEFAULT_MODEL_REF,
|
||||
BAILIAN_DEFAULT_MODEL_REF,
|
||||
MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
} from "./onboard-auth.models.js";
|
||||
export { KILOCODE_DEFAULT_MODEL_REF };
|
||||
|
||||
@@ -476,14 +476,14 @@ export function setQianfanApiKey(
|
||||
});
|
||||
}
|
||||
|
||||
export function setBailianApiKey(
|
||||
export function setModelStudioApiKey(
|
||||
key: SecretInput,
|
||||
agentDir?: string,
|
||||
options?: ApiKeyStorageOptions,
|
||||
) {
|
||||
upsertAuthProfile({
|
||||
profileId: "bailian:default",
|
||||
credential: buildApiKeyCredential("bailian", key, undefined, options),
|
||||
profileId: "modelstudio:default",
|
||||
credential: buildApiKeyCredential("modelstudio", key, undefined, options),
|
||||
agentDir: resolveAuthAgentDir(agentDir),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -225,20 +225,19 @@ export function buildKilocodeModelDefinition(): ModelDefinitionConfig {
|
||||
};
|
||||
}
|
||||
|
||||
// Alibaba Cloud Model Studio (Bailian) Coding Plan
|
||||
export const BAILIAN_CN_BASE_URL = "https://coding.dashscope.aliyuncs.com/v1";
|
||||
export const BAILIAN_GLOBAL_BASE_URL = "https://coding-intl.dashscope.aliyuncs.com/v1";
|
||||
export const BAILIAN_BASE_URL = BAILIAN_CN_BASE_URL;
|
||||
export const BAILIAN_DEFAULT_MODEL_ID = "qwen3.5-plus";
|
||||
export const BAILIAN_DEFAULT_MODEL_REF = `bailian/${BAILIAN_DEFAULT_MODEL_ID}`;
|
||||
export const BAILIAN_DEFAULT_COST = {
|
||||
// Alibaba Cloud Model Studio Coding Plan
|
||||
export const MODELSTUDIO_CN_BASE_URL = "https://coding.dashscope.aliyuncs.com/v1";
|
||||
export const MODELSTUDIO_GLOBAL_BASE_URL = "https://coding-intl.dashscope.aliyuncs.com/v1";
|
||||
export const MODELSTUDIO_DEFAULT_MODEL_ID = "qwen3.5-plus";
|
||||
export const MODELSTUDIO_DEFAULT_MODEL_REF = `modelstudio/${MODELSTUDIO_DEFAULT_MODEL_ID}`;
|
||||
export const MODELSTUDIO_DEFAULT_COST = {
|
||||
input: 0,
|
||||
output: 0,
|
||||
cacheRead: 0,
|
||||
cacheWrite: 0,
|
||||
};
|
||||
|
||||
const BAILIAN_MODEL_CATALOG = {
|
||||
const MODELSTUDIO_MODEL_CATALOG = {
|
||||
"qwen3.5-plus": {
|
||||
name: "qwen3.5-plus",
|
||||
reasoning: false,
|
||||
@@ -297,9 +296,9 @@ const BAILIAN_MODEL_CATALOG = {
|
||||
},
|
||||
} as const;
|
||||
|
||||
type BailianCatalogId = keyof typeof BAILIAN_MODEL_CATALOG;
|
||||
type ModelStudioCatalogId = keyof typeof MODELSTUDIO_MODEL_CATALOG;
|
||||
|
||||
export function buildBailianModelDefinition(params: {
|
||||
export function buildModelStudioModelDefinition(params: {
|
||||
id: string;
|
||||
name?: string;
|
||||
reasoning?: boolean;
|
||||
@@ -308,7 +307,7 @@ export function buildBailianModelDefinition(params: {
|
||||
contextWindow?: number;
|
||||
maxTokens?: number;
|
||||
}): ModelDefinitionConfig {
|
||||
const catalog = BAILIAN_MODEL_CATALOG[params.id as BailianCatalogId];
|
||||
const catalog = MODELSTUDIO_MODEL_CATALOG[params.id as ModelStudioCatalogId];
|
||||
return {
|
||||
id: params.id,
|
||||
name: params.name ?? catalog?.name ?? params.id,
|
||||
@@ -316,14 +315,14 @@ export function buildBailianModelDefinition(params: {
|
||||
input:
|
||||
(params.input as ("text" | "image")[]) ??
|
||||
([...(catalog?.input ?? ["text"])] as ("text" | "image")[]),
|
||||
cost: params.cost ?? BAILIAN_DEFAULT_COST,
|
||||
cost: params.cost ?? MODELSTUDIO_DEFAULT_COST,
|
||||
contextWindow: params.contextWindow ?? catalog?.contextWindow ?? 262144,
|
||||
maxTokens: params.maxTokens ?? catalog?.maxTokens ?? 65536,
|
||||
};
|
||||
}
|
||||
|
||||
export function buildBailianDefaultModelDefinition(): ModelDefinitionConfig {
|
||||
return buildBailianModelDefinition({
|
||||
id: BAILIAN_DEFAULT_MODEL_ID,
|
||||
export function buildModelStudioDefaultModelDefinition(): ModelDefinitionConfig {
|
||||
return buildModelStudioModelDefinition({
|
||||
id: MODELSTUDIO_DEFAULT_MODEL_ID,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -39,10 +39,10 @@ export {
|
||||
applyXiaomiProviderConfig,
|
||||
applyZaiConfig,
|
||||
applyZaiProviderConfig,
|
||||
applyBailianConfig,
|
||||
applyBailianConfigCn,
|
||||
applyBailianProviderConfig,
|
||||
applyBailianProviderConfigCn,
|
||||
applyModelStudioConfig,
|
||||
applyModelStudioConfigCn,
|
||||
applyModelStudioProviderConfig,
|
||||
applyModelStudioProviderConfigCn,
|
||||
KILOCODE_BASE_URL,
|
||||
} from "./onboard-auth.config-core.js";
|
||||
export {
|
||||
@@ -88,7 +88,7 @@ export {
|
||||
setVolcengineApiKey,
|
||||
setZaiApiKey,
|
||||
setXaiApiKey,
|
||||
setBailianApiKey,
|
||||
setModelStudioApiKey,
|
||||
writeOAuthCredentials,
|
||||
HUGGINGFACE_DEFAULT_MODEL_REF,
|
||||
VERCEL_AI_GATEWAY_DEFAULT_MODEL_REF,
|
||||
@@ -97,7 +97,7 @@ export {
|
||||
TOGETHER_DEFAULT_MODEL_REF,
|
||||
MISTRAL_DEFAULT_MODEL_REF,
|
||||
XAI_DEFAULT_MODEL_REF,
|
||||
BAILIAN_DEFAULT_MODEL_REF,
|
||||
MODELSTUDIO_DEFAULT_MODEL_REF,
|
||||
} from "./onboard-auth.credentials.js";
|
||||
export {
|
||||
buildKilocodeModelDefinition,
|
||||
|
||||
@@ -30,8 +30,8 @@ type AuthChoiceFlagOptions = Pick<
|
||||
| "xaiApiKey"
|
||||
| "litellmApiKey"
|
||||
| "qianfanApiKey"
|
||||
| "bailianApiKeyCn"
|
||||
| "bailianApiKey"
|
||||
| "modelstudioApiKeyCn"
|
||||
| "modelstudioApiKey"
|
||||
| "volcengineApiKey"
|
||||
| "byteplusApiKey"
|
||||
| "customBaseUrl"
|
||||
|
||||
@@ -15,8 +15,8 @@ import {
|
||||
applyCloudflareAiGatewayConfig,
|
||||
applyKilocodeConfig,
|
||||
applyQianfanConfig,
|
||||
applyBailianConfig,
|
||||
applyBailianConfigCn,
|
||||
applyModelStudioConfig,
|
||||
applyModelStudioConfigCn,
|
||||
applyKimiCodeConfig,
|
||||
applyMinimaxApiConfig,
|
||||
applyMinimaxApiConfigCn,
|
||||
@@ -39,7 +39,7 @@ import {
|
||||
setCloudflareAiGatewayConfig,
|
||||
setByteplusApiKey,
|
||||
setQianfanApiKey,
|
||||
setBailianApiKey,
|
||||
setModelStudioApiKey,
|
||||
setGeminiApiKey,
|
||||
setKilocodeApiKey,
|
||||
setKimiCodingApiKey,
|
||||
@@ -501,13 +501,13 @@ export async function applyNonInteractiveAuthChoice(params: {
|
||||
return applyQianfanConfig(nextConfig);
|
||||
}
|
||||
|
||||
if (authChoice === "bailian-api-key-cn") {
|
||||
if (authChoice === "modelstudio-api-key-cn") {
|
||||
const resolved = await resolveApiKey({
|
||||
provider: "bailian",
|
||||
provider: "modelstudio",
|
||||
cfg: baseConfig,
|
||||
flagValue: opts.bailianApiKeyCn,
|
||||
flagName: "--bailian-api-key-cn",
|
||||
envVar: "BAILIAN_API_KEY",
|
||||
flagValue: opts.modelstudioApiKeyCn,
|
||||
flagName: "--modelstudio-api-key-cn",
|
||||
envVar: "MODELSTUDIO_API_KEY",
|
||||
runtime,
|
||||
});
|
||||
if (!resolved) {
|
||||
@@ -515,26 +515,26 @@ export async function applyNonInteractiveAuthChoice(params: {
|
||||
}
|
||||
if (
|
||||
!(await maybeSetResolvedApiKey(resolved, (value) =>
|
||||
setBailianApiKey(value, undefined, apiKeyStorageOptions),
|
||||
setModelStudioApiKey(value, undefined, apiKeyStorageOptions),
|
||||
))
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
nextConfig = applyAuthProfileConfig(nextConfig, {
|
||||
profileId: "bailian:default",
|
||||
provider: "bailian",
|
||||
profileId: "modelstudio:default",
|
||||
provider: "modelstudio",
|
||||
mode: "api_key",
|
||||
});
|
||||
return applyBailianConfigCn(nextConfig);
|
||||
return applyModelStudioConfigCn(nextConfig);
|
||||
}
|
||||
|
||||
if (authChoice === "bailian-api-key") {
|
||||
if (authChoice === "modelstudio-api-key") {
|
||||
const resolved = await resolveApiKey({
|
||||
provider: "bailian",
|
||||
provider: "modelstudio",
|
||||
cfg: baseConfig,
|
||||
flagValue: opts.bailianApiKey,
|
||||
flagName: "--bailian-api-key",
|
||||
envVar: "BAILIAN_API_KEY",
|
||||
flagValue: opts.modelstudioApiKey,
|
||||
flagName: "--modelstudio-api-key",
|
||||
envVar: "MODELSTUDIO_API_KEY",
|
||||
runtime,
|
||||
});
|
||||
if (!resolved) {
|
||||
@@ -542,17 +542,17 @@ export async function applyNonInteractiveAuthChoice(params: {
|
||||
}
|
||||
if (
|
||||
!(await maybeSetResolvedApiKey(resolved, (value) =>
|
||||
setBailianApiKey(value, undefined, apiKeyStorageOptions),
|
||||
setModelStudioApiKey(value, undefined, apiKeyStorageOptions),
|
||||
))
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
nextConfig = applyAuthProfileConfig(nextConfig, {
|
||||
profileId: "bailian:default",
|
||||
provider: "bailian",
|
||||
profileId: "modelstudio:default",
|
||||
provider: "modelstudio",
|
||||
mode: "api_key",
|
||||
});
|
||||
return applyBailianConfig(nextConfig);
|
||||
return applyModelStudioConfig(nextConfig);
|
||||
}
|
||||
|
||||
if (authChoice === "openai-api-key") {
|
||||
|
||||
@@ -23,8 +23,8 @@ type OnboardProviderAuthOptionKey = keyof Pick<
|
||||
| "xaiApiKey"
|
||||
| "litellmApiKey"
|
||||
| "qianfanApiKey"
|
||||
| "bailianApiKeyCn"
|
||||
| "bailianApiKey"
|
||||
| "modelstudioApiKeyCn"
|
||||
| "modelstudioApiKey"
|
||||
| "volcengineApiKey"
|
||||
| "byteplusApiKey"
|
||||
>;
|
||||
@@ -187,18 +187,18 @@ export const ONBOARD_PROVIDER_AUTH_FLAGS: ReadonlyArray<OnboardProviderAuthFlag>
|
||||
description: "QIANFAN API key",
|
||||
},
|
||||
{
|
||||
optionKey: "bailianApiKeyCn",
|
||||
authChoice: "bailian-api-key-cn",
|
||||
cliFlag: "--bailian-api-key-cn",
|
||||
cliOption: "--bailian-api-key-cn <key>",
|
||||
description: "Alibaba Bailian Coding Plan API key (China)",
|
||||
optionKey: "modelstudioApiKeyCn",
|
||||
authChoice: "modelstudio-api-key-cn",
|
||||
cliFlag: "--modelstudio-api-key-cn",
|
||||
cliOption: "--modelstudio-api-key-cn <key>",
|
||||
description: "Alibaba Cloud Model Studio Coding Plan API key (China)",
|
||||
},
|
||||
{
|
||||
optionKey: "bailianApiKey",
|
||||
authChoice: "bailian-api-key",
|
||||
cliFlag: "--bailian-api-key",
|
||||
cliOption: "--bailian-api-key <key>",
|
||||
description: "Alibaba Bailian Coding Plan API key (Global/Intl)",
|
||||
optionKey: "modelstudioApiKey",
|
||||
authChoice: "modelstudio-api-key",
|
||||
cliFlag: "--modelstudio-api-key",
|
||||
cliOption: "--modelstudio-api-key <key>",
|
||||
description: "Alibaba Cloud Model Studio Coding Plan API key (Global/Intl)",
|
||||
},
|
||||
{
|
||||
optionKey: "volcengineApiKey",
|
||||
|
||||
@@ -49,8 +49,8 @@ export type AuthChoice =
|
||||
| "volcengine-api-key"
|
||||
| "byteplus-api-key"
|
||||
| "qianfan-api-key"
|
||||
| "bailian-api-key-cn"
|
||||
| "bailian-api-key"
|
||||
| "modelstudio-api-key-cn"
|
||||
| "modelstudio-api-key"
|
||||
| "custom-api-key"
|
||||
| "skip";
|
||||
export type AuthChoiceGroupId =
|
||||
@@ -77,7 +77,7 @@ export type AuthChoiceGroupId =
|
||||
| "together"
|
||||
| "huggingface"
|
||||
| "qianfan"
|
||||
| "bailian"
|
||||
| "modelstudio"
|
||||
| "xai"
|
||||
| "volcengine"
|
||||
| "byteplus"
|
||||
@@ -138,8 +138,8 @@ export type OnboardOptions = {
|
||||
volcengineApiKey?: string;
|
||||
byteplusApiKey?: string;
|
||||
qianfanApiKey?: string;
|
||||
bailianApiKeyCn?: string;
|
||||
bailianApiKey?: string;
|
||||
modelstudioApiKeyCn?: string;
|
||||
modelstudioApiKey?: string;
|
||||
customBaseUrl?: string;
|
||||
customApiKey?: string;
|
||||
customModelId?: string;
|
||||
|
||||
@@ -21,6 +21,7 @@ export const PROVIDER_ENV_VARS: Record<string, readonly string[]> = {
|
||||
xai: ["XAI_API_KEY"],
|
||||
mistral: ["MISTRAL_API_KEY"],
|
||||
kilocode: ["KILOCODE_API_KEY"],
|
||||
modelstudio: ["MODELSTUDIO_API_KEY"],
|
||||
volcengine: ["VOLCANO_ENGINE_API_KEY"],
|
||||
byteplus: ["BYTEPLUS_API_KEY"],
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user