koishi-plugin-aka-ai-generator 0.2.6 → 0.2.7

package/lib/index.js

@@ -701,6 +701,35 @@ function apply(ctx, config) {
     return value?.replace(/^\-+/, "").trim().toLowerCase();
   }
   __name(normalizeSuffix, "normalizeSuffix");
+  function parseNumImagesFromPrompt(prompt) {
+    if (!prompt || typeof prompt !== "string") {
+      return { numImages: void 0, cleanedPrompt: prompt };
+    }
+    const patterns = [
+      /生成\s*([1-4])\s*张(?:图片)?/i,
+      /([1-4])\s*张(?:图片)?/,
+      /生成\s*([1-4])\s*个(?:图片)?/i,
+      /([1-4])\s*个(?:图片)?/,
+      /num[:\s]*([1-4])/i,
+      /数量[:\s]*([1-4])/i
+    ];
+    let numImages = void 0;
+    let cleanedPrompt = prompt;
+    for (const pattern of patterns) {
+      const match = prompt.match(pattern);
+      if (match) {
+        const num = parseInt(match[1], 10);
+        if (num >= 1 && num <= 4) {
+          numImages = num;
+          cleanedPrompt = prompt.replace(pattern, "").trim();
+          cleanedPrompt = cleanedPrompt.replace(/\s+/g, " ").replace(/[，,]\s*$/, "").trim();
+          break;
+        }
+      }
+    }
+    return { numImages, cleanedPrompt };
+  }
+  __name(parseNumImagesFromPrompt, "parseNumImagesFromPrompt");
   function buildModelMappingIndex(mappings) {
     const map = /* @__PURE__ */ new Map();
     if (!Array.isArray(mappings)) return map;
@@ -1184,16 +1213,33 @@ ${infoParts.join("\n")}`;
             return limitCheck.message;
           }
           const modifiers = parseStyleCommandModifiers(argv, img);
-          const promptSegments = [style.prompt];
+          let userPromptParts = [];
           if (modifiers.customAdditions?.length) {
-            promptSegments.push(...modifiers.customAdditions);
+            userPromptParts.push(...modifiers.customAdditions);
           }
           if (modifiers.customPromptSuffix) {
-            promptSegments.push(modifiers.customPromptSuffix);
+            userPromptParts.push(modifiers.customPromptSuffix);
+          }
+          const userPromptText = userPromptParts.join(" - ");
+          let promptNumImages = void 0;
+          let cleanedUserPrompt = userPromptText;
+          if (userPromptText) {
+            const parsed = parseNumImagesFromPrompt(userPromptText);
+            if (parsed.numImages) {
+              promptNumImages = parsed.numImages;
+              cleanedUserPrompt = parsed.cleanedPrompt;
+              if (config.logLevel === "debug") {
+                logger.debug("从 prompt 中解析到生成数量", { numImages: promptNumImages, cleanedPrompt: cleanedUserPrompt });
+              }
+            }
+          }
+          const promptSegments = [style.prompt];
+          if (cleanedUserPrompt) {
+            promptSegments.push(cleanedUserPrompt);
           }
           const mergedPrompt = promptSegments.filter(Boolean).join(" - ");
           const requestContext = {
-            numImages: options?.num
+            numImages: options?.num || promptNumImages
           };
           if (modifiers.modelMapping?.provider) {
             requestContext.provider = modifiers.modelMapping.provider;
@@ -1275,8 +1321,15 @@ ${infoParts.join("\n")}`;
         if (!prompt) {
           return "未检测到prompt描述，请重新发送";
         }
+        const { numImages: promptNumImages, cleanedPrompt } = parseNumImagesFromPrompt(prompt);
+        if (promptNumImages) {
+          prompt = cleanedPrompt;
+          if (config.logLevel === "debug") {
+            logger.debug("从 prompt 中解析到生成数量", { numImages: promptNumImages, cleanedPrompt });
+          }
+        }
         const imageUrl = collectedImages[0];
-        const imageCount = options?.num || config.defaultNumImages;
+        const imageCount = options?.num || promptNumImages || config.defaultNumImages;
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }
@@ -1374,7 +1427,14 @@ Prompt: ${prompt}`);
         if (!prompt) {
           return "未检测到prompt描述，请重新发送";
         }
-        const imageCount = options?.num || config.defaultNumImages;
+        const { numImages: promptNumImages, cleanedPrompt } = parseNumImagesFromPrompt(prompt);
+        if (promptNumImages) {
+          prompt = cleanedPrompt;
+          if (config.logLevel === "debug") {
+            logger.debug("从 prompt 中解析到生成数量", { numImages: promptNumImages, cleanedPrompt });
+          }
+        }
+        const imageCount = options?.num || promptNumImages || config.defaultNumImages;
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }

package/package.json

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