Updated geo distance

Author: bobtabor-msft

Quickstart-Vector-Search/vector-search-quickstart.ipynb

@@ -679,30 +679,27 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 64,
    "id": "185ed07b",
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Total semantic hybrid results: 3\n",
+      "Total semantic hybrid results: 2\n",
       "- HotelId: 48\n",
       "  HotelName: Nordick's Valley Motel\n",
       "  Score: 0.6605852246284485\n",
       "  City/State: Washington D.C., null\n",
       "  Description: Only 90 miles (about 2 hours) from the nation's capital and nearby most everything the historic valley has to offer. Hiking? Wine Tasting? Exploring the caverns? It's all nearby and we have specially priced packages to help make our B&B your home base for fun while visiting the valley.\n",
+      "\n",
       "- HotelId: 49\n",
       "  HotelName: Swirling Currents Hotel\n",
       "  Score: 0.602634072303772\n",
       "  City/State: Arlington, VA\n",
       "  Description: Spacious rooms, glamorous suites and residences, rooftop pool, walking access to shopping, dining, entertainment and the city center. Each room comes equipped with a microwave, a coffee maker and a minifridge. In-room entertainment includes complimentary W-Fi and flat-screen TVs.\n",
-      "- HotelId: 1\n",
-      "  HotelName: Stay-Kay City Hotel\n",
-      "  Score: 0.5699889063835144\n",
-      "  City/State: New York, NY\n",
-      "  Description: This classic hotel is fully-refurbished and ideally located on the main commercial artery of the city in the heart of New York. A few minutes away is Times Square and the historic centre of the city, as well as other places of interest that make New York one of America's most attractive and cosmopolitan cities.\n"
+      "\n"
      ]
     }
    ],
@@ -724,7 +721,7 @@
     "                \"HotelId\", \"HotelName\", \"Category\", \"Description\", \"Address/City\", \"Address/StateProvince\"\n",
     "            ],\n",
     "            facets=[\"Address/StateProvince\"],\n",
-    "            filter=\"geo.distance(Location, geography'POINT(-77.03241 38.90166)') le 500\",\n",
+    "            filter=\"geo.distance(Location, geography'POINT(-77.03241 38.90166)') le 300\",\n",
     "            vector_filter_mode=\"postFilter\",\n",
     "            vector_queries=[vector_query]\n",
     "        )\n",
@@ -754,20 +751,6 @@
     "## "
    ]
   },
-  {
-   "cell_type": "markdown",
-   "id": "7321f2e3",
-   "metadata": {},
-   "source": [
-    "# IMPORTANT\n",
-    "\n",
-    "I got an extra result in the example above ... compare with what you see here:\n",
-    "\n",
-    "[Single vector search with filter](https://learn.microsoft.com/en-us/azure/search/search-get-started-vector?tabs=keyless#single-vector-search-with-filter)\n",
-    "\n",
-    "Other than the extra result, the scores were identical!"
-   ]
-  },
   {
    "cell_type": "markdown",
    "id": "72013e57",
@@ -884,7 +867,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 55,
+   "execution_count": 66,
    "id": "d27d6bdb",
    "metadata": {},
    "outputs": [
@@ -893,44 +876,44 @@
      "output_type": "stream",
      "text": [
       "Total semantic hybrid results: 7\n",
-      "- Score: 0.0314980149269104\n",
-      "  Re-ranker Score: N/A\n",
+      "- Score: 0.03125\n",
+      "  Re-ranker Score: 2.2252650260925293\n",
       "  HotelId: 2\n",
       "  HotelName: Old Century Hotel\n",
       "  Description: The hotel is situated in a nineteenth century plaza, which has been expanded and renovated to the highest architectural standards to create a modern, functional and first-class hotel in which art and unique historical elements coexist with the most modern comforts. The hotel also regularly hosts events like wine tastings, beer dinners, and live music.\n",
       "  Category: Boutique\n",
-      "- Score: 0.03253968432545662\n",
-      "  Re-ranker Score: N/A\n",
+      "- Score: 0.0317460335791111\n",
+      "  Re-ranker Score: 2.073197841644287\n",
       "  HotelId: 49\n",
       "  HotelName: Swirling Currents Hotel\n",
       "  Description: Spacious rooms, glamorous suites and residences, rooftop pool, walking access to shopping, dining, entertainment and the city center. Each room comes equipped with a microwave, a coffee maker and a minifridge. In-room entertainment includes complimentary W-Fi and flat-screen TVs.\n",
       "  Category: Suite\n",
-      "- Score: 0.03229166567325592\n",
-      "  Re-ranker Score: N/A\n",
+      "- Score: 0.03279569745063782\n",
+      "  Re-ranker Score: 1.982808232307434\n",
       "  HotelId: 4\n",
       "  HotelName: Sublime Palace Hotel\n",
       "  Description: Sublime Palace Hotel is located in the heart of the historic center of Sublime in an extremely vibrant and lively area within short walking distance to the sites and landmarks of the city and is surrounded by the extraordinary beauty of churches, buildings, shops and monuments. Sublime Cliff is part of a lovingly restored 19th century resort, updated for every modern convenience.\n",
       "  Category: Boutique\n",
-      "- Score: 0.032522473484277725\n",
-      "  Re-ranker Score: N/A\n",
+      "- Score: 0.016393441706895828\n",
+      "  Re-ranker Score: 1.9773139953613281\n",
       "  HotelId: 1\n",
       "  HotelName: Stay-Kay City Hotel\n",
       "  Description: This classic hotel is fully-refurbished and ideally located on the main commercial artery of the city in the heart of New York. A few minutes away is Times Square and the historic centre of the city, as well as other places of interest that make New York one of America's most attractive and cosmopolitan cities.\n",
       "  Category: Boutique\n",
-      "- Score: 0.03154495730996132\n",
-      "  Re-ranker Score: N/A\n",
+      "- Score: 0.01515151560306549\n",
+      "  Re-ranker Score: 1.7511626482009888\n",
       "  HotelId: 3\n",
       "  HotelName: Gastronomic Landscape Hotel\n",
       "  Description: The Gastronomic Hotel stands out for its culinary excellence under the management of William Dough, who advises on and oversees all of the Hotel’s restaurant services.\n",
       "  Category: Suite\n",
-      "- Score: 0.015384615398943424\n",
-      "  Re-ranker Score: N/A\n",
+      "- Score: 0.03205128386616707\n",
+      "  Re-ranker Score: 1.6370235681533813\n",
       "  HotelId: 48\n",
       "  HotelName: Nordick's Valley Motel\n",
       "  Description: Only 90 miles (about 2 hours) from the nation's capital and nearby most everything the historic valley has to offer. Hiking? Wine Tasting? Exploring the caverns? It's all nearby and we have specially priced packages to help make our B&B your home base for fun while visiting the valley.\n",
       "  Category: Boutique\n",
-      "- Score: 0.016129031777381897\n",
-      "  Re-ranker Score: N/A\n",
+      "- Score: 0.032522473484277725\n",
+      "  Re-ranker Score: 1.3456499576568604\n",
       "  HotelId: 13\n",
       "  HotelName: Luxury Lion Resort\n",
       "  Description: Unmatched Luxury. Visit our downtown hotel to indulge in luxury accommodations. Moments from the stadium and transportation hubs, we feature the best in convenience and comfort.\n",
@@ -942,7 +925,7 @@
     "if semantic_hybrid_query_vector:\n",
     "    try:\n",
     "        vector_query = VectorizedQuery(\n",
-    "            vector=semantic_hybrid_query_vector,\n",
+    "            vector=vector,\n",
     "            k_nearest_neighbors=5,\n",
     "            fields=\"DescriptionVector\",\n",
     "            kind=\"vector\",\n",
@@ -965,7 +948,7 @@
     "        for result in results:\n",
     "            doc = result\n",
     "            score = result.get(\"@search.score\", \"N/A\")\n",
-    "            reranker_score = result.get(\"@search.rerankerScore\", \"N/A\")\n",
+    "            reranker_score = result.get(\"@search.reranker_score\", \"N/A\")\n",
     "            print(f\"- Score: {score}\")\n",
     "            print(f\"  Re-ranker Score: {reranker_score}\")\n",
     "            print(f\"  HotelId: {doc['HotelId']}\")\n",