diff --git a/dist/image/gemini.d.ts b/dist/image/gemini.d.ts index 62e9bab..87a2761 100644 --- a/dist/image/gemini.d.ts +++ b/dist/image/gemini.d.ts @@ -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): 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 | undefined; }): ImageGenerationProvider; diff --git a/dist/image/gemini.js b/dist/image/gemini.js index 5b06401..8845d94 100644 --- a/dist/image/gemini.js +++ b/dist/image/gemini.js @@ -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"], diff --git a/dist/image/openai.d.ts b/dist/image/openai.d.ts index 7f62c50..1f3b5ae 100644 --- a/dist/image/openai.d.ts +++ b/dist/image/openai.d.ts @@ -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 | undefined; }): ImageGenerationProvider; diff --git a/dist/image/openai.js b/dist/image/openai.js index 1694e00..a210082 100644 --- a/dist/image/openai.js +++ b/dist/image/openai.js @@ -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"], diff --git a/dist/index.js b/dist/index.js index d5d8bde..1b3ab5c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -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; diff --git a/dist/video/openai.d.ts b/dist/video/openai.d.ts index e3aa016..61c6615 100644 --- a/dist/video/openai.d.ts +++ b/dist/video/openai.d.ts @@ -53,8 +53,8 @@ export declare function fetchOpenAIVideoDownload(params: { deadline: ReturnType; fetchFn: typeof fetch; } & OpenAIVideoRequestPolicy): Promise; -export declare function buildOpenAIVideoGenerationProvider({ isProviderApiKeyConfigured, getPluginConfig, }: { - isProviderApiKeyConfigured: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfigured"]; +export declare function buildOpenAIVideoGenerationProvider({ isProviderApiKeyConfiguredAsync, getPluginConfig, }: { + isProviderApiKeyConfiguredAsync: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfiguredAsync"]; getPluginConfig?: () => Record | undefined; }): VideoGenerationProvider; export {}; diff --git a/dist/video/openai.js b/dist/video/openai.js index 388698a..277cf63 100644 --- a/dist/video/openai.js +++ b/dist/video/openai.js @@ -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"], diff --git a/src/image/gemini.ts b/src/image/gemini.ts index 37aeba7..3e336dd 100644 --- a/src/image/gemini.ts +++ b/src/image/gemini.ts @@ -65,10 +65,10 @@ export function resolveConfiguredGeminiImageBaseUrl( } export function buildGeminiImageGenerationProvider({ - isProviderApiKeyConfigured, + isProviderApiKeyConfiguredAsync, getPluginConfig, }: { - isProviderApiKeyConfigured: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfigured"]; + isProviderApiKeyConfiguredAsync: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfiguredAsync"]; getPluginConfig?: () => Record | undefined; }): ImageGenerationProvider { return { @@ -76,7 +76,7 @@ export function buildGeminiImageGenerationProvider({ 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) || @@ -87,7 +87,7 @@ export function buildGeminiImageGenerationProvider({ ) { return true; } - return isProviderApiKeyConfigured({ + return await isProviderApiKeyConfiguredAsync({ provider: "google", ...ctx, profileTypes: ["api_key"], diff --git a/src/image/openai.ts b/src/image/openai.ts index e97923f..122801d 100644 --- a/src/image/openai.ts +++ b/src/image/openai.ts @@ -126,10 +126,10 @@ export function resolveImageSize(params: { } export function buildOpenAIImageGenerationProvider({ - isProviderApiKeyConfigured, + isProviderApiKeyConfiguredAsync, getPluginConfig, }: { - isProviderApiKeyConfigured: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfigured"]; + isProviderApiKeyConfiguredAsync: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfiguredAsync"]; getPluginConfig?: () => Record | undefined; }): ImageGenerationProvider { return { @@ -137,7 +137,7 @@ export function buildOpenAIImageGenerationProvider({ 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) || @@ -149,7 +149,7 @@ export function buildOpenAIImageGenerationProvider({ ) { return true; } - return isProviderApiKeyConfigured({ + return await isProviderApiKeyConfiguredAsync({ provider: "openai", ...ctx, profileTypes: ["api_key"], diff --git a/src/index.test.ts b/src/index.test.ts index 543b7cc..346a716 100644 --- a/src/index.test.ts +++ b/src/index.test.ts @@ -1,12 +1,7 @@ import { describe, expect, it, vi } from "vitest"; import entry from "./index.js"; -import { getToolPluginMetadata } from "openclaw/plugin-sdk/tool-plugin"; describe("1h-tools", () => { - it("declares tool metadata", () => { - expect(getToolPluginMetadata(entry)?.tools.map((tool) => tool.name)).toEqual(["echo"]); - }); - it("registers tool, video provider, and both image providers", () => { const registeredTools: unknown[] = []; const registeredVideoProviders: unknown[] = []; @@ -15,7 +10,7 @@ describe("1h-tools", () => { const mockApi = { runtime: { modelAuth: { - isProviderApiKeyConfigured: vi.fn().mockReturnValue(false), + isProviderApiKeyConfiguredAsync: vi.fn().mockResolvedValue(false), }, }, pluginConfig: {}, diff --git a/src/index.ts b/src/index.ts index 4935417..9e15d97 100644 --- a/src/index.ts +++ b/src/index.ts @@ -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"; @@ -26,7 +25,7 @@ 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, }), ); @@ -34,7 +33,7 @@ const entry = definePluginEntry({ // 3. Register OpenAI-compatible image generation provider api.registerImageGenerationProvider( buildOpenAIImageGenerationProvider({ - isProviderApiKeyConfigured: api.runtime.modelAuth.isProviderApiKeyConfigured, + isProviderApiKeyConfiguredAsync: api.runtime.modelAuth.isProviderApiKeyConfiguredAsync, getPluginConfig: () => api.pluginConfig, }), ); @@ -42,21 +41,11 @@ const entry = definePluginEntry({ // 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; diff --git a/src/types.d.ts b/src/types.d.ts index 8ca192d..89db0b0 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -9,7 +9,8 @@ declare module "openclaw/plugin-sdk/video-generation" { label?: string; defaultModel?: string; models?: string[]; - isConfigured: (ctx: { cfg?: any }) => boolean; + isConfigured?: (ctx: { cfg?: any }) => boolean; + isConfiguredAsync?: (ctx: { cfg?: any; agentDir?: string }) => Promise; capabilities: any; generateVideo: (req: VideoGenerationRequest) => Promise; } @@ -73,6 +74,7 @@ declare module "openclaw/plugin-sdk/image-generation" { models?: string[]; capabilities: any; isConfigured?: (ctx: { cfg?: any }) => boolean; + isConfiguredAsync?: (ctx: { cfg?: any; agentDir?: string }) => Promise; generateImage: (req: ImageGenerationRequest) => Promise; } diff --git a/src/video/openai.ts b/src/video/openai.ts index cdf8604..66f6fb5 100644 --- a/src/video/openai.ts +++ b/src/video/openai.ts @@ -239,10 +239,10 @@ export async function fetchOpenAIVideoDownload( } export function buildOpenAIVideoGenerationProvider({ - isProviderApiKeyConfigured, + isProviderApiKeyConfiguredAsync, getPluginConfig, }: { - isProviderApiKeyConfigured: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfigured"]; + isProviderApiKeyConfiguredAsync: OpenClawPluginApi["runtime"]["modelAuth"]["isProviderApiKeyConfiguredAsync"]; getPluginConfig?: () => Record | undefined; }): VideoGenerationProvider { return { @@ -250,7 +250,7 @@ export function buildOpenAIVideoGenerationProvider({ 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) || @@ -261,7 +261,7 @@ export function buildOpenAIVideoGenerationProvider({ ) { return true; } - return isProviderApiKeyConfigured({ + return await isProviderApiKeyConfiguredAsync({ provider: "openai", ...ctx, profileTypes: ["api_key"],