Issue #984: aggiunta endpoint semantic-autocomplete

smclab · Jun 24, 2024 · 87cdab9 · 87cdab9
1 parent 50fc4af
commit 87cdab9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/core/app/datasource/src/main/java/io/openk9/datasource/searcher/SearcherService.java b/core/app/datasource/src/main/java/io/openk9/datasource/searcher/SearcherService.java
@@ -97,6 +97,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.BiConsumer;
@@ -496,6 +497,8 @@ public Uni<QueryAnalysisResponse> queryAnalysis(QueryAnalysisRequest request) {
 
 		String searchText = request.getSearchText();
 
+		String mode = request.getMode();
+
 		Uni<Grammar> grammarUni =
 			grammarProvider.getOrCreateGrammar(request.getVirtualHost(), JWT.of(request.getJwt()));
 
@@ -547,8 +550,11 @@ public Uni<QueryAnalysisResponse> queryAnalysis(QueryAnalysisRequest request) {
 						int startPos = maps.getPos().get(0);
 						Object keywordKey = map.get("keywordKey");
 
-						if (startPos > 0 || keywordKey != null) {
-							continue;
+						if (Objects.equals(mode, "semantic-autocomplete")) {
+							logger.info(mode);
+							if (startPos > 0 && keywordKey != null) {
+								continue;
+							}
 						}
 
 						if (tokenType != null && !tokenType.equals("TOKEN")) {

diff --git a/core/app/searcher/src/main/java/io/openk9/searcher/resource/SearchResource.java b/core/app/searcher/src/main/java/io/openk9/searcher/resource/SearchResource.java
@@ -133,7 +133,7 @@ public Uni<io.openk9.searcher.queryanalysis.QueryAnalysisResponse> queryAnalysis
 		io.openk9.searcher.queryanalysis.QueryAnalysisRequest searchRequest) {
 
 		QueryAnalysisRequest queryAnalysisRequest =
-			getQueryAnalysisRequest(searchRequest);
+			getQueryAnalysisRequest(searchRequest, "query-analysis");
 
 		return searcherClient
 			.queryAnalysis(queryAnalysisRequest)
@@ -143,13 +143,13 @@ public Uni<io.openk9.searcher.queryanalysis.QueryAnalysisResponse> queryAnalysis
 
 
 	@POST
-	@Path("/suggerimenti")
+	@Path("/semantic-autocomplete")
 	@Produces(MediaType.APPLICATION_JSON)
-	public Uni<io.openk9.searcher.queryanalysis.QueryAnalysisResponse> suggerimenti(
+	public Uni<io.openk9.searcher.queryanalysis.QueryAnalysisResponse> semanticAutocomplete(
 		io.openk9.searcher.queryanalysis.QueryAnalysisRequest searchRequest) {
 
 		QueryAnalysisRequest queryAnalysisRequest =
-			getQueryAnalysisRequest(searchRequest);
+			getQueryAnalysisRequest(searchRequest, "semantic-autocomplete");
 
 		return searcherClient
 			.queryAnalysis(queryAnalysisRequest)
@@ -230,14 +230,15 @@ private io.openk9.searcher.queryanalysis.QueryAnalysisResponse _toQueryAnalysisR
 	}
 
 	private QueryAnalysisRequest getQueryAnalysisRequest(
-		io.openk9.searcher.queryanalysis.QueryAnalysisRequest searchRequest) {
+		io.openk9.searcher.queryanalysis.QueryAnalysisRequest searchRequest, String mode) {
 
 		QueryAnalysisRequest.Builder builder =
 			QueryAnalysisRequest.newBuilder();
 
 		builder.setSearchText(searchRequest.getSearchText());
 		builder.setVirtualHost(request.host());
 		builder.setJwt(rawToken == null ? "" : rawToken);
+		builder.setMode(mode);
 
 		if (searchRequest.getTokens() != null) {
 

diff --git a/core/client/grpc/searcher-client-grpc/src/main/proto/searcher.proto b/core/client/grpc/searcher-client-grpc/src/main/proto/searcher.proto
@@ -81,6 +81,7 @@ message QueryAnalysisRequest {
   repeated QueryAnalysisToken tokens = 2;
   string virtualHost = 3;
   optional string jwt = 4;
+  string mode = 5;
 }
 
 message QueryAnalysisToken {