Merge branch 'main' of https://github.com/nick863/get-started-with-ai-agents into nirovins/add_index

Author: nick863

.devcontainer/devcontainer.json

@@ -0,0 +1,24 @@
+{
+    "name": "azureai-basic-python",
+    "image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
+    "forwardPorts": [50505],
+    "features": {
+        "ghcr.io/azure/azure-dev/azd:latest": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-bicep",
+                "ms-python.python",
+                "ms-toolsai.jupyter",
+                "GitHub.vscode-github-actions"
+            ]
+        }
+    },
+    "postCreateCommand": "python3 -m pip install -r requirements-dev.txt && python3 -m pip install -e  src",
+    "remoteUser": "vscode",
+    "hostRequirements": {
+        "memory": "8gb"
+    }
+}

azure.yaml

@@ -43,6 +43,7 @@ pipeline:
     - USE_APPLICATION_INSIGHTS
     - USE_SEARCH_SERVICE
     - AZURE_AI_AGENT_NAME
+    - AZURE_AI_AGENT_ID
     - AZURE_AI_AGENT_DEPLOYMENT_NAME
     - AZURE_AI_AGENT_DEPLOYMENT_SKU
     - AZURE_AI_AGENT_DEPLOYMENT_CAPACITY

infra/api.bicep

@@ -15,6 +15,7 @@ param aiSearchIndexName string
 param embeddingDeploymentDimensions string
 param searchServiceEndpoint string
 param agentName string
+param agentID string
 
 resource apiIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   name: identityName
@@ -34,6 +35,10 @@ var env = [
     name: 'AZURE_AI_AGENT_NAME'
     value: agentName
   }
+  {
+    name: 'AZURE_AI_AGENT_ID'
+    value: agentID
+  }
   {
     name: 'AZURE_AI_AGENT_DEPLOYMENT_NAME'
     value: agentDeploymentName

infra/main.bicep

@@ -77,6 +77,8 @@ param principalId string = ''
 param agentModelFormat string
 @description('Name of agent to deploy')
 param agentName string
+@description('ID of agent to deploy')
+param aiAgentID string = ''
 @description('Name of the chat model to deploy')
 param agentModelName string
 @description('Name of the model deployment')
@@ -134,6 +136,8 @@ var resourceToken = toLower(uniqueString(subscription().id, environmentName, loc
 var projectName = !empty(aiProjectName) ? aiProjectName : 'ai-project-${resourceToken}'
 var tags = { 'azd-env-name': environmentName }
 
+var agentID = !empty(aiAgentID) ? aiAgentID : ''
+
 var aiDeployments = [
   {
     name: agentDeploymentName
@@ -296,6 +300,7 @@ module api 'api.bicep' = {
     embeddingDeploymentName: embeddingDeploymentName
     embeddingDeploymentDimensions: embeddingDeploymentDimensions
     agentName: agentName
+    agentID: agentID
     exists: apiAppExists
   }
 }
@@ -420,6 +425,7 @@ output AZURE_AI_SEARCH_INDEX_NAME string = aiSearchIndexName
 output AZURE_AI_SEARCH_ENDPOINT string = searchServiceEndpoint
 output AZURE_AI_EMBED_DIMENSIONS string = embeddingDeploymentDimensions
 output AZURE_AI_AGENT_NAME string = agentName
+output AZURE_AI_AGENT_ID string = agentID
 
 // Outputs required by azd for ACA
 output AZURE_CONTAINER_ENVIRONMENT_NAME string = containerApps.outputs.environmentName

infra/main.parameters.json

@@ -53,6 +53,9 @@
     "agentName": {
       "value": "${AZURE_AI_AGENT_NAME=agent-template-assistant}"
     },
+    "aiAgentID": {
+      "value": "${AZURE_AI_AGENT_ID}"
+    },
     "agentDeploymentName": {
       "value": "${AZURE_AI_AGENT_MODEL_NAME=gpt-4o-mini}"
     },