Merge branch 'main' into feature/pdct-1759-make-backend-config-endpoi…

…nt-focused-on-corpora-not
climatepolicyradar · Dec 18, 2024 · 696cb2e · 696cb2e
2 parents 0357c63 + 5d01cd9
commit 696cb2e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "navigator_backend"
-version = "1.19.19"
+version = "1.19.21"
 description = ""
 authors = ["CPR-dev-team <[email protected]>"]
 packages = [{ include = "app" }, { include = "tests" }]
@@ -10,7 +10,7 @@ python = "^3.10"
 Authlib = "^0.15.5"
 bcrypt = "^3.2.0"
 boto3 = "^1.26"
-cpr_sdk = { version = "1.10.2", extras = ["vespa"] }
+cpr_sdk = { version = "1.11.0", extras = ["vespa"] }
 fastapi = "^0.104.1"
 fastapi-health = "^0.4.0"
 fastapi-pagination = { extras = ["sqlalchemy"], version = "^0.12.19" }

diff --git a/tests/search/vespa/fixtures/vespa_test_schema/schemas/document_passage.sd b/tests/search/vespa/fixtures/vespa_test_schema/schemas/document_passage.sd
@@ -177,7 +177,7 @@ schema document_passage {
         first-phase {
             expression: text_score()
         }
-        match-features: text_score() fieldMatch(text_block)
+        summary-features: text_score() fieldMatch(text_block)
     }
 
     rank-profile exact_not_stemmed inherits default {
@@ -187,7 +187,7 @@ schema document_passage {
         first-phase {
             expression: text_score()
         }
-        match-features: text_score() fieldMatch(text_block)
+        summary-features: text_score() fieldMatch(text_block)
     }
 
     rank-profile hybrid_no_closeness inherits default {
@@ -197,7 +197,7 @@ schema document_passage {
         first-phase {
             expression: text_score()
         }
-        match-features: text_score() bm25(text_block)
+        summary-features: text_score() bm25(text_block)
     }
 
     rank-profile hybrid inherits default {
@@ -210,7 +210,7 @@ schema document_passage {
         first-phase {
             expression: text_score()
         }
-        match-features: text_score() bm25(text_block) closeness(text_embedding)
+        summary-features: text_score() bm25(text_block) closeness(text_embedding)
     }
 
     rank-profile hybrid_custom_weight inherits default {
@@ -224,6 +224,6 @@ schema document_passage {
         first-phase {
             expression: text_score()
         }
-        match-features: text_score() bm25(text_block) closeness(text_embedding)
+        summary-features: text_score() bm25(text_block) closeness(text_embedding)
     }
 }
diff --git a/tests/search/vespa/fixtures/vespa_test_schema/schemas/family_document.sd b/tests/search/vespa/fixtures/vespa_test_schema/schemas/family_document.sd
@@ -178,7 +178,7 @@ schema family_document {
         first-phase {
             expression: name_score() + description_score()
         }
-        match-features: name_score() description_score()
+        summary-features: name_score() description_score()
     }
 
     rank-profile exact_not_stemmed inherits default {
@@ -191,7 +191,7 @@ schema family_document {
         first-phase {
             expression: name_score() + description_score()
         }
-        match-features: name_score() description_score()
+        summary-features: name_score() description_score()
     }
 
     rank-profile hybrid_no_closeness inherits default {
@@ -204,7 +204,7 @@ schema family_document {
         first-phase {
             expression: name_score() + description_score()
         }
-        match-features: name_score() description_score()
+        summary-features: name_score() description_score()
     }
 
     rank-profile hybrid inherits default {
@@ -220,7 +220,7 @@ schema family_document {
         first-phase {
             expression: name_score() + description_score()
         }
-        match-features: name_score() description_score()
+        summary-features: name_score() description_score()
     }
 
     rank-profile hybrid_no_description_embedding inherits default {
@@ -236,7 +236,7 @@ schema family_document {
         first-phase {
             expression: name_score() + description_score()
         }
-        match-features: name_score() description_score()
+        summary-features: name_score() description_score()
     }
 
     rank-profile hybrid_custom_weight inherits default {
@@ -253,7 +253,7 @@ schema family_document {
         first-phase {
             expression: name_score() + description_score()
         }
-        match-features: name_score() description_score()
+        summary-features: name_score() description_score()
     }