koishi-plugin-aka-ai-generator 0.4.0 → 0.4.2

package/lib/index.js

@@ -598,6 +598,39 @@ function parseGeminiResponse(response, logger) {
       logger?.error("Gemini API 返回错误", { error: response.error });
       throw new Error(`Gemini API 错误: ${response.error.message || JSON.stringify(response.error)}`);
     }
+    if (response.promptFeedback) {
+      const blockReason = response.promptFeedback.blockReason;
+      const safetyRatings = response.promptFeedback.safetyRatings;
+      if (blockReason) {
+        logger?.error("Gemini API 请求被阻止", {
+          blockReason,
+          safetyRatings,
+          blockReasonMessage: response.promptFeedback.blockReasonMessage
+        });
+        let errorMessage = "请求被 Gemini API 阻止";
+        switch (blockReason) {
+          case "SAFETY":
+            errorMessage = "内容被安全策略阻止，可能包含不安全的内容";
+            break;
+          case "OTHER":
+            errorMessage = "请求被阻止（原因：OTHER），可能是内容不符合使用政策或模型无法处理";
+            if (response.promptFeedback.blockReasonMessage) {
+              errorMessage += `：${response.promptFeedback.blockReasonMessage}`;
+            }
+            break;
+          case "RECITATION":
+            errorMessage = "内容包含受版权保护的内容";
+            break;
+          default:
+            errorMessage = `请求被阻止（原因：${blockReason}）`;
+        }
+        if (safetyRatings && Array.isArray(safetyRatings) && safetyRatings.length > 0) {
+          const ratings = safetyRatings.map((r) => `${r.category}:${r.probability}`).join(", ");
+          errorMessage += ` [安全评分: ${ratings}]`;
+        }
+        throw new Error(errorMessage);
+      }
+    }
     if (response.candidates && response.candidates.length > 0) {
       for (const candidate of response.candidates) {
         if (candidate.finishReason && candidate.finishReason !== "STOP") {
@@ -638,14 +671,29 @@ function parseGeminiResponse(response, logger) {
         }
       }
     } else {
-      logger?.warn("Gemini API 响应中没有 candidates", { response: JSON.stringify(response).substring(0, 500) });
+      const hasPromptFeedback = !!response.promptFeedback;
+      const responseKeys = Object.keys(response);
+      logger?.error("Gemini API 响应中没有 candidates", {
+        response: JSON.stringify(response).substring(0, 500),
+        hasPromptFeedback,
+        responseKeys
+      });
+      if (!hasPromptFeedback) {
+        throw new Error("Gemini API 响应格式异常：既没有生成内容也没有反馈信息");
+      }
+      if (hasPromptFeedback && !response.promptFeedback.blockReason) {
+        logger?.warn("有 promptFeedback 但没有 blockReason，也没有 candidates", {
+          promptFeedback: response.promptFeedback
+        });
+      }
     }
     if (images.length === 0) {
       logger?.error("未能从 Gemini API 响应中提取到任何图片", {
         hasCandidates: !!response.candidates,
         candidatesCount: response.candidates?.length || 0,
         responseKeys: Object.keys(response),
-        firstCandidate: response.candidates?.[0] ? JSON.stringify(response.candidates[0]).substring(0, 300) : null
+        firstCandidate: response.candidates?.[0] ? JSON.stringify(response.candidates[0]).substring(0, 300) : null,
+        promptFeedback: response.promptFeedback ? JSON.stringify(response.promptFeedback) : null
       });
     }
     return images;
@@ -1309,22 +1357,18 @@ function apply(ctx, config) {
         return { images: [], text: imgParam.trim() };
       }
       await session.send("请输入画面描述");
-      while (true) {
-        const msg = await session.prompt(3e4);
-        if (!msg) return { error: "等待超时" };
-        const elements = import_koishi.h.parse(msg);
-        const images = import_koishi.h.select(elements, "img");
-        if (images.length > 0) {
-          await session.send("检测到图片，请发送文字描述");
-          continue;
-        }
-        const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
-        if (!text) {
-          await session.send("未检测到描述，请重新发送");
-          continue;
-        }
-        return { images: [], text };
+      const msg = await session.prompt(3e4);
+      if (!msg) return { error: "等待超时" };
+      const elements = import_koishi.h.parse(msg);
+      const images = import_koishi.h.select(elements, "img");
+      if (images.length > 0) {
+        return { error: "检测到图片，本功能仅支持文字输入" };
+      }
+      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) {
@@ -1379,8 +1423,7 @@ function apply(ctx, config) {
       }
       if (text) {
         if (collectedImages.length === 0) {
-          await session.send("未检测到图片，请先发送图片");
-          continue;
+          return { error: "未检测到图片，请重新发起指令并发送图片" };
         }
         collectedText = text;
         break;
@@ -1438,23 +1481,20 @@ function apply(ctx, config) {
     finalPrompt = finalPrompt.trim();
     if (!finalPrompt) {
       await session.send("请发送画面描述");
-      while (true) {
-        const promptMsg = await session.prompt(3e4);
-        if (!promptMsg) {
-          return "未检测到描述，请重新发送";
-        }
-        const elements = import_koishi.h.parse(promptMsg);
-        const images = import_koishi.h.select(elements, "img");
-        if (images.length > 0) {
-          await session.send("检测到图片，请发送文字描述");
-          continue;
-        }
-        const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
-        if (text) {
-          finalPrompt = text;
-          break;
-        }
-        await session.send("未检测到有效文字描述，请重新发送");
+      const promptMsg = await session.prompt(3e4);
+      if (!promptMsg) {
+        return "未检测到描述，操作已取消";
+      }
+      const elements = import_koishi.h.parse(promptMsg);
+      const images = import_koishi.h.select(elements, "img");
+      if (images.length > 0) {
+        return "检测到图片，本功能仅支持文字输入";
+      }
+      const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
+      if (text) {
+        finalPrompt = text;
+      } else {
+        return "未检测到有效文字描述，操作已取消";
       }
     }
     const providerType = requestContext?.provider || config.provider;
@@ -1622,7 +1662,7 @@ ${infoParts.join("\n")}`;
             prompt = text;
             break;
           }
-          return "未检测到有效内容，请重新发送";
+          return "未检测到有效内容，操作已取消";
         }
         if (collectedImages.length < 2) {
           return "需要至少两张图片进行合成，请重新发送";

package/package.json

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