koishi-plugin-best-cave 2.7.8 → 2.7.10

package/lib/index.js

@@ -722,10 +722,11 @@ var HashManager = class {
       if (requireAdmin(session, this.config)) return requireAdmin(session, this.config);
       try {
         const allCaves = await this.ctx.database.get("cave", { status: "active" });
-        if (allCaves.length === 0) return "无需补全回声洞哈希";
-        await session.send(`开始补全 ${allCaves.length} 个回声洞的哈希...`);
-        const existingHashes = await this.ctx.database.get("cave_hash", {});
-        const existingHashSet = new Set(existingHashes.map((h4) => `${h4.cave}-${h4.hash}-${h4.type}`));
+        const existingHashes = await this.ctx.database.get("cave_hash", {}, { fields: ["cave"] });
+        const hashedCaveIds = new Set(existingHashes.map((h4) => h4.cave));
+        const cavesToProcess = allCaves.filter((cave2) => !hashedCaveIds.has(cave2.id));
+        if (cavesToProcess.length === 0) return "无需补全回声洞哈希";
+        await session.send(`开始补全 ${cavesToProcess.length} 个回声洞的哈希...`);
         let hashesToInsert = [];
         let processedCaveCount = 0;
         let totalHashesGenerated = 0;
@@ -734,19 +735,15 @@ var HashManager = class {
           if (hashesToInsert.length === 0) return;
           await this.ctx.database.upsert("cave_hash", hashesToInsert);
           totalHashesGenerated += hashesToInsert.length;
-          this.logger.info(`[${processedCaveCount}/${allCaves.length}] 正在导入 ${hashesToInsert.length} 条回声洞哈希...`);
+          this.logger.info(`[${processedCaveCount}/${cavesToProcess.length}] 正在导入 ${hashesToInsert.length} 条回声洞哈希...`);
           hashesToInsert = [];
         }, "flushBatch");
-        for (const cave2 of allCaves) {
+        for (const cave2 of cavesToProcess) {
           processedCaveCount++;
           try {
             const newHashesForCave = await this.generateAllHashesForCave(cave2);
-            for (const hashObj of newHashesForCave) {
-              const uniqueKey = `${hashObj.cave}-${hashObj.hash}-${hashObj.type}`;
-              if (!existingHashSet.has(uniqueKey)) {
-                hashesToInsert.push(hashObj);
-                existingHashSet.add(uniqueKey);
-              }
+            if (newHashesForCave.length > 0) {
+              hashesToInsert.push(...newHashesForCave);
             }
             if (hashesToInsert.length >= 100) await flushBatch();
           } catch (error) {
@@ -755,9 +752,10 @@ var HashManager = class {
           }
         }
         await flushBatch();
-        return `已补全 ${allCaves.length} 个回声洞的 ${totalHashesGenerated} 条哈希（失败 ${errorCount} 条）`;
+        const successCount = processedCaveCount - errorCount;
+        return `已补全 ${successCount} 个回声洞的 ${totalHashesGenerated} 条哈希（失败 ${errorCount} 条）`;
       } catch (error) {
-        this.logger.error("生成哈希失败:", error);
+        this.logger.error("补全哈希失败:", error);
         return `操作失败: ${error.message}`;
       }
     });
@@ -821,13 +819,13 @@ var HashManager = class {
       if (requireAdmin(session, this.config)) return requireAdmin(session, this.config);
       let cavesToProcess;
       try {
+        await session.send("正在修复，请稍候...");
         if (ids.length === 0) {
-          await session.send("正在修复，请稍候...");
           cavesToProcess = await this.ctx.database.get("cave", { status: "active" });
         } else {
           cavesToProcess = await this.ctx.database.get("cave", { id: { $in: ids }, status: "active" });
         }
-        if (!cavesToProcess.length) return "无可修复回声洞";
+        if (!cavesToProcess.length) return "无可修复的回声洞";
         let fixedFiles = 0;
         let errorCount = 0;
         const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
@@ -1101,10 +1099,13 @@ var AIManager = class {
       const formatContent = /* @__PURE__ */ __name((elements) => elements.filter((el) => el.type === "text").map((el) => el.content).join(" "), "formatContent");
       const userMessage = {
         role: "user",
-        content: JSON.stringify({
-          new_content: { text: formatContent(newElements) },
-          existing_contents: potentialDuplicates.map((cave) => ({ id: cave.id, text: formatContent(cave.elements) }))
-        })
+        content: [{
+          type: "input_text",
+          text: JSON.stringify({
+            new_content: { text: formatContent(newElements) },
+            existing_contents: potentialDuplicates.map((cave) => ({ id: cave.id, text: formatContent(cave.elements) }))
+          })
+        }]
       };
       const response = await this.requestAI([userMessage], this.config.aiCheckPrompt, this.config.aiCheckSchema);
       return {
@@ -1148,7 +1149,7 @@ var AIManager = class {
   async getAnalysis(elements, mediaToSave, mediaBuffers) {
     const userContent = [];
     const combinedText = elements.filter((el) => el.type === "text" && el.content).map((el) => el.content).join("\n");
-    if (combinedText.trim()) userContent.push({ type: "text", text: combinedText });
+    if (combinedText.trim()) userContent.push({ type: "input_text", text: combinedText });
     const mediaMap = new Map(mediaBuffers?.map((m) => [m.fileName, m.buffer]));
     const imageElements = elements.filter((el) => el.type === "image" && el.file);
     for (const el of imageElements) {
@@ -1165,8 +1166,8 @@ var AIManager = class {
         if (buffer) {
           const mimeType = path3.extname(el.file).toLowerCase() === ".png" ? "image/png" : "image/jpeg";
           userContent.push({
-            type: "image_url",
-            image_url: { url: `data:${mimeType};base64,${buffer.toString("base64")}` }
+            type: "input_image",
+            image_url: `data:${mimeType};base64,${buffer.toString("base64")}`
           });
         }
       } catch (error) {
@@ -1197,22 +1198,28 @@ var AIManager = class {
       this.rateLimitResetTime = Date.now() + 6e4;
       this.requestCount = 0;
     }
-    let schema = JSON.parse(schemaString);
-    const toolName = "extract_data";
+    let schema;
+    try {
+      schema = JSON.parse(schemaString);
+    } catch (error) {
+      this.logger.error("解析 JSON Schema 失败:", error);
+      throw new Error("无效的 JSON Schema 配置");
+    }
     const payload = {
       model: this.config.aiModel,
-      messages: [{ role: "system", content: systemPrompt }, ...messages],
-      tools: [{
-        type: "function",
-        function: {
-          name: toolName,
-          description: "根据提供的内容提取或分析信息。",
-          parameters: schema
+      input: [
+        { role: "system", content: systemPrompt },
+        ...messages
+      ],
+      text: {
+        format: {
+          type: "json_schema",
+          name: "extracted_data",
+          schema
         }
-      }],
-      tool_choice: { type: "function", function: { name: toolName } }
+      }
     };
-    const fullUrl = `${this.config.aiEndpoint.replace(/\/$/, "")}/chat/completions`;
+    const fullUrl = `${this.config.aiEndpoint.replace(/\/$/, "")}/responses`;
     const headers = {
       "Content-Type": "application/json",
       "Authorization": `Bearer ${this.config.aiApiKey}`
@@ -1220,9 +1227,9 @@ var AIManager = class {
     try {
       this.requestCount++;
       const response = await this.http.post(fullUrl, payload, { headers, timeout: 9e4 });
-      const toolCall = response.choices?.[0]?.message?.tool_calls?.[0];
-      if (toolCall?.function?.arguments) {
-        return JSON.parse(toolCall.function.arguments);
+      const responseText = response.output?.[0]?.content?.[0]?.text;
+      if (responseText) {
+        return JSON.parse(responseText);
       } else {
         this.logger.error("AI 响应格式不正确:", JSON.stringify(response));
         throw new Error("AI 响应格式不正确");
@@ -1262,8 +1269,8 @@ var Config = import_koishi3.Schema.intersect([
   import_koishi3.Schema.object({
     enablePend: import_koishi3.Schema.boolean().default(false).description("启用审核"),
     enableSimilarity: import_koishi3.Schema.boolean().default(false).description("启用查重"),
-    textThreshold: import_koishi3.Schema.number().min(0).max(100).step(0.01).default(90).description("文本相似度阈值 (%)"),
-    imageThreshold: import_koishi3.Schema.number().min(0).max(100).step(0.01).default(90).description("图片相似度阈值 (%)")
+    textThreshold: import_koishi3.Schema.number().min(0).max(100).step(0.01).default(95).description("文本相似度阈值 (%)"),
+    imageThreshold: import_koishi3.Schema.number().min(0).max(100).step(0.01).default(95).description("图片相似度阈值 (%)")
   }).description("复核配置"),
   import_koishi3.Schema.object({
     enableAI: import_koishi3.Schema.boolean().default(false).description("启用 AI"),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-best-cave",
   "description": "功能强大、高度可定制的回声洞。支持丰富的媒体类型、内容查重、人工审核、用户昵称、数据迁移以及本地/S3 双重文件存储后端。",
-  "version": "2.7.8",
+  "version": "2.7.10",
   "contributors": [
     "Yis_Rime <yis_rime@outlook.com>"
   ],