fix: Dynamic Agent Naming and Thread-Safe Deletion for Agent Factories

Author: Avijit-Microsoft

infra/main.bicep

@@ -252,6 +252,7 @@ module backend_docker 'deploy_backend_docker.bicep' = {
       DISPLAY_CHART_DEFAULT: 'False'
       APPLICATIONINSIGHTS_CONNECTION_STRING: aifoundry.outputs.applicationInsightsConnectionString
       DUMMY_TEST: 'True'
+      SOLUTION_NAME: solutionPrefix
     }
   }
   scope: resourceGroup(resourceGroup().name)

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.36.1.42791",
-      "templateHash": "373408339880701879"
+      "templateHash": "1377300534086071379"
     }
   },
   "parameters": {
@@ -2694,7 +2694,8 @@
               "USE_AI_PROJECT_CLIENT": "True",
               "DISPLAY_CHART_DEFAULT": "False",
               "APPLICATIONINSIGHTS_CONNECTION_STRING": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.applicationInsightsConnectionString.value]",
-              "DUMMY_TEST": "True"
+              "DUMMY_TEST": "True",
+              "SOLUTION_NAME": "[variables('solutionPrefix')]"
             }
           }
         },

src/api/agents/conversation_agent_factory.py

@@ -7,6 +7,8 @@
 from plugins.chat_with_data_plugin import ChatWithDataPlugin
 from services.chat_service import ChatService
 
+from common.config.config import Config
+
 
 class ConversationAgentFactory:
     _lock = asyncio.Lock()
@@ -16,11 +18,13 @@ class ConversationAgentFactory:
     async def get_agent(cls) -> AzureAIAgent:
         async with cls._lock:
             if cls._agent is None:
+                config = Config()
+                solution_name = config.solution_name
                 ai_agent_settings = AzureAIAgentSettings()
                 creds = DefaultAzureCredential()
                 client = AzureAIAgent.create_client(credential=creds, endpoint=ai_agent_settings.endpoint)
 
-                agent_name = "KM-ConversationKnowledgeAgent"
+                agent_name = f"KM-ConversationKnowledgeAgent-{solution_name}"
                 agent_instructions = '''You are a helpful assistant.
                 Always return the citations as is in final response.
                 Always return citation markers exactly as they appear in the source data, placed in the "answer" field at the correct location. Do not modify, convert, or simplify these markers.
@@ -48,14 +52,15 @@ async def get_agent(cls) -> AzureAIAgent:
 
     @classmethod
     async def delete_agent(cls):
-        if cls._agent is not None:
-            thread_cache = getattr(ChatService, "thread_cache", None)
-            if thread_cache is not None:
-                for conversation_id, thread_id in list(thread_cache.items()):
-                    try:
-                        thread = AzureAIAgentThread(client=cls._agent.client, thread_id=thread_id)
-                        await thread.delete()
-                    except Exception as e:
-                        print(f"Failed to delete thread {thread_id} for conversation {conversation_id}: {e}", flush=True)
-            await cls._agent.client.agents.delete_agent(cls._agent.id)
-            cls._agent = None
+        async with cls._lock:
+            if cls._agent is not None:
+                thread_cache = getattr(ChatService, "thread_cache", None)
+                if thread_cache is not None:
+                    for conversation_id, thread_id in list(thread_cache.items()):
+                        try:
+                            thread = AzureAIAgentThread(client=cls._agent.client, thread_id=thread_id)
+                            await thread.delete()
+                        except Exception as e:
+                            print(f"Failed to delete thread {thread_id} for conversation {conversation_id}: {e}", flush=True)
+                await cls._agent.client.agents.delete_agent(cls._agent.id)
+                cls._agent = None

src/api/agents/search_agent_factory.py

@@ -21,6 +21,7 @@ async def get_agent(cls) -> dict:
                 azure_ai_search_connection_name = config.azure_ai_search_connection_name
                 azure_ai_search_index_name = config.azure_ai_search_index
                 deployment_model = config.azure_openai_deployment_model
+                solution_name = config.solution_name
 
                 field_mapping = {
                     "contentFields": ["content"],
@@ -56,7 +57,7 @@ async def get_agent(cls) -> dict:
 
                 agent = project_client.agents.create_agent(
                     model=deployment_model,
-                    name="KM-ChatWithCallTranscriptsAgent",
+                    name=f"KM-ChatWithCallTranscriptsAgent-{solution_name}",
                     instructions="You are a helpful agent. Use the tools provided and always cite your sources.",
                     tools=ai_search.definitions,
                     tool_resources=ai_search.resources,
@@ -70,6 +71,7 @@ async def get_agent(cls) -> dict:
 
     @classmethod
     async def delete_agent(cls):
-        if cls._agent is not None:
-            cls._agent["client"].agents.delete_agent(cls._agent["agent"].id)
-            cls._agent = None
+        async with cls._lock:
+            if cls._agent is not None:
+                cls._agent["client"].agents.delete_agent(cls._agent["agent"].id)
+                cls._agent = None

src/api/common/config/config.py

@@ -41,3 +41,5 @@ def __init__(self):
         self.azure_cosmosdb_account = os.getenv("AZURE_COSMOSDB_ACCOUNT")
         self.azure_cosmosdb_conversations_container = os.getenv("AZURE_COSMOSDB_CONVERSATIONS_CONTAINER")
         self.azure_cosmosdb_enable_feedback = os.getenv("AZURE_COSMOSDB_ENABLE_FEEDBACK", "false").lower() == "true"
+
+        self.solution_name = os.getenv("SOLUTION_NAME", "")