Merge branch 'feature/azd-kernel-invoke-marktayl'

Author: Fr4nc3

src/backend/kernel_agents/agent_base.py

@@ -1,18 +1,18 @@
-import logging
 import json
+import logging
 import os
-from typing import Any, Dict, List, Mapping, Optional, Callable, Awaitable
+from typing import Any, Awaitable, Callable, Dict, List, Mapping, Optional, Union
 
 import semantic_kernel as sk
+from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
 from semantic_kernel.functions import KernelFunction
-from semantic_kernel.functions.kernel_function_decorator import kernel_function
 from semantic_kernel.functions.kernel_arguments import KernelArguments
-from semantic_kernel.agents.azure_ai.azure_ai_agent import AzureAIAgent
+from semantic_kernel.functions.kernel_function_decorator import kernel_function
 
 # Updated imports for compatibility
 try:
     # Try importing from newer structure first
-    from semantic_kernel.contents import ChatMessageContent, ChatHistory
+    from semantic_kernel.contents import ChatHistory, ChatMessageContent
 except ImportError:
     # Fall back to older structure for compatibility
     class ChatMessageContent:
@@ -30,7 +30,10 @@ def __init__(self):
             self.messages = []
 
 
+# Import the new AppConfig instance
+from app_config import config
 from context.cosmos_memory_kernel import CosmosMemoryContext
+from event_utils import track_event_if_configured
 from models.messages_kernel import (
     ActionRequest,
     ActionResponse,
@@ -39,10 +42,6 @@ def __init__(self):
     StepStatus,
 )
 
-# Import the new AppConfig instance
-from app_config import config
-from event_utils import track_event_if_configured
-
 # Default formatting instructions used across agents
 DEFAULT_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."
 
@@ -77,6 +76,8 @@ def __init__(
             client: The client required by AzureAIAgent
             definition: The definition required by AzureAIAgent
         """
+        # Add plugins if not already set
+        # if not self.plugins:
         # If agent_type is provided, load tools from config automatically
         if agent_type and not tools:
             tools = self.get_tools_from_config(kernel, agent_type)
@@ -94,6 +95,7 @@ def __init__(
         super().__init__(
             kernel=kernel,
             deployment_name=None,  # Set as needed
+            plugins=None,  # Use the loaded plugins,
             endpoint=None,  # Set as needed
             api_version=None,  # Set as needed
             token=None,  # Set as needed
@@ -120,6 +122,15 @@ def __init__(
         # Register the handler functions
         self._register_functions()
 
+    # @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
+
     def _default_system_message(self, agent_name=None) -> str:
         name = agent_name or getattr(self, "_agent_name", "Agent")
         return f"You are an AI assistant named {name}. Help the user by providing accurate and helpful information."
@@ -202,7 +213,9 @@ async def handle_action_request(self, action_request: ActionRequest) -> str:
 
             # Call the agent to handle the action
             async_generator = self._agent.invoke(
-                f"{action_request.action}\n\nPlease perform this action"
+                # messages=f"{json.dumps(self._chat_history)}\n\n
+                messages=f"{action_request.action}\n\nPlease perform this action"
+                # messages=action_request.action
             )
 
             response_content = ""
@@ -477,7 +490,7 @@ def get_tools_from_config(
         plugin_name = f"{agent_type}_plugin"
 
         # Early return if no tools defined - prevent empty iteration
-        if not config.get("tools"):
+        if not config.get("tools"):  # or agent_type == "Product_Agent":
             logging.info(
                 f"No tools defined for agent type '{agent_type}'. Returning empty list."
             )

src/backend/kernel_agents/hr_tools.py

@@ -1,11 +1,11 @@
 from typing import List, Optional
 
 import semantic_kernel as sk
-from semantic_kernel.functions import KernelFunction
-
-from kernel_agents.agent_base import BaseAgent
 from context.cosmos_memory_kernel import CosmosMemoryContext
+from kernel_agents.agent_base import BaseAgent
+from kernel_agents.marketing_tools import MarketingTools
 from models.messages_kernel import AgentType
+from semantic_kernel.functions import KernelFunction
 
 
 class MarketingAgent(BaseAgent):
@@ -48,7 +48,7 @@ def __init__(
         if tools is None:
             # Load the marketing tools configuration
             config = self.load_tools_config("marketing", config_path)
-            tools = self.get_tools_from_config(kernel, "marketing", config_path)
+            tools = self.get_tools(kernel, "marketing", config_path)
 
             # Use system message from config if not explicitly provided
             if not system_message:
@@ -71,3 +71,8 @@ def __init__(
             client=client,
             definition=definition,
         )
+
+    # @property
+    # def plugins(self):
+    #     """Get the plugins for the syntax checker agent."""
+    #     return ["marketing_functions", MarketingTools()]