Merge pull request microsoft#74 from microsoft/hotfix

fix: Merging hotfix branches to main

Author: Roopan-Microsoft

.devcontainer/devcontainer.json

@@ -1,31 +1,31 @@
-{
-    "name": "Multi Agent Custom Automation Engine Solution Accelerator",
-    "image": "mcr.microsoft.com/devcontainers/python:3.10",
-    "features": {
-        "ghcr.io/devcontainers/features/azure-cli:1.0.8": {},
-        "ghcr.io/azure/azure-dev/azd:latest": {},
-        "ghcr.io/rchaganti/vsc-devcontainer-features/azurebicep:1.0.5": {}
-    },
-
-    "postCreateCommand": "sudo chmod +x .devcontainer/setupEnv.sh && ./.devcontainer/setupEnv.sh",
-    
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-azuretools.azure-dev",
-                "ms-azuretools.vscode-bicep",
-                "ms-python.python"
-            ]
-        },
-        "codespaces": {
-            "openFiles": [
-              "README.md"
-            ]
-        }
-    },
-    
-    "remoteUser": "vscode",
-    "hostRequirements": {
-        "memory": "8gb"
-    }
-}
+{
+    "name": "Multi Agent Custom Automation Engine Solution Accelerator",
+    "image": "mcr.microsoft.com/devcontainers/python:3.10",
+    "features": {
+        "ghcr.io/devcontainers/features/azure-cli:1.0.8": {},
+        "ghcr.io/azure/azure-dev/azd:latest": {},
+        "ghcr.io/rchaganti/vsc-devcontainer-features/azurebicep:1.0.5": {}
+    },
+
+    "postCreateCommand": "sudo chmod +x .devcontainer/setupEnv.sh && ./.devcontainer/setupEnv.sh",
+    
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-bicep",
+                "ms-python.python"
+            ]
+        },
+        "codespaces": {
+            "openFiles": [
+              "README.md"
+            ]
+        }
+    },
+    
+    "remoteUser": "vscode",
+    "hostRequirements": {
+        "memory": "8gb"
+    }
+}

.devcontainer/setupEnv.sh

@@ -5,4 +5,7 @@ pip install --upgrade pip
 
 (cd ./src/frontend; pip install -r requirements.txt)
 
-(cd ./src/backend; pip install -r requirements.txt)
+
+(cd ./src/backend; pip install -r requirements.txt)
+
+

.flake8

@@ -2,4 +2,4 @@
 max-line-length = 88
 extend-ignore = E501
 exclude = .venv, frontend
-ignore = E203, W503, G004, G200
+ignore = E203, W503, G004, G200, E402

.github/workflows/test.yml

@@ -37,8 +37,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r src/backend/requirements.txt
-          pip install pytest-cov
-          pip install pytest-asyncio
 
       - name: Check if test files exist
         id: check_tests
@@ -50,7 +48,6 @@ jobs:
             echo "Test files found, running tests."
             echo "skip_tests=false" >> $GITHUB_ENV
           fi
-
       - name: Run tests with coverage
         if: env.skip_tests == 'false'
         run: |
@@ -59,4 +56,4 @@ jobs:
       - name: Skip coverage report if no tests
         if: env.skip_tests == 'true'
         run: |
-          echo "Skipping coverage report because no tests were found."
+          echo "Skipping coverage report because no tests were found."

README.md

@@ -177,8 +177,8 @@ To add your newly created backend image:
         name: 'FRONTEND_SITE_NAME'
         value: 'https://<website Name>.azurewebsites.net'
 
-        name: 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY'
-        value: <Application Insights Instrumentation Key>
+        name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
+        value: <Application Insights Connection String>
 
 - Click 'Save' and deploy your new revision
 

deploy/macae-continer-oc.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.32.4.45862",
-      "templateHash": "13282901028774763433"
+      "templateHash": "14272651486454797588"
     }
   },
   "parameters": {
@@ -368,7 +368,7 @@
                   "value": "[format('https://{0}.azurewebsites.net', format(variables('uniqueNameFormat'), 'frontend'))]"
                 },
                 {
-                  "name": "APPLICATIONINSIGHTS_INSTRUMENTATION_KEY",
+                  "name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
                   "value": "[reference('appInsights').ConnectionString]"
                 }
               ]

deploy/macae-continer.bicep

@@ -280,7 +280,7 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
               value: 'https://${format(uniqueNameFormat, 'frontend')}.azurewebsites.net'
             }
             {
-              name: 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY'
+              name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
               value: appInsights.properties.ConnectionString
             }
           ]

documentation/LocalDeployment.md

@@ -9,6 +9,7 @@
 # Local setup
 
 > **Note for macOS Developers**: If you are using macOS on Apple Silicon (ARM64) the DevContainer will **not** work. This is due to a limitation with the Azure Functions Core Tools (see [here](https://github.com/Azure/azure-functions-core-tools/issues/3112)). We recommend using the [Non DevContainer Setup](./NON_DEVCONTAINER_SETUP.md) instructions to run the accelerator locally.
+
 The easiest way to run this accelerator is in a VS Code Dev Containers, which will open the project in your local VS Code using the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers):
 
 1. Start Docker Desktop (install it if not already installed)
@@ -96,8 +97,8 @@ The files for the dev container are located in `/.devcontainer/` folder.
       **Using a Different Database in Cosmos:**
 
       You can set the solution up to use a different database in Cosmos. For example, you can name it something like autogen-dev. To do this:
-		1. Change the environment variable **COSMOSDB_DATABASE** to the new database name.
- 		2. You will need to create the database in the Cosmos DB account. You can do this from the Data Explorer pane in the portal, click on the drop down labeled “_+ New Container_” and provide all the necessary details.
+    1. Change the environment variable **COSMOSDB_DATABASE** to the new database name.
+    2. You will need to create the database in the Cosmos DB account. You can do this from the Data Explorer pane in the portal, click on the drop down labeled “_+ New Container_” and provide all the necessary details.
 
 6. **Create a `.env` file:**
 

src/__init__.py

@@ -6,7 +6,7 @@ AZURE_OPENAI_ENDPOINT=
 AZURE_OPENAI_MODEL_NAME=gpt-4o
 AZURE_OPENAI_DEPLOYMENT_NAME=gpt-4o
 AZURE_OPENAI_API_VERSION=2024-08-01-preview
-APPLICATIONINSIGHTS_INSTRUMENTATION_KEY=
+APPLICATIONINSIGHTS_CONNECTION_STRING=
 
 BACKEND_API_URL='http://localhost:8000'
 FRONTEND_SITE_NAME='http://127.0.0.1:3000'