koishi-plugin-aka-ai-generator 0.7.1 → 0.7.4

package/lib/index.d.ts

@@ -42,6 +42,9 @@ export interface Config {
     securityBlockWindow: number;
     securityBlockWarningThreshold: number;
     enableVideoGeneration: boolean;
+    videoProvider: 'yunwu';
+    videoApiKey: string;
+    videoApiBase: string;
     videoModelId: string;
     videoMaxWaitTime: number;
     videoCreditsMultiplier: number;

package/lib/index.js

@@ -984,41 +984,18 @@ var YunwuVideoProvider = class {
   async queryTaskStatus(taskId) {
     const { logger, ctx } = this.config;
     try {
-      const possibleEndpoints = [
-        `/v1/video/${taskId}`,
-        `/v1/video/status/${taskId}`,
-        `/v1/videos/generations/${taskId}`
-      ];
-      let response = null;
-      let lastError = null;
-      for (const endpoint of possibleEndpoints) {
-        try {
-          response = await ctx.http.get(
-            `${this.config.apiBase}${endpoint}`,
-            {
-              headers: {
-                "Authorization": `Bearer ${this.config.apiKey}`,
-                "Accept": "application/json"
-              },
-              timeout: this.config.apiTimeout * 1e3
-            }
-          );
-          if (response && !response.error) {
-            logger?.debug("查询任务状态成功", { taskId, endpoint });
-            break;
-          }
-        } catch (err) {
-          lastError = err;
-          if (err.response?.status === 404 && possibleEndpoints.indexOf(endpoint) < possibleEndpoints.length - 1) {
-            logger?.debug("尝试下一个查询端点", { taskId, endpoint, nextEndpoint: possibleEndpoints[possibleEndpoints.indexOf(endpoint) + 1] });
-            continue;
-          }
-          throw err;
+      const endpoint = `/v1/video/${taskId}`;
+      logger?.debug("查询任务状态", { taskId, endpoint });
+      const response = await ctx.http.get(
+        `${this.config.apiBase}${endpoint}`,
+        {
+          headers: {
+            "Authorization": `Bearer ${this.config.apiKey}`,
+            "Accept": "application/json"
+          },
+          timeout: this.config.apiTimeout * 1e3
         }
-      }
-      if (!response) {
-        throw lastError || new Error("所有查询端点都失败");
-      }
+      );
       const status = response.status || response.data?.status || "pending";
       const videoUrl = response.video_url || response.url || response.data?.video_url || response.data?.url;
       return {
@@ -1073,6 +1050,8 @@ var YunwuVideoProvider = class {
     try {
       logger?.info("开始生成视频", { prompt, imageUrl, options });
       const taskId = await this.createVideoTask(prompt, imageUrl, options);
+      logger?.debug("任务已创建，等待 3 秒后开始查询", { taskId });
+      await new Promise((resolve) => setTimeout(resolve, 3e3));
       const videoUrl = await this.pollTaskCompletion(taskId, maxWaitTime);
       logger?.info("视频生成完成", { taskId, videoUrl });
       return videoUrl;
@@ -1653,9 +1632,14 @@ var Config = import_koishi2.Schema.intersect([
       prompts: import_koishi2.Schema.array(StyleItemSchema).role("table").default([]).description("属于该类型的 prompt 列表")
     })).role("table").default({}).description("按类型管理的 prompt 组，键名即为分组名称")
   }),
-  // 视频生成配置
+  // 视频生成配置（独立于图像生成配置）
   import_koishi2.Schema.object({
     enableVideoGeneration: import_koishi2.Schema.boolean().default(false).description("启用图生成视频功能（消耗较大，需谨慎开启）"),
+    videoProvider: import_koishi2.Schema.union([
+      import_koishi2.Schema.const("yunwu").description("云雾服务")
+    ]).default("yunwu").description("视频生成供应商（目前只支持云雾）"),
+    videoApiKey: import_koishi2.Schema.string().description("视频生成 API 密钥（独立于图像生成配置）").role("secret").default(""),
+    videoApiBase: import_koishi2.Schema.string().default("https://yunwu.ai").description("视频生成 API 地址"),
     videoModelId: import_koishi2.Schema.string().default("sora-2").description("视频生成模型ID (sora-2 或 sora-2-pro)"),
     videoMaxWaitTime: import_koishi2.Schema.number().default(300).min(60).max(600).description("视频生成最大等待时间（秒），超时后可异步查询"),
     videoCreditsMultiplier: import_koishi2.Schema.number().default(5).min(1).max(20).description("视频生成积分倍数（相对于图片生成，默认5倍）"),
@@ -1666,14 +1650,8 @@ var Config = import_koishi2.Schema.intersect([
       aspectRatio: import_koishi2.Schema.string().description("宽高比（如 16:9）")
     })).role("table").default([
       {
-        commandName: "慢动作视频",
-        prompt: "缓慢流畅的运镜，展现细节和质感",
-        duration: 25,
-        aspectRatio: "16:9"
-      },
-      {
-        commandName: "快节奏视频",
-        prompt: "快速动态的场景变化，充满活力",
+        commandName: "变视频",
+        prompt: "将该图片生成一段符合产品展现的流畅视频",
         duration: 15,
         aspectRatio: "16:9"
       }
@@ -1703,16 +1681,22 @@ function apply(ctx, config) {
   const modelMappingIndex = buildModelMappingIndex(config.modelMappings);
   let videoProvider = null;
   if (config.enableVideoGeneration) {
-    videoProvider = new YunwuVideoProvider({
-      apiKey: config.yunwuApiKey,
-      modelId: config.videoModelId,
-      apiBase: "https://yunwu.ai",
-      apiTimeout: config.apiTimeout,
-      logLevel: config.logLevel,
-      logger,
-      ctx
-    });
-    logger.info(`视频生成功能已启用 (模型: ${config.videoModelId})`);
+    if (!config.videoApiKey) {
+      logger.warn("视频生成功能已启用，但未配置视频 API 密钥，视频功能将不可用");
+    } else if (config.videoProvider !== "yunwu") {
+      logger.warn(`视频生成供应商 ${config.videoProvider} 暂不支持，仅支持 yunwu`);
+    } else {
+      videoProvider = new YunwuVideoProvider({
+        apiKey: config.videoApiKey,
+        modelId: config.videoModelId,
+        apiBase: config.videoApiBase,
+        apiTimeout: config.apiTimeout,
+        logLevel: config.logLevel,
+        logger,
+        ctx
+      });
+      logger.info(`视频生成功能已启用 (供应商: ${config.videoProvider}, 模型: ${config.videoModelId}, API: ${config.videoApiBase})`);
+    }
   }
   const styleDefinitions = collectStyleDefinitions();
   function collectStyleDefinitions() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-ai-generator",
   "description": "自用AI生成插件(GPTGod & Yunwu)",
-  "version": "0.7.1",
+  "version": "0.7.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [