koishi-plugin-aka-ai-generator 0.2.17 → 0.3.0

package/lib/index.js

@@ -740,8 +740,9 @@ __name(createImageProvider, "createImageProvider");
 // src/index.ts
 var name = "aka-ai-generator";
 var COMMANDS = {
-  GENERATE_IMAGE: "生成图像",
-  COMPOSE_IMAGE: "合成图像",
+  IMG_TO_IMG: "图生图",
+  TXT_TO_IMG: "文生图",
+  COMPOSE_IMAGE: "合成图",
   CHANGE_POSE: "改姿势",
   OPTIMIZE_DESIGN: "修改设计",
   PIXELATE: "变像素",
@@ -852,35 +853,6 @@ 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;
@@ -1005,7 +977,8 @@ function apply(ctx, config) {
     // 非管理员指令（包含动态风格指令）
     userCommands: [
       ...getStyleCommands(),
-      { name: COMMANDS.GENERATE_IMAGE, description: "使用自定义prompt进行图像处理" },
+      { name: COMMANDS.TXT_TO_IMG, description: "根据文字描述生成图像" },
+      { name: COMMANDS.IMG_TO_IMG, description: "使用自定义prompt进行图像处理（图生图）" },
       { name: COMMANDS.COMPOSE_IMAGE, description: "合成多张图片，使用自定义prompt控制合成效果" },
       { name: COMMANDS.QUERY_QUOTA, description: "查询用户额度信息" }
     ],
@@ -1277,6 +1250,23 @@ function apply(ctx, config) {
   async function getInputData(session, imgParam, mode) {
     const collectedImages = [];
     let collectedText = "";
+    if (mode === "text") {
+      if (typeof imgParam === "string" && imgParam.trim()) {
+        return { images: [], text: imgParam.trim() };
+      }
+      if (session.content) {
+        const elements2 = import_koishi.h.parse(session.content);
+        const text2 = import_koishi.h.select(elements2, "text").map((e) => e.attrs.content).join(" ").trim();
+        if (text2) return { images: [], text: text2 };
+      }
+      await session.send("请输入画面描述");
+      const msg = await session.prompt(3e4);
+      if (!msg) return { error: "等待超时" };
+      const elements = import_koishi.h.parse(msg);
+      const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
+      if (!text) return { error: "未检测到描述" };
+      return { images: [], text };
+    }
     if (imgParam) {
       if (typeof imgParam === "object" && imgParam.attrs?.src) {
         collectedImages.push(imgParam.attrs.src);
@@ -1295,7 +1285,7 @@ function apply(ctx, config) {
     if (collectedImages.length > 0) {
       if (mode === "single") {
         if (collectedImages.length > 1) {
-          return { error: '本功能仅支持处理一张图片，检测到多张图片。如需合成多张图片请使用"合成图像"命令' };
+          return { error: '本功能仅支持处理一张图片，检测到多张图片。如需合成多张图片请使用"合成图"命令' };
         }
         return { images: collectedImages };
       }
@@ -1453,26 +1443,14 @@ ${infoParts.join("\n")}`;
             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 numImages = options?.num || promptNumImages || config.defaultNumImages;
+          const numImages = options?.num || config.defaultNumImages;
           const limitCheck = await checkDailyLimit(session.userId, numImages);
           if (!limitCheck.allowed) {
             return limitCheck.message;
           }
           const promptSegments = [style.prompt];
-          if (cleanedUserPrompt) {
-            promptSegments.push(cleanedUserPrompt);
+          if (userPromptText) {
+            promptSegments.push(userPromptText);
           }
           const mergedPrompt = promptSegments.filter(Boolean).join(" - ");
           const requestContext = {
@@ -1499,7 +1477,19 @@ ${infoParts.join("\n")}`;
       }
     }
   }
-  ctx.command(COMMANDS.GENERATE_IMAGE, "使用自定义prompt进行图像处理").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }) => {
+  ctx.command(`${COMMANDS.TXT_TO_IMG} [prompt:text]`, "根据文字描述生成图像").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }, prompt) => {
+    if (!session?.userId) return "会话无效";
+    const numImages = options?.num || config.defaultNumImages;
+    const limitCheck = await checkDailyLimit(session.userId, numImages);
+    if (!limitCheck.allowed) {
+      return limitCheck.message;
+    }
+    const requestContext = {
+      numImages
+    };
+    return processImageWithTimeout(session, prompt, "", COMMANDS.TXT_TO_IMG, requestContext, {}, "text");
+  });
+  ctx.command(COMMANDS.IMG_TO_IMG, "使用自定义prompt进行图像处理").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async ({ session, options }) => {
     if (!session?.userId) return "会话无效";
     return Promise.race([
       (async () => {
@@ -1522,10 +1512,10 @@ ${infoParts.join("\n")}`;
           const text = textElements.map((el) => el.attrs.content).join(" ").trim();
           if (images.length > 0) {
             if (collectedImages.length > 0) {
-              return '本功能仅支持处理一张图片，如需合成多张图片请使用"合成图像"命令';
+              return '本功能仅支持处理一张图片，如需合成多张图片请使用"合成图"命令';
             }
             if (images.length > 1) {
-              return '本功能仅支持处理一张图片，检测到多张图片。如需合成多张图片请使用"合成图像"命令';
+              return '本功能仅支持处理一张图片，检测到多张图片。如需合成多张图片请使用"合成图"命令';
             }
             for (const img of images) {
               collectedImages.push(img.attrs.src);
@@ -1550,20 +1540,13 @@ ${infoParts.join("\n")}`;
           return "未检测到图片，请重新发送";
         }
         if (collectedImages.length > 1) {
-          return '本功能仅支持处理一张图片，检测到多张图片。如需合成多张图片请使用"合成图像"命令';
+          return '本功能仅支持处理一张图片，检测到多张图片。如需合成多张图片请使用"合成图"命令';
         }
         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 || promptNumImages || config.defaultNumImages;
+        const imageCount = options?.num || config.defaultNumImages;
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }
@@ -1593,7 +1576,7 @@ Prompt: ${prompt}`);
               await new Promise((resolve) => setTimeout(resolve, 1e3));
             }
           }
-          await recordUserUsage(session, COMMANDS.GENERATE_IMAGE, resultImages.length);
+          await recordUserUsage(session, COMMANDS.IMG_TO_IMG, resultImages.length);
           activeTasks.delete(userId);
         } catch (error) {
           activeTasks.delete(userId);
@@ -1661,14 +1644,7 @@ Prompt: ${prompt}`);
         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 imageCount = options?.num || promptNumImages || config.defaultNumImages;
+        const imageCount = options?.num || config.defaultNumImages;
         if (imageCount < 1 || imageCount > 4) {
           return "生成数量必须在 1-4 之间";
         }
@@ -1683,7 +1659,7 @@ Prompt: ${prompt}`);
           numImages: imageCount,
           imageCount: collectedImages.length
         });
-        await session.send(`开始合成图像（${collectedImages.length}张）...
+        await session.send(`开始合成图（${collectedImages.length}张）...
 Prompt: ${prompt}`);
         try {
           activeTasks.set(userId, "processing");

package/package.json

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