koishi-plugin-aka-ai-generator 0.0.2 → 0.0.5

package/lib/index.d.ts

@@ -37,6 +37,7 @@ export interface Config {
     rateLimitMax: number;
     adminUsers: string[];
     styles: StyleConfig[];
+    logLevel: 'info' | 'debug';
 }
 export interface RechargeRecord {
     id: string;

package/lib/index.js

@@ -195,7 +195,9 @@ async function downloadImageAsBase642(ctx, url, timeout, logger) {
         mimeType = "image/gif";
       }
     }
-    logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
+    if (logger) {
+      logger.debug("图片下载并转换为Base64", { url, mimeType, size: base64.length });
+    }
     return { data: base64, mimeType };
   } catch (error) {
     logger.error("下载图片失败", { url, error });
@@ -203,14 +205,23 @@ async function downloadImageAsBase642(ctx, url, timeout, logger) {
   }
 }
 __name(downloadImageAsBase642, "downloadImageAsBase64");
-function parseGptGodResponse(response) {
+function parseGptGodResponse(response, logger) {
   try {
     const images = [];
     if (Array.isArray(response.images)) {
+      if (logger) {
+        logger.debug("从 response.images 数组提取图片", { count: response.images.length });
+      }
       return response.images;
     }
-    if (response.image && typeof response.image === "string" && response.image.startsWith("data:")) {
-      images.push(response.image);
+    if (response.image && typeof response.image === "string") {
+      if (response.image.startsWith("data:") || response.image.startsWith("http")) {
+        if (logger) {
+          logger.debug("从 response.image 提取图片");
+        }
+        images.push(response.image);
+        return images;
+      }
     }
     if (response?.choices?.length > 0) {
       const firstChoice = response.choices[0];
@@ -219,33 +230,123 @@ function parseGptGodResponse(response) {
       if (typeof messageContent === "string") {
         contentText = messageContent;
       } else if (Array.isArray(messageContent)) {
-        contentText = messageContent.map((part) => part?.text || "").join("\n");
+        for (const part of messageContent) {
+          if (part?.type === "image_url" && part?.image_url?.url) {
+            if (logger) {
+              logger.debug("从 content 数组的 image_url 提取图片");
+            }
+            images.push(part.image_url.url);
+          } else if (part?.type === "text" && part?.text) {
+            contentText += part.text + "\n";
+          } else if (part?.text) {
+            contentText += part.text + "\n";
+          }
+        }
       } else if (messageContent?.text) {
         contentText = messageContent.text;
       }
-      const mdImageRegex = /!\[.*?\]\((https?:\/\/[^\)]+)\)/g;
-      let match;
-      while ((match = mdImageRegex.exec(contentText)) !== null) {
-        images.push(match[1]);
+      if (images.length > 0) {
+        return images;
       }
-      if (images.length === 0) {
-        const urlRegex = /(https?:\/\/[^\s"')]+\.(?:png|jpg|jpeg|webp|gif))/gi;
-        let urlMatch;
-        while ((urlMatch = urlRegex.exec(contentText)) !== null) {
-          images.push(urlMatch[1]);
+      if (contentText) {
+        const mdImageRegex = /!\[.*?\]\((https?:\/\/[^\)]+)\)/g;
+        let match;
+        while ((match = mdImageRegex.exec(contentText)) !== null) {
+          images.push(match[1]);
+        }
+        if (images.length === 0) {
+          const urlRegex = /(https?:\/\/[^\s"')<>]+\.(?:png|jpg|jpeg|webp|gif|bmp))/gi;
+          let urlMatch;
+          while ((urlMatch = urlRegex.exec(contentText)) !== null) {
+            images.push(urlMatch[1]);
+          }
+        }
+        if (images.length === 0 && contentText.trim().startsWith("http")) {
+          const trimmedUrl = contentText.trim().split(/\s/)[0];
+          if (trimmedUrl.match(/^https?:\/\//)) {
+            images.push(trimmedUrl);
+          }
+        }
+        const dataUrlRegex = /(data:image\/[^;]+;base64,[^\s"')<>]+)/gi;
+        let dataUrlMatch;
+        while ((dataUrlMatch = dataUrlRegex.exec(contentText)) !== null) {
+          images.push(dataUrlMatch[1]);
+        }
+      }
+      if (images.length === 0 && firstChoice.message) {
+        if (firstChoice.message.image_url) {
+          if (logger) {
+            logger.debug("从 message.image_url 提取图片");
+          }
+          images.push(firstChoice.message.image_url);
+        }
+        if (Array.isArray(firstChoice.message.images)) {
+          if (logger) {
+            logger.debug("从 message.images 数组提取图片", { count: firstChoice.message.images.length });
+          }
+          return firstChoice.message.images;
+        }
+      }
+    }
+    if (images.length === 0) {
+      if (response.data) {
+        if (Array.isArray(response.data)) {
+          const dataImages = response.data.filter(
+            (item) => item?.url || item?.image_url || typeof item === "string" && (item.startsWith("http") || item.startsWith("data:"))
+          ).map((item) => item?.url || item?.image_url || item);
+          if (dataImages.length > 0) {
+            if (logger) {
+              logger.debug("从 response.data 数组提取图片", { count: dataImages.length });
+            }
+            return dataImages;
+          }
+        } else if (response.data.url || response.data.image_url) {
+          if (logger) {
+            logger.debug("从 response.data 提取图片");
+          }
+          images.push(response.data.url || response.data.image_url);
+        }
+      }
+      if (response.result) {
+        if (Array.isArray(response.result)) {
+          const resultImages = response.result.filter(
+            (item) => item?.url || item?.image_url || typeof item === "string" && (item.startsWith("http") || item.startsWith("data:"))
+          ).map((item) => item?.url || item?.image_url || item);
+          if (resultImages.length > 0) {
+            if (logger) {
+              logger.debug("从 response.result 数组提取图片", { count: resultImages.length });
+            }
+            return resultImages;
+          }
+        } else if (typeof response.result === "string" && (response.result.startsWith("http") || response.result.startsWith("data:"))) {
+          if (logger) {
+            logger.debug("从 response.result 提取图片");
+          }
+          images.push(response.result);
         }
       }
-      if (images.length === 0 && contentText.trim().startsWith("http")) {
-        images.push(contentText.trim());
+    }
+    if (images.length > 0) {
+      if (logger) {
+        logger.debug("成功提取图片", { count: images.length });
       }
-      const dataUrlRegex = /(data:image\/[^;]+;base64,[^\s"')]+)/gi;
-      let dataUrlMatch;
-      while ((dataUrlMatch = dataUrlRegex.exec(contentText)) !== null) {
-        images.push(dataUrlMatch[1]);
+    } else {
+      if (logger) {
+        logger.warn("未能从响应中提取图片", {
+          responseStructure: {
+            hasChoices: !!response?.choices,
+            hasImages: !!response?.images,
+            hasImage: !!response?.image,
+            hasData: !!response?.data,
+            hasResult: !!response?.result,
+            keys: Object.keys(response || {})
+          }
+        });
       }
     }
     return images;
   } catch (error) {
+    logger?.error("解析响应时出错", { error });
     return [];
   }
 }
@@ -265,7 +366,9 @@ var GptGodProvider = class {
     if (!this.config.apiKey) {
       throw new Error("GPTGod 配置不完整，请检查 API Key");
     }
-    logger.debug("调用 GPTGod 图像编辑 API", { prompt, imageCount: urls.length, numImages });
+    if (this.config.logLevel === "debug") {
+      logger.debug("调用 GPTGod 图像编辑 API", { prompt, imageCount: urls.length, numImages });
+    }
     const contentParts = [
       {
         type: "text",
@@ -312,9 +415,62 @@ var GptGodProvider = class {
         }
       );
       logger.success("GPTGod 图像编辑 API 调用成功");
-      const images = parseGptGodResponse(response);
+      if (response?.choices?.length > 0) {
+        const firstChoice = response.choices[0];
+        const messageContent = firstChoice.message?.content;
+        let errorMessage = "";
+        if (typeof messageContent === "string") {
+          errorMessage = messageContent;
+        } else if (Array.isArray(messageContent)) {
+          const textParts = messageContent.filter((part) => part?.type === "text" && part?.text).map((part) => part.text).join(" ");
+          errorMessage = textParts;
+        } else if (messageContent?.text) {
+          errorMessage = messageContent.text;
+        }
+        if (errorMessage && (errorMessage.includes("PROHIBITED_CONTENT") || errorMessage.includes("blocked by Google Gemini") || errorMessage.includes("prohibited under official usage policies") || errorMessage.toLowerCase().includes("content is prohibited"))) {
+          logger.error("内容被 Google Gemini 政策拦截", {
+            errorMessage: errorMessage.substring(0, 200),
+            finishReason: firstChoice.finish_reason
+          });
+          throw new Error("内容被安全策略拦截");
+        }
+        if (errorMessage && (errorMessage.toLowerCase().includes("error") || errorMessage.toLowerCase().includes("failed") || errorMessage.toLowerCase().includes("blocked")) && !errorMessage.match(/https?:\/\//)) {
+          logger.error("API 返回错误消息", {
+            errorMessage: errorMessage.substring(0, 200),
+            finishReason: firstChoice.finish_reason
+          });
+          const shortError = errorMessage.length > 50 ? errorMessage.substring(0, 50) + "..." : errorMessage;
+          throw new Error(`处理失败：${shortError}`);
+        }
+      }
+      if (this.config.logLevel === "debug") {
+        logger.debug("GPTGod API 响应结构", {
+          hasChoices: !!response?.choices,
+          choicesLength: response?.choices?.length,
+          hasImages: !!response?.images,
+          hasImage: !!response?.image,
+          responseKeys: Object.keys(response || {}),
+          firstChoiceContent: response?.choices?.[0]?.message?.content ? typeof response.choices[0].message.content === "string" ? response.choices[0].message.content.substring(0, 200) : JSON.stringify(response.choices[0].message.content).substring(0, 200) : "none"
+        });
+      }
+      const images = parseGptGodResponse(response, this.config.logLevel === "debug" ? logger : null);
       if (images.length < numImages) {
-        logger.warn("生成的图片数量不足", { requested: numImages, received: images.length });
+        const warnData = {
+          requested: numImages,
+          received: images.length
+        };
+        if (this.config.logLevel === "debug") {
+          warnData.responsePreview = JSON.stringify(response).substring(0, 500);
+        }
+        logger.warn("生成的图片数量不足", warnData);
+        if (images.length === 0 && response?.choices?.[0]?.message?.content) {
+          const content = response.choices[0].message.content;
+          const contentText = typeof content === "string" ? content : Array.isArray(content) ? content.map((p) => p?.text || "").join(" ") : "";
+          if (contentText && !contentText.match(/https?:\/\//)) {
+            const shortError = contentText.length > 50 ? contentText.substring(0, 50) + "..." : contentText;
+            throw new Error(`生成失败：${shortError}`);
+          }
+        }
       }
       return images;
     } catch (error) {
@@ -337,6 +493,7 @@ function createImageProvider(config) {
         apiKey: config.yunwuApiKey,
         modelId: config.yunwuModelId,
         apiTimeout: config.apiTimeout,
+        logLevel: config.logLevel,
         logger: config.logger,
         ctx: config.ctx
       });
@@ -345,6 +502,7 @@ function createImageProvider(config) {
         apiKey: config.gptgodApiKey,
         modelId: config.gptgodModelId,
         apiTimeout: config.apiTimeout,
+        logLevel: config.logLevel,
         logger: config.logger,
         ctx: config.ctx
       });
@@ -384,7 +542,12 @@ var Config = import_koishi.Schema.intersect([
     rateLimitWindow: import_koishi.Schema.number().default(300).min(60).max(3600).description("限流时间窗口（秒）"),
     rateLimitMax: import_koishi.Schema.number().default(3).min(1).max(20).description("限流窗口内最大调用次数"),
     // 管理员设置
-    adminUsers: import_koishi.Schema.array(import_koishi.Schema.string()).default([]).description("管理员用户ID列表（不受每日使用限制）")
+    adminUsers: import_koishi.Schema.array(import_koishi.Schema.string()).default([]).description("管理员用户ID列表（不受每日使用限制）"),
+    // 日志级别设置
+    logLevel: import_koishi.Schema.union([
+      import_koishi.Schema.const("info").description("普通信息"),
+      import_koishi.Schema.const("debug").description("完整的debug信息")
+    ]).default("info").description("日志输出详细程度")
   }),
   // 自定义风格命令配置
   import_koishi.Schema.object({
@@ -432,6 +595,7 @@ function apply(ctx, config) {
     gptgodApiKey: config.gptgodApiKey,
     gptgodModelId: config.gptgodModelId,
     apiTimeout: config.apiTimeout,
+    logLevel: config.logLevel,
     logger,
     ctx
   });
@@ -688,7 +852,9 @@ function apply(ctx, config) {
     if (img) {
       url = img.attrs?.src || null;
       if (url) {
-        logger.debug("从命令参数获取图片", { url });
+        if (config.logLevel === "debug") {
+          logger.debug("从命令参数获取图片", { url });
+        }
         return url;
       }
     }
@@ -701,7 +867,9 @@ function apply(ctx, config) {
           return null;
         }
         url = images2[0].attrs.src;
-        logger.debug("从引用消息获取图片", { url });
+        if (config.logLevel === "debug") {
+          logger.debug("从引用消息获取图片", { url });
+        }
         return url;
       }
     }
@@ -722,7 +890,9 @@ function apply(ctx, config) {
       return null;
     }
     url = images[0].attrs.src;
-    logger.debug("从用户输入获取图片", { url });
+    if (config.logLevel === "debug") {
+      logger.debug("从用户输入获取图片", { url });
+    }
     return url;
   }
   __name(getImageUrl, "getImageUrl");
@@ -816,7 +986,7 @@ function apply(ctx, config) {
         if (activeTasks.has(userId)) {
           return "您有一个图像处理任务正在进行中，请等待完成";
         }
-        await session.send('请发送一张图片和prompt，支持两种方式：\n1. 同时发送：[图片] + prompt描述\n2. 分步发送：先发送一张图片，再发送prompt文字\n\n例如：[图片] 让这张图片变成油画风格\n\n注意：本功能仅支持处理一张图片，多张图片请使用"合成图像"命令');
+        await session.send('图片+描述\n\n多张图片使用"合成图像"指令');
         const collectedImages = [];
         let prompt = "";
         while (true) {
@@ -921,7 +1091,7 @@ Prompt: ${prompt}`);
         if (activeTasks.has(userId)) {
           return "您有一个图像处理任务正在进行中，请等待完成";
         }
-        await session.send("请发送多张图片和prompt，支持两种方式：\n1. 同时发送：[图片1] [图片2]... + prompt描述\n2. 分步发送：先发送多张图片，再发送prompt文字\n\n例如：[图片1] [图片2] 将这两张图片合成一张");
+        await session.send("多张图片+描述");
         const collectedImages = [];
         let prompt = "";
         while (true) {

package/lib/providers/index.d.ts

@@ -7,6 +7,7 @@ export interface ProviderFactoryConfig {
     gptgodApiKey: string;
     gptgodModelId: string;
     apiTimeout: number;
+    logLevel: 'info' | 'debug';
     logger: any;
     ctx: any;
 }

package/lib/providers/types.d.ts

@@ -10,6 +10,7 @@ export interface ImageProvider {
 }
 export interface ProviderConfig {
     apiTimeout: number;
+    logLevel: 'info' | 'debug';
     logger: any;
     ctx: any;
 }

package/package.json

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