use VespaResult in the notebook

1 files changed, 100 insertions, 88 deletions

diff --git a/python/vespa/notebooks/index.ipynb b/python/vespa/notebooks/index.ipynb
index 076bb935c02..20b87c46083 100644
--- a/python/vespa/notebooks/index.ipynb
+++ b/python/vespa/notebooks/index.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -31,7 +31,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "`pip install vespa`"
+    "`pip install pyvespa`"
    ]
   },
   {
@@ -45,7 +45,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -65,7 +65,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -99,7 +99,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -111,22 +111,22 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "{'totalCount': 1077}"
+       "969"
       ]
      },
-     "execution_count": null,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "query_result[\"root\"][\"fields\"]"
+    "query_result.number_documents_retrieved"
    ]
   },
   {
@@ -140,7 +140,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -176,7 +176,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -239,11 +239,11 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.000000</td>\n",
+       "      <td>0.062500</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
+       "      <td>0.142857</td>\n",
+       "      <td>0.055357</td>\n",
        "      <td>0</td>\n",
        "      <td>0</td>\n",
        "      <td>1</td>\n",
@@ -268,7 +268,7 @@
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
-       "      <td>56212</td>\n",
+       "      <td>97200</td>\n",
        "      <td>0</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -287,12 +287,12 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.187500</td>\n",
-       "      <td>0.5</td>\n",
-       "      <td>0.617188</td>\n",
-       "      <td>0.428571</td>\n",
-       "      <td>0.457087</td>\n",
-       "      <td>34026</td>\n",
+       "      <td>0.266667</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0.869792</td>\n",
+       "      <td>0.571429</td>\n",
+       "      <td>0.679189</td>\n",
+       "      <td>69447</td>\n",
        "      <td>0</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -311,11 +311,11 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.000000</td>\n",
+       "      <td>0.142857</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
+       "      <td>0.437500</td>\n",
+       "      <td>0.142857</td>\n",
+       "      <td>0.224554</td>\n",
        "      <td>3</td>\n",
        "      <td>0</td>\n",
        "      <td>1</td>\n",
@@ -340,7 +340,7 @@
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
-       "      <td>56212</td>\n",
+       "      <td>97200</td>\n",
        "      <td>0</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -359,12 +359,12 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.187500</td>\n",
-       "      <td>0.5</td>\n",
-       "      <td>0.617188</td>\n",
-       "      <td>0.428571</td>\n",
-       "      <td>0.457087</td>\n",
-       "      <td>34026</td>\n",
+       "      <td>0.266667</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>0.869792</td>\n",
+       "      <td>0.571429</td>\n",
+       "      <td>0.679189</td>\n",
+       "      <td>69447</td>\n",
        "      <td>0</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -383,11 +383,11 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.071429</td>\n",
+       "      <td>0.111111</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
        "      <td>0.083333</td>\n",
-       "      <td>0.039286</td>\n",
+       "      <td>0.047222</td>\n",
        "      <td>1</td>\n",
        "      <td>1</td>\n",
        "      <td>1</td>\n",
@@ -412,7 +412,7 @@
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
-       "      <td>29774</td>\n",
+       "      <td>116256</td>\n",
        "      <td>1</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -431,12 +431,12 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.500000</td>\n",
+       "      <td>0.187500</td>\n",
        "      <td>1.0</td>\n",
        "      <td>1.000000</td>\n",
-       "      <td>0.333333</td>\n",
-       "      <td>0.700000</td>\n",
-       "      <td>22787</td>\n",
+       "      <td>0.250000</td>\n",
+       "      <td>0.612500</td>\n",
+       "      <td>14888</td>\n",
        "      <td>1</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -455,11 +455,11 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.058824</td>\n",
+       "      <td>0.083333</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
        "      <td>0.083333</td>\n",
-       "      <td>0.036765</td>\n",
+       "      <td>0.041667</td>\n",
        "      <td>5</td>\n",
        "      <td>1</td>\n",
        "      <td>1</td>\n",
@@ -484,7 +484,7 @@
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
        "      <td>1.000000</td>\n",
-       "      <td>29774</td>\n",
+       "      <td>116256</td>\n",
        "      <td>1</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -503,12 +503,12 @@
        "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.500000</td>\n",
+       "      <td>0.187500</td>\n",
        "      <td>1.0</td>\n",
        "      <td>1.000000</td>\n",
-       "      <td>0.333333</td>\n",
-       "      <td>0.700000</td>\n",
-       "      <td>22787</td>\n",
+       "      <td>0.250000</td>\n",
+       "      <td>0.612500</td>\n",
+       "      <td>14888</td>\n",
        "      <td>1</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
@@ -673,51 +673,51 @@
        "11                                    0.0                            0.0   \n",
        "\n",
        "    textSimilarity(title).fieldCoverage  textSimilarity(title).order  \\\n",
-       "0                              0.000000                          0.0   \n",
+       "0                              0.062500                          0.0   \n",
        "1                              1.000000                          1.0   \n",
-       "2                              0.187500                          0.5   \n",
-       "3                              0.000000                          0.0   \n",
+       "2                              0.266667                          1.0   \n",
+       "3                              0.142857                          0.0   \n",
        "4                              1.000000                          1.0   \n",
-       "5                              0.187500                          0.5   \n",
-       "6                              0.071429                          0.0   \n",
+       "5                              0.266667                          1.0   \n",
+       "6                              0.111111                          0.0   \n",
        "7                              1.000000                          1.0   \n",
-       "8                              0.500000                          1.0   \n",
-       "9                              0.058824                          0.0   \n",
+       "8                              0.187500                          1.0   \n",
+       "9                              0.083333                          0.0   \n",
        "10                             1.000000                          1.0   \n",
-       "11                             0.500000                          1.0   \n",
+       "11                             0.187500                          1.0   \n",
        "\n",
        "    textSimilarity(title).proximity  textSimilarity(title).queryCoverage  \\\n",
-       "0                          0.000000                             0.000000   \n",
+       "0                          0.000000                             0.142857   \n",
        "1                          1.000000                             1.000000   \n",
-       "2                          0.617188                             0.428571   \n",
-       "3                          0.000000                             0.000000   \n",
+       "2                          0.869792                             0.571429   \n",
+       "3                          0.437500                             0.142857   \n",
        "4                          1.000000                             1.000000   \n",
-       "5                          0.617188                             0.428571   \n",
+       "5                          0.869792                             0.571429   \n",
        "6                          0.000000                             0.083333   \n",
        "7                          1.000000                             1.000000   \n",
-       "8                          1.000000                             0.333333   \n",
+       "8                          1.000000                             0.250000   \n",
        "9                          0.000000                             0.083333   \n",
        "10                         1.000000                             1.000000   \n",
-       "11                         1.000000                             0.333333   \n",
+       "11                         1.000000                             0.250000   \n",
        "\n",
        "    textSimilarity(title).score  document_id  query_id  relevant  \n",
-       "0                      0.000000            0         0         1  \n",
-       "1                      1.000000        56212         0         0  \n",
-       "2                      0.457087        34026         0         0  \n",
-       "3                      0.000000            3         0         1  \n",
-       "4                      1.000000        56212         0         0  \n",
-       "5                      0.457087        34026         0         0  \n",
-       "6                      0.039286            1         1         1  \n",
-       "7                      1.000000        29774         1         0  \n",
-       "8                      0.700000        22787         1         0  \n",
-       "9                      0.036765            5         1         1  \n",
-       "10                     1.000000        29774         1         0  \n",
-       "11                     0.700000        22787         1         0  \n",
+       "0                      0.055357            0         0         1  \n",
+       "1                      1.000000        97200         0         0  \n",
+       "2                      0.679189        69447         0         0  \n",
+       "3                      0.224554            3         0         1  \n",
+       "4                      1.000000        97200         0         0  \n",
+       "5                      0.679189        69447         0         0  \n",
+       "6                      0.047222            1         1         1  \n",
+       "7                      1.000000       116256         1         0  \n",
+       "8                      0.612500        14888         1         0  \n",
+       "9                      0.041667            5         1         1  \n",
+       "10                     1.000000       116256         1         0  \n",
+       "11                     0.612500        14888         1         0  \n",
        "\n",
        "[12 rows x 984 columns]"
       ]
      },
-     "execution_count": null,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -753,7 +753,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -771,7 +771,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
@@ -807,19 +807,19 @@
        "    <tr>\n",
        "      <th>0</th>\n",
        "      <td>0</td>\n",
-       "      <td>1267</td>\n",
-       "      <td>62529</td>\n",
-       "      <td>0.020263</td>\n",
-       "      <td>0</td>\n",
+       "      <td>1040</td>\n",
+       "      <td>127518</td>\n",
+       "      <td>0.008156</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>1</th>\n",
        "      <td>1</td>\n",
-       "      <td>887</td>\n",
-       "      <td>62529</td>\n",
-       "      <td>0.014185</td>\n",
-       "      <td>0</td>\n",
+       "      <td>922</td>\n",
+       "      <td>127518</td>\n",
+       "      <td>0.007230</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>0</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
@@ -828,15 +828,15 @@
       ],
       "text/plain": [
        "   query_id  match_ratio_retrieved_docs  match_ratio_docs_available  \\\n",
-       "0         0                        1267                       62529   \n",
-       "1         1                         887                       62529   \n",
+       "0         0                        1040                      127518   \n",
+       "1         1                         922                      127518   \n",
        "\n",
        "   match_ratio_value  recall_10_value  reciprocal_rank_10_value  \n",
-       "0           0.020263                0                         0  \n",
-       "1           0.014185                0                         0  "
+       "0           0.008156              0.0                         0  \n",
+       "1           0.007230              0.0                         0  "
       ]
      },
-     "execution_count": null,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -857,6 +857,18 @@
    "display_name": "vespa",
    "language": "python",
    "name": "vespa"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.7"
   }
  },
  "nbformat": 4,