don't require parms

castorini · Jan 23, 2025 · 37597ff · 37597ff
1 parent 1ed836e
commit 37597ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/main/java/io/anserini/server/ControllerV1_0.java b/src/main/java/io/anserini/server/ControllerV1_0.java
@@ -50,8 +50,8 @@ public Map<String, Object> searchIndex(@PathVariable(value = "index", required =
       @RequestParam(value = "hits", defaultValue = "10") int hits,
       @RequestParam(value = "qid", defaultValue = "") String qid,
       @RequestParam(value = "efSearch", defaultValue = "100") int efSearch,
-      @RequestParam(value = "encoder", required = true) String encoder,
-      @RequestParam(value = "queryGenerator", required = true) String queryGenerator) {
+      @RequestParam(value = "encoder", required = false) String encoder,
+      @RequestParam(value = "queryGenerator", required = false) String queryGenerator) {
 
     if (index == null) {
       index = DEFAULT_INDEX;
@@ -61,10 +61,8 @@ public Map<String, Object> searchIndex(@PathVariable(value = "index", required =
       throw new IllegalArgumentException("Index " + index + " not found!");
     }
 
-    if (index.contains(".hnsw")) {
-      if (encoder == null || queryGenerator == null) {
-        throw new IllegalArgumentException("HNSW indexes require both 'encoder' and 'queryGenerator' parameters");
-      }
+    if (index.contains(".hnsw") && (encoder == null || queryGenerator == null)) {
+      throw new IllegalArgumentException("HNSW indexes require both 'encoder' and 'queryGenerator' parameters");
     }
 
     SearchService searchService = new SearchService(index);

diff --git a/src/main/java/io/anserini/server/SearchService.java b/src/main/java/io/anserini/server/SearchService.java
@@ -137,15 +137,8 @@ private HnswDenseSearcher.Args createHnswArgs(int efSearch, String encoder, Stri
     HnswDenseSearcher.Args args = new HnswDenseSearcher.Args();
     args.index = indexDir;
     args.efSearch = efSearch;
-    args.queryGenerator = queryGenerator != null ? queryGenerator : DEFAULT_QUERY_GENERATOR;
-
-    // Attempt to get encoder from IndexInfo, or use provided encoder
-    if (encoder != null) {
-      args.encoder = encoder;
-    } else if (IndexInfo.contains(prebuiltIndex)) {
-      IndexInfo info = IndexInfo.get(prebuiltIndex);
-      args.encoder = info.model.substring(0, info.model.indexOf(" w/ HNSW"));
-    }
+    args.encoder = encoder;
+    args.queryGenerator = queryGenerator;
     return args;
   }