Merge pull request #380 from vespa-engine/tgm/move-query-module

Update tests to use learntorank.query and deprecate vespa.query
vespa-engine · Oct 3, 2022 · b1b4f85 · b1b4f85
2 parents a268a6e + 27f3cd1
commit b1b4f85
Show file tree

Hide file tree

Showing 13 changed files with 713 additions and 672 deletions.
diff --git a/docs/sphinx/source/collect-training-data.ipynb b/docs/sphinx/source/collect-training-data.ipynb
@@ -30,12 +30,12 @@
    "outputs": [],
    "source": [
     "from vespa.application import Vespa\n",
-    "from vespa.query import QueryModel, RankProfile, OR\n",
+    "from learntorank.query import QueryModel, Ranking, OR\n",
     "\n",
     "app = Vespa(url = \"https://api.cord19.vespa.ai\")\n",
     "query_model = QueryModel(\n",
     "    match_phase = OR(),\n",
-    "    rank_profile = RankProfile(name=\"bm25\", list_features=True)\n",
+    "    ranking = Ranking(name=\"bm25\", list_features=True)\n",
     ")"
    ]
   },
@@ -75,7 +75,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -413,7 +413,7 @@
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>12 rows × 984 columns</p>\n",
+       "<p>12 rows × 1038 columns</p>\n",
        "</div>"
       ],
       "text/plain": [
@@ -585,10 +585,10 @@
        "10                             1.000000                     1.000000  \n",
        "11                             0.250000                     0.612500  \n",
        "\n",
-       "[12 rows x 984 columns]"
+       "[12 rows x 1038 columns]"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -615,7 +615,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -953,7 +953,7 @@
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>12 rows × 984 columns</p>\n",
+       "<p>12 rows × 1038 columns</p>\n",
        "</div>"
       ],
       "text/plain": [
@@ -1125,10 +1125,10 @@
        "10                             1.000000                     1.000000  \n",
        "11                             0.250000                     0.612500  \n",
        "\n",
-       "[12 rows x 984 columns]"
+       "[12 rows x 1038 columns]"
       ]
      },
-     "execution_count": 7,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1170,9 +1170,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.1"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/docs/sphinx/source/evaluation.ipynb b/docs/sphinx/source/evaluation.ipynb
@@ -30,12 +30,12 @@
    "outputs": [],
    "source": [
     "from vespa.application import Vespa\n",
-    "from vespa.query import QueryModel, RankProfile, OR\n",
+    "from learntorank.query import QueryModel, Ranking, OR\n",
     "\n",
     "app = Vespa(url = \"https://api.cord19.vespa.ai\")\n",
     "query_model = QueryModel(\n",
     "    match_phase = OR(),\n",
-    "    rank_profile = RankProfile(name=\"bm25\", list_features=True))"
+    "    ranking = Ranking(name=\"bm25\", list_features=True))"
    ]
   },
   {