fix: Merging hotfix branches to main

.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/backend/.env.sample

@@ -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'

src/backend/Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.11-slim
 
 
 # Backend app setup
-WORKDIR /app/backend
+WORKDIR /src/backend
 COPY . .  
 # Install dependencies
 RUN pip install --no-cache-dir -r requirements.txt

src/backend/agents/agentutils.py

@@ -6,8 +6,8 @@
 )
 from pydantic import BaseModel
 
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
-from models.messages import Step
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.models.messages import Step
 
 common_agent_system_message = "If you do not have the information for the arguments of the function you need to call, do not call the function. Instead, respond back to the user requesting further information. You must not hallucinate or invent any of the information used as arguments in the function. For example, if you need to call a function that requires a delivery address, you must not generate 123 Example St. You must skip calling functions and return a clarification message along the lines of: Sorry, I'm missing some information I need to help you with that. Could you please provide the delivery address so I can do that for you?"
 

src/backend/agents/base_agent.py

@@ -13,15 +13,15 @@
 from autogen_core.components.tool_agent import tool_agent_caller_loop
 from autogen_core.components.tools import Tool
 
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
-from models.messages import (
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.models.messages import (
     ActionRequest,
     ActionResponse,
     AgentMessage,
     Step,
     StepStatus,
 )
-from event_utils import track_event_if_configured
+from src.backend.event_utils import track_event_if_configured
 
 
 class BaseAgent(RoutedAgent):

src/backend/agents/generic.py

@@ -5,8 +5,8 @@
 from autogen_core.components.models import AzureOpenAIChatCompletionClient
 from autogen_core.components.tools import FunctionTool, Tool
 
-from agents.base_agent import BaseAgent
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.agents.base_agent import BaseAgent
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
 
 
 async def dummy_function() -> str:

src/backend/agents/group_chat_manager.py

@@ -9,8 +9,8 @@
 from autogen_core.components import RoutedAgent, default_subscription, message_handler
 from autogen_core.components.models import AzureOpenAIChatCompletionClient
 
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
-from models.messages import (
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.models.messages import (
     ActionRequest,
     AgentMessage,
     BAgentType,
@@ -22,7 +22,7 @@
     StepStatus,
 )
 
-from event_utils import track_event_if_configured
+from src.backend.event_utils import track_event_if_configured
 
 
 @default_subscription

src/backend/agents/hr.py

@@ -6,8 +6,8 @@
 from autogen_core.components.tools import FunctionTool, Tool
 from typing_extensions import Annotated
 
-from agents.base_agent import BaseAgent
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.agents.base_agent import BaseAgent
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
 
 formatting_instructions = "Instructions: returning the output of this function call verbatim to the user in markdown. Then write AGENT SUMMARY: and then include a summary of what you did."
 

src/backend/agents/human.py

@@ -4,15 +4,15 @@
 from autogen_core.base import AgentId, MessageContext
 from autogen_core.components import RoutedAgent, default_subscription, message_handler
 
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
-from models.messages import (
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.models.messages import (
     ApprovalRequest,
     HumanFeedback,
     StepStatus,
     AgentMessage,
     Step,
 )
-from event_utils import track_event_if_configured
+from src.backend.event_utils import track_event_if_configured
 
 
 @default_subscription

src/backend/agents/marketing.py

@@ -5,8 +5,8 @@
 from autogen_core.components.models import AzureOpenAIChatCompletionClient
 from autogen_core.components.tools import FunctionTool, Tool
 
-from agents.base_agent import BaseAgent
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.agents.base_agent import BaseAgent
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
 
 
 # Define new Marketing tools (functions)

src/backend/agents/planner.py

@@ -13,8 +13,8 @@
 )
 from pydantic import BaseModel
 
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
-from models.messages import (
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.models.messages import (
     AgentMessage,
     HumanClarification,
     BAgentType,
@@ -26,7 +26,7 @@
     HumanFeedbackStatus,
 )
 
-from event_utils import track_event_if_configured
+from src.backend.event_utils import track_event_if_configured
 
 
 @default_subscription

src/backend/agents/procurement.py

@@ -6,8 +6,8 @@
 from autogen_core.components.tools import FunctionTool, Tool
 from typing_extensions import Annotated
 
-from agents.base_agent import BaseAgent
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.agents.base_agent import BaseAgent
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
 
 
 # Define new Procurement tools (functions)

src/backend/agents/product.py

@@ -8,8 +8,8 @@
 from autogen_core.components.tools import FunctionTool, Tool
 from typing_extensions import Annotated
 
-from agents.base_agent import BaseAgent
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.agents.base_agent import BaseAgent
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
 
 formatting_instructions = "Instructions: returning the output of this function call verbatim to the user in markdown. Then write AGENT SUMMARY: and then include a summary of what you did."
 

src/backend/agents/tech_support.py

@@ -6,8 +6,8 @@
 from autogen_core.components.tools import FunctionTool, Tool
 from typing_extensions import Annotated
 
-from agents.base_agent import BaseAgent
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.agents.base_agent import BaseAgent
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
 
 formatting_instructions = "Instructions: returning the output of this function call verbatim to the user in markdown. Then write AGENT SUMMARY: and then include a summary of what you did."
 
@@ -523,7 +523,6 @@ async def get_tech_information(
     Document Name: Contoso's IT Policy and Procedure Manual
     Domain: IT Policy
     Description: A comprehensive guide detailing the IT policies and procedures at Contoso, including acceptable use, security protocols, and incident reporting.
-
     At Contoso, we prioritize the security and efficiency of our IT infrastructure. All employees are required to adhere to the following policies:
     - Use strong passwords and change them every 90 days.
     - Report any suspicious emails to the IT department immediately.

src/backend/app.py

@@ -1,16 +1,21 @@
-# app.py
+#!/usr/bin/env python
+import os
+import sys
+
+# Add the parent directory (the one that contains the "src" folder) to sys.path.
+# This allows absolute imports such as "from src.backend.middleware.health_check" to work
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
 import asyncio
 import logging
-import os
 import uuid
 from typing import List, Optional
-from middleware.health_check import HealthCheckMiddleware
+from src.backend.middleware.health_check import HealthCheckMiddleware
 from autogen_core.base import AgentId
 from fastapi import FastAPI, HTTPException, Query, Request
-from auth.auth_utils import get_authenticated_user_details
-from config import Config
-from context.cosmos_memory import CosmosBufferedChatCompletionContext
-from models.messages import (
+from src.backend.auth.auth_utils import get_authenticated_user_details
+from src.backend.config import Config
+from src.backend.context.cosmos_memory import CosmosBufferedChatCompletionContext
+from src.backend.models.messages import (
     HumanFeedback,
     HumanClarification,
     InputTask,
@@ -19,15 +24,15 @@
     AgentMessage,
     PlanWithSteps,
 )
-from utils import initialize_runtime_and_context, retrieve_all_agent_tools, rai_success
-from event_utils import track_event_if_configured
+from src.backend.utils import initialize_runtime_and_context, retrieve_all_agent_tools, rai_success
+from src.backend.event_utils import track_event_if_configured
 from fastapi.middleware.cors import CORSMiddleware
 from azure.monitor.opentelemetry import configure_azure_monitor
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
 
 
 # Check if the Application Insights Instrumentation Key is set in the environment variables
-instrumentation_key = os.getenv("APPLICATIONINSIGHTS_INSTRUMENTATION_KEY")
+instrumentation_key = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
 if instrumentation_key:
     # Configure Application Insights if the Instrumentation Key is found
     configure_azure_monitor(connection_string=instrumentation_key)