Commit 59897f3e authored by alex yao's avatar alex yao

fix: web search 插件读取pdf文件

parent e308ea99
...@@ -88,6 +88,7 @@ public class WebSearchFunction extends AbstractLargeModelFunction { ...@@ -88,6 +88,7 @@ public class WebSearchFunction extends AbstractLargeModelFunction {
Search execute = getCustomSearchAPI() Search execute = getCustomSearchAPI()
.cse().list().setCx(CX) .cse().list().setCx(CX)
.setKey(KEY) .setKey(KEY)
.setFileType("pdf,html")
.setQ(query) .setQ(query)
.setStart(1L) .setStart(1L)
.setNum(3) .setNum(3)
...@@ -97,7 +98,7 @@ public class WebSearchFunction extends AbstractLargeModelFunction { ...@@ -97,7 +98,7 @@ public class WebSearchFunction extends AbstractLargeModelFunction {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
int i = 0; int i = 0;
for (WebSearchFunctionResult webSearchFunctionResult : results) { for (WebSearchFunctionResult webSearchFunctionResult : results) {
stringBuilder.append(i).append(":").append(webSearchFunctionResult.getContent()).append("\n"); stringBuilder.append(i).append(":").append(webSearchFunctionResult.getHtmlContent()).append("\n");
} }
result.setPromptContent(stringBuilder.toString()); result.setPromptContent(stringBuilder.toString());
result.setFunctionResult(results); result.setFunctionResult(results);
...@@ -137,7 +138,8 @@ public class WebSearchFunction extends AbstractLargeModelFunction { ...@@ -137,7 +138,8 @@ public class WebSearchFunction extends AbstractLargeModelFunction {
WebSearchFunctionResult webSearchResult = new WebSearchFunctionResult(); WebSearchFunctionResult webSearchResult = new WebSearchFunctionResult();
webSearchResult.setTitle(item.getTitle()); webSearchResult.setTitle(item.getTitle());
webSearchResult.setUrl(item.getLink()); webSearchResult.setUrl(item.getLink());
webSearchResult.setContent(htmlContent); webSearchResult.setContent(item.getSnippet());
webSearchResult.setHtmlContent(item.getSnippet());
results.add(webSearchResult); results.add(webSearchResult);
} }
countDownLatch.countDown(); countDownLatch.countDown();
......
...@@ -10,10 +10,20 @@ public class WebSearchFunctionResult { ...@@ -10,10 +10,20 @@ public class WebSearchFunctionResult {
private String url; private String url;
// //
// private String snippet; private String htmlContent;
private String content; private String content;
public String getHtmlContent() {
return htmlContent;
}
public void setHtmlContent(String htmlContent) {
this.htmlContent = htmlContent;
}
public String getTitle() { public String getTitle() {
return title; return title;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment