Merge pull request #668 from microsoft/dev-v3

fix: Merging dev changes to main branch

Author: Roopan-Microsoft

docs/quota_check.md

@@ -11,11 +11,11 @@ azd auth login
 
 ### 📌 Default Models & Capacities:
 ```
-gpt-4o:150
+gpt4.1:150,o4-mini:50,gpt4.1-mini:50
 ```
 ### 📌 Default Regions:
 ```
-eastus, uksouth, eastus2, northcentralus, swedencentral, westus, westus2, southcentralus, canadacentral
+australiaeast, eastus2, francecentral, japaneast, norwayeast, swedencentral, uksouth, westus
 ```
 ### Usage Scenarios:
 - No parameters passed → Default models and capacities will be checked in default regions.
@@ -37,19 +37,23 @@ eastus, uksouth, eastus2, northcentralus, swedencentral, westus, westus2, southc
    ```
 ✔️ Check specific model(s) in default regions:
   ```
-  ./quota_check_params.sh --models gpt-4o:150
+  ./quota_check_params.sh --models gpt4.1:150
   ```
 ✔️ Check default models in specific region(s):
   ```
-./quota_check_params.sh --regions eastus,westus
+./quota_check_params.sh --regions eastus2,westus
   ```
 ✔️ Passing Both models and regions:  
   ```
-  ./quota_check_params.sh --models gpt-4o:150 --regions eastus,westus2
+  ./quota_check_params.sh --models gpt4.1:150 --regions eastus2,westus
   ```
 ✔️ All parameters combined:
   ```
- ./quota_check_params.sh --models gpt-4o:150 --regions eastus,westus --verbose
+ ./quota_check_params.sh --models gpt4.1:150 --regions eastus2,westus --verbose
+  ```
+✔️ Multiple models with single region:
+  ```
+ ./quota_check_params.sh --models gpt4.1:150,gpt4.1-mini:50 --regions eastus2 --verbose
   ```
 
 ### **Sample Output**

infra/main.bicep

@@ -1500,6 +1500,9 @@ module webSite 'modules/web-sites.bicep' = {
           WEBSITES_CONTAINER_START_TIME_LIMIT: '1800' // 30 minutes, adjust as needed
           BACKEND_API_URL: 'https://${containerApp.outputs.fqdn}'
           AUTH_ENABLED: 'false'
+          AZURE_BASIC_LOGGING_LEVEL: 'INFO'
+          AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
+          AZURE_LOGGING_PACKAGES: ''
         }
         // WAF aligned configuration for Monitoring
         applicationInsightResourceId: enableMonitoring ? applicationInsights!.outputs.resourceId : null

infra/main_custom.bicep

@@ -1856,6 +1856,9 @@ module webSite 'modules/web-sites.bicep' = {
           //WEBSITES_CONTAINER_START_TIME_LIMIT: '1800' // 30 minutes, adjust as needed
           BACKEND_API_URL: 'https://${containerApp.outputs.fqdn}'
           AUTH_ENABLED: 'false'
+          AZURE_BASIC_LOGGING_LEVEL: 'INFO'
+          AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
+          AZURE_LOGGING_PACKAGES: ''
           ENABLE_ORYX_BUILD: 'True'
         }
         // WAF aligned configuration for Monitoring

infra/scripts/quota_check_params.sh

@@ -47,7 +47,7 @@ log_verbose() {
 }
 
 # Default Models and Capacities (Comma-separated in "model:capacity" format)
-DEFAULT_MODEL_CAPACITY="gpt-4o:150"
+DEFAULT_MODEL_CAPACITY="gpt4.1:150,o4-mini:50,gpt4.1-mini:50"
 # Convert the comma-separated string into an array
 IFS=',' read -r -a MODEL_CAPACITY_PAIRS <<< "$DEFAULT_MODEL_CAPACITY"
 

src/backend/.env.sample

@@ -33,3 +33,11 @@ AZURE_AI_SEARCH_INDEX_NAME=
 AZURE_AI_SEARCH_ENDPOINT=
 AZURE_AI_SEARCH_API_KEY=
 BING_CONNECTION_NAME=
+
+# 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/app_kernel.py

@@ -60,23 +60,18 @@ async def lifespan(app: FastAPI):
         "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
-)
-
-logging.getLogger("opentelemetry.sdk").setLevel(
-    logging.ERROR
-)
+# Configure logging levels from environment variables
+logging.basicConfig(level=getattr(logging, config.AZURE_BASIC_LOGGING_LEVEL.upper(), logging.INFO))
+
+# Configure Azure package logging levels
+azure_level = getattr(logging, config.AZURE_PACKAGE_LOGGING_LEVEL.upper(), logging.WARNING)
+# Parse comma-separated logging packages
+if config.AZURE_LOGGING_PACKAGES:
+    packages = [pkg.strip() for pkg in config.AZURE_LOGGING_PACKAGES.split(",") if pkg.strip()]
+    for logger_name in packages:
+        logging.getLogger(logger_name).setLevel(azure_level)
+
+logging.getLogger("opentelemetry.sdk").setLevel(logging.ERROR)
 
 # Initialize the FastAPI app
 app = FastAPI(lifespan=lifespan)

src/backend/common/config/app_config.py

@@ -73,6 +73,11 @@ def __init__(self):
         # Azure Search settings
         self.AZURE_SEARCH_ENDPOINT = self._get_optional("AZURE_AI_SEARCH_ENDPOINT")
 
+        # Logging settings
+        self.AZURE_BASIC_LOGGING_LEVEL = self._get_optional("AZURE_BASIC_LOGGING_LEVEL", "INFO")
+        self.AZURE_PACKAGE_LOGGING_LEVEL = self._get_optional("AZURE_PACKAGE_LOGGING_LEVEL", "WARNING")
+        self.AZURE_LOGGING_PACKAGES = self._get_optional("AZURE_LOGGING_PACKAGES")
+
         # Optional MCP server endpoint (for local MCP server or remote)
         # Example: http://127.0.0.1:8000/mcp
         self.MCP_SERVER_ENDPOINT = self._get_optional("MCP_SERVER_ENDPOINT")