Merge branch 'dev' into dependabotchanges

Author: Roopan-Microsoft

.devcontainer/setup_env.sh

@@ -7,5 +7,3 @@ git pull
 sudo chmod +x ./infra/scripts/checkquota_km.sh
 sudo chmod +x ./infra/scripts/quota_check_params.sh
 sudo chmod +x ./infra/scripts/run_process_data_scripts.sh
-sudo chmod +x ./infra/scripts/docker-build.sh
-sudo chmod +x ./infra/scripts/docker-build.ps1

.github/workflows/deploy-KMGeneric.yml

@@ -14,7 +14,7 @@ on:
 env:
   GPT_MIN_CAPACITY: 150
   TEXT_EMBEDDING_MIN_CAPACITY: 80
-  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+  BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -112,15 +112,19 @@ jobs:
           echo "Generated SOLUTION_PREFIX: ${UNIQUE_SOLUTION_PREFIX}" 
       - name: Determine Tag Name Based on Branch
         id: determine_tag
-        run: echo "tagname=${{ github.ref_name == 'main' && 'latest_fdp' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}" >> $GITHUB_OUTPUT
+        run: echo "tagname=${{ github.ref_name == 'main' && 'latest_waf' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || github.ref_name == 'dependabotchanges' && 'dependabotchanges' || 'latest_waf' }}" >> $GITHUB_OUTPUT
       - name: Deploy Bicep Template
         id: deploy
         run: |
           set -e
+
+          # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
+            current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
+          
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
-            --parameters environmentName=${{env.SOLUTION_PREFIX}} contentUnderstandingLocation="swedencentral" secondaryLocation="${{ env.AZURE_LOCATION }}" imageTag=${{ steps.determine_tag.outputs.tagname }} gptDeploymentCapacity=150 aiDeploymentsLocation="${{ env.AZURE_LOCATION }}"
+            --parameters solutionName=${{env.SOLUTION_PREFIX}} location="${{ env.AZURE_LOCATION }}" contentUnderstandingLocation="swedencentral" secondaryLocation="${{ env.AZURE_LOCATION }}" gptDeploymentCapacity=150 aiServiceLocation="${{ env.AZURE_LOCATION }}" createdBy="Pipeline" tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
 
      
 

.github/workflows/docker-build.yml

@@ -49,7 +49,7 @@ jobs:
         id: determine_tag
         run: |
          if [[ "${{ github.ref_name }}" == "main" ]]; then
-          echo "tagname=latest_fdp" >> $GITHUB_OUTPUT
+          echo "tagname=latest_waf" >> $GITHUB_OUTPUT
          elif [[ "${{ github.ref_name }}" == "dev" ]]; then
           echo "tagname=dev" >> $GITHUB_OUTPUT
          elif [[ "${{ github.ref_name }}" == "demo" ]]; then

azure.yaml

@@ -7,7 +7,7 @@ environment:
 name: conversation-knowledge-mining
 
 requiredVersions:
-  azd: ">= 1.15.0"
+  azd: ">= 1.18.0"
 
 metadata:
   template: [email protected]

docs/workshop/docs/workshop/Challenge-3-and-4/knowledge_mining_api.ipynb

@@ -28,7 +28,7 @@
     "import pyodbc\n",
     "from dotenv import load_dotenv\n",
     "\n",
-    "from azure.identity.aio import DefaultAzureCredential, get_bearer_token_provider\n",
+    "from azure.identity.aio import AzureCliCredential, get_bearer_token_provider\n",
     "from azure.ai.agents.models import TruncationObject\n",
     "\n",
     "from semantic_kernel.functions.kernel_function_decorator import kernel_function\n",
@@ -61,7 +61,7 @@
     "    mid_id = os.getenv(\"SQLDB_USER_MID\")\n",
     "\n",
     "    try:\n",
-    "        async with DefaultAzureCredential() as credential:\n",
+    "        async with AzureCliCredential() as credential:\n",
     "            token = await credential.get_token(\"https://database.windows.net/.default\")\n",
     "            token_bytes = token.token.encode(\"utf-16-LE\")\n",
     "            token_struct = struct.pack(\n",
@@ -128,7 +128,7 @@
     "\n",
     "        try:\n",
     "            token_provider = get_bearer_token_provider(\n",
-    "                DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
+    "                AzureCliCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
     "            )\n",
     "            token = await token_provider()\n",
     "            client = openai.AzureOpenAI(\n",
@@ -175,7 +175,7 @@
     "                    Only return the generated SQL query. Do not return anything else.'''\n",
     "            \n",
     "            token_provider = get_bearer_token_provider(\n",
-    "                DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
+    "                AzureCliCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
     "            )\n",
     "            token = await token_provider()\n",
     "            client = openai.AzureOpenAI(\n",
@@ -212,7 +212,7 @@
     "    ):\n",
     "        try:\n",
     "            token_provider = get_bearer_token_provider(\n",
-    "                DefaultAzureCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
+    "                AzureCliCredential(), \"https://cognitiveservices.azure.com/.default\"\n",
     "            )\n",
     "            token = await token_provider()\n",
     "            client = openai.AzureOpenAI(\n",
@@ -313,7 +313,7 @@
     "async def main() -> None:\n",
     "    ai_agent_settings = AzureAIAgentSettings()\n",
     "    async with (\n",
-    "        DefaultAzureCredential() as creds,\n",
+    "        AzureCliCredential() as creds,\n",
     "        AzureAIAgent.create_client(credential=creds, endpoint=ai_agent_settings.endpoint) as client,\n",
     "    ):\n",
     "        AGENT_INSTRUCTIONS = '''You are a helpful assistant.\n",

docs/workshop/docs/workshop/Challenge-5/notebooks/video_chapter_generation.ipynb

@@ -117,8 +117,8 @@
     ")\n",
     "from python.content_understanding_client import AzureContentUnderstandingClient\n",
     "\n",
-    "from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
-    "credential = DefaultAzureCredential()\n",
+    "from azure.identity import AzureCliCredential, get_bearer_token_provider\n",
+    "credential = AzureCliCredential()\n",
     "token_provider = get_bearer_token_provider(credential, AUTHENTICATION_URL)\n",
     "\n",
     "# The analyzer template is used to define the schema of the output\n",

docs/workshop/docs/workshop/Challenge-5/notebooks/video_tag_generation.ipynb

@@ -117,8 +117,8 @@
     ")\n",
     "from python.content_understanding_client import AzureContentUnderstandingClient\n",
     "\n",
-    "from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
-    "credential = DefaultAzureCredential()\n",
+    "from azure.identity import AzureCliCredential, get_bearer_token_provider\n",
+    "credential = AzureCliCredential()\n",
     "token_provider = get_bearer_token_provider(credential, AUTHENTICATION_URL)\n",
     "\n",
     "# The analyzer template is used to define the schema of the output\n",

docs/workshop/docs/workshop/Challenge-5/python/content_understanding_client.py

@@ -32,13 +32,13 @@ def __init__(
         )
 
     def _get_analyzer_url(self, endpoint, api_version, analyzer_id):
-        return f"{endpoint}/contentunderstanding/analyzers/{analyzer_id}?api-version={api_version}"  # noqa
+        return f"{endpoint}/contentunderstanding/analyzers/{analyzer_id}?api-version={api_version}"
 
     def _get_analyzer_list_url(self, endpoint, api_version):
         return f"{endpoint}/contentunderstanding/analyzers?api-version={api_version}"
 
     def _get_analyze_url(self, endpoint, api_version, analyzer_id):
-        return f"{endpoint}/contentunderstanding/analyzers/{analyzer_id}:analyze?api-version={api_version}"  # noqa
+        return f"{endpoint}/contentunderstanding/analyzers/{analyzer_id}:analyze?api-version={api_version}"
 
     def _get_training_data_config(
         self, storage_container_sas_url, storage_container_path_prefix
@@ -143,7 +143,7 @@ def begin_create_analyzer(
         if (
             training_storage_container_sas_url
             and training_storage_container_path_prefix
-        ):  # noqa
+        ):
             analyzer_template["trainingData"] = self._get_training_data_config(
                 training_storage_container_sas_url,
                 training_storage_container_path_prefix,

docs/workshop/docs/workshop/Challenge-5/python/utility.py

@@ -5,7 +5,7 @@
 
 from openai import AzureOpenAI
 import tiktoken
-from azure.identity import DefaultAzureCredential, get_bearer_token_provider
+from azure.identity import AzureCliCredential, get_bearer_token_provider
 from tenacity import retry, wait_random_exponential, stop_after_attempt
 from pydantic import BaseModel, Field
 
@@ -158,7 +158,7 @@ def __init__(
         if aoai_api_key is None or aoai_api_key == "":
             print("Using Entra ID/AAD to authenticate")
             token_provider = get_bearer_token_provider(
-                DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
+                AzureCliCredential(), "https://cognitiveservices.azure.com/.default"
             )
 
             self.client = AzureOpenAI(

docs/workshop/docs/workshop/Challenge-6/Content_safety_evaluation.ipynb

@@ -36,7 +36,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from azure.identity import DefaultAzureCredential\n",
+    "from azure.identity import AzureCliCredential\n",
     "\n",
     "azure_ai_project = {\n",
     "    \"subscription_id\": os.environ.get(\"AZURE_SUBSCRIPTION_ID\"),\n",
@@ -122,8 +122,8 @@
    "outputs": [],
    "source": [
     "from azure.ai.evaluation.simulator import AdversarialScenario\n",
-    "from azure.identity import DefaultAzureCredential\n",
-    "credential = DefaultAzureCredential()\n",
+    "from azure.identity import AzureCliCredential\n",
+    "credential = AzureCliCredential()\n",
     "\n",
     "scenario = AdversarialScenario.ADVERSARIAL_QA\n",
     "adversarial_simulator = AdversarialSimulator(azure_ai_project=azure_ai_project, credential=credential)\n",
@@ -150,7 +150,7 @@
     "from azure.ai.evaluation import ContentSafetyEvaluator\n",
     "import pandas as pd\n",
     "\n",
-    "credential = DefaultAzureCredential()\n",
+    "credential = AzureCliCredential()\n",
     "# instantiate an evaluator with image and multi-modal support\n",
     "safety_evaluator = ContentSafetyEvaluator(credential=credential, azure_ai_project=azure_ai_project)\n",
     "\n",