Merge branch 'agentic-retrieval' of https://github.com/haileytap/azure-search-python-samples into agentic-retrieval

Author: haileytap

Quickstart-Semantic-Search/requirements.txt

@@ -0,0 +1,3 @@
+azure-identity
+dotenv
+azure-search-documents==11.6.0b12

Quickstart-Semantic-Search/sample.env

@@ -0,0 +1,2 @@
+AZURE_SEARCH_ENDPOINT=https://your-search-service.search.windows.net
+AZURE_SEARCH_INDEX_NAME=hotels-sample-index

Quickstart-Semantic-Search/semantic-search-quickstart.ipynb

@@ -0,0 +1,7 @@
+azure-ai-projects==1.0.0b11
+azure-ai-agents==1.0.0
+azure-identity
+aiohttp
+ipykernel
+dotenv
+azure-search-documents==11.6.0b12

Quickstart-Vector-Search/requirements.txt

@@ -0,0 +1,2 @@
+AZURE_SEARCH_ENDPOINT=https://your-search-service.search.windows.net
+AZURE_SEARCH_INDEX_NAME=vector-search-quickstart

Quickstart-Vector-Search/sample.env

@@ -44,4 +44,4 @@ This sample is a Jupyter Python3 .ipynb file to perform the actions against the
 
 ## Next steps
 
-You can learn more about Azure AI Search on the [official documentation site](https://docs.microsoft.com/azure/search).
+You can learn more about Azure AI Search on the [official documentation site](https://learn.microsoft.com/azure/search).

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

@@ -29,7 +29,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "! pip install azure-search-documents==11.6.0b1 --quiet\n",
+    "! pip install azure-search-documents==11.6.0b12 --quiet\n",
     "! pip install azure-identity --quiet\n",
     "! pip install python-dotenv --quiet"
    ]
@@ -43,7 +43,7 @@
     "# Provide variables\n",
     "search_endpoint: str = \"PUT-YOUR-SEARCH-ENDPOINT-HERE\"\n",
     "search_api_key: str = \"PUT-YOUR-SEARCH-API-KEY-HERE\"\n",
-    "index_name: str = \"hotels-quickstart\""
+    "index_name: str = \"hotels-quickstart-csharp\""
    ]
   },
   {
@@ -80,7 +80,6 @@
     "        SimpleField(name=\"HotelId\", type=SearchFieldDataType.String, key=True),\n",
     "        SearchableField(name=\"HotelName\", type=SearchFieldDataType.String, sortable=True),\n",
     "        SearchableField(name=\"Description\", type=SearchFieldDataType.String, analyzer_name=\"en.lucene\"),\n",
-    "        SearchableField(name=\"Description_fr\", type=SearchFieldDataType.String, analyzer_name=\"fr.lucene\"),\n",
     "        SearchableField(name=\"Category\", type=SearchFieldDataType.String, facetable=True, filterable=True, sortable=True),\n",
     "\n",
     "        SearchableField(name=\"Tags\", collection=True, type=SearchFieldDataType.String, facetable=True, filterable=True),\n",
@@ -126,13 +125,12 @@
     "    {\n",
     "    \"@search.action\": \"upload\",\n",
     "    \"HotelId\": \"1\",\n",
-    "    \"HotelName\": \"Secret Point Motel\",\n",
-    "    \"Description\": \"The hotel is ideally located on the main commercial artery of the city in the heart of New York. A few minutes away is Time's 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",
-    "    \"Description_fr\": \"L'hôtel est idéalement situé sur la principale artère commerciale de la ville en plein cœur de New York. A quelques minutes se trouve la place du temps et le centre historique de la ville, ainsi que d'autres lieux d'intérêt qui font de New York l'une des villes les plus attractives et cosmopolites de l'Amérique.\",\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",
-    "    \"Tags\": [ \"pool\", \"air conditioning\", \"concierge\" ],\n",
+    "    \"Tags\": [ \"view\", \"air conditioning\", \"concierge\" ],\n",
     "    \"ParkingIncluded\": \"false\",\n",
-    "    \"LastRenovationDate\": \"1970-01-18T00:00:00Z\",\n",
+    "    \"LastRenovationDate\": \"2020-01-18T00:00:00Z\",\n",
     "    \"Rating\": 3.60,\n",
     "    \"Address\": {\n",
     "        \"StreetAddress\": \"677 5th Ave\",\n",
@@ -145,13 +143,12 @@
     "    {\n",
     "    \"@search.action\": \"upload\",\n",
     "    \"HotelId\": \"2\",\n",
-    "    \"HotelName\": \"Twin Dome Motel\",\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.\",\n",
-    "    \"Description_fr\": \"L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.\",\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",
     "    \"Tags\": [ \"pool\", \"free wifi\", \"concierge\" ],\n",
     "    \"ParkingIncluded\": \"false\",\n",
-    "    \"LastRenovationDate\": \"1979-02-18T00:00:00Z\",\n",
+    "    \"LastRenovationDate\": \"2019-02-18T00:00:00Z\",\n",
     "    \"Rating\": 3.60,\n",
     "    \"Address\": {\n",
     "        \"StreetAddress\": \"140 University Town Center Dr\",\n",
@@ -164,11 +161,10 @@
     "    {\n",
     "    \"@search.action\": \"upload\",\n",
     "    \"HotelId\": \"3\",\n",
-    "    \"HotelName\": \"Triple Landscape Hotel\",\n",
-    "    \"Description\": \"The Hotel stands out for its gastronomic excellence under the management of William Dough, who advises on and oversees all of the Hotel's restaurant services.\",\n",
-    "    \"Description_fr\": \"L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.\",\n",
-    "    \"Category\": \"Resort and Spa\",\n",
-    "    \"Tags\": [ \"air conditioning\", \"bar\", \"continental breakfast\" ],\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",
+    "    \"Tags\": [ \"restaurant\", \"bar\", \"continental breakfast\" ],\n",
     "    \"ParkingIncluded\": \"true\",\n",
     "    \"LastRenovationDate\": \"2015-09-20T00:00:00Z\",\n",
     "    \"Rating\": 4.80,\n",
@@ -183,13 +179,12 @@
     "    {\n",
     "    \"@search.action\": \"upload\",\n",
     "    \"HotelId\": \"4\",\n",
-    "    \"HotelName\": \"Sublime Cliff Hotel\",\n",
-    "    \"Description\": \"Sublime Cliff 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 1800 palace.\",\n",
-    "    \"Description_fr\": \"Le sublime Cliff Hotel est situé au coeur du centre historique de sublime dans un quartier extrêmement animé et vivant, à courte distance de marche des sites et monuments de la ville et est entouré par l'extraordinaire beauté des églises, des bâtiments, des commerces et Monuments. Sublime Cliff fait partie d'un Palace 1800 restauré avec amour.\",\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",
-    "    \"Tags\": [ \"concierge\", \"view\", \"24-hour front desk service\" ],\n",
+    "    \"Tags\": [ \"concierge\", \"view\", \"air conditioning\" ],\n",
     "    \"ParkingIncluded\": \"true\",\n",
-    "    \"LastRenovationDate\": \"1960-02-06T00:00:00Z\",\n",
+    "    \"LastRenovationDate\": \"2020-02-06T00:00:00Z\",\n",
     "    \"Rating\": 4.60,\n",
     "    \"Address\": {\n",
     "        \"StreetAddress\": \"7400 San Pedro Ave\",\n",
@@ -245,13 +240,14 @@
     "# Run an empty query (returns selected fields, all documents)\n",
     "results =  search_client.search(query_type='simple',\n",
     "    search_text=\"*\" ,\n",
-    "    select='HotelName,Description',\n",
+    "    select='HotelName,Description,Tags',\n",
     "    include_total_count=True)\n",
     "\n",
     "print ('Total Documents Matching Query:', results.get_count())\n",
     "for result in results:\n",
     "    print(result[\"@search.score\"])\n",
     "    print(result[\"HotelName\"])\n",
+    "    print(result[\"Tags\"])\n",
     "    print(f\"Description: {result['Description']}\")\n"
    ]
   },
@@ -449,7 +445,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": ".venv",
    "language": "python",
    "name": "python3"
   },
@@ -463,12 +459,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
-  },
-  "vscode": {
-   "interpreter": {
-    "hash": "9ff083f0c83558f9261023d47a77b9b3eb892c62cdbe066d046abcad1a5edb5c"
-   }
+   "version": "3.10.12"
   }
  },
  "nbformat": 4,

Quickstart/README.md

@@ -90,14 +90,14 @@
     "\n",
     "# The following variables from your .env file are used in this notebook\n",
     "project_endpoint = os.environ[\"PROJECT_ENDPOINT\"]\n",
-    "agent_model = os.getenv(\"AGENT_MODEL\", \"gpt-4o-mini\")\n",
+    "agent_model = os.getenv(\"AGENT_MODEL\", \"gpt-4.1-mini\")\n",
     "endpoint = os.environ[\"AZURE_SEARCH_ENDPOINT\"]\n",
     "credential = DefaultAzureCredential()\n",
     "token_provider = get_bearer_token_provider(credential, \"https://search.azure.com/.default\")\n",
     "index_name = os.getenv(\"AZURE_SEARCH_INDEX\", \"earth_at_night\")\n",
     "azure_openai_endpoint = os.environ[\"AZURE_OPENAI_ENDPOINT\"]\n",
-    "azure_openai_gpt_deployment = os.getenv(\"AZURE_OPENAI_GPT_DEPLOYMENT\", \"gpt-4o-mini\")\n",
-    "azure_openai_gpt_model = os.getenv(\"AZURE_OPENAI_GPT_MODEL\", \"gpt-4o-mini\")\n",
+    "azure_openai_gpt_deployment = os.getenv(\"AZURE_OPENAI_GPT_DEPLOYMENT\", \"gpt-4.1-mini\")\n",
+    "azure_openai_gpt_model = os.getenv(\"AZURE_OPENAI_GPT_MODEL\", \"gpt-4.1-mini\")\n",
     "azure_openai_embedding_deployment = os.getenv(\"AZURE_OPENAI_EMBEDDING_DEPLOYMENT\", \"text-embedding-3-large\")\n",
     "azure_openai_embedding_model = os.getenv(\"AZURE_OPENAI_EMBEDDING_MODEL\", \"text-embedding-3-large\")\n",
     "agent_name = os.getenv(\"AZURE_SEARCH_AGENT_NAME\", \"earth-search-agent\")"

Quickstart/azure-search-quickstart.ipynb

@@ -1,5 +1,5 @@
 PROJECT_ENDPOINT=https://your-foundry-resource.services.ai.azure.com/api/projects/your-foundry-project
 AZURE_OPENAI_ENDPOINT=https://your-openai-service.openai.azure.com
-AZURE_OPENAI_GPT_DEPLOYMENT=gpt-4o-mini
+AZURE_OPENAI_GPT_DEPLOYMENT=gpt-4.1-mini
 AZURE_SEARCH_ENDPOINT=https://your-search-service.search.windows.net
 AZURE_SEARCH_INDEX_NAME=earth_at_night