koishi-plugin-aka-ai-generator 0.7.0 → 0.7.3

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

@@ -886,7 +886,7 @@ var YunwuVideoProvider = class {
   }
   /**
    * 创建视频生成任务
-   * API: POST /v1/videos/generations
+   * API: POST /v1/video/create
    */
   async createVideoTask(prompt, imageUrl, options) {
     const { logger, ctx } = this.config;
@@ -898,64 +898,127 @@ var YunwuVideoProvider = class {
         this.config.apiTimeout,
         logger
       );
+      let orientation = "landscape";
+      if (options?.aspectRatio === "9:16") {
+        orientation = "portrait";
+      } else if (options?.aspectRatio === "1:1") {
+        orientation = "portrait";
+      }
+      let duration = options?.duration || 15;
+      if (duration < 15) {
+        duration = 15;
+      } else if (duration > 25) {
+        duration = 25;
+      } else if (duration <= 20) {
+        duration = 15;
+      } else {
+        duration = 25;
+      }
       const requestBody = {
+        images: [`data:${mimeType};base64,${imageBase64}`],
         model: this.config.modelId,
+        orientation,
         prompt,
-        image: `data:${mimeType};base64,${imageBase64}`,
-        duration: options?.duration || 5,
-        aspect_ratio: options?.aspectRatio || "16:9"
+        size: "large",
+        // 高清1080p
+        duration,
+        watermark: true,
+        // 默认优先无水印，出错会兜底到有水印
+        private: false
+        // 默认视频会发布
       };
-      if (options?.fps) {
-        requestBody.fps = options.fps;
-      }
       logger?.info("提交视频生成任务", {
         model: this.config.modelId,
         promptLength: prompt.length,
         duration: requestBody.duration,
-        aspectRatio: requestBody.aspect_ratio
+        orientation: requestBody.orientation
       });
       const response = await ctx.http.post(
-        `${this.config.apiBase}/v1/videos/generations`,
+        `${this.config.apiBase}/v1/video/create`,
         requestBody,
         {
           headers: {
             "Authorization": `Bearer ${this.config.apiKey}`,
-            "Content-Type": "application/json"
+            "Content-Type": "application/json",
+            "Accept": "application/json"
           },
           timeout: this.config.apiTimeout * 1e3
         }
       );
       if (response.error) {
-        throw new Error(sanitizeString(response.error.message || "创建任务失败"));
+        const errorMsg = response.error.message || response.error.type || "创建任务失败";
+        throw new Error(sanitizeString(errorMsg));
       }
-      const taskId = response.id || response.task_id || response.data?.id;
+      if (response.status && response.status >= 400) {
+        const errorMsg = response.data?.error?.message || response.data?.error || response.statusText || "创建任务失败";
+        logger?.error("API 返回错误状态", { status: response.status, error: errorMsg, response: response.data });
+        throw new Error(sanitizeString(errorMsg));
+      }
+      const taskId = response.id || response.data?.id;
       if (!taskId) {
         logger?.error("未能获取任务ID", { response });
-        throw new Error("未能获取任务ID");
+        throw new Error("未能获取任务ID，请检查 API 响应格式");
       }
       logger?.info("视频任务已创建", { taskId });
       return taskId;
     } catch (error) {
       logger?.error("创建视频任务失败", { error: sanitizeError(error) });
-      throw new Error(`创建视频任务失败: ${sanitizeString(error.message)}`);
+      let errorMessage = error.message || "创建视频任务失败";
+      if (error.response) {
+        const responseData = error.response.data;
+        if (responseData?.error) {
+          errorMessage = responseData.error.message || responseData.error.type || errorMessage;
+        } else if (responseData?.message) {
+          errorMessage = responseData.message;
+        }
+      } else if (error.response?.data?.error) {
+        errorMessage = error.response.data.error.message || error.response.data.error.type || errorMessage;
+      }
+      throw new Error(`创建视频任务失败: ${sanitizeString(errorMessage)}`);
     }
   }
   /**
    * 查询任务状态
-   * API: GET /v1/videos/generations/{taskId}
+   * API: GET /v1/video/{taskId} (根据创建端点的模式推断)
    */
   async queryTaskStatus(taskId) {
     const { logger, ctx } = this.config;
     try {
-      const response = await ctx.http.get(
-        `${this.config.apiBase}/v1/videos/generations/${taskId}`,
-        {
-          headers: {
-            "Authorization": `Bearer ${this.config.apiKey}`
-          },
-          timeout: this.config.apiTimeout * 1e3
+      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;
         }
-      );
+      }
+      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 {
@@ -967,7 +1030,11 @@ var YunwuVideoProvider = class {
       };
     } catch (error) {
       logger?.error("查询任务状态失败", { taskId, error: sanitizeError(error) });
-      throw new Error(`查询任务失败: ${sanitizeString(error.message)}`);
+      let errorMessage = error.message || "查询任务失败";
+      if (error.response?.data?.error) {
+        errorMessage = error.response.data.error.message || error.response.data.error.type || errorMessage;
+      }
+      throw new Error(`查询任务失败: ${sanitizeString(errorMessage)}`);
     }
   }
   /**
@@ -1586,28 +1653,27 @@ 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倍）"),
     videoStyles: import_koishi2.Schema.array(import_koishi2.Schema.object({
       commandName: import_koishi2.Schema.string().required().description("命令名称").role("table-cell", { width: 100 }),
       prompt: import_koishi2.Schema.string().role("textarea", { rows: 2 }).required().description("视频描述 prompt"),
-      duration: import_koishi2.Schema.number().min(3).max(10).description("视频时长（秒）"),
+      duration: import_koishi2.Schema.number().default(15).description("视频时长（秒，仅支持 15 或 25）"),
       aspectRatio: import_koishi2.Schema.string().description("宽高比（如 16:9）")
     })).role("table").default([
       {
-        commandName: "慢动作视频",
-        prompt: "缓慢流畅的运镜，展现细节和质感",
-        duration: 8,
-        aspectRatio: "16:9"
-      },
-      {
-        commandName: "快节奏视频",
-        prompt: "快速动态的场景变化，充满活力",
-        duration: 5,
+        commandName: "变视频",
+        prompt: "将该图片生成一段符合产品展现的流畅视频",
+        duration: 15,
         aspectRatio: "16:9"
       }
     ]).description("视频风格预设")
@@ -1636,16 +1702,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() {
@@ -2137,7 +2209,7 @@ ${infoParts.join("\n")}`;
     }
   }
   if (config.enableVideoGeneration && videoProvider) {
-    ctx.command("图生视频 [img:text]", "根据图片和描述生成视频").option("duration", "-d <duration:number> 视频时长（3-10秒）").option("ratio", "-r <ratio:string> 宽高比（16:9, 9:16, 1:1）").action(async ({ session, options }, img) => {
+    ctx.command("图生视频 [img:text]", "根据图片和描述生成视频").option("duration", "-d <duration:number> 视频时长（15 或 25 秒）").option("ratio", "-r <ratio:string> 宽高比（16:9, 9:16, 1:1）").action(async ({ session, options }, img) => {
       if (!session?.userId) return "会话无效";
       const userId = session.userId;
       const userName = session.username || userId || "未知用户";
@@ -2177,9 +2249,9 @@ ${infoParts.join("\n")}`;
           }
           prompt = text;
         }
-        const duration = options?.duration || 5;
-        if (duration < 3 || duration > 10) {
-          return "视频时长必须在 3-10 秒之间";
+        const duration = options?.duration || 15;
+        if (duration !== 15 && duration !== 25) {
+          return "视频时长必须是 15 或 25 秒";
         }
         const ratio = options?.ratio || "16:9";
         const validRatios = ["16:9", "9:16", "1:1"];
@@ -2289,7 +2361,7 @@ ${infoParts.join("\n")}`;
             finalPrompt,
             imageUrls[0],
             {
-              duration: style.duration || 5,
+              duration: style.duration || 15,
               aspectRatio: style.aspectRatio || "16:9"
             },
             config.videoMaxWaitTime

package/lib/providers/yunwu-video.d.ts

@@ -9,12 +9,12 @@ export declare class YunwuVideoProvider implements VideoProvider {
     constructor(config: YunwuVideoConfig);
     /**
      * 创建视频生成任务
-     * API: POST /v1/videos/generations
+     * API: POST /v1/video/create
      */
     createVideoTask(prompt: string, imageUrl: string, options?: VideoGenerationOptions): Promise<string>;
     /**
      * 查询任务状态
-     * API: GET /v1/videos/generations/{taskId}
+     * API: GET /v1/video/{taskId} (根据创建端点的模式推断)
      */
     queryTaskStatus(taskId: string): Promise<VideoTaskStatus>;
     /**

package/package.json

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