szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【代码评审】AI：联网检索

This commit is contained in:
YunaiV 2025-03-15 07:38:22 +08:00
parent 4ea26c7e81
commit d7567e669c
8 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
View File

@ -3,9 +3,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.message;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
@Schema(description = "管理后台 - AI 聊天消息发送 Request VO") @Schema(description = "管理后台 - AI 聊天消息发送 Request VO")
@Data @Data
@ -22,6 +20,8 @@ public class AiChatMessageSendReqVO {
@Schema(description = "是否携带上下文", example = "true") @Schema(description = "是否携带上下文", example = "true")
private Boolean useContext; private Boolean useContext;
@Schema(description = "搜索enable", example = "true") // TODO @芋艿：改成 useSearch，保持和 useContext 一个风格
@Schema(description = "是否搜索", example = "true")
private Boolean searchEnable; private Boolean searchEnable;
} }

22
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java
View File

@ -24,7 +24,7 @@ import cn.iocoder.yudao.module.ai.service.knowledge.AiKnowledgeSegmentService;
import cn.iocoder.yudao.module.ai.service.model.AiApiKeyService; import cn.iocoder.yudao.module.ai.service.model.AiApiKeyService;
import cn.iocoder.yudao.module.ai.service.model.AiChatModelService; import cn.iocoder.yudao.module.ai.service.model.AiChatModelService;
import cn.iocoder.yudao.module.ai.service.websearch.WebSearchService; import cn.iocoder.yudao.module.ai.service.websearch.WebSearchService;
import cn.iocoder.yudao.module.ai.service.websearch.vo.WebSearchRespVO; import cn.iocoder.yudao.module.ai.service.websearch.vo.AiWebSearchRespVO;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.ai.chat.messages.Message; import org.springframework.ai.chat.messages.Message;
@ -97,9 +97,10 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
List<AiKnowledgeSegmentDO> segmentList = recallSegment(sendReqVO.getContent(), conversation.getKnowledgeId()); List<AiKnowledgeSegmentDO> segmentList = recallSegment(sendReqVO.getContent(), conversation.getKnowledgeId());
// 3.3 联网搜索内容 // 3.3 联网搜索内容
List<WebSearchRespVO> webSearch = getWebSearch(sendReqVO.getContent(), sendReqVO.getSearchEnable(), 10); // TODO @芋艿：可能要改成前端检索；
List<AiWebSearchRespVO> webSearch = getWebSearch(sendReqVO.getContent(), sendReqVO.getSearchEnable(), 10);
// 3.4 创建 chat 需要的 Prompt // 3.4 创建 Chat 需要的 Prompt
Prompt prompt = buildPrompt(conversation, historyMessages, segmentList, model, sendReqVO, webSearch); Prompt prompt = buildPrompt(conversation, historyMessages, segmentList, model, sendReqVO, webSearch);
ChatResponse chatResponse = chatModel.call(prompt); ChatResponse chatResponse = chatModel.call(prompt);
@ -135,7 +136,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
// 3.3 联网搜索 // 3.3 联网搜索
// todo count 看是否需要放到配置文件 // todo count 看是否需要放到配置文件
List<WebSearchRespVO> webSearch = getWebSearch(sendReqVO.getContent(), sendReqVO.getSearchEnable(), 10); List<AiWebSearchRespVO> webSearch = getWebSearch(sendReqVO.getContent(), sendReqVO.getSearchEnable(), 10);
// 3.4 构建 Prompt，并进行调用 // 3.4 构建 Prompt，并进行调用
Prompt prompt = buildPrompt(conversation, historyMessages, segmentList, model, sendReqVO, webSearch); Prompt prompt = buildPrompt(conversation, historyMessages, segmentList, model, sendReqVO, webSearch);
@ -172,12 +173,12 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
* @param count 查询数量 * @param count 查询数量
* @return 返回查询结果 * @return 返回查询结果
*/ */
private List<WebSearchRespVO> getWebSearch(String prompt, Boolean searchEnable, int count) { private List<AiWebSearchRespVO> getWebSearch(String prompt, Boolean searchEnable, int count) {
if (searchEnable != null && searchEnable) { if (searchEnable != null && searchEnable) {
List<WebSearchRespVO> webSearchRespList = webSearchService.bingSearch(prompt, count); List<AiWebSearchRespVO> webSearchRespList = webSearchService.bingSearch(prompt, count);
Map<String, String> webCrawlerRespMap Map<String, String> webCrawlerRespMap
= webSearchService.webCrawler(webSearchRespList.stream().map(WebSearchRespVO::getUrl).toList()); = webSearchService.webCrawler(webSearchRespList.stream().map(AiWebSearchRespVO::getUrl).toList());
for (WebSearchRespVO webSearchRespVO : webSearchRespList) { for (AiWebSearchRespVO webSearchRespVO : webSearchRespList) {
if (!webCrawlerRespMap.containsKey(webSearchRespVO.getUrl())) { if (!webCrawlerRespMap.containsKey(webSearchRespVO.getUrl())) {
continue; continue;
} }
@ -196,7 +197,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
private Prompt buildPrompt(AiChatConversationDO conversation, List<AiChatMessageDO> messages, private Prompt buildPrompt(AiChatConversationDO conversation, List<AiChatMessageDO> messages,
List<AiKnowledgeSegmentDO> segmentList, AiChatModelDO model, List<AiKnowledgeSegmentDO> segmentList, AiChatModelDO model,
AiChatMessageSendReqVO sendReqVO, List<WebSearchRespVO> webSearchRespList) { AiChatMessageSendReqVO sendReqVO, List<AiWebSearchRespVO> webSearchRespList) {
// 1. 构建 Prompt Message 列表 // 1. 构建 Prompt Message 列表
List<Message> chatMessages = new ArrayList<>(); List<Message> chatMessages = new ArrayList<>();
@ -217,13 +218,14 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
List<AiChatMessageDO> contextMessages = filterContextMessages(messages, conversation, sendReqVO); List<AiChatMessageDO> contextMessages = filterContextMessages(messages, conversation, sendReqVO);
contextMessages.forEach(message -> chatMessages.add(AiUtils.buildMessage(message.getType(), message.getContent()))); contextMessages.forEach(message -> chatMessages.add(AiUtils.buildMessage(message.getType(), message.getContent())));
// 1.4 user message 新发送消息 // 1.4 user message 新发送消息
// TODO @芋艿：处理下 prompt 模版
if (sendReqVO.getSearchEnable() != null if (sendReqVO.getSearchEnable() != null
&& sendReqVO.getSearchEnable() && CollUtil.isNotEmpty(webSearchRespList)) { && sendReqVO.getSearchEnable() && CollUtil.isNotEmpty(webSearchRespList)) {
StringBuilder promptBuilder = StrUtil.builder(); StringBuilder promptBuilder = StrUtil.builder();
promptBuilder.append("## 以下是联网搜索内容: \n"); promptBuilder.append("## 以下是联网搜索内容: \n");
int i = 1; int i = 1;
for (WebSearchRespVO webSearchRespVO : webSearchRespList) { for (AiWebSearchRespVO webSearchRespVO : webSearchRespList) {
promptBuilder.append("[内容%s begin]".formatted(i)).append("\n"); promptBuilder.append("[内容%s begin]".formatted(i)).append("\n");
promptBuilder.append("标题：").append(webSearchRespVO.getTitle()).append("\n"); promptBuilder.append("标题：").append(webSearchRespVO.getTitle()).append("\n");
promptBuilder.append("地址：").append(webSearchRespVO.getUrl()).append("\n"); promptBuilder.append("地址：").append(webSearchRespVO.getUrl()).append("\n");

6
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/websearch/WebSearchService.java
View File

@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.ai.service.websearch; package cn.iocoder.yudao.module.ai.service.websearch;
import cn.iocoder.yudao.module.ai.service.websearch.vo.WebSearchRespVO; import cn.iocoder.yudao.module.ai.service.websearch.vo.AiWebSearchRespVO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -17,7 +17,7 @@ public interface WebSearchService {
* @param count 返回结果数量 * @param count 返回结果数量
* @return 搜索结果列表 * @return 搜索结果列表
*/ */
List<WebSearchRespVO> bingSearch(String query, Integer count); List<AiWebSearchRespVO> bingSearch(String query, Integer count);
/** /**
* Google 搜索 * Google 搜索
@ -26,7 +26,7 @@ public interface WebSearchService {
* @param count 返回结果数量 * @param count 返回结果数量
* @return 搜索结果列表 * @return 搜索结果列表
*/ */
List<WebSearchRespVO> googleSearch(String query, Integer count); List<AiWebSearchRespVO> googleSearch(String query, Integer count);
/** /**
* web 爬虫 * web 爬虫

16
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/websearch/WebSearchServiceImpl.java
View File

@ -6,7 +6,7 @@ import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONArray; import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.module.ai.service.websearch.vo.WebSearchRespVO; import cn.iocoder.yudao.module.ai.service.websearch.vo.AiWebSearchRespVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -46,7 +46,7 @@ public class WebSearchServiceImpl implements WebSearchService {
* @return 搜索结果列表 * @return 搜索结果列表
*/ */
@Override @Override
public List<WebSearchRespVO> bingSearch(String query, Integer count) { public List<AiWebSearchRespVO> bingSearch(String query, Integer count) {
if (query == null || query.isEmpty()) { if (query == null || query.isEmpty()) {
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }
@ -66,12 +66,12 @@ public class WebSearchServiceImpl implements WebSearchService {
JSONObject json = JSONUtil.parseObj(body); JSONObject json = JSONUtil.parseObj(body);
// 处理结果 // 处理结果
List<WebSearchRespVO> results = new ArrayList<>(); List<AiWebSearchRespVO> results = new ArrayList<>();
if (json.containsKey("webPages") && json.getJSONObject("webPages").containsKey("value")) { if (json.containsKey("webPages") && json.getJSONObject("webPages").containsKey("value")) {
JSONArray items = json.getJSONObject("webPages").getJSONArray("value"); JSONArray items = json.getJSONObject("webPages").getJSONArray("value");
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
JSONObject item = items.getJSONObject(i); JSONObject item = items.getJSONObject(i);
WebSearchRespVO result = new WebSearchRespVO() AiWebSearchRespVO result = new AiWebSearchRespVO()
.setTitle(item.getStr("name")) .setTitle(item.getStr("name"))
.setUrl(item.getStr("url")) .setUrl(item.getStr("url"))
.setSnippet(item.getStr("snippet")); .setSnippet(item.getStr("snippet"));
@ -87,14 +87,14 @@ public class WebSearchServiceImpl implements WebSearchService {
} }
/** /**
* Google 搜索（使用Serper API） * Google 搜索（使用 Serper API）
* *
* @param query 搜索关键词 * @param query 搜索关键词
* @param count 返回结果数量 * @param count 返回结果数量
* @return 搜索结果列表 * @return 搜索结果列表
*/ */
@Override @Override
public List<WebSearchRespVO> googleSearch(String query, Integer count) { public List<AiWebSearchRespVO> googleSearch(String query, Integer count) {
if (query == null || query.isEmpty()) { if (query == null || query.isEmpty()) {
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }
@ -119,10 +119,10 @@ public class WebSearchServiceImpl implements WebSearchService {
JSONArray organicResults = json.getJSONArray("organic"); JSONArray organicResults = json.getJSONArray("organic");
// 处理结果 // 处理结果
List<WebSearchRespVO> results = new ArrayList<>(); List<AiWebSearchRespVO> results = new ArrayList<>();
for (int i = 0; i < organicResults.size(); i++) { for (int i = 0; i < organicResults.size(); i++) {
JSONObject item = organicResults.getJSONObject(i); JSONObject item = organicResults.getJSONObject(i);
WebSearchRespVO result = new WebSearchRespVO() AiWebSearchRespVO result = new AiWebSearchRespVO()
.setTitle(item.getStr("title")) .setTitle(item.getStr("title"))
.setUrl(item.getStr("link")) .setUrl(item.getStr("link"))
.setSnippet(item.containsKey("snippet") ? item.getStr("snippet") : ""); .setSnippet(item.containsKey("snippet") ? item.getStr("snippet") : "");

7
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/websearch/vo/WebSearchRespVO.java → yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/websearch/vo/AiWebSearchRespVO.java
View File

@ -1,14 +1,12 @@
package cn.iocoder.yudao.module.ai.service.websearch.vo; package cn.iocoder.yudao.module.ai.service.websearch.vo;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors;
/** /**
* 搜索结果 * AI 搜索结果
*/ */
@Data @Data
@Accessors(chain = true) public class AiWebSearchRespVO {
public class WebSearchRespVO {
/** /**
* 标题 * 标题
@ -26,4 +24,5 @@ public class WebSearchRespVO {
* 网站内容 * 网站内容
*/ */
private String content; private String content;
} }

1
yudao-module-ai/yudao-module-ai-biz/src/test/java/cn/iocoder/yudao/module/ai/package-info.java
View File

@ -1 +1,2 @@
// TODO @芋艿：看情况删除
package cn.iocoder.yudao.module.ai; package cn.iocoder.yudao.module.ai;

8
yudao-module-ai/yudao-module-ai-biz/src/test/java/cn/iocoder/yudao/module/ai/service/WebSearchServiceTests.java
View File

@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.ai.service; package cn.iocoder.yudao.module.ai.service;
import cn.iocoder.yudao.module.ai.service.websearch.WebSearchServiceImpl; import cn.iocoder.yudao.module.ai.service.websearch.WebSearchServiceImpl;
import cn.iocoder.yudao.module.ai.service.websearch.vo.WebSearchRespVO; import cn.iocoder.yudao.module.ai.service.websearch.vo.AiWebSearchRespVO;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -41,14 +41,14 @@ public class WebSearchServiceTests {
// 创建网络搜索服务实例 // 创建网络搜索服务实例
WebSearchServiceImpl webSearchService = new WebSearchServiceImpl(); WebSearchServiceImpl webSearchService = new WebSearchServiceImpl();
// 调用谷歌搜索方法，搜索"长沙今天天气"，限制返回6条结果 // 调用谷歌搜索方法，搜索"长沙今天天气"，限制返回6条结果
List<WebSearchRespVO> webSearchRespList = webSearchService.googleSearch("长沙今天天气", 6); List<AiWebSearchRespVO> webSearchRespList = webSearchService.googleSearch("长沙今天天气", 6);
// 从搜索结果中提取URL，并爬取对应网页内容 // 从搜索结果中提取URL，并爬取对应网页内容
Map<String, String> webCrawlerRespMap Map<String, String> webCrawlerRespMap
= webSearchService.webCrawler(webSearchRespList.stream().map(WebSearchRespVO::getUrl).toList()); = webSearchService.webCrawler(webSearchRespList.stream().map(AiWebSearchRespVO::getUrl).toList());
// 打印搜索结果 // 打印搜索结果
for (WebSearchRespVO webSearchRespVO : webSearchRespList) { for (AiWebSearchRespVO webSearchRespVO : webSearchRespList) {
System.err.println(JSON.toJSONString(webSearchRespVO)); System.err.println(JSON.toJSONString(webSearchRespVO));
} }

2
yudao-server/src/main/resources/application-local.yaml
View File

@ -228,7 +228,7 @@ yudao:
wxa-subscribe-message: wxa-subscribe-message:
miniprogram-state: developer # 跳转小程序类型：开发版为 “developer”；体验版为 “trial”为；正式版为 “formal” miniprogram-state: developer # 跳转小程序类型：开发版为 “developer”；体验版为 “trial”为；正式版为 “formal”
tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
web-search: web-search: # TODO 芋艿：key 要不要放到 yudao ai 那去
bing-api-key: xx bing-api-key: xx
google-api-key: xx google-api-key: xx
justauth: justauth: