Skip to content

Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance

Merge branch 'master' of https://github.com/yacy/yacy_search_server

Michael Peter Christenbfd334bc6350
diff --cc source/net/yacy/http/servlets/RAGProxyServlet.java
index 532e76a98,cc1c14514..0545b3d40
--- a/source/net/yacy/http/servlets/RAGProxyServlet.java
+++ b/source/net/yacy/http/servlets/RAGProxyServlet.java
@@@ -142,14 -150,25 +150,15 @@@ public class RAGProxyServlet extends Ht
if (rag) {
// modify system and user prompt here in bodyObject to enable RAG
String query = this.searchWordsForPrompt(llm4tldr.llm, llm4tldr.model, user);
- out.print(responseLine("Searching for '" + query + "'\n\n").toString() + "\n");
- out.flush();
- JSONArray searchResults = searchResults(query, 4, true);
- out.print(responseLine("\n").toString());
- out.flush();
- system += LLM_SYSTEM_PREFIX;
+ String searchResultMarkdown = searchResultsAsMarkdown(query, 4);
user += LLM_USER_PREFIX;
- for (int i = 0; i < searchResults.length(); i++) {
- JSONObject r = searchResults.getJSONObject(i);
- String snippet = r.optString("snippet", "");
- user += snippet + "\n\n";
- }
- systemObject.put("content", system);
+ user += searchResultMarkdown;
userObject.put("content", user);
- // write back modified bodyMap to body
- body = bodyObject.toString();
}
+
+ // write back modified bodyMap to body
+ body = bodyObject.toString();
// Open request to back-end service
URL url = new URI(llm4Chat.llm.hoststub + "/v1/chat/completions").toURL();