koishi-plugin-aka-ai-generator 0.8.1 → 0.8.4

package/lib/index.js

@@ -1830,42 +1830,43 @@ var Config = import_koishi2.Schema.intersect([
       import_koishi2.Schema.const("gemini").description("Google Gemini 原生")
     ]).default("yunwu").description("图像生成供应商")
   }).description("🎨 供应商选择"),
-  // ===== 2. 云雾 API 配置（条件显示） =====
+  // ===== 2. API 配置（根据 provider 条件显示） =====
   import_koishi2.Schema.union([
+    // 云雾配置
     import_koishi2.Schema.object({
       provider: import_koishi2.Schema.const("yunwu").required(),
       yunwuApiKey: import_koishi2.Schema.string().role("secret").required().description("云雾 API 密钥"),
-      yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").description("云雾图像生成模型ID")
+      yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").description("云雾图像生成模型ID"),
+      // 其他 provider 的隐藏默认值
+      gptgodApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      gptgodModelId: import_koishi2.Schema.string().default("nano-banana").hidden(),
+      geminiApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      geminiModelId: import_koishi2.Schema.string().default("gemini-2.5-flash").hidden(),
+      geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").hidden()
     }),
-    import_koishi2.Schema.object({
-      yunwuApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
-      yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").hidden()
-    })
-  ]),
-  // ===== 3. GPTGod API 配置（条件显示） =====
-  import_koishi2.Schema.union([
+    // GPTGod 配置
     import_koishi2.Schema.object({
       provider: import_koishi2.Schema.const("gptgod").required(),
       gptgodApiKey: import_koishi2.Schema.string().role("secret").required().description("GPTGod API 密钥"),
-      gptgodModelId: import_koishi2.Schema.string().default("nano-banana").description("GPTGod 模型ID")
+      gptgodModelId: import_koishi2.Schema.string().default("nano-banana").description("GPTGod 模型ID"),
+      // 其他 provider 的隐藏默认值
+      yunwuApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").hidden(),
+      geminiApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      geminiModelId: import_koishi2.Schema.string().default("gemini-2.5-flash").hidden(),
+      geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").hidden()
     }),
-    import_koishi2.Schema.object({
-      gptgodApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
-      gptgodModelId: import_koishi2.Schema.string().default("nano-banana").hidden()
-    })
-  ]),
-  // ===== 4. Gemini API 配置（条件显示） =====
-  import_koishi2.Schema.union([
+    // Gemini 配置
     import_koishi2.Schema.object({
       provider: import_koishi2.Schema.const("gemini").required(),
       geminiApiKey: import_koishi2.Schema.string().role("secret").required().description("Gemini API 密钥"),
       geminiModelId: import_koishi2.Schema.string().default("gemini-2.5-flash").description("Gemini 模型ID"),
-      geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").description("Gemini API 基础地址")
-    }),
-    import_koishi2.Schema.object({
-      geminiApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
-      geminiModelId: import_koishi2.Schema.string().default("gemini-2.5-flash").hidden(),
-      geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").hidden()
+      geminiApiBase: import_koishi2.Schema.string().default("https://generativelanguage.googleapis.com").description("Gemini API 基础地址"),
+      // 其他 provider 的隐藏默认值
+      yunwuApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      yunwuModelId: import_koishi2.Schema.string().default("gemini-2.5-flash-image").hidden(),
+      gptgodApiKey: import_koishi2.Schema.string().role("secret").default("").hidden(),
+      gptgodModelId: import_koishi2.Schema.string().default("nano-banana").hidden()
     })
   ]),
   // ===== 5. 通用设置 =====
@@ -2838,9 +2839,11 @@ ${messages.join("\n")}`;
       logger.info(`已注册视频风格命令: ${style.commandName}`);
     }
   }
-  ctx.command(`${COMMANDS.TXT_TO_IMG} [prompt:text]`, "根据文字描述生成图像").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }, prompt) => {
+  ctx.command(`${COMMANDS.TXT_TO_IMG} [prompt:text]`, "根据文字描述生成图像").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async (argv, prompt) => {
+    const { session, options } = argv;
     if (!session?.userId) return "会话无效";
     const numImages = options?.num || config.defaultNumImages;
+    const modifiers = parseStyleCommandModifiers(argv, prompt, modelMappingIndex);
     const userName = session.username || session.userId || "未知用户";
     const limitCheck = await userManager.checkAndReserveQuota(session.userId, userName, numImages, config);
     if (!limitCheck.allowed) {
@@ -2849,12 +2852,25 @@ ${messages.join("\n")}`;
     const requestContext = {
       numImages
     };
-    return processImageWithTimeout(session, prompt, "", COMMANDS.TXT_TO_IMG, requestContext, {}, "text");
+    if (modifiers.modelMapping?.provider) {
+      requestContext.provider = modifiers.modelMapping.provider;
+    }
+    if (modifiers.modelMapping?.modelId) {
+      requestContext.modelId = modifiers.modelMapping.modelId;
+    }
+    const displayInfo = {};
+    if (modifiers.modelMapping?.modelId) {
+      displayInfo.modelId = modifiers.modelMapping.modelId;
+      displayInfo.modelDescription = modifiers.modelMapping.suffix || modifiers.modelMapping.modelId;
+    }
+    return processImageWithTimeout(session, prompt, "", COMMANDS.TXT_TO_IMG, requestContext, displayInfo, "text");
   });
-  ctx.command(`${COMMANDS.IMG_TO_IMG} [img:text]`, "使用自定义prompt进行图像处理").option("num", "-n <num:number> 生成图片数量 (1-4)").option("multiple", "-m 允许多图输入").action(async ({ session, options }, img) => {
+  ctx.command(`${COMMANDS.IMG_TO_IMG} [img:text]`, "使用自定义prompt进行图像处理").option("num", "-n <num:number> 生成图片数量 (1-4)").option("multiple", "-m 允许多图输入").action(async (argv, img) => {
+    const { session, options } = argv;
     if (!session?.userId) return "会话无效";
     const numImages = options?.num || config.defaultNumImages;
     const mode = options?.multiple ? "multiple" : "single";
+    const modifiers = parseStyleCommandModifiers(argv, img, modelMappingIndex);
     const userName = session.username || session.userId || "未知用户";
     const limitCheck = await userManager.checkAndReserveQuota(session.userId, userName, numImages, config);
     if (!limitCheck.allowed) {
@@ -2863,11 +2879,24 @@ ${messages.join("\n")}`;
     const requestContext = {
       numImages
     };
-    return processImageWithTimeout(session, img, "", COMMANDS.IMG_TO_IMG, requestContext, {}, mode);
+    if (modifiers.modelMapping?.provider) {
+      requestContext.provider = modifiers.modelMapping.provider;
+    }
+    if (modifiers.modelMapping?.modelId) {
+      requestContext.modelId = modifiers.modelMapping.modelId;
+    }
+    const displayInfo = {};
+    if (modifiers.modelMapping?.modelId) {
+      displayInfo.modelId = modifiers.modelMapping.modelId;
+      displayInfo.modelDescription = modifiers.modelMapping.suffix || modifiers.modelMapping.modelId;
+    }
+    return processImageWithTimeout(session, img, "", COMMANDS.IMG_TO_IMG, requestContext, displayInfo, mode);
   });
-  ctx.command(COMMANDS.COMPOSE_IMAGE, "合成多张图片，使用自定义prompt控制合成效果").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }) => {
+  ctx.command(COMMANDS.COMPOSE_IMAGE, "合成多张图片，使用自定义prompt控制合成效果").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async (argv) => {
+    const { session, options } = argv;
     if (!session?.userId) return "会话无效";
     const userId = session.userId;
+    const modifiers = parseStyleCommandModifiers(argv, void 0, modelMappingIndex);
     if (!userManager.startTask(userId)) {
       return "您有一个图像处理任务正在进行中，请等待完成";
     }
@@ -2924,15 +2953,31 @@ ${messages.join("\n")}`;
             return limitCheck.message;
           }
           if (isTimeout) throw new Error("命令执行超时");
+          const requestContext = {
+            numImages: imageCount
+          };
+          if (modifiers.modelMapping?.provider) {
+            requestContext.provider = modifiers.modelMapping.provider;
+          }
+          if (modifiers.modelMapping?.modelId) {
+            requestContext.modelId = modifiers.modelMapping.modelId;
+          }
           logger.info("开始图片合成处理", {
             userId,
             imageUrls: collectedImages,
             prompt,
             numImages: imageCount,
-            imageCount: collectedImages.length
+            imageCount: collectedImages.length,
+            modelMapping: modifiers.modelMapping ? { provider: modifiers.modelMapping.provider, modelId: modifiers.modelMapping.modelId } : null
           });
-          await session.send(`开始合成图（${collectedImages.length}张）...
-Prompt: ${prompt}`);
+          let statusMessage = `开始合成图（${collectedImages.length}张）...`;
+          if (modifiers.modelMapping?.modelId) {
+            statusMessage += `
+使用模型：${modifiers.modelMapping.suffix || modifiers.modelMapping.modelId}`;
+          }
+          statusMessage += `
+Prompt: ${prompt}`;
+          await session.send(statusMessage);
           const generatedImages = [];
           let creditDeducted = false;
           const onImageGenerated = /* @__PURE__ */ __name(async (imageUrl, index, total) => {
@@ -2998,9 +3043,10 @@ Prompt: ${prompt}`);
             hasCallback: !!onImageGenerated,
             imageCount,
             promptLength: prompt.length,
-            collectedImagesCount: collectedImages.length
+            collectedImagesCount: collectedImages.length,
+            modelId: requestContext.modelId || "default"
           });
-          const resultImages = await requestProviderImages(prompt, collectedImages, imageCount, void 0, onImageGenerated);
+          const resultImages = await requestProviderImages(prompt, collectedImages, imageCount, requestContext, onImageGenerated);
           logger.info("requestProviderImages 返回 (COMPOSE_IMAGE)", {
             userId,
             imagesCount: resultImages.length,

package/package.json

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