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

package/lib/index.d.ts

@@ -10,6 +10,11 @@ export interface StyleConfig {
     commandName: string;
     prompt: string;
 }
+export interface StyleGroupConfig {
+    typeName: string;
+    typeDescription?: string;
+    prompts: StyleConfig[];
+}
 export interface UserData {
     userId: string;
     userName: string;
@@ -41,6 +46,7 @@ export interface Config {
     rateLimitMax: number;
     adminUsers: string[];
     styles: StyleConfig[];
+    styleGroups?: StyleGroupConfig[];
     logLevel: 'info' | 'debug';
 }
 export interface RechargeRecord {

package/lib/index.js

@@ -604,6 +604,10 @@ var COMMANDS = {
   RECHARGE_HISTORY: "图像充值记录",
   FUNCTION_LIST: "图像功能"
 };
+var StyleItemSchema = import_koishi.Schema.object({
+  commandName: import_koishi.Schema.string().required().description("命令名称（不含前缀斜杠）"),
+  prompt: import_koishi.Schema.string().role("textarea", { rows: 4 }).required().description("生成 prompt")
+});
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     provider: import_koishi.Schema.union([
@@ -641,10 +645,7 @@ var Config = import_koishi.Schema.intersect([
   }),
   // 自定义风格命令配置
   import_koishi.Schema.object({
-    styles: import_koishi.Schema.array(import_koishi.Schema.object({
-      commandName: import_koishi.Schema.string().required().description("命令名称（不含前缀斜杠）"),
-      prompt: import_koishi.Schema.string().role("textarea", { rows: 4 }).required().description("生成 prompt")
-    })).role("table").default([
+    styles: import_koishi.Schema.array(StyleItemSchema).role("table").default([
       {
         commandName: "变手办",
         prompt: "将这张照片变成手办模型。在它后面放置一个印有图像主体的盒子，桌子上有一台电脑显示Blender建模过程。在盒子前面添加一个圆形塑料底座，角色手办站在上面。如果可能的话，将场景设置在室内"
@@ -669,7 +670,12 @@ var Config = import_koishi.Schema.intersect([
         commandName: "变像素",
         prompt: "请根据用户提供的图片，将图像主体转换为经典的8位像素艺术风格。要求：1. 完全保持主体的身份、外观特征和核心识别元素不变，确保转换后仍然清晰可识别；2. 采用极简的8位像素风格，使用有限的复古调色板（通常为16-256色），营造经典街机游戏的美学氛围；3. 所有细节都进行像素化处理，使用清晰的像素块和锐利的边缘，避免平滑渐变；4. 采用干净的块状形式，保持简单、标志性的设计，突出主体的核心特征；5. 背景可以简化为纯色背景（如纯白或纯黑），或者保持简单的像素化背景，确保主体突出；6. 整体风格应具有强烈的复古游戏感，让人联想到经典街机游戏和早期电子游戏的视觉美学；7. 保持主体的比例和基本结构，但用像素块重新诠释所有细节。"
       }
-    ]).description("自定义风格命令配置")
+    ]).description("自定义风格命令配置"),
+    styleGroups: import_koishi.Schema.array(import_koishi.Schema.object({
+      typeName: import_koishi.Schema.string().required().description("类型名称，用于分组展示"),
+      typeDescription: import_koishi.Schema.string().role("textarea", { rows: 2 }).description("可选：类型说明"),
+      prompts: import_koishi.Schema.array(StyleItemSchema).role("table").default([]).description("属于该类型的 prompt 列表")
+    })).role("table").default([]).description("按类型管理的 prompt 组，保存时将自动展开为 styles")
   })
 ]);
 function apply(ctx, config) {
@@ -701,6 +707,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;
@@ -783,11 +818,41 @@ function apply(ctx, config) {
     return modifiers;
   }
   __name(parseStyleCommandModifiers, "parseStyleCommandModifiers");
+  const styleDefinitions = collectStyleDefinitions();
+  function collectStyleDefinitions() {
+    const unique = /* @__PURE__ */ new Map();
+    const pushStyle = /* @__PURE__ */ __name((style, groupName) => {
+      if (!style?.commandName || !style?.prompt) return;
+      if (unique.has(style.commandName)) {
+        logger.warn("检测到重复的风格命令名称，已跳过", { commandName: style.commandName, groupName });
+        return;
+      }
+      unique.set(style.commandName, {
+        ...style,
+        groupName
+      });
+    }, "pushStyle");
+    if (Array.isArray(config.styles)) {
+      for (const style of config.styles) {
+        pushStyle(style);
+      }
+    }
+    if (Array.isArray(config.styleGroups)) {
+      for (const group of config.styleGroups) {
+        if (!group?.typeName || !Array.isArray(group.prompts)) continue;
+        for (const style of group.prompts) {
+          pushStyle(style, group.typeName);
+        }
+      }
+    }
+    return Array.from(unique.values());
+  }
+  __name(collectStyleDefinitions, "collectStyleDefinitions");
   function getStyleCommands() {
-    if (!config.styles || !Array.isArray(config.styles)) return [];
-    return config.styles.filter((style) => style.commandName && style.prompt).map((style) => ({
+    if (!styleDefinitions.length) return [];
+    return styleDefinitions.filter((style) => style.commandName && style.prompt).map((style) => ({
       name: style.commandName,
-      description: "图像风格转换"
+      description: style.groupName ? `图像风格转换（${style.groupName}）` : "图像风格转换"
     }));
   }
   __name(getStyleCommands, "getStyleCommands");
@@ -1173,8 +1238,8 @@ ${infoParts.join("\n")}`;
     }
   }
   __name(processImage, "processImage");
-  if (config.styles && Array.isArray(config.styles)) {
-    for (const style of config.styles) {
+  if (styleDefinitions.length > 0) {
+    for (const style of styleDefinitions) {
       if (style.commandName && style.prompt) {
         ctx.command(`${style.commandName} [img:text]`, "图像风格转换").option("num", "-n <num:number> 生成图片数量 (1-4)").action(async (argv, img) => {
           const { session, options } = argv;
@@ -1184,16 +1249,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 +1357,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 +1463,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.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [