fix: Merging hotfix changes into main branch (#61)

Roopan-Microsoft · Prashant-Microsoft · Kiran-Siluveru-Microsoft · web-flow · commit 21a3a277b193 · 2025-01-30T18:10:51.000+05:30
* fix: ui changes (#1) * fix: in progress status color after fetch task details (#5) * cancel notification message updated (#7) * Update task.js (#9) * Stages overflow issue fix (#10) * fix: added space to the agent (#13) * Approve reject buttons titles disabling buttons and (#15) * Fix: UX becomes damaged when chat outputs sample code for a task (#14) * task page UI updates * UI updated code for task * Task page UI updated code * status section UI update in task page * Added custom event (#24) * feat: added custom event * Logs updated * modify code * added exception logs * added exception logs for cosmos memory --------- Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> * fix: task with zero stages cannot show the page, spins forever and rai test prompt (#41) * Updated the workflow for build and push docker * updated the repo name * Update requirements.txt * Update requirements.txt * Update requirements.txt * feat: Integrated application insights instrumentation key into the bicep file (#42) * feat: Integrated application insights instrumentation key into bicep files * added application insights instrumentation key into env and readme file * updated json file * upgraded json file * Update docker-build-and-push.yml * Update docker-build-and-push.yml * Update docker-build-and-push.yml * Update docker-build-and-push.yml * Update docker-build-and-push.yml * Update docker-build-and-push.yml * pyLint issues fixed * lint issues fixed --------- Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> * Update test.yml (#43) * Disabling Text Area functionality (#47) * fix: Usability and Alignments changes (#48) * Name update and padding removed * fix home page padding and cards height * remove gap in tasks section * Update docker-build-and-push.yml to debug * Update docker-build-and-push.yml * Update docker-build-and-push.yml to take the correct event name * Update docker-build-and-push.yml * fix: text area background color (#50) * fix: text area background color * Cursor hover style and Light dark color updated * feat: customize track events (#54) * feat: customized track event * pylint fix * pylint fix * fix: added config variable (#59) * fix: added config variable * pylint fix * Title updated (#60) * fix: operation id field of custom events showing as zero on the server (#49) * fix: operation id issue on server * lint issue fixed --------- Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> --------- Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Mohan-Microsoft <v-mvenudass@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com>
diff --git a/TRANSPARENCY_FAQS.md b/TRANSPARENCY_FAQS.md
@@ -1,4 +1,4 @@
-# Multi-Agent: Custom Automation Engine – Solution Accelerator : Responsible AI FAQ 
+# Multi-Agent-Custom-Automation-Engine – Solution Accelerator : Responsible AI FAQ 
 
 ## What is the Multi Agent: Custom Automation Engine – Solution Accelerator? 
 Multi Agent: Custom Automation Engine – Solution Accelerator is an open-source GitHub Repository that enables users to solve complex tasks using multiple agents. The accelerator is designed to be generic across business tasks.  The user enters a task and a planning LLM formulates a plan to complete that task.  The system then dynamically generates agents which can complete the task.  The system also allows the user to create actions that agents can take (for example sending emails or scheduling orientation sessions for new employees).  These actions are taken into account by the planner and dynamically created agents may be empowered to take these actions.
diff --git a/src/backend/.env.sample b/src/backend/.env.sample
@@ -3,6 +3,7 @@ COSMOSDB_DATABASE=autogen
 COSMOSDB_CONTAINER=memory
 
 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=
diff --git a/src/backend/agents/group_chat_manager.py b/src/backend/agents/group_chat_manager.py
@@ -305,12 +305,12 @@ async def _execute_step(self, session_id: str, step: Step):
         )
 
         track_event_if_configured(
-            f"Group Chat Manager - Requesting {step.agent.value.title()} to perform the action and added into the cosmos",
+            f"Group Chat Manager - Requesting {formatted_agent} to perform the action and added into the cosmos",
             {
                 "session_id": session_id,
                 "user_id": self._user_id,
                 "plan_id": step.plan_id,
-                "content": f"Requesting {step.agent.value.title()} to perform action: {step.action}",
+                "content": f"Requesting {formatted_agent} to perform action: {step.action}",
                 "source": "GroupChatManager",
                 "step_id": step.id,
             },
diff --git a/src/backend/app.py b/src/backend/app.py
@@ -23,6 +23,7 @@
 from 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
@@ -52,6 +53,8 @@
 # Initialize the FastAPI app
 app = FastAPI()
 
+FastAPIInstrumentor.instrument_app(app)
+
 frontend_url = Config.FRONTEND_SITE_NAME
 
 # Add this near the top of your app.py, after initializing the app
diff --git a/src/backend/config.py b/src/backend/config.py
@@ -37,6 +37,7 @@ class Config:
     COSMOSDB_CONTAINER = GetRequiredConfig("COSMOSDB_CONTAINER")
 
     AZURE_OPENAI_DEPLOYMENT_NAME = GetRequiredConfig("AZURE_OPENAI_DEPLOYMENT_NAME")
+    AZURE_OPENAI_MODEL_NAME = GetOptionalConfig("AZURE_OPENAI_MODEL_NAME", default=AZURE_OPENAI_DEPLOYMENT_NAME)
     AZURE_OPENAI_API_VERSION = GetRequiredConfig("AZURE_OPENAI_API_VERSION")
     AZURE_OPENAI_ENDPOINT = GetRequiredConfig("AZURE_OPENAI_ENDPOINT")
     AZURE_OPENAI_API_KEY = GetOptionalConfig("AZURE_OPENAI_API_KEY")
@@ -89,7 +90,8 @@ def GetAzureOpenAIChatCompletionClient(model_capabilities):
         if Config.AZURE_OPENAI_API_KEY == "":
             # Use DefaultAzureCredential for auth
             Config.__aoai_chatCompletionClient = AzureOpenAIChatCompletionClient(
-                model=Config.AZURE_OPENAI_DEPLOYMENT_NAME,
+                model=Config.AZURE_OPENAI_MODEL_NAME,
+                azure_deployment=Config.AZURE_OPENAI_DEPLOYMENT_NAME,
                 api_version=Config.AZURE_OPENAI_API_VERSION,
                 azure_endpoint=Config.AZURE_OPENAI_ENDPOINT,
                 azure_ad_token_provider=Config.GetTokenProvider(
@@ -101,7 +103,8 @@ def GetAzureOpenAIChatCompletionClient(model_capabilities):
         else:
             # Fallback behavior to use API key
             Config.__aoai_chatCompletionClient = AzureOpenAIChatCompletionClient(
-                model=Config.AZURE_OPENAI_DEPLOYMENT_NAME,
+                model=Config.AZURE_OPENAI_MODEL_NAME,
+                azure_deployment=Config.AZURE_OPENAI_DEPLOYMENT_NAME,
                 api_version=Config.AZURE_OPENAI_API_VERSION,
                 azure_endpoint=Config.AZURE_OPENAI_ENDPOINT,
                 api_key=Config.AZURE_OPENAI_API_KEY,
diff --git a/src/frontend/wwwroot/app.html b/src/frontend/wwwroot/app.html
@@ -17,7 +17,7 @@
             <aside class="menu mx-3 mt-5">
                 <strong id="goHomeButton" class="menu-logo is-flex is-align-items-center">
                     <img class="mr-3" src="../assets/app-logo.svg">
-                    <span>Multi-Agent: Custom Automation Engine</span>
+                    <span>Multi-Agent-Custom-Automation-Engine</span>
                 </strong>
                 <button id="newTaskButton" class="button is-fullwidth my-6">New task</button>
                 <p class="menu-label">My tasks</p>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Multi-Agent: Custom Automation Engine – Solution Accelerator : Responsible AI FAQ`
	`1`	`+# Multi-Agent-Custom-Automation-Engine – Solution Accelerator : Responsible AI FAQ`
`2`	`2`
`3`	`3`	`## What is the Multi Agent: Custom Automation Engine – Solution Accelerator?`
`4`	`4`	Multi Agent: Custom Automation Engine – Solution Accelerator is an open-source GitHub Repository that enables users to solve complex tasks using multiple agents. The accelerator is designed to be generic across business tasks. The user enters a task and a planning LLM formulates a plan to complete that task. The system then dynamically generates agents which can complete the task. The system also allows the user to create actions that agents can take (for example sending emails or scheduling orientation sessions for new employees). These actions are taken into account by the planner and dynamically created agents may be empowered to take these actions.
Original file line number	Diff line number	Diff line change
`@@ -305,12 +305,12 @@ async def _execute_step(self, session_id: str, step: Step):`
`305`	`305`	`)`
`306`	`306`
`307`	`307`	`track_event_if_configured(`
`308`		`- f"Group Chat Manager - Requesting {step.agent.value.title()} to perform the action and added into the cosmos",`
	`308`	`+ f"Group Chat Manager - Requesting {formatted_agent} to perform the action and added into the cosmos",`
`309`	`309`	`{`
`310`	`310`	`"session_id": session_id,`
`311`	`311`	`"user_id": self._user_id,`
`312`	`312`	`"plan_id": step.plan_id,`
`313`		`- "content": f"Requesting {step.agent.value.title()} to perform action: {step.action}",`
	`313`	`+ "content": f"Requesting {formatted_agent} to perform action: {step.action}",`
`314`	`314`	`"source": "GroupChatManager",`
`315`	`315`	`"step_id": step.id,`
`316`	`316`	`},`