refactor: migrate to async isConfiguredAsync and remove deprecated tool-plugin import

This commit is contained in:
openclaw committed 2026-11-13 02:46:41 +00:00
1 parent 8cd50b1c4d
commit 59b7316944
13 files changed
+37 -61

No files matched your search

+2 -2
View File
@@ -15,7 +15,7 @@ export interface GeminiImagePluginConfig {
export declare function resolvePluginApiKey(rawKey: string | SecretRefObject | undefined): string | undefined;
export declare function resolveGeminiImageConfig(cfg: ImageGenerationRequest["cfg"] | undefined, apiPluginConfig?: Record<string, unknown>): GeminiImagePluginConfig | undefined;
export declare function resolveConfiguredGeminiImageBaseUrl(pluginCfg?: GeminiImagePluginConfig): string;
export declare function buildGeminiImageGenerationProvider({ isProviderApiKeyConfigured, getPluginConfig, }: {
isProviderApiKeyConfigured: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfigured"];
export declare function buildGeminiImageGenerationProvider({ isProviderApiKeyConfiguredAsync, getPluginConfig, }: {
isProviderApiKeyConfiguredAsync: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfiguredAsync"];
getPluginConfig?: () => Record<string, unknown> | undefined;
}): ImageGenerationProvider;
+3 -3
View File
@@ -25,13 +25,13 @@ export function resolveConfiguredGeminiImageBaseUrl(pluginCfg) {
normalizeOptionalString(process.env.GEMINI_IMAGE_BASE_URL) ??
DEFAULT_GEMINI_IMAGE_BASE_URL);
}
export function buildGeminiImageGenerationProvider({ isProviderApiKeyConfigured, getPluginConfig, }) {
export function buildGeminiImageGenerationProvider({ isProviderApiKeyConfiguredAsync, getPluginConfig, }) {
return {
id: "1h-gemini-image",
label: "1-h Gemini Image",
defaultModel: DEFAULT_GEMINI_IMAGE_MODEL,
models: [DEFAULT_GEMINI_IMAGE_MODEL],
isConfigured: (ctx) => {
isConfiguredAsync: async (ctx) => {
const pluginCfg = resolveGeminiImageConfig(ctx.cfg, getPluginConfig?.());
if (resolvePluginApiKey(pluginCfg?.apiKey) ||
Boolean(pluginCfg?.apiKey) ||
@@ -40,7 +40,7 @@ export function buildGeminiImageGenerationProvider({ isProviderApiKeyConfigured,
normalizeOptionalString(process.env.BIFROST_API_KEY)) {
return true;
}
return isProviderApiKeyConfigured({
return await isProviderApiKeyConfiguredAsync({
provider: "google",
...ctx,
profileTypes: ["api_key"],
+2 -2
View File
@@ -21,7 +21,7 @@ export declare function resolveImageSize(params: {
aspectRatio?: string;
model?: string;
}): string;
export declare function buildOpenAIImageGenerationProvider({ isProviderApiKeyConfigured, getPluginConfig, }: {
isProviderApiKeyConfigured: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfigured"];
export declare function buildOpenAIImageGenerationProvider({ isProviderApiKeyConfiguredAsync, getPluginConfig, }: {
isProviderApiKeyConfiguredAsync: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfiguredAsync"];
getPluginConfig?: () => Record<string, unknown> | undefined;
}): ImageGenerationProvider;
+3 -3
View File
@@ -76,13 +76,13 @@ export function resolveImageSize(params) {
return DEFAULT_SIZE;
}
}
export function buildOpenAIImageGenerationProvider({ isProviderApiKeyConfigured, getPluginConfig, }) {
export function buildOpenAIImageGenerationProvider({ isProviderApiKeyConfiguredAsync, getPluginConfig, }) {
return {
id: "1h-openai-image",
label: "1-h OpenAI Image",
defaultModel: DEFAULT_OPENAI_IMAGE_MODEL,
models: [DEFAULT_OPENAI_IMAGE_MODEL, "gpt-image-2.5", "gpt-image-2.5-flare", "gpt-image-2.5-sunburst"],
isConfigured: (ctx) => {
isConfiguredAsync: async (ctx) => {
const pluginCfg = resolveImageConfig(ctx.cfg, getPluginConfig?.());
if (resolvePluginApiKey(pluginCfg?.apiKey) ||
Boolean(pluginCfg?.apiKey) ||
@@ -92,7 +92,7 @@ export function buildOpenAIImageGenerationProvider({ isProviderApiKeyConfigured,
normalizeOptionalString(process.env.OPENAI_API_KEY)) {
return true;
}
return isProviderApiKeyConfigured({
return await isProviderApiKeyConfiguredAsync({
provider: "openai",
...ctx,
profileTypes: ["api_key"],
+3 -13
View File
@@ -1,6 +1,5 @@
import { jsonResult } from "openclaw/plugin-sdk/core";
import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
import { toolPluginMetadataSymbol } from "openclaw/plugin-sdk/tool-plugin";
import { echoTool } from "./tools/echo.js";
import { buildOpenAIVideoGenerationProvider } from "./video/openai.js";
import { buildOpenAIImageGenerationProvider } from "./image/openai.js";
@@ -23,28 +22,19 @@ const entry = definePluginEntry({
});
// 2. Register OpenAI-compatible video generation provider
api.registerVideoGenerationProvider(buildOpenAIVideoGenerationProvider({
isProviderApiKeyConfigured: api.runtime.modelAuth.isProviderApiKeyConfigured,
isProviderApiKeyConfiguredAsync: api.runtime.modelAuth.isProviderApiKeyConfiguredAsync,
getPluginConfig: () => api.pluginConfig,
}));
// 3. Register OpenAI-compatible image generation provider
api.registerImageGenerationProvider(buildOpenAIImageGenerationProvider({
isProviderApiKeyConfigured: api.runtime.modelAuth.isProviderApiKeyConfigured,
isProviderApiKeyConfiguredAsync: api.runtime.modelAuth.isProviderApiKeyConfiguredAsync,
getPluginConfig: () => api.pluginConfig,
}));
// 4. Register Gemini-native image generation provider
api.registerImageGenerationProvider(buildGeminiImageGenerationProvider({
isProviderApiKeyConfigured: api.runtime.modelAuth.isProviderApiKeyConfigured,
isProviderApiKeyConfiguredAsync: api.runtime.modelAuth.isProviderApiKeyConfiguredAsync,
getPluginConfig: () => api.pluginConfig,
}));
},
});
Object.defineProperty(entry, toolPluginMetadataSymbol, {
value: {
id: "1h-tools",
name: "1-h Tools",
description: "Custom Tools and Media Providers for OpenClaw.",
tools: [echoTool],
},
enumerable: false,
});
export default entry;
+2 -2
View File
@@ -53,8 +53,8 @@ export declare function fetchOpenAIVideoDownload(params: {
deadline: ReturnType<typeof createProviderOperationDeadline>;
fetchFn: typeof fetch;
} & OpenAIVideoRequestPolicy): Promise<any>;
export declare function buildOpenAIVideoGenerationProvider({ isProviderApiKeyConfigured, getPluginConfig, }: {
isProviderApiKeyConfigured: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfigured"];
export declare function buildOpenAIVideoGenerationProvider({ isProviderApiKeyConfiguredAsync, getPluginConfig, }: {
isProviderApiKeyConfiguredAsync: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfiguredAsync"];
getPluginConfig?: () => Record<string, unknown> | undefined;
}): VideoGenerationProvider;
export {};
+3 -3
View File
@@ -134,13 +134,13 @@ export async function fetchOpenAIVideoDownload(params) {
},
});
}
export function buildOpenAIVideoGenerationProvider({ isProviderApiKeyConfigured, getPluginConfig, }) {
export function buildOpenAIVideoGenerationProvider({ isProviderApiKeyConfiguredAsync, getPluginConfig, }) {
return {
id: "1h-openai-video",
label: "1-h OpenAI Video",
defaultModel: DEFAULT_OPENAI_VIDEO_MODEL,
models: [DEFAULT_OPENAI_VIDEO_MODEL, "sora-2-pro", "gemini-video"],
isConfigured: (ctx) => {
isConfiguredAsync: async (ctx) => {
const pluginCfg = resolveVideoConfig(ctx.cfg, getPluginConfig?.());
if (resolvePluginApiKey(pluginCfg?.apiKey) ||
Boolean(pluginCfg?.apiKey) ||
@@ -149,7 +149,7 @@ export function buildOpenAIVideoGenerationProvider({ isProviderApiKeyConfigured,
normalizeOptionalString(process.env.CCLOAD_API_KEY)) {
return true;
}
return isProviderApiKeyConfigured({
return await isProviderApiKeyConfiguredAsync({
provider: "openai",
...ctx,
profileTypes: ["api_key"],