Merge pull request microsoft#80 from microsoft/updateContinerName

Update continer name

Author: Roopan-Microsoft

infra/deploy_ai_foundry.bicep

@@ -298,3 +298,5 @@ output storageAccountName string = storageNameCleaned
 
 output logAnalyticsId string = logAnalytics.id
 output storageAccountId string = storage.id
+
+output projectConnectionString string = '${split(aiHubProject.properties.discoveryUrl, '/')[2]};${subscription().subscriptionId};${resourceGroup().name};${aiHubProject.name}'

infra/main.bicep

@@ -36,7 +36,7 @@ param capacity int = 5
 var uniqueId = toLower(uniqueString(subscription().id, Prefix, resourceGroup().location))
 var UniquePrefix = 'cm${padLeft(take(uniqueId, 12), 12, '0')}'
 var ResourcePrefix = take('cm${Prefix}${UniquePrefix}', 15)
-var imageVersion = 'rc1' // Change to 'fnd01' when ready
+var imageVersion = 'fnd01'
 var location  = resourceGroup().location
 var dblocation  = resourceGroup().location
 var cosmosdbDatabase  = 'cmsadb'
@@ -341,6 +341,26 @@ resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
               name: 'TERMINATION_MODEL_DEPLOY'
               value: llmModel
             }
+            {
+              name: 'AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME'
+              value: llmModel
+            }
+            {
+              name: 'AZURE_AI_AGENT_PROJECT_NAME'
+              value: azureAifoundry.outputs.aiProjectName
+            }
+            {
+              name: 'AZURE_AI_AGENT_RESOURCE_GROUP_NAME'
+              value: resourceGroup().name
+            }
+            {
+              name: 'AZURE_AI_AGENT_SUBSCRIPTION_ID'
+              value: subscription().subscriptionId
+            }
+            {
+              name: 'AZURE_AI_AGENT_PROJECT_CONNECTION_STRING'
+              value: azureAifoundry.outputs.projectConnectionString
+            }
           ]
           resources: {
             cpu: 1
@@ -434,6 +454,22 @@ resource containers 'Microsoft.Storage/storageAccounts/blobServices/containers@2
   dependsOn: [azureAifoundry]
 }]
 
+resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' existing = {
+  name: '${ResourcePrefix}-prj' // aiProjectName must be calculated - available at main start.
+}
+
+resource aiDeveloper 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = {
+  name: '64702f94-c441-49e6-a78b-ef80e0188fee'
+}
+
+resource aiDeveloperAccessProj 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
+  name: guid(containerAppBackend.name, aiHubProject.id, aiDeveloper.id)
+  scope: aiHubProject
+  properties: {
+    roleDefinitionId: aiDeveloper.id
+    principalId: containerAppBackend.identity.principalId
+  }
+}
 
 resource contributorRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2021-06-15' existing = {
   name: '${databaseAccount.name}/00000000-0000-0000-0000-000000000002'

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.34.44.8038",
-      "templateHash": "1388245659062904286"
+      "templateHash": "8953208502938265930"
     }
   },
   "parameters": {
@@ -216,6 +216,26 @@
                 {
                   "name": "TERMINATION_MODEL_DEPLOY",
                   "value": "[variables('llmModel')]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME",
+                  "value": "[variables('llmModel')]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_PROJECT_NAME",
+                  "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiProjectName.value]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_RESOURCE_GROUP_NAME",
+                  "value": "[resourceGroup().name]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_SUBSCRIPTION_ID",
+                  "value": "[subscription().subscriptionId]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_PROJECT_CONNECTION_STRING",
+                  "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.projectConnectionString.value]"
                 }
               ],
               "resources": {
@@ -354,7 +374,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.34.44.8038",
-              "templateHash": "107965290127824528"
+              "templateHash": "17863870312619064541"
             }
           },
           "parameters": {
@@ -453,6 +473,8 @@
               "name": "bicep",
               "version": "0.34.44.8038",
               "templateHash": "10664495342911727649"
+              "version": "0.34.44.8038",
+              "templateHash": "10664495342911727649"
             }
           },
           "parameters": {
@@ -590,7 +612,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.34.44.8038",
-              "templateHash": "9573081501419024290"
+              "templateHash": "8087543237770345715"
             }
           },
           "parameters": {
@@ -939,6 +961,10 @@
             "storageAccountId": {
               "type": "string",
               "value": "[resourceId('Microsoft.Storage/storageAccounts', variables('storageNameCleaned'))]"
+            },
+            "projectConnectionString": {
+              "type": "string",
+              "value": "[format('{0};{1};{2};{3}', split(reference(resourceId('Microsoft.MachineLearningServices/workspaces', variables('aiProjectName')), '2024-01-01-preview').discoveryUrl, '/')[2], subscription().subscriptionId, resourceGroup().name, variables('aiProjectName'))]"
             }
           }
         }

src/backend/sql_agents/agents/semantic_verifier/prompt.txt

@@ -7,5 +7,6 @@
 - Do not hallucinate or assume any functionality that is not explicitly mentioned in the scripts.
 - Avoid using any first person language in any of the output.
 - You are allowed to make common sense assumptions about the backend data and the return types. of the sql queries.
-- If the scripts are not semantically equivalent, judgement would be 'Semantically Not Equivalent' and the differences would be listed in the 'differences' field.
-- If the scripts are semantically equivalent, judgement would be 'Semantically Equivalent' and the 'differences' field would be an empty list.
+- If the scripts are not semantically equivalent, judgement would be 'Semantically Not Equivalent' and the differences would be listed in the differences field.
+- If the scripts are semantically equivalent, judgement would be 'Semantically Equivalent' and the differences field would be an empty list.
+- Include a one sentence summary of your response at the end of each evaluation, in the summary field.

src/backend/sql_agents/agents/semantic_verifier/response.py

@@ -1,17 +1,13 @@
-from semantic_kernel.kernel_pydantic import KernelBaseModel
+"""SQL semantic verifier response models"""
+
+from semantic_kernel.kernel_pydantic import KernelBaseModel
 
 
 class SemanticVerifierResponse(KernelBaseModel):
     """
-    Response model for the semantic verifier agent
-    Args:
-        analysis (str): The analysis of the SQL query.
-        judgement (str): The judgement of the SQL query.
-        differences (list[str]): List of differences found in the SQL query.
-        summary (str): A one sentence summary of the response.
+    Model for the response of the semantic verifier agent
     """
 
-    analysis: str
     judgement: str
     differences: list[str]
     summary: str

src/backend/sql_agents/convert_script.py

@@ -4,6 +4,7 @@
 and updates the database with the results.
 """
 
+import asyncio
 import json
 import logging
 
@@ -65,6 +66,8 @@ async def convert_script(
         )
         carry_response = None
         async for response in chat.invoke():
+            # TEMPORARY: awaiting bug fix for rate limits
+            await asyncio.sleep(5)
             carry_response = response
             if response.role == AuthorRole.ASSISTANT.value:
                 # Our process can terminate with either of these as the last response
@@ -120,6 +123,9 @@ async def convert_script(
                         )
                         current_migration = result.fixed_query
                     case AgentType.SEMANTIC_VERIFIER.value:
+                        logger.info(
+                            "Semantic verifier agent response: %s", response.content
+                        )
                         result = SemanticVerifierResponse.model_validate_json(
                             response.content or ""
                         )

src/backend/sql_agents/process_batch.py

@@ -4,6 +4,7 @@
 It is the main entry point for the SQL migration process.
 """
 
+import asyncio
 import logging
 
 from azure.identity.aio import DefaultAzureCredential
@@ -124,6 +125,8 @@ async def process_batch_async(
                     )
                 else:
                     await batch_service.update_file_counts(file["file_id"])
+                # TEMPORARY: awaiting bug fix for rate limits
+                await asyncio.sleep(5)
             except UnicodeDecodeError as ucde:
                 logger.error("Error decoding file: %s", file)
                 logger.error("Error decoding file. %s", ucde)