MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 05:47:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

优化了一下

Browse source
This commit is contained in:
gaoao-3 2025-01-02 11:05:00 +08:00
parent 5162fe2936
commit e0d252aa75
3 changed files with 22 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

44
utils/tools/CustomSearchTool.js
View file

@ -1,7 +1,7 @@
import { AbstractTool } from './AbstractTool.js'
import fetch from 'node-fetch'
import { Config } from '../config.js'
import { UrlExtractionTool } from './UrlExtractionTool.js' // 1. 引入 UrlExtractionTool
import { AbstractTool } from './AbstractTool.js';
import fetch from 'node-fetch';
import { Config } from '../config.js';
// import { UrlExtractionTool } from './UrlExtractionTool.js'; // 不再需要引入 UrlExtractionTool
/**
* 自定义搜索工具类
@ -17,7 +17,7 @@ export class CustomSearchTool extends AbstractTool {
properties: {
query: {
type: 'string',
description: 'Search keyword or URL',
description: 'Search keyword', // 修改描述，不再支持 URL
},
length: {
type: 'integer',
@ -40,48 +40,26 @@ export class CustomSearchTool extends AbstractTool {
}
try {
// 尝试使用OpenAI API进行搜索或摘要
let result = await searchOrSummarize(query, length);
// 2. 修改 func 方法: 判断是否为 URL 且 searchOrSummarize 结果不理想
const isUrl = /^(https?:\/\/)/i.test(query);
if (isUrl && (!result || result.includes("failed") || result.trim() === '')) { // 假设不理想的结果包括空字符串或包含"failed"
console.log(`[CustomSearchTool] searchOrSummarize failed or returned empty for URL, trying UrlExtractionTool...`);
// 创建 UrlExtractionTool 实例
const urlTool = new UrlExtractionTool();
// 调用 UrlExtractionTool 的 func 方法提取 URL 内容
const extractionResult = await urlTool.func({ message: query, appendContent: false });
// 3. 整合提取的内容: 如果提取成功，则将提取的内容作为 searchOrSummarize 的输入
if (extractionResult && extractionResult.extractedContent) {
console.log(`[CustomSearchTool] Successfully extracted content using UrlExtractionTool, summarizing...`);
result = await searchOrSummarize(extractionResult.extractedContent, length);
} else {
// 如果 UrlExtractionTool 也失败了，则返回错误信息
return `Failed to extract content from URL and summarize. ${extractionResult.message}`;
}
}
// 直接使用OpenAI API进行搜索或摘要
const result = await searchOrSummarize(query, length);
console.log(`Search or summarization result: ${result}`);
// 返回搜索结果或摘要给AI
return result;
} catch (error) {
// 4. 优化错误处理: 捕获 UrlExtractionTool 可能抛出的错误
console.error('Search or summarization failed:', error);
return `Search or summarization failed, please check the logs. ${error.message}`;
}
};
// 工具描述
description = 'Use OpenAI API for custom search or summarize URL content, providing comprehensive search results or summaries. If a URL is provided and summarization fails, it will attempt to extract the content first and then summarize.';
description = 'Use OpenAI API for custom search, providing comprehensive search results or summaries. This tool does not handle URLs.'; // 修改描述，明确不再处理 URL
}
/**
* 使用OpenAI API进行搜索或摘要
* @param {string} query - 搜索关键词或URL提取的内容
* @param {string} query - 搜索关键词
* @param {number} length - 期望的摘要长度（以句子为单位）
* @returns {Promise<string>} - 搜索结果或摘要
*/
@ -102,11 +80,11 @@ async function searchOrSummarize(query, length) {
messages: [
{
role: 'system',
content: `You are a search and summarization assistant. Please use English to search based on the following keywords or summarize the provided text, and return a summary of ${length} sentences.`,
content: `You are a search and summarization assistant. Please use English to search based on the following keywords and return a summary of ${length} sentences.`, // 简化提示词
},
{
role: 'user',
content: `Search or summarize: ${query}`,
content: `Search: ${query}`, // 简化提示词
},
],
max_tokens: 1000 * length,