koishi-plugin-aka-ai-generator 0.8.0 → 0.8.3

package/lib/index.js

@@ -1777,6 +1777,12 @@ function parseStyleCommandModifiers(argv, imgParam, modelMappingIndex) {
     flagCandidates.push(token);
     index++;
   }
+  const debugInfo = {
+    flagCandidates,
+    modelMappingKeys: Array.from(modelMappingIndex.keys()),
+    argsList: argsList.slice(0, 10)
+    // 只取前10个避免太长
+  };
   for (const arg of flagCandidates) {
     if (!arg.startsWith("-")) continue;
     const key = normalizeSuffix(arg);
@@ -1784,9 +1790,13 @@ function parseStyleCommandModifiers(argv, imgParam, modelMappingIndex) {
     const mapping = modelMappingIndex.get(key);
     if (mapping) {
       modifiers.modelMapping = mapping;
+      console.log("[parseStyleCommandModifiers] 找到模型映射", { arg, key, mapping, debugInfo });
       break;
     }
   }
+  if (!modifiers.modelMapping && flagCandidates.some((f) => f.startsWith("-"))) {
+    console.log("[parseStyleCommandModifiers] 未找到模型映射", debugInfo);
+  }
   return modifiers;
 }
 __name(parseStyleCommandModifiers, "parseStyleCommandModifiers");
@@ -2828,9 +2838,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) {
@@ -2839,12 +2851,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) {
@@ -2853,11 +2878,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 "您有一个图像处理任务正在进行中，请等待完成";
     }
@@ -2914,15 +2952,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) => {
@@ -2988,9 +3042,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.0",
+  "version": "0.8.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [