Merge pull request #1 from Azure-Samples/creds

Change credentials approach

Author: pamelafox

.env.sample

@@ -0,0 +1,6 @@
+AZURE_OPENAI_SERVICE="SERVICE-NAME"
+AZURE_OPENAI_DEPLOYMENT_NAME=DEPLOYMENT-NAME
+AZURE_OPENAI_ADA_DEPLOYMENT=ADA-DEPLOYMENT
+AZURE_SEARCH_SERVICE=SEARCH-SERVICE-NAME
+AZURE_COMPUTERVISION_SERVICE=COMPUTERVISION-SERVICE-NAME
+AZURE_TENANT_ID=TENANT-ID

README.md

@@ -6,31 +6,26 @@ This repository contains many notebooks that explain how Azure AI Search works,
 
 1. Run `azd up` on [azure-search-openai-demo](https://github.com/Azure-Samples/azure-search-openai-demo/) with GPT-4-vision enabled. This will create the necessary resources for the Azure OpenAI, Azure AI Search services, and the Computer Vision service.
 
-2. Create a .env with these variables, and the values taken from `.azure/ENV-NAME/.env`
+2. Create a .env with these variables, with the values taken from `.azure/ENV-NAME/.env` in the azure-search-openai-demo repository.
 
     ```shell
     AZURE_OPENAI_SERVICE=YOUR-SERVICE-NAME
     AZURE_OPENAI_DEPLOYMENT_NAME=YOUR-OPENAI-DEPLOYMENT-NAME
     AZURE_OPENAI_ADA_DEPLOYMENT=YOUR-EMBED-DEPLOYMENT-NAME
     AZURE_SEARCH_SERVICE=YOUR-SEARCH-SERVICE-NAME
     AZURE_COMPUTERVISION_SERVICE=YOUR-COMPUTERVISION-SERVICE-NAME
+    AZURE_TENANT_ID=YOUR-TENANT-ID
     ```
 
-3. Login to your Azure account using either the Azure CLI or the Azure Developer CLI:
+3. Login to your Azure account using the Azure CLI. Specify `--tenant-id` if you deployed that repo to a non-default tenant.
 
     ```shell
     azd auth login
     ```
 
-4. If you deployed your resource group to a tenant other than your home tenant, set the tenant ID:
+4. Create a Python virtual environment or open the project in a container.
 
-    ```shell
-    export TENANT_ID=YOUR-TENANT-ID
-    ```
-
-5. Create a Python virtual environment or open the project in a container.
-
-6. Install the requirements:
+5. Install the requirements:
 
     ```shell
     pip install -r requirements.txt

azure_ai_search.ipynb

@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -31,7 +31,7 @@
     "AZURE_SEARCH_SERVICE = os.getenv(\"AZURE_SEARCH_SERVICE\")\n",
     "AZURE_SEARCH_ENDPOINT = f\"https://{AZURE_SEARCH_SERVICE}.search.windows.net\"\n",
     "\n",
-    "azure_credential = azure.identity.DefaultAzureCredential()\n",
+    "azure_credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv(\"AZURE_TENANT_ID\"))\n",
     "index_client = SearchIndexClient(endpoint=AZURE_SEARCH_ENDPOINT, credential=azure_credential)"
    ]
   },
@@ -46,16 +46,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "<azure.search.documents.indexes.models._index.SearchIndex at 0x114201090>"
+       "<azure.search.documents.indexes.models._index.SearchIndex at 0x138703b90>"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 2,
      "metadata": {},
      "output_type": "execute_result"
     }

image_search.ipynb

@@ -9,14 +9,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [],
    "source": [
     "import os\n",
     "\n",
     "import dotenv\n",
-    "from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
+    "from azure.identity import AzureDeveloperCliCredential, get_bearer_token_provider\n",
     "from azure.search.documents import SearchClient\n",
     "from azure.search.documents.indexes import SearchIndexClient\n",
     "from azure.search.documents.indexes.models import (\n",
@@ -36,8 +36,8 @@
     "\n",
     "AZURE_SEARCH_SERVICE = os.getenv(\"AZURE_SEARCH_SERVICE\")\n",
     "AZURE_SEARCH_ENDPOINT = f\"https://{AZURE_SEARCH_SERVICE}.search.windows.net\"\n",
-    "AZURE_SEARCH_IMAGES_INDEX = \"images-index\"\n",
-    "azure_credential = DefaultAzureCredential()\n",
+    "AZURE_SEARCH_IMAGES_INDEX = \"images-index4\"\n",
+    "azure_credential = AzureDeveloperCliCredential(tenant_id=os.getenv(\"AZURE_TENANT_ID\"))\n",
     "search_client = SearchClient(AZURE_SEARCH_ENDPOINT, AZURE_SEARCH_IMAGES_INDEX, credential=azure_credential)"
    ]
   },
@@ -50,16 +50,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "<azure.search.documents.indexes.models._index.SearchIndex at 0x120d3efd0>"
+       "<azure.search.documents.indexes.models._index.SearchIndex at 0x12c3ba910>"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 11,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -99,7 +99,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -124,7 +124,6 @@
     "    url = f\"{AZURE_COMPUTER_VISION_URL}:vectorizeImage\"\n",
     "    headers = get_auth_headers()\n",
     "    headers[\"Content-Type\"] = mimetype\n",
-    "    # add error checking\n",
     "    response = requests.post(url, headers=headers, params=get_model_params(), data=open(image_file, \"rb\"))\n",
     "    if response.status_code != 200:\n",
     "        print(image_file, response.status_code, response.json())\n",
@@ -145,7 +144,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -166,7 +165,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
@@ -177,7 +176,7 @@
        "<PIL.JpegImagePlugin.JpegImageFile image mode=RGB size=640x451>"
       ]
      },
-     "execution_count": 8,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -189,7 +188,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -213,7 +212,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [
     {
@@ -224,7 +223,7 @@
        "<PIL.JpegImagePlugin.JpegImageFile image mode=RGB size=640x433>"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 17,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -235,7 +234,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [
     {
@@ -259,7 +258,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
@@ -270,7 +269,7 @@
        "<PIL.JpegImagePlugin.JpegImageFile image mode=RGB size=640x404>"
       ]
      },
-     "execution_count": 12,
+     "execution_count": 19,
      "metadata": {},
      "output_type": "execute_result"
     }

rag.ipynb

@@ -16,7 +16,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -30,7 +30,7 @@
     "\n",
     "dotenv.load_dotenv()\n",
     "\n",
-    "azure_credential = azure.identity.DefaultAzureCredential()\n",
+    "azure_credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv(\"AZURE_TENANT_ID\"))\n",
     "\n",
     "# Initialize Azure OpenAI client\n",
     "AZURE_OPENAI_SERVICE = os.getenv(\"AZURE_OPENAI_SERVICE\")\n",
@@ -63,7 +63,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -84,14 +84,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "[role_library.pdf#page=29]:  The Manager of Product Management will collaborate with internal teams, such as engineering, sales, marketing, and finance, as well as external partners, suppliers, and customers to ensure successful product execution.\n",
+      "[role_library-28.png]: · Knowledge of industry trends, technologies, and regulations.\n",
+      "· Excellent communication and presentation skills.\n",
+      "Manager of Product Management\n",
+      "Job Title: Manager of Product Management, Contoso Electronics\n",
+      "Job Summary:\n",
+      "The Manager of Product Management is responsible for overseeing the product management team, driving product development and marketing strategy for Contoso Electronics. This individual will be accountable for the successful launch of new products and the implementation of product life-cycle management processes. The Manager of Product Management will collaborate with internal teams, such as engineering, sales, marketing, and finance, as well as external partners, suppliers, and customers to ensure successful product execution.\n",
       "Responsibilities:\n",
       "· Lead the product management team and provide guidance on product strategy, design, development, and launch.\n",
       "· Develop and implement product life-cycle management processes.\n",
@@ -107,9 +112,33 @@
       "· Bachelor's degree in business, engineering, or a related field.\n",
       "· At least 5 years of experience in product management.\n",
       "· Proven track record of successful product launches.\n",
+      "· Strong understanding of product life-cycle management processes.\n",
+      "· Excellent project management, organizational, and communication skills.\n",
+      ". Ability to work collaboratively with internal and external teams.\n",
+      "· Ability to analyze customer feedback and identify areas for improvement.\n",
+      "· Experience with market research, product marketing, and pricing strategies.\n",
+      "· Knowledge of budgeting and cost models.\n",
       "\n",
       "\n",
-      "[role_library.pdf#page=28]: \n",
+      "[role_library-28.png]:  The Manager of Product Management will collaborate with internal teams, such as engineering, sales, marketing, and finance, as well as external partners, suppliers, and customers to ensure successful product execution.\n",
+      "Responsibilities:\n",
+      "· Lead the product management team and provide guidance on product strategy, design, development, and launch.\n",
+      "· Develop and implement product life-cycle management processes.\n",
+      "· Monitor and analyze industry trends to identify opportunities for new products.\n",
+      "· Develop product marketing plans and go-to-market strategies.\n",
+      "· Research customer needs and develop customer-centric product roadmaps.\n",
+      "· Collaborate with internal teams to ensure product execution and successful launch.\n",
+      "· Develop pricing strategies and cost models.\n",
+      "· Oversee product portfolio and performance metrics.\n",
+      "· Manage product development budget.\n",
+      "· Analyze product performance and customer feedback to identify areas for improvement.\n",
+      "Qualifications:\n",
+      "· Bachelor's degree in business, engineering, or a related field.\n",
+      "· At least 5 years of experience in product management.\n",
+      "· Proven track record of successful product launches.\n",
+      "\n",
+      "\n",
+      "[role_library-27.png]: \n",
       "· 7+ years of experience in research and development in the electronics sector.\n",
       "· Proven track record of successfully designing, testing, and optimizing products.\n",
       "· Experience leading a team of researchers and engineers.\n",
@@ -122,7 +151,7 @@
       "The Manager of Product Management is responsible for overseeing the product management team, driving product development and marketing strategy for Contoso Electronics. This individual will be accountable for the successful launch of new products and the implementation of product life-cycle management processes. The Manager of Product Management will collaborate with internal teams, such as engineering, sales, marketing, and finance, as well as external partners, suppliers, and customers to ensure successful product execution.\n",
       "\n",
       "\n",
-      "[role_library.pdf#page=23]: Company: Contoso Electronics\n",
+      "[role_library-22.png]: Company: Contoso Electronics\n",
       "Location: Anywhere\n",
       "Job Type: Full-Time\n",
       "Salary: Competitive, commensurate with experience\n",
@@ -138,7 +167,7 @@
       "· Establish and maintain relationships with key customers, partners, and vendors.\n",
       "\n",
       "\n",
-      "[role_library.pdf#page=11]: \n",
+      "[role_library-10.png]: \n",
       "· Proven track record of successful product launches.\n",
       "· Excellent organizational and project management skills.\n",
       "· Ability to work independently and effectively in a fast-paced environment.\n",
@@ -155,22 +184,6 @@
       "Responsibilities:\n",
       "· Lead and manage the product management team, including setting team goals and objectives, hiring, training, and developing team members, and evaluating performance\n",
       "· Develop and \n",
-      "\n",
-      "\n",
-      "[role_library.pdf#page=12]: \n",
-      "Responsibilities:\n",
-      "· Lead and manage the product management team, including setting team goals and objectives, hiring, training, and developing team members, and evaluating performance\n",
-      "· Develop and maintain a long-term product strategy, roadmap and vision for Contoso Electronics products\n",
-      "· Drive product innovation, identify new product opportunities, and assess market and customer needs\n",
-      ". Act as the primary liaison between the business and technical teams, ensuring that product plans are translated into successful products\n",
-      ". Manage the product life cycle from concept through product launch and post-launch support\n",
-      "· Ensure product quality and customer satisfaction by developing product requirements and testing plans\n",
-      "· Monitor and report on product performance, sales, and customer feedback\n",
-      "· Collaborate with stakeholders, customers, and other partners to develop product enhancements\n",
-      "Qualifications:\n",
-      "· Bachelor's degree in engineering, business, marketing, or related field\n",
-      "· 10+ years of experience in product management, product engineering, product marketing, or related field\n",
-      "· Proven ability to lead product innovation, develop and execute product strategy, and manage products \n",
       "\n"
      ]
     }
@@ -198,14 +211,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "A product manager is responsible for overseeing the product management team, driving product development and marketing strategy, developing product life-cycle management processes, researching customer needs, collaborating with internal teams, developing pricing strategies, analyzing product performance, and identifying areas for improvement. They should have a bachelor's degree in business, engineering, or a related field, at least 5 years of experience in product management, and a proven track record of successful product launches. [role_library.pdf#page=29, role_library.pdf#page=28, role_library.pdf#page=23, role_library.pdf#page=11]\n"
+      "A product manager is responsible for overseeing the product management team, driving product development and marketing strategy, and ensuring successful product execution [role_library-28.png]. They collaborate with internal teams such as engineering, sales, marketing, and finance, as well as external partners, suppliers, and customers [role_library-28.png]. They develop and implement product life-cycle management processes, monitor industry trends, develop product marketing plans and go-to-market strategies, research customer needs, collaborate with internal teams, develop pricing strategies and cost models, oversee product portfolio and performance metrics, manage product development budget, and analyze product performance and customer feedback [role_library-28.png]. They should have a bachelor's degree in business, engineering, or a related field and at least 5 years of experience in product management with a proven track record of successful product launches [role_library-28.png]. They should also have excellent project management, organizational, communication, problem-solving, and analytical skills [role_library-28.png][role_library-27.png][role_library-10.png].\n"
      ]
     }
    ],