Merge branch 'feature/azd-semantickernel' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into feature/azd-semantickernel

Author: gpickett

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

@@ -1,14 +1,13 @@
 @description('Location for all resources.')
-param location string //Fixed for model availability, change back to resourceGroup().location
-
+param location string = 'EastUS2' //Fixed for model availability, change back to resourceGroup().location
 
 @description('Location for OpenAI resources.')
 param azureOpenAILocation string = 'japaneast' //Fixed for model availability
 
 
 
 @description('A prefix to add to the start of all resource names. Note: A "unique" suffix will also be added')
-param prefix string = take('macaeo-${uniqueString(resourceGroup().id)}', 10)
+param prefix string = 'macaeo'
 
 @description('Tags to apply to all deployed resources')
 param tags object = {}
@@ -31,7 +30,7 @@ param resourceSize {
     maxReplicas: 1
   }
 }
-param capacity int = 1
+param capacity int = 10
 
 
 var modelVersion = '2024-08-06'
@@ -142,33 +141,6 @@ module aifoundry 'deploy_ai_foundry.bicep' = {
   }
   scope: resourceGroup(resourceGroup().name)
 }
-// resource openai 'Microsoft.CognitiveServices/accounts@2023-10-01-preview' = {
-//   name: format(uniqueNameFormat, 'openai')
-//   location: azureOpenAILocation
-//   tags: tags
-//   kind: 'OpenAI'
-//   sku: {
-//     name: 'S0'
-//   }
-//   properties: {
-//     customSubDomainName: format(uniqueNameFormat, 'openai')
-//   }
-//   resource gpt4o 'deployments' = {
-//     name: 'gpt-4o'
-//     sku: {
-//       name: 'GlobalStandard'
-//       capacity: resourceSize.gpt4oCapacity
-//     }
-//     properties: {
-//       model: {
-//         format: 'OpenAI'
-//         name: gptModelVersion
-//         version: '2024-08-06'
-//       }
-//       versionUpgradeOption: 'NoAutoUpgrade'
-//     }
-//   }
-// }
 
 resource aoaiUserRoleDefinition 'Microsoft.Authorization/roleDefinitions@2022-05-01-preview' existing = {
   name: '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd' //'Cognitive Services OpenAI User'
@@ -339,6 +311,10 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
               name: 'AZURE_OPENAI_ENDPOINT'
               value: aiServices.properties.endpoint
             }
+            {
+              name: 'AZURE_OPENAI_MODEL_NAME'
+              value: gptModelVersion
+            }
             {
               name: 'AZURE_OPENAI_DEPLOYMENT_NAME'
               value: gptModelVersion
@@ -348,13 +324,34 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
               value: aoaiApiVersion
             }
             {
-              name: 'FRONTEND_SITE_NAME'
-              value: 'https://${format(uniqueNameFormat, 'frontend')}.azurewebsites.net'
+              name: 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY'
+              value: appInsights.properties.InstrumentationKey
             }
             {
               name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
               value: appInsights.properties.ConnectionString
             }
+            {
+              name: 'AZURE_AI_AGENT_PROJECT_CONNECTION_STRING'
+              value: aifoundry.outputs.projectConnectionString
+            }
+            {
+              name: 'AZURE_AI_SUBSCRIPTION_ID'
+              value: subscription().subscriptionId
+            }
+            {
+              name: 'AZURE_AI_RESOURCE_GROUP'
+              value: resourceGroup().name
+            }
+            {
+              name: 'AZURE_AI_PROJECT_NAME'
+              value: aifoundry.outputs.aiProjectName
+            }
+            {
+              name: 'FRONTEND_SITE_NAME'
+              value: 'https://${format(uniqueNameFormat, 'frontend')}.azurewebsites.net'
+            }
+
           ]
         }
       ]
@@ -417,6 +414,23 @@ resource frontendAppService 'Microsoft.Web/sites@2021-02-01' = {
   }
 }
 
+resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' existing = {
+  name: '${prefix}-aiproject' // 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(containerApp.name, aiHubProject.id, aiDeveloper.id)
+  scope: aiHubProject
+  properties: {
+    roleDefinitionId: aiDeveloper.id
+    principalId: containerApp.identity.principalId
+  }
+}
+
 var cosmosAssignCli  = 'az cosmosdb sql role assignment create --resource-group "${resourceGroup().name}" --account-name "${cosmos.name}" --role-definition-id "${cosmos::contributorRoleDefinition.id}" --scope "${cosmos.id}" --principal-id "${containerApp.identity.principalId}"'
 
 module managedIdentityModule 'deploy_managed_identity.bicep' = {

src/backend/app_config.py

@@ -219,7 +219,10 @@ async def create_azure_ai_agent(
                     tool_definitions = tools
 
             # Create the agent using the project client
-            logging.info("Creating agent '%s' with model '%s'", agent_name, self.AZURE_OPENAI_DEPLOYMENT_NAME)
+            if response_format is not None:
+                logging.info("Response format provided: %s", response_format)
+
+                
             agent_definition = await project_client.agents.create_agent(
                 model=self.AZURE_OPENAI_DEPLOYMENT_NAME,
                 name=agent_name,

src/backend/app_kernel.py

@@ -144,25 +144,6 @@ async def input_task_endpoint(input_task: InputTask, request: Request):
 
         print(f"Plan: {plan}")
 
-        if not plan or not plan.id:
-            # If plan not found by session, try to extract plan ID from result
-            plan_id_match = re.search(r"Plan '([^']+)'", result)
-            
-            if plan_id_match:
-                plan_id = plan_id_match.group(1)
-                plan = await memory_store.get_plan(plan_id)
-            
-            # If still no plan found, handle the failure
-            if not plan or not plan.id:
-                track_event_if_configured(
-                    "PlanCreationFailed", 
-                    {
-                        "session_id": input_task.session_id,
-                        "description": input_task.description,
-                    }
-                )
-                raise HTTPException(status_code=400, detail="Error: Failed to create plan")
-        
         # Log custom event for successful input task processing
         track_event_if_configured(
             "InputTaskProcessed",

src/backend/event_utils.py

@@ -4,8 +4,24 @@
 
 
 def track_event_if_configured(event_name: str, event_data: dict):
-    instrumentation_key = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
-    if instrumentation_key:
-        track_event(event_name, event_data)
-    else:
-        logging.warning(f"Skipping track_event for {event_name} as Application Insights is not configured")
+    """Track an event if Application Insights is configured.
+    
+    This function safely wraps the Azure Monitor track_event function
+    to handle potential errors with the ProxyLogger.
+    
+    Args:
+        event_name: The name of the event to track
+        event_data: Dictionary of event data/dimensions
+    """
+    try:
+        instrumentation_key = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
+        if instrumentation_key:
+            track_event(event_name, event_data)
+        # else:
+        #     logging.warning(f"Skipping track_event for {event_name} as Application Insights is not configured")
+    except AttributeError as e:
+        # Handle the 'ProxyLogger' object has no attribute 'resource' error
+        logging.warning(f"ProxyLogger error in track_event: {e}")
+    except Exception as e:
+        # Catch any other exceptions to prevent them from bubbling up
+        logging.warning(f"Error in track_event: {e}")

src/backend/kernel_agents/agent_base.py

@@ -110,8 +110,6 @@ def __init__(
         # Required properties for AgentGroupChat compatibility
         self.name = agent_name  # This is crucial for AgentGroupChat to identify agents
 
-        # Log initialization
-        logging.info(f"Initialized {agent_name} with {len(self._tools)} tools")
 
         # Register the handler functions
         self._register_functions()
@@ -541,11 +539,6 @@ def get_tools_from_config(cls, kernel: sk.Kernel, agent_type: str, config_path:
             except Exception as e:
                 logging.error(f"Failed to create tool '{tool.get('name', 'unknown')}': {str(e)}")
 
-        # Log the total number of tools created
-        if kernel_functions:
-            logging.info(f"Created {len(kernel_functions)} tools for agent type '{agent_type}'")
-        else:
-            logging.info(f"No tools were successfully created for agent type '{agent_type}'")
 
         return kernel_functions