Merge remote-tracking branch 'upstream/feature/use-sk-threads-for-agent-comms'

Author: Fr4nc3

src/backend/app_config.py

@@ -7,6 +7,7 @@
 from azure.cosmos.aio import CosmosClient
 from azure.identity import ClientSecretCredential, DefaultAzureCredential
 from dotenv import load_dotenv
+from semantic_kernel.agents import AzureAIAgentThread  # pylint:disable=E0611
 from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
 from semantic_kernel.contents import ChatHistory
 from semantic_kernel.functions import KernelFunction

src/backend/kernel_agents/agent_base.py

@@ -12,6 +12,7 @@
 from event_utils import track_event_if_configured
 from models.messages_kernel import (ActionRequest, ActionResponse,
                                     AgentMessage, Step, StepStatus)
+from semantic_kernel.agents import AzureAIAgentThread  # pylint:disable=E0611
 from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
 from semantic_kernel.functions import KernelFunction
 from semantic_kernel.functions.kernel_arguments import KernelArguments
@@ -34,6 +35,7 @@ def __init__(
         system_message: Optional[str] = None,
         client=None,
         definition=None,
+        thread: AzureAIAgentThread=None,
     ):
         """Initialize the base agent.
 
@@ -74,19 +76,12 @@ def __init__(
         self._tools = tools
         self._system_message = system_message
         self._chat_history = [{"role": "system", "content": self._system_message}]
-        # self._agent = None  # Will be initialized in async_init
+        self._message = None  # Will be initialized in handle_action_request
+        self._thread = thread
 
         # Required properties for AgentGroupChat compatibility
         self.name = agent_name  # This is crucial for AgentGroupChat to identify agents
 
-    # @property
-    # def plugins(self) -> Optional[dict[str, Callable]]:
-    #     """Get the plugins for this agent.
-
-    #     Returns:
-    #         A list of plugins, or None if not applicable.
-    #     """
-    #     return None
     @staticmethod
     def default_system_message(agent_name=None) -> str:
         name = agent_name
@@ -114,32 +109,17 @@ async def handle_action_request(self, action_request: ActionRequest) -> str:
                 status=StepStatus.failed,
                 message="Step not found in memory.",
             )
-            return response.json()
+            return response.model_dump_json()
 
-        # Add messages to chat history for context
-        # This gives the agent visibility of the conversation history
-        self._chat_history.extend(
-            [
-                {"role": "assistant", "content": action_request.action},
-                {
-                    "role": "user",
-                    "content": f"{step.human_feedback}. Now make the function call",
-                },
-            ]
-        )
+        self._message = [
+            action_request.action
+        ]
 
         try:
-            # Use the agent to process the action
-            # chat_history = self._chat_history.copy()
-
-            # Call the agent to handle the action
-            thread = None
-            # thread = self.client.agents.get_thread(
-            #     thread=step.session_id
-            # )  # AzureAIAgentThread(thread_id=step.session_id)
+            # Use the agent to process the action request
             async_generator = self.invoke(
-                messages=f"{str(self._chat_history)}\n\nPlease perform this action",
-                thread=thread,
+                messages=self._message,
+                thread=self._thread,
             )
 
             response_content = ""
@@ -149,6 +129,10 @@ async def handle_action_request(self, action_request: ActionRequest) -> str:
                 if chunk is not None:
                     response_content += str(chunk)
 
+            # Log the messages in the thread
+            # async for msg in self._thread.get_messages():
+            #     logging.info(f"thread messages - role:{msg.role} - content:{msg.content}")
+
             logging.info(f"Response content length: {len(response_content)}")
             logging.info(f"Response content: {response_content}")
 

src/backend/kernel_agents/agent_factory.py

@@ -77,6 +77,9 @@ class AgentFactory:
     # Cache of agent instances by session_id and agent_type
     _agent_cache: Dict[str, Dict[AgentType, BaseAgent]] = {}
 
+    # Cache of threads
+    _thread_cache: Dict[str, AzureAIAgentThread] = {}
+
     # Cache of Azure AI Agent instances
     _azure_ai_agent_cache: Dict[str, Dict[str, AzureAIAgent]] = {}
 
@@ -91,6 +94,7 @@ async def create_agent(
         system_message: Optional[str] = None,
         response_format: Optional[Any] = None,
         client: Optional[Any] = None,
+        thread: Optional[AzureAIAgentThread] = None,
         **kwargs,
     ) -> BaseAgent:
         """Create an agent of the specified type.
@@ -168,6 +172,7 @@ async def create_agent(
                     "tools": tools,
                     "system_message": system_message,
                     "client": client,
+                    "thread": thread,
                     **kwargs,
                 }.items()
                 if k in valid_keys
@@ -222,14 +227,20 @@ async def create_all_agents(
         planner_agent_type = AgentType.PLANNER
         group_chat_manager_type = AgentType.GROUP_CHAT_MANAGER
 
+        if cls._thread_cache is None or session_id not in cls._thread_cache:
+            #Create thread for agent conversation
+            thread = AzureAIAgentThread(client=client)
+            cls._thread_cache[session_id] = thread
+
         try:
             if client is None:
                 # Create the AIProjectClient instance using the config
                 # This is a placeholder; replace with actual client creation logic
                 client = config.get_ai_project_client()
         except Exception as client_exc:
             logger.error(f"Error creating AIProjectClient: {client_exc}")
-        # Initialize cache for this session if it doesn't exist
+
+        # Initialize agent cache for this session if it doesn't exist
         if session_id not in cls._agent_cache:
             cls._agent_cache[session_id] = {}
 
@@ -246,6 +257,7 @@ async def create_all_agents(
                 temperature=temperature,
                 client=client,
                 memory_store=memory_store,
+                thread=cls._thread_cache[session_id],
             )
 
         # Create agent name to instance mapping for the planner

src/backend/kernel_agents/generic_agent.py

@@ -22,6 +22,7 @@ def __init__(
         agent_name: str = AgentType.GENERIC.value,
         client=None,
         definition=None,
+        thread=None,
     ) -> None:
         """Initialize the Generic Agent.
 
@@ -60,6 +61,7 @@ def __init__(
             system_message=system_message,
             client=client,
             definition=definition,
+            thread=thread,
         )
 
     @classmethod
@@ -82,6 +84,7 @@ async def create(
         system_message = kwargs.get("system_message", None)
         agent_name = kwargs.get("agent_name")
         client = kwargs.get("client")
+        thread = kwargs.get("thread")
 
         try:
             logging.info("Initializing GenericAgent from async init azure AI Agent")
@@ -102,6 +105,7 @@ async def create(
                 system_message=system_message,
                 agent_name=agent_name,
                 client=client,
+                thread=thread,
                 definition=agent_definition,
             )
 

src/backend/kernel_agents/hr_agent.py

@@ -26,6 +26,7 @@ def __init__(
         agent_name: str = AgentType.HR.value,
         client=None,
         definition=None,
+        thread=None,
     ) -> None:
         """Initialize the HR Agent.
 
@@ -62,6 +63,7 @@ def __init__(
             system_message=system_message,
             client=client,
             definition=definition,
+            thread=thread,
         )
 
     @classmethod
@@ -84,6 +86,7 @@ async def create(
         system_message = kwargs.get("system_message", None)
         agent_name = kwargs.get("agent_name")
         client = kwargs.get("client")
+        thread = kwargs.get("thread")
 
         try:
             logging.info("Initializing HRAgent from async init azure AI Agent")
@@ -104,6 +107,7 @@ async def create(
                 system_message=system_message,
                 agent_name=agent_name,
                 client=client,
+                thread=thread,
                 definition=agent_definition,
             )
 

src/backend/kernel_agents/human_agent.py

@@ -28,6 +28,7 @@ def __init__(
         agent_name: str = AgentType.HUMAN.value,
         client=None,
         definition=None,
+        thread=None,
     ) -> None:
         """Initialize the Human Agent.
 
@@ -59,6 +60,7 @@ def __init__(
             system_message=system_message,
             client=client,
             definition=definition,
+            thread=thread,
         )
 
     @classmethod
@@ -81,6 +83,7 @@ async def create(
         system_message = kwargs.get("system_message", None)
         agent_name = kwargs.get("agent_name")
         client = kwargs.get("client")
+        thread = kwargs.get("thread")
 
         try:
             logging.info("Initializing HumanAgent from async init azure AI Agent")
@@ -101,6 +104,7 @@ async def create(
                 system_message=system_message,
                 agent_name=agent_name,
                 client=client,
+                thread=thread,
                 definition=agent_definition,
             )
 

src/backend/kernel_agents/marketing_agent.py

@@ -25,6 +25,7 @@ def __init__(
         agent_name: str = AgentType.MARKETING.value,
         client=None,
         definition=None,
+        thread=None,
     ) -> None:
         """Initialize the Marketing Agent.
 
@@ -61,6 +62,7 @@ def __init__(
             system_message=system_message,
             client=client,
             definition=definition,
+            thread=thread,
         )
 
     @classmethod
@@ -83,6 +85,7 @@ async def create(
         system_message = kwargs.get("system_message", None)
         agent_name = kwargs.get("agent_name")
         client = kwargs.get("client")
+        thread = kwargs.get("thread")
 
         try:
             logging.info("Initializing MarketingAgent from async init azure AI Agent")
@@ -103,6 +106,7 @@ async def create(
                 system_message=system_message,
                 agent_name=agent_name,
                 client=client,
+                thread=thread,
                 definition=agent_definition,
             )
 

src/backend/kernel_agents/procurement_agent.py

@@ -25,6 +25,7 @@ def __init__(
         agent_name: str = AgentType.PROCUREMENT.value,
         client=None,
         definition=None,
+        thread=None,
     ) -> None:
         """Initialize the Procurement Agent.
 
@@ -61,6 +62,7 @@ def __init__(
             system_message=system_message,
             client=client,
             definition=definition,
+            thread=thread,
         )
 
     @classmethod
@@ -83,6 +85,7 @@ async def create(
         system_message = kwargs.get("system_message", None)
         agent_name = kwargs.get("agent_name")
         client = kwargs.get("client")
+        thread = kwargs.get("thread")
 
         try:
             logging.info("Initializing ProcurementAgent from async init azure AI Agent")
@@ -103,6 +106,7 @@ async def create(
                 system_message=system_message,
                 agent_name=agent_name,
                 client=client,
+                thread=thread,
                 definition=agent_definition,
             )
 

src/backend/kernel_agents/product_agent.py

@@ -28,6 +28,7 @@ def __init__(
         agent_name: str = AgentType.PRODUCT.value,
         client=None,
         definition=None,
+        thread=None,
     ) -> None:
         """Initialize the Product Agent.
 
@@ -65,6 +66,7 @@ def __init__(
             system_message=system_message,
             client=client,
             definition=definition,
+            thread=thread,
         )
 
     @classmethod
@@ -87,6 +89,7 @@ async def create(
         system_message = kwargs.get("system_message", None)
         agent_name = kwargs.get("agent_name")
         client = kwargs.get("client")
+        thread = kwargs.get("thread")
 
         try:
             logging.info("Initializing ProductAgent from async init azure AI Agent")
@@ -107,6 +110,7 @@ async def create(
                 system_message=system_message,
                 agent_name=agent_name,
                 client=client,
+                thread=thread,
                 definition=agent_definition,
             )
 

src/backend/kernel_agents/tech_support_agent.py

@@ -25,6 +25,7 @@ def __init__(
         agent_name: str = AgentType.TECH_SUPPORT.value,
         client=None,
         definition=None,
+        thread=None,
     ) -> None:
         """Initialize the Tech Support Agent.
 
@@ -62,6 +63,7 @@ def __init__(
             system_message=system_message,
             client=client,
             definition=definition,
+            thread=thread,
         )
 
     @classmethod
@@ -84,6 +86,7 @@ async def create(
         system_message = kwargs.get("system_message", None)
         agent_name = kwargs.get("agent_name")
         client = kwargs.get("client")
+        thread = kwargs.get("thread")
 
         try:
             logging.info("Initializing TechSupportAgent from async init azure AI Agent")
@@ -104,6 +107,7 @@ async def create(
                 system_message=system_message,
                 agent_name=agent_name,
                 client=client,
+                thread=thread,
                 definition=agent_definition,
             )