vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-20 05:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify provider auth storage setters

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-27 17:04:09 +00:00
parent 67f609ea9a
commit 910cb9f1af
9 changed files with 61 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/agents/models-config.providers.moonshot.test.ts
View File

@@ -2,7 +2,10 @@ import { mkdtempSync } from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { describe, expect, it } from "vitest";
import { MOONSHOT_BASE_URL as MOONSHOT_AI_BASE_URL, MOONSHOT_CN_BASE_URL } from "../../extensions/moonshot/api.js";
import {
MOONSHOT_BASE_URL as MOONSHOT_AI_BASE_URL,
MOONSHOT_CN_BASE_URL,
} from "../../extensions/moonshot/api.js";
import { captureEnv } from "../test-utils/env.js";
import { resolveImplicitProvidersForTest } from "./models-config.e2e-harness.js";
import { applyNativeStreamingUsageCompat } from "./models-config.providers.js";

6
src/commands/auth-choice.test.ts
View File

@@ -1,16 +1,14 @@
import fs from "node:fs/promises";
import type { OAuthCredentials } from "@mariozechner/pi-ai";
import { afterEach, describe, expect, it, vi } from "vitest";
import { MINIMAX_CN_API_BASE_URL } from "../../extensions/minimax/api.js";
import { ZAI_CODING_CN_BASE_URL, ZAI_CODING_GLOBAL_BASE_URL } from "../../extensions/zai/api.js";
import { resolveAgentDir } from "../agents/agent-scope.js";
import type { OpenClawConfig } from "../config/config.js";
import { resolveAgentModelPrimaryValue } from "../config/model-input.js";
import type { ModelProviderConfig } from "../config/types.models.js";
import { createProviderApiKeyAuthMethod } from "../plugins/provider-api-key-auth.js";
import { providerApiKeyAuthRuntime } from "../plugins/provider-api-key-auth.runtime.js";
import {
MINIMAX_CN_API_BASE_URL,
} from "../../extensions/minimax/api.js";
import { ZAI_CODING_CN_BASE_URL, ZAI_CODING_GLOBAL_BASE_URL } from "../../extensions/zai/api.js";
import type { ProviderAuthMethod, ProviderPlugin } from "../plugins/types.js";
import type { WizardPrompter } from "../wizard/prompts.js";
import { applyAuthChoice, resolvePreferredProviderForAuthChoice } from "./auth-choice.js";

5
src/commands/onboard-non-interactive.provider-auth.test.ts
View File

@@ -2,10 +2,7 @@ import fs from "node:fs/promises";
import path from "node:path";
import { setTimeout as delay } from "node:timers/promises";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import {
MINIMAX_API_BASE_URL,
MINIMAX_CN_API_BASE_URL,
} from "../../extensions/minimax/api.js";
import { MINIMAX_API_BASE_URL, MINIMAX_CN_API_BASE_URL } from "../../extensions/minimax/api.js";
import {
ZAI_CODING_CN_BASE_URL,
ZAI_CODING_GLOBAL_BASE_URL,

216
src/plugins/provider-auth-storage.ts
View File

@@ -18,6 +18,12 @@ import { KILOCODE_DEFAULT_MODEL_REF } from "./provider-model-kilocode.js";
const resolveAuthAgentDir = (agentDir?: string) => agentDir ?? resolveOpenClawAgentDir();
type ProviderApiKeySetter = (
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) => Promise<void> | void;
function upsertProviderApiKeyProfile(params: {
provider: string;
key: SecretInput;
@@ -33,6 +39,20 @@ function upsertProviderApiKeyProfile(params: {
});
}
function createProviderApiKeySetter(
provider: string,
resolveKey: (key: SecretInput) => SecretInput = (key) => key,
): ProviderApiKeySetter {
return async (key, agentDir, options) => {
upsertProviderApiKeyProfile({
provider,
key: resolveKey(key),
agentDir,
options,
});
};
}
export {
HUGGINGFACE_DEFAULT_MODEL_REF,
KILOCODE_DEFAULT_MODEL_REF,
@@ -50,29 +70,9 @@ export {
type WriteOAuthCredentialsOptions,
};
export async function setAnthropicApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "anthropic", key, agentDir, options });
}
export async function setOpenaiApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "openai", key, agentDir, options });
}
export async function setGeminiApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "google", key, agentDir, options });
}
export const setAnthropicApiKey = createProviderApiKeySetter("anthropic");
export const setOpenaiApiKey = createProviderApiKeySetter("openai");
export const setGeminiApiKey = createProviderApiKeySetter("google");
export async function setMinimaxApiKey(
key: SecretInput,
@@ -84,90 +84,17 @@ export async function setMinimaxApiKey(
upsertProviderApiKeyProfile({ provider, key, agentDir, options, profileId });
}
export async function setMoonshotApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "moonshot", key, agentDir, options });
}
export async function setKimiCodingApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "kimi", key, agentDir, options });
}
export async function setVolcengineApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "volcengine", key, agentDir, options });
}
export async function setByteplusApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "byteplus", key, agentDir, options });
}
export async function setSyntheticApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "synthetic", key, agentDir, options });
}
export async function setVeniceApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "venice", key, agentDir, options });
}
export async function setZaiApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertAuthProfile({
profileId: "zai:default",
credential: buildApiKeyCredential("zai", key, undefined, options),
agentDir: resolveAuthAgentDir(agentDir),
});
}
export async function setXiaomiApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertAuthProfile({
profileId: "xiaomi:default",
credential: buildApiKeyCredential("xiaomi", key, undefined, options),
agentDir: resolveAuthAgentDir(agentDir),
});
}
export async function setOpenrouterApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
const safeKey = typeof key === "string" && key === "undefined" ? "" : key;
upsertAuthProfile({
profileId: "openrouter:default",
credential: buildApiKeyCredential("openrouter", safeKey, undefined, options),
agentDir: resolveAuthAgentDir(agentDir),
});
}
export const setMoonshotApiKey = createProviderApiKeySetter("moonshot");
export const setKimiCodingApiKey = createProviderApiKeySetter("kimi");
export const setVolcengineApiKey = createProviderApiKeySetter("volcengine");
export const setByteplusApiKey = createProviderApiKeySetter("byteplus");
export const setSyntheticApiKey = createProviderApiKeySetter("synthetic");
export const setVeniceApiKey = createProviderApiKeySetter("venice");
export const setZaiApiKey = createProviderApiKeySetter("zai");
export const setXiaomiApiKey = createProviderApiKeySetter("xiaomi");
export const setOpenrouterApiKey = createProviderApiKeySetter("openrouter", (key) =>
typeof key === "string" && key === "undefined" ? "" : key,
);
export async function setCloudflareAiGatewayConfig(
accountId: string,
@@ -190,21 +117,8 @@ export async function setCloudflareAiGatewayConfig(
});
}
export async function setLitellmApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "litellm", key, agentDir, options });
}
export async function setVercelAiGatewayApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "vercel-ai-gateway", key, agentDir, options });
}
export const setLitellmApiKey = createProviderApiKeySetter("litellm");
export const setVercelAiGatewayApiKey = createProviderApiKeySetter("vercel-ai-gateway");
export async function setOpencodeZenApiKey(
key: SecretInput,
@@ -232,54 +146,10 @@ async function setSharedOpencodeApiKey(
}
}
export async function setTogetherApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "together", key, agentDir, options });
}
export async function setHuggingfaceApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "huggingface", key, agentDir, options });
}
export function setQianfanApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "qianfan", key, agentDir, options });
}
export function setModelStudioApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "modelstudio", key, agentDir, options });
}
export function setXaiApiKey(key: SecretInput, agentDir?: string, options?: ApiKeyStorageOptions) {
upsertProviderApiKeyProfile({ provider: "xai", key, agentDir, options });
}
export async function setMistralApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "mistral", key, agentDir, options });
}
export async function setKilocodeApiKey(
key: SecretInput,
agentDir?: string,
options?: ApiKeyStorageOptions,
) {
upsertProviderApiKeyProfile({ provider: "kilocode", key, agentDir, options });
}
export const setTogetherApiKey = createProviderApiKeySetter("together");
export const setHuggingfaceApiKey = createProviderApiKeySetter("huggingface");
export const setQianfanApiKey = createProviderApiKeySetter("qianfan");
export const setModelStudioApiKey = createProviderApiKeySetter("modelstudio");
export const setXaiApiKey = createProviderApiKeySetter("xai");
export const setMistralApiKey = createProviderApiKeySetter("mistral");
export const setKilocodeApiKey = createProviderApiKeySetter("kilocode");

2
src/plugins/provider-zai-endpoint.ts
View File

@@ -1,10 +1,10 @@
import { fetchWithTimeout } from "../utils/fetch-timeout.js";
import {
ZAI_CN_BASE_URL,
ZAI_CODING_CN_BASE_URL,
ZAI_CODING_GLOBAL_BASE_URL,
ZAI_GLOBAL_BASE_URL,
} from "../../extensions/zai/api.js";
import { fetchWithTimeout } from "../utils/fetch-timeout.js";
export type ZaiEndpointId = "global" | "cn" | "coding-global" | "coding-cn";