Merge branch 'dev' into feature/dev-localauthchanges

Author: Abdul-Microsoft

.flake8

@@ -1,5 +1,5 @@
 [flake8]
 max-line-length = 88
 extend-ignore = E501
-exclude = .venv, frontend
+exclude = .venv, frontend, src/backend/tests
 ignore = E203, W503, G004, G200, E402

.github/workflows/deploy.yml

@@ -168,34 +168,6 @@ jobs:
             echo "Azure Container Registry name: ${acr_name}"
           fi
 
-      
-      - name: Build the image and update the container app
-        id: build-and-update
-        run: |
-
-          set -e
-          # Define variables for acr and container app names
-          acr_name="${{ env.ACR_NAME }}"
-          echo "ACR name: {$acr_name}"
-          backend_container_app_name="macae-backend"
-          backend_build_image_tag="backend:latest"
-
-          echo "Building the container image..."
-          # Build the image
-          az acr build -r ${acr_name} -t ${backend_build_image_tag} ./src/backend
-          echo "Backend image build completed successfully."
-
-          frontend_container_app_name="${{ env.APP_SERVICE_NAME }}"
-          frontend_build_image_tag="frontend:latest"
-
-          echo "Building the container image..."
-          # Build the image
-          az acr build -r ${acr_name} -t ${frontend_build_image_tag} ./src/frontend
-          echo "Frontend image build completed successfully."
-
-          # Add the new container to the website
-          az webapp config container set --resource-group ${{ env.RESOURCE_GROUP_NAME }} --name ${frontend_container_app_name} --container-image-name ${acr_name}.azurecr.io/frontend:latest --container-registry-url https://${acr_name}.azurecr.io
-                  
           
       - name: Delete Bicep Deployment
         if: success()

infra/scripts/checkquota.sh

@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# List of Azure regions to check for quota (update as needed)
+IFS=', ' read -ra REGIONS <<< "$AZURE_REGIONS"
+
+SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}"
+GPT_MIN_CAPACITY="${GPT_MIN_CAPACITY}"
+AZURE_CLIENT_ID="${AZURE_CLIENT_ID}"
+AZURE_TENANT_ID="${AZURE_TENANT_ID}"
+AZURE_CLIENT_SECRET="${AZURE_CLIENT_SECRET}"
+
+# Authenticate using Managed Identity
+echo "Authentication using Managed Identity..."
+if ! az login --service-principal -u "$AZURE_CLIENT_ID" -p "$AZURE_CLIENT_SECRET" --tenant "$AZURE_TENANT_ID"; then
+   echo "❌ Error: Failed to login using Managed Identity."
+   exit 1
+fi
+
+echo "🔄 Validating required environment variables..."
+if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" || -z "$REGIONS" ]]; then
+    echo "❌ ERROR: Missing required environment variables."
+    exit 1
+fi
+
+echo "🔄 Setting Azure subscription..."
+if ! az account set --subscription "$SUBSCRIPTION_ID"; then
+    echo "❌ ERROR: Invalid subscription ID or insufficient permissions."
+    exit 1
+fi
+echo "✅ Azure subscription set successfully."
+
+# Define models and their minimum required capacities
+declare -A MIN_CAPACITY=(
+    ["OpenAI.GlobalStandard.gpt-4o"]=$GPT_MIN_CAPACITY
+)
+
+VALID_REGION=""
+for REGION in "${REGIONS[@]}"; do
+    echo "----------------------------------------"
+    echo "🔍 Checking region: $REGION"
+
+    QUOTA_INFO=$(az cognitiveservices usage list --location "$REGION" --output json)
+    if [ -z "$QUOTA_INFO" ]; then
+        echo "⚠️ WARNING: Failed to retrieve quota for region $REGION. Skipping."
+        continue
+    fi
+
+    INSUFFICIENT_QUOTA=false
+    for MODEL in "${!MIN_CAPACITY[@]}"; do
+        MODEL_INFO=$(echo "$QUOTA_INFO" | awk -v model="\"value\": \"$MODEL\"" '
+            BEGIN { RS="},"; FS="," }
+            $0 ~ model { print $0 }
+        ')
+
+        if [ -z "$MODEL_INFO" ]; then
+            echo "⚠️ WARNING: No quota information found for model: $MODEL in $REGION. Skipping."
+            continue
+        fi
+
+        CURRENT_VALUE=$(echo "$MODEL_INFO" | awk -F': ' '/"currentValue"/ {print $2}' | tr -d ',' | tr -d ' ')
+        LIMIT=$(echo "$MODEL_INFO" | awk -F': ' '/"limit"/ {print $2}' | tr -d ',' | tr -d ' ')
+
+        CURRENT_VALUE=${CURRENT_VALUE:-0}
+        LIMIT=${LIMIT:-0}
+
+        CURRENT_VALUE=$(echo "$CURRENT_VALUE" | cut -d'.' -f1)
+        LIMIT=$(echo "$LIMIT" | cut -d'.' -f1)
+
+        AVAILABLE=$((LIMIT - CURRENT_VALUE))
+
+        echo "✅ Model: $MODEL | Used: $CURRENT_VALUE | Limit: $LIMIT | Available: $AVAILABLE"
+
+        if [ "$AVAILABLE" -lt "${MIN_CAPACITY[$MODEL]}" ]; then
+            echo "❌ ERROR: $MODEL in $REGION has insufficient quota."
+            INSUFFICIENT_QUOTA=true
+            break
+        fi
+    done
+
+    if [ "$INSUFFICIENT_QUOTA" = false ]; then
+        VALID_REGION="$REGION"
+        break
+    fi
+
+done
+
+if [ -z "$VALID_REGION" ]; then
+    echo "❌ No region with sufficient quota found. Blocking deployment."
+    echo "QUOTA_FAILED=true" >> "$GITHUB_ENV"
+    exit 0
+else
+    echo "✅ Final Region: $VALID_REGION"
+    echo "VALID_REGION=$VALID_REGION" >> "$GITHUB_ENV"
+    exit 0
+fi

src/backend/app_config.py

@@ -1,13 +1,12 @@
 # app_config.py
 import os
 import logging
-from typing import Optional, List, Dict, Any
+from typing import Optional, List
 from dotenv import load_dotenv
-from azure.identity import DefaultAzureCredential, ClientSecretCredential
+from azure.identity import DefaultAzureCredential
 from azure.cosmos.aio import CosmosClient
 from azure.ai.projects.aio import AIProjectClient
 from semantic_kernel.kernel import Kernel
-from semantic_kernel.contents import ChatHistory
 from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
 from semantic_kernel.functions import KernelFunction
 

src/backend/app_kernel.py

@@ -1,21 +1,15 @@
 # app_kernel.py
 import asyncio
-import json
 import logging
-import os
-import re
 import uuid
-from typing import Any, Dict, List, Optional
+from typing import Dict, List, Optional
 
 # Semantic Kernel imports
-import semantic_kernel as sk
 from app_config import config
 from auth.auth_utils import get_authenticated_user_details
 
 # Azure monitoring
-from azure.monitor.opentelemetry import configure_azure_monitor
 from config_kernel import Config
-from context.cosmos_memory_kernel import CosmosMemoryContext
 from event_utils import track_event_if_configured
 
 # FastAPI imports
@@ -26,21 +20,17 @@
 # Local imports
 from middleware.health_check import HealthCheckMiddleware
 from models.messages_kernel import (
-    ActionRequest,
-    ActionResponse,
     AgentMessage,
     AgentType,
     HumanClarification,
     HumanFeedback,
     InputTask,
-    Plan,
     PlanWithSteps,
     Step,
 )
 
 # Updated import for KernelArguments
-from semantic_kernel.functions.kernel_arguments import KernelArguments
-from utils_kernel import get_agents, initialize_runtime_and_context, rai_success
+from utils_kernel import initialize_runtime_and_context, rai_success
 
 # # Check if the Application Insights Instrumentation Key is set in the environment variables
 # connection_string = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")

src/backend/config_kernel.py

@@ -1,18 +1,3 @@
-# config_kernel.py
-import os
-import logging
-import semantic_kernel as sk
-from semantic_kernel.kernel import Kernel
-
-# Updated imports for compatibility
-try:
-    # Try newer structure
-    from semantic_kernel.contents import ChatHistory
-except ImportError:
-    # Fall back to older structure for compatibility
-    from semantic_kernel.connectors.ai.chat_completion_client import ChatHistory
-from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
-
 # Import AppConfig from app_config
 from app_config import config
 

src/backend/context/cosmos_memory_kernel.py

@@ -525,8 +525,8 @@ async def get_collections(self) -> List[str]:
 
         try:
             query = """
-                SELECT DISTINCT c.collection 
-                FROM c 
+                SELECT DISTINCT c.collection
+                FROM c
                 WHERE c.data_type = 'memory' AND c.session_id = @session_id
             """
             parameters = [{"name": "@session_id", "value": self.session_id}]
@@ -595,7 +595,7 @@ async def get_memory_record(
     ) -> Optional[MemoryRecord]:
         """Retrieve a memory record."""
         query = """
-            SELECT * FROM c 
+            SELECT * FROM c
             WHERE c.collection=@collection AND c.key=@key AND c.session_id=@session_id AND c.data_type=@data_type
         """
         parameters = [
@@ -625,7 +625,7 @@ async def get_memory_record(
     async def remove_memory_record(self, collection: str, key: str) -> None:
         """Remove a memory record."""
         query = """
-            SELECT c.id FROM c 
+            SELECT c.id FROM c
             WHERE c.collection=@collection AND c.key=@key AND c.session_id=@session_id AND c.data_type=@data_type
         """
         parameters = [
@@ -668,7 +668,7 @@ async def get_memory_records(
             query = """
                 SELECT *
                 FROM c
-                WHERE c.collection = @collection 
+                WHERE c.collection = @collection
                 AND c.data_type = 'memory'
                 AND c.session_id = @session_id
                 ORDER BY c._ts DESC

src/backend/handlers/runtime_interrupt_kernel.py

@@ -1,7 +1,6 @@
 from typing import Any, Dict, List, Optional
 
 import semantic_kernel as sk
-from semantic_kernel.kernel_arguments import KernelArguments
 from semantic_kernel.kernel_pydantic import KernelBaseModel
 
 

src/backend/kernel_agents/agent_base.py

@@ -1,14 +1,8 @@
-import json
 import logging
-import os
-from typing import Any, Awaitable, Callable, Dict, List, Mapping, Optional, Union
+from typing import Any, List, Mapping, Optional
 
-import semantic_kernel as sk
 from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
 from semantic_kernel.functions import KernelFunction
-from semantic_kernel.functions.kernel_arguments import KernelArguments
-from semantic_kernel.functions.kernel_function_decorator import kernel_function
-from semantic_kernel.agents import AzureAIAgentThread
 
 
 # Import the new AppConfig instance

src/backend/kernel_agents/agent_factory.py

@@ -1,10 +1,7 @@
 """Factory for creating agents in the Multi-Agent Custom Automation Engine."""
 
 import logging
-from typing import Dict, List, Callable, Any, Optional, Type
-from types import SimpleNamespace
-from semantic_kernel import Kernel
-from semantic_kernel.functions import KernelFunction
+from typing import Dict, Any, Optional, Type
 from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
 import inspect
 
@@ -23,7 +20,6 @@
 from kernel_agents.product_agent import ProductAgent
 from kernel_agents.planner_agent import PlannerAgent  # Add PlannerAgent import
 from kernel_agents.group_chat_manager import GroupChatManager
-from semantic_kernel.prompt_template.prompt_template_config import PromptTemplateConfig
 from context.cosmos_memory_kernel import CosmosMemoryContext
 from models.messages_kernel import PlannerResponsePlan, AgentType
 
@@ -216,7 +212,7 @@ async def create_agent(
             if hasattr(agent, "async_init") and inspect.iscoroutinefunction(
                 agent.async_init
             ):
-                init_result = await agent.async_init()
+                await agent.async_init()
 
         except Exception as e:
             logger.error(