Merge pull request #381 from vespa-engine/tgm/remove-query-module

Tgm/remove query module
vespa-engine · Oct 4, 2022 · ec80c6a · ec80c6a
2 parents b1b4f85 + b049463
commit ec80c6a
Show file tree

Hide file tree

Showing 8 changed files with 217 additions and 1,356 deletions.
diff --git a/setup.py b/setup.py
@@ -30,6 +30,7 @@ def get_target_version():
         "cryptography",
         "aiohttp",
         "tenacity",
+        "learntorank"
     ],
     extras_require={
         "ml": ["transformers", "torch", "tensorflow", "tensorflow_ranking", "keras_tuner"],

diff --git a/vespa/application.py b/vespa/application.py
@@ -20,7 +20,7 @@
 from time import sleep
 
 from vespa.io import VespaQueryResponse, VespaResponse
-from vespa.query import QueryModel
+from learntorank.query import QueryModel
 from vespa.package import ApplicationPackage
 
 retry_strategy = Retry(

diff --git a/vespa/gallery.py b/vespa/gallery.py
@@ -12,7 +12,7 @@
     QueryProfileType,
     QueryTypeField,
 )
-from vespa.query import QueryModel, AND, RankProfile as Ranking
+from learntorank.query import QueryModel, AND, Ranking
 
 
 class TextSearch(ApplicationPackage):
@@ -58,7 +58,7 @@ def __init__(
             name=name,
             schema=[schema],
             default_query_model=QueryModel(
-                name="and_bm25", match_phase=AND(), rank_profile=Ranking(name="bm25")
+                name="and_bm25", match_phase=AND(), ranking=Ranking(name="bm25")
             ),
         )
 

diff --git a/vespa/package.py b/vespa/package.py
@@ -9,7 +9,7 @@
 from io import BytesIO
 
 from vespa.json_serialization import ToJson, FromJson
-from vespa.query import QueryModel
+from learntorank.query import QueryModel
 
 
 class HNSW(ToJson, FromJson["HNSW"]):

diff --git a/vespa/query.py b/vespa/query.py