koishi-plugin-hhs-huatu 0.2.1 → 0.2.2

package/lib/index.js

@@ -1152,6 +1152,59 @@ function parseForbidden(input) {
 }
 __name(parseForbidden, "parseForbidden");
 var backslash = /@@__BACKSLASH__@@/g;
+function cleanUndesiredParameter(undesired) {
+  const optionPatterns = [
+    /-K\s+["']?[^"']*["']?/g,
+    // -K 选项
+    /-m\s+\w+/g,
+    // -m 选项
+    /-s\s+\w+/g,
+    // -s 选项
+    /-r\s+[\w\d]+/g,
+    // -r 选项
+    /-o\s+\w+/g,
+    // -o 选项
+    /-O\s*/g,
+    // -O 选项
+    /-x\s+\d+/g,
+    // -x 选项
+    /-t\s+\d+/g,
+    // -t 选项
+    /-c\s+[\d.]+/g,
+    // -c 选项
+    /-R\s+[\d.]+/g,
+    // -R 选项
+    /-n\s+[\d.]+/g,
+    // -n 选项
+    /-N\s+[\d.]+/g,
+    // -N 选项
+    /-H\s*/g,
+    // -H 选项
+    /-S\s*/g,
+    // -S 选项
+    /-d\s*/g,
+    // -d 选项
+    /-C\s+\w+/g,
+    // -C 选项
+    /-D\s*/g,
+    // -D 选项
+    /-T\s*/g,
+    // -T 选项
+    /-i\s+\d+/g,
+    // -i 选项
+    /-b\s+\d+/g,
+    // -b 选项
+    /-I\s*/g
+    // -I 选项
+  ];
+  let cleaned = undesired.trim();
+  for (const pattern of optionPatterns) {
+    cleaned = cleaned.replace(pattern, "").trim();
+  }
+  cleaned = cleaned.replace(/^["']|["']$/g, "").trim();
+  return cleaned;
+}
+__name(cleanUndesiredParameter, "cleanUndesiredParameter");
 function parseInput(session, input, config, override, undesired) {
   if (!input) {
     return [
@@ -1167,8 +1220,21 @@ function parseInput(session, input, config, override, undesired) {
   }
   const negative = [];
   const placement = session.resolve(config.placement);
-  const appendToList = /* @__PURE__ */ __name((words, input2 = "") => {
-    const tags = input2.split(/,\s*/g);
+  const appendToList = /* @__PURE__ */ __name((words, input2 = "", isNegative = false) => {
+    let tags;
+    if (isNegative) {
+      if (input2.includes(",")) {
+        tags = input2.split(/,\s*/g);
+      } else {
+        tags = [input2.trim()];
+      }
+    } else {
+      if (input2.includes(",")) {
+        tags = input2.split(/,\s*/g);
+      } else {
+        tags = input2.split(/\s+/g).filter((tag) => tag.trim());
+      }
+    }
     if (placement === "before") tags.reverse();
     for (let tag of tags) {
       tag = tag.trim();
@@ -1184,10 +1250,13 @@ function parseInput(session, input, config, override, undesired) {
   const capture = input.match(/(,\s*|\s+)(-u\s+|--undesired\s+|negative prompts?:\s*)([\s\S]+)/m);
   if (capture?.[3]) {
     input = input.slice(0, capture.index).trim();
-    appendToList(negative, capture[3]);
+    appendToList(negative, capture[3], true);
   }
   if (undesired) {
-    appendToList(negative, undesired);
+    const cleanedUndesired = cleanUndesiredParameter(undesired);
+    if (cleanedUndesired) {
+      appendToList(negative, cleanedUndesired, true);
+    }
   }
   const forbidden = parseForbidden(session.resolve(config.forbidden));
   const positive = input.split(/,\s*/g).filter((word) => {
@@ -1205,15 +1274,30 @@ function parseInput(session, input, config, override, undesired) {
     if (/^<.+>$/.test(word)) return word.replace(/ /g, "_");
     return config.lowerCase ? word.toLowerCase() : word;
   });
-  if (Math.max(getWordCount(positive), getWordCount(negative)) > (session.resolve(config.maxWords) || Infinity)) {
+  const processedNegative = negative.filter((word) => {
+    word = word.toLowerCase().replace(/[\x00-\x7f]/g, (s) => s.replace(/[^0-9a-zA-Z]/, " ")).replace(/\s+/, " ").trim();
+    if (!word) return false;
+    for (const { pattern, strict } of forbidden) {
+      if (strict && word.split(/\W+/g).includes(pattern)) {
+        return false;
+      } else if (!strict && word.includes(pattern)) {
+        return false;
+      }
+    }
+    return true;
+  }).map((word) => {
+    if (/^<.+>$/.test(word)) return word.replace(/ /g, "_");
+    return config.lowerCase ? word.toLowerCase() : word;
+  });
+  if (Math.max(getWordCount(positive), getWordCount(processedNegative)) > (session.resolve(config.maxWords) || Infinity)) {
     return [".too-many-words"];
   }
   if (!override) {
-    appendToList(positive, session.resolve(config.basePrompt));
-    appendToList(negative, session.resolve(config.negativePrompt));
-    if (config.defaultPromptSw) appendToList(positive, session.resolve(config.defaultPrompt));
+    appendToList(positive, session.resolve(config.basePrompt), false);
+    appendToList(processedNegative, session.resolve(config.negativePrompt), true);
+    if (config.defaultPromptSw) appendToList(positive, session.resolve(config.defaultPrompt), false);
   }
-  return [null, positive.join(", "), negative.join(", ")];
+  return [null, positive.join(", "), processedNegative.join(", ")];
 }
 __name(parseInput, "parseInput");
 function getWordCount(words) {
@@ -1247,7 +1331,9 @@ var STRATEGIES = {
           formData
         );
         const nsfw = response.data.results[0].entities[0].classes.nsfw;
-        logger.info(`api4ai图片审核结果：${nsfw}`);
+        if (config.debugLog) {
+          logger.info(`api4ai图片审核结果：${nsfw}`);
+        }
         return {
           pass: nsfw <= config.api4ai.nsfwThreshold,
           score: nsfw,
@@ -1267,11 +1353,15 @@ var STRATEGIES = {
       });
       const bucket = config.bucket || "default-1250000000";
       const region = config.region?.toLowerCase() || "ap-chengdu";
-      logger.info(`腾讯云图片审核请求参数: Region=${region}, Bucket=${bucket}, BizType=${config.bizType}`);
+      if (config.debugLog) {
+        logger.info(`腾讯云图片审核请求参数: Region=${region}, Bucket=${bucket}, BizType=${config.bizType}`);
+      }
       try {
         const imageBase64 = Buffer.from(buffer).toString("base64");
         const url = `https://${bucket}.ci.${region}.myqcloud.com/image/auditing`;
-        logger.info(`腾讯云图片审核请求URL: ${url}`);
+        if (config.debugLog) {
+          logger.info(`腾讯云图片审核请求URL: ${url}`);
+        }
         const requestData = {
           Input: {
             Content: imageBase64
@@ -1301,13 +1391,17 @@ var STRATEGIES = {
             }
           );
         });
-        logger.info(`腾讯云图片审核响应:`, JSON.stringify(response));
+        if (config.debugLog) {
+          logger.info(`腾讯云图片审核响应:`, JSON.stringify(response));
+        }
         const result = response.JobsDetail || response.Response && response.Response.JobsDetail;
         if (!result) {
           throw new Error("审核结果解析失败，未找到JobsDetail字段");
         }
         const label = result.Label;
-        logger.info(`腾讯云图片审核结果: Label=${label}`);
+        if (config.debugLog) {
+          logger.info(`腾讯云图片审核结果: Label=${label}`);
+        }
         return {
           pass: label === "Normal",
           score: label === "Normal" ? 0 : 1,
@@ -1325,7 +1419,9 @@ var STRATEGIES = {
           if (error.statusCode) {
             errorMessage += ` (状态码: ${error.statusCode})`;
           }
-          logger.error(`腾讯云图片审核失败详情:`, JSON.stringify(error, Object.getOwnPropertyNames(error)));
+          if (config.debugLog) {
+            logger.error(`腾讯云图片审核失败详情:`, JSON.stringify(error, Object.getOwnPropertyNames(error)));
+          }
         }
         logger.error(`腾讯云图片审核失败: ${errorMessage}`);
         throw new Error(errorMessage);
@@ -1346,7 +1442,9 @@ async function auditImage(ctx, data, config) {
       buffer = Buffer.from(data);
     }
     const imageSizeKB = Math.round(buffer.length / 1024);
-    ctx.logger.debug(`图片大小: ${imageSizeKB}KB`);
+    if (config.debugLog) {
+      ctx.logger.debug(`图片大小: ${imageSizeKB}KB`);
+    }
     const maxSizeKB = config.imageAudit?.maxSizeKB || 4096;
     if (imageSizeKB > maxSizeKB) {
       ctx.logger.warn(`图片大小(${imageSizeKB}KB)超过限制(${maxSizeKB}KB)，可能影响审核性能`);
@@ -1376,7 +1474,9 @@ async function auditImage(ctx, data, config) {
     if (!result.processingTime) {
       result.processingTime = totalProcessingTime;
     }
-    ctx.logger.debug(`图片审核完成，总耗时: ${totalProcessingTime}ms`);
+    if (config.debugLog) {
+      ctx.logger.debug(`图片审核完成，总耗时: ${totalProcessingTime}ms`);
+    }
     return result;
   } catch (error) {
     let errorMessage = "审核失败";
@@ -1390,7 +1490,7 @@ async function auditImage(ctx, data, config) {
       if (error.statusCode) {
         errorMessage += ` (状态码: ${error.statusCode})`;
       }
-      if (config.imageAudit?.debug) {
+      if (config.debugLog) {
         ctx.logger.error(`图片审核失败详情:`, JSON.stringify(error, Object.getOwnPropertyNames(error)));
       } else {
         ctx.logger.error(`图片审核失败: ${errorMessage}`);
@@ -1480,6 +1580,56 @@ var inject = {
   required: ["http"],
   optional: ["translator"]
 };
+function extractOptionsFromUndesired(undesired) {
+  const extractedOptions = {};
+  let cleanedUndesired = undesired.trim();
+  const optionPatterns = [
+    // 带引号的选项（优先级最高）
+    { pattern: /-K\s+["']([^"']*)["']/g, key: "chars" },
+    { pattern: /-m\s+["']([^"']*)["']/g, key: "model" },
+    { pattern: /-s\s+["']([^"']*)["']/g, key: "sampler" },
+    { pattern: /-r\s+["']([^"']*)["']/g, key: "resolution" },
+    { pattern: /-o\s+["']([^"']*)["']/g, key: "output" },
+    { pattern: /-C\s+["']([^"']*)["']/g, key: "scheduler" },
+    // 不带引号的选项
+    { pattern: /-K\s+(\S+)/g, key: "chars" },
+    { pattern: /-m\s+(\w+)/g, key: "model" },
+    { pattern: /-s\s+(\w+)/g, key: "sampler" },
+    { pattern: /-r\s+([\w\d]+)/g, key: "resolution" },
+    { pattern: /-o\s+(\w+)/g, key: "output" },
+    { pattern: /-O\s*/g, key: "override", value: true },
+    { pattern: /-x\s+(\d+)/g, key: "seed" },
+    { pattern: /-t\s+(\d+)/g, key: "steps" },
+    { pattern: /-c\s+([\d.]+)/g, key: "scale" },
+    { pattern: /-R\s+([\d.]+)/g, key: "rescale" },
+    { pattern: /-n\s+([\d.]+)/g, key: "noise" },
+    { pattern: /-N\s+([\d.]+)/g, key: "strength" },
+    { pattern: /-H\s*/g, key: "hiresFix", value: true },
+    { pattern: /-S\s*/g, key: "smea", value: true },
+    { pattern: /-d\s*/g, key: "smeaDyn", value: true },
+    { pattern: /-C\s+(\w+)/g, key: "scheduler" },
+    { pattern: /-D\s*/g, key: "decrisper", value: true },
+    { pattern: /-T\s*/g, key: "noTranslator", value: true },
+    { pattern: /-i\s+(\d+)/g, key: "iterations" },
+    { pattern: /-b\s+(\d+)/g, key: "batch" },
+    { pattern: /-I\s*/g, key: "ignoreSpace", value: true }
+  ];
+  for (const { pattern, key, value } of optionPatterns) {
+    const matches = [...cleanedUndesired.matchAll(pattern)];
+    for (const match of matches) {
+      if (value !== void 0) {
+        extractedOptions[key] = value;
+      } else if (match[1]) {
+        extractedOptions[key] = match[1];
+      }
+      cleanedUndesired = cleanedUndesired.replace(match[0], "").trim();
+    }
+  }
+  cleanedUndesired = cleanedUndesired.replace(/\s+/g, " ").trim();
+  cleanedUndesired = cleanedUndesired.replace(/^["']|["']$/g, "").trim();
+  return { cleanedUndesired, extractedOptions };
+}
+__name(extractOptionsFromUndesired, "extractOptionsFromUndesired");
 function apply(ctx, config) {
   const userTasks = /* @__PURE__ */ Object.create(null);
   const userCooldowns = /* @__PURE__ */ Object.create(null);
@@ -2636,8 +2786,18 @@ function apply(ctx, config) {
   const cmd = ctx.command("novelai [prompts...]").alias("nai").alias("imagine").alias("nai4", { options: { model: "nai-v4-full", sampler: "k_euler_a", iterations: 1, batch: 1 } }).alias("nai4c", { options: { model: "nai-v4-curated-preview", sampler: "k_euler_a", iterations: 1, batch: 1 } }).alias("nai4-5c", { options: { model: "nai-v4-5-curated", sampler: "k_euler_a", iterations: 1, batch: 1 } }).alias("nai4-5", { options: { model: "nai-v4-5-full", sampler: "k_euler_a", iterations: 1, batch: 1 } }).userFields(["authority"]).shortcut("imagine", { i18n: true, fuzzy: true }).shortcut("enhance", { i18n: true, fuzzy: true, options: { enhance: true } }).option("enhance", "-e", { hidden: some(restricted, thirdParty, noImage) }).option("model", "-m <model>", { type: models, hidden: thirdParty }).option("resolution", "-r <resolution>", { type: resolution2 }).option("output", "-o", { type: ["minimal", "default", "verbose"] }).option("override", "-O", { hidden: restricted }).option("sampler", "-s <sampler>").option("seed", "-x <seed:number>").option("steps", "-t <step>", { type: step, hidden: restricted }).option("scale", "-c <scale:number>").option("rescale", "-R <rescale:number>").option("noise", "-n <noise:number>", { hidden: some(restricted, thirdParty) }).option("strength", "-N <strength:number>", { hidden: restricted }).option("hiresFix", "-H", { hidden: /* @__PURE__ */ __name(() => config.type !== "sd-webui", "hidden") }).option("hiresFixSteps", "<step>", { type: step, hidden: /* @__PURE__ */ __name(() => config.type !== "sd-webui", "hidden") }).option("smea", "-S", { hidden: /* @__PURE__ */ __name(() => config.model !== "nai-v3", "hidden") }).option("smeaDyn", "-d", { hidden: /* @__PURE__ */ __name(() => config.model !== "nai-v3", "hidden") }).option("scheduler", "-C <scheduler:string>", {
     hidden: /* @__PURE__ */ __name(() => config.type === "naifu", "hidden"),
     type: ["token", "login"].includes(config.type) ? scheduler.nai : config.type === "sd-webui" ? scheduler.sd : config.type === "stable-horde" ? scheduler.horde : []
-  }).option("decrisper", "-D", { hidden: thirdParty }).option("undesired", "-u <undesired>").option("noTranslator", "-T", { hidden: /* @__PURE__ */ __name(() => !ctx.translator || !config.translator, "hidden") }).option("iterations", "-i <iterations:posint>", { fallback: 1, hidden: /* @__PURE__ */ __name(() => config.maxIterations <= 1, "hidden") }).option("batch", "-b <batch:option>", { fallback: 1, hidden: /* @__PURE__ */ __name(() => config.maxIterations <= 1, "hidden") }).option("chars", "-K <chars>").option("ignoreSpace", "-I", { hidden: true }).action(async ({ session, options: options2, name: name2 }, ...prompts) => {
-    const input = prompts.join(" ");
+  }).option("decrisper", "-D", { hidden: thirdParty }).option("undesired", "-u <undesired:text>").option("noTranslator", "-T", { hidden: /* @__PURE__ */ __name(() => !ctx.translator || !config.translator, "hidden") }).option("iterations", "-i <iterations:posint>", { fallback: 1, hidden: /* @__PURE__ */ __name(() => config.maxIterations <= 1, "hidden") }).option("batch", "-b <batch:option>", { fallback: 1, hidden: /* @__PURE__ */ __name(() => config.maxIterations <= 1, "hidden") }).option("chars", "-K <chars>").option("ignoreSpace", "-I", { hidden: true }).action(async ({ session, options: options2, name: name2 }, ...prompts) => {
+    let input = prompts.join(" ");
+    if (options2.undesired) {
+      const { cleanedUndesired, extractedOptions } = extractOptionsFromUndesired(options2.undesired);
+      options2.undesired = cleanedUndesired;
+      Object.assign(options2, extractedOptions);
+      if (config.debugLog) {
+        ctx.logger.info(`[Undesired Debug] 原始 undesired: ${options2.undesired}`);
+        ctx.logger.info(`[Undesired Debug] 清理后 undesired: ${cleanedUndesired}`);
+        ctx.logger.info(`[Undesired Debug] 提取的选项: ${JSON.stringify(extractedOptions)}`);
+      }
+    }
     if (config.debugLog) {
       ctx.logger.info(`[Characters Debug] 接收到的 prompts 数组: ${JSON.stringify(prompts)}`);
       ctx.logger.info(`[Characters Debug] 接收到的 input: ${input}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-hhs-huatu",
   "description": "Generate images by diffusion models",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [