Merge pull request #282 from microsoft/dev

fix: Merging dev changes to main branch

Author: Roopan-Microsoft

.github/workflows/deploy.yml

@@ -98,7 +98,7 @@ jobs:
           rg_exists=$(az group exists --name ${{ env.RESOURCE_GROUP_NAME }})
           if [ "$rg_exists" = "false" ]; then
             echo "Resource group does not exist. Creating..."
-            az group create --name ${{ env.RESOURCE_GROUP_NAME }} --location northcentralus || { echo "Error creating resource group"; exit 1; }
+            az group create --name ${{ env.RESOURCE_GROUP_NAME }} --location australiaeast || { echo "Error creating resource group"; exit 1; }
           else
             echo "Resource group already exists."
           fi
@@ -382,7 +382,7 @@ jobs:
 
           # Purge OpenAI Resource
           echo "Purging the OpenAI Resource..."
-          if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/northcentralus/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/deletedAccounts/${{ env.OPENAI_RESOURCE_NAME }} --verbose; then
+          if ! az resource delete --ids /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/providers/Microsoft.CognitiveServices/locations/australiaeast/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}/deletedAccounts/${{ env.OPENAI_RESOURCE_NAME }} --verbose; then
             echo "Failed to purge openai resource: ${{ env.OPENAI_RESOURCE_NAME }}"
           else
             echo "Purged the openai resource: ${{ env.OPENAI_RESOURCE_NAME }}"

infra/main.bicep

@@ -887,10 +887,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.19.0' = {
               name: 'AZURE_BLOB_CONTAINER_NAME'
               value: appStorageContainerName
             }
-            {
-              name: 'AZURE_OPENAI_ENDPOINT'
-              value: 'https://${aiServices.outputs.name}.openai.azure.com/'
-            }
+
             {
               name: 'MIGRATOR_AGENT_MODEL_DEPLOY'
               value: modelDeployment.name
@@ -955,6 +952,18 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.19.0' = {
               name: 'APP_ENV'
               value: 'prod'
             }
+            {
+              name: 'AZURE_BASIC_LOGGING_LEVEL'
+              value: 'INFO'
+            }
+            {
+              name: 'AZURE_PACKAGE_LOGGING_LEVEL'
+              value: 'WARNING'
+            }
+            {
+              name: 'AZURE_LOGGING_PACKAGES'
+              value: ''
+            }
           ],
           enableMonitoring
             ? [
@@ -1072,7 +1081,6 @@ output WEB_APP_URL string = 'https://${containerAppFrontend.outputs.fqdn}'
 output COSMOSDB_ENDPOINT string = cosmosDb.outputs.endpoint
 output AZURE_BLOB_ACCOUNT_NAME string = storageAccount.outputs.name
 output AZURE_BLOB_ENDPOINT string = 'https://${storageAccount.outputs.name}.blob.core.windows.net/'
-output AZURE_OPENAI_ENDPOINT string = 'https://${aiServices.outputs.name}.openai.azure.com/'
 output AZURE_AI_AGENT_PROJECT_NAME string = aiServices.outputs.aiProjectInfo.name
 output AZURE_AI_AGENT_ENDPOINT string = aiServices.outputs.aiProjectInfo.apiEndpoint
 output AZURE_AI_AGENT_PROJECT_CONNECTION_STRING string = aiServices.outputs.aiProjectInfo.apiEndpoint

infra/main.json

@@ -921,10 +921,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.19.0' = {
               name: 'AZURE_BLOB_CONTAINER_NAME'
               value: appStorageContainerName
             }
-            {
-              name: 'AZURE_OPENAI_ENDPOINT'
-              value: 'https://${aiServices.outputs.name}.openai.azure.com/'
-            }
+
             {
               name: 'MIGRATOR_AGENT_MODEL_DEPLOY'
               value: modelDeployment.name
@@ -985,6 +982,18 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.19.0' = {
               name: 'APP_ENV'
               value: 'prod'
             }
+            {
+              name: 'AZURE_BASIC_LOGGING_LEVEL'
+              value: 'INFO'
+            }
+            {
+              name: 'AZURE_PACKAGE_LOGGING_LEVEL'
+              value: 'WARNING'
+            }
+            {
+              name: 'AZURE_LOGGING_PACKAGES'
+              value: ''
+            }
           ],
           enableMonitoring
             ? [
@@ -1113,7 +1122,6 @@ output COSMOSDB_ENDPOINT string = cosmosDb.outputs.endpoint
 output AZURE_BLOB_ACCOUNT_NAME string = storageAccount.outputs.name
 output AZURE_BLOB_ENDPOINT string = 'https://${storageAccount.outputs.name}.blob.core.windows.net/'
 output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer
-output AZURE_OPENAI_ENDPOINT string = 'https://${aiServices.outputs.name}.openai.azure.com/'
 output AZURE_AI_AGENT_PROJECT_NAME string = aiServices.outputs.aiProjectInfo.name
 output AZURE_AI_AGENT_ENDPOINT string = aiServices.outputs.aiProjectInfo.apiEndpoint
 output AZURE_AI_AGENT_RESOURCE_GROUP_NAME string = resourceGroup().name

infra/main_custom.bicep

@@ -25,4 +25,12 @@ AZURE_AI_AGENT_RESOURCE_GROUP_NAME = ""
 AZURE_AI_AGENT_PROJECT_NAME = ""
 AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME = ""
 
-APP_ENV = "dev"
+APP_ENV = "dev"
+
+# Basic application logging (default: INFO level)
+AZURE_BASIC_LOGGING_LEVEL=INFO
+# Azure package logging (default: WARNING level to suppress INFO)
+AZURE_PACKAGE_LOGGING_LEVEL=WARNING
+# Comma-separated list of specific logger names to configure (default: empty - no custom loggers)
+# Example: AZURE_LOGGING_PACKAGES=azure.identity.aio._internal,azure.monitor.opentelemetry.exporter.export._base
+AZURE_LOGGING_PACKAGES=

src/backend/.env.sample

@@ -53,20 +53,6 @@
         "No Application Insights Instrumentation Key found. Skipping configuration"
     )
 
-# Configure logging
-logging.basicConfig(level=logging.INFO)
-
-# Suppress INFO logs from 'azure.core.pipeline.policies.http_logging_policy'
-logging.getLogger("azure.core.pipeline.policies.http_logging_policy").setLevel(
-    logging.WARNING
-)
-logging.getLogger("azure.identity.aio._internal").setLevel(logging.WARNING)
-
-# Suppress info logs from OpenTelemetry exporter
-logging.getLogger("azure.monitor.opentelemetry.exporter.export._base").setLevel(
-    logging.WARNING
-)
-
 
 def record_exception_to_trace(e):
     """Record exception to the current OpenTelemetry trace span."""

src/backend/api/api_routes.py

@@ -1,4 +1,6 @@
 """Create and configure the FastAPI application."""
+import logging
+import os
 from contextlib import asynccontextmanager
 
 from api.api_routes import router as backend_router
@@ -26,6 +28,24 @@
 load_dotenv()
 
 # Configure logging
+# Basic application logging (default: INFO level)
+AZURE_BASIC_LOGGING_LEVEL = os.getenv("AZURE_BASIC_LOGGING_LEVEL", "INFO").upper()
+# Azure package logging (default: WARNING level to suppress INFO)
+AZURE_PACKAGE_LOGGING_LEVEL = os.getenv("AZURE_PACKAGE_LOGGING_LEVEL", "WARNING").upper()
+# Azure logging packages (default: empty list)
+azure_logging_packages_env = os.getenv("AZURE_LOGGING_PACKAGES")
+AZURE_LOGGING_PACKAGES = azure_logging_packages_env.split(",") if azure_logging_packages_env else []
+
+# Basic config: logging.basicConfig(level=logging.INFO)
+logging.basicConfig(
+    level=getattr(logging, AZURE_BASIC_LOGGING_LEVEL, logging.INFO),
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+)
+
+# Package config: Azure loggers set to WARNING to suppress INFO
+for logger_name in AZURE_LOGGING_PACKAGES:
+    logging.getLogger(logger_name).setLevel(getattr(logging, AZURE_PACKAGE_LOGGING_LEVEL, logging.WARNING))
+
 logger = AppLogger("app")
 
 # Global variables for agents

src/backend/app.py

@@ -39,7 +39,6 @@ def __init__(self):
         self.azure_service_bus_namespace = os.getenv("AZURE_SERVICE_BUS_NAMESPACE")
         self.azure_queue_name = os.getenv("AZURE_QUEUE_NAME")
 
-        self.azure_openai_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
         self.ai_project_endpoint = os.getenv("AI_PROJECT_ENDPOINT")
         self.migrator_agent_model_deploy = os.getenv("MIGRATOR_AGENT_MODEL_DEPLOY")
         self.picker_agent_model_deploy = os.getenv("PICKER_AGENT_MODEL_DEPLOY")

src/backend/common/config/config.py

@@ -36,7 +36,6 @@ typing-extensions
 python-jose[cryptography]
 passlib[bcrypt]
 semantic-kernel[azure]==1.32.2
-openai==2.0.0
 sqlparse
 sqlglot
 unittest2