Merge pull request #115 from Fr4nc3/main

Fixing agents

Author: Fr4nc3

src/backend/app_kernel.py

@@ -37,7 +37,7 @@
 )
 from utils_kernel import initialize_runtime_and_context, get_agents, rai_success
 from event_utils import track_event_if_configured
-from models.agent_types import AgentType
+from models.messages_kernel import AgentType
 from kernel_agents.agent_factory import AgentFactory
 
 # # Check if the Application Insights Instrumentation Key is set in the environment variables
@@ -242,7 +242,7 @@ async def human_feedback_endpoint(human_feedback: HumanFeedback, request: Reques
     agents = await get_agents(human_feedback.session_id, user_id)
 
     # Send the feedback to the human agent
-    human_agent = agents["HumanAgent"]
+    human_agent = agents[AgentType.HUMAN.value]
 
     # Convert feedback to JSON for the kernel function
     human_feedback_json = human_feedback.json()
@@ -325,7 +325,7 @@ async def human_clarification_endpoint(
     agents = await get_agents(human_clarification.session_id, user_id)
 
     # Send the clarification to the planner agent
-    planner_agent = agents["PlannerAgent"]
+    planner_agent = agents[AgentType.PLANNER.value]
 
     # Convert clarification to JSON for proper processing
     human_clarification_json = human_clarification.json()
@@ -419,7 +419,7 @@ async def approve_step_endpoint(
     human_feedback_json = human_feedback.json()
 
     # First process with HumanAgent to update step status
-    human_agent = agents["HumanAgent"]
+    human_agent = agents[AgentType.HUMAN.value]
     await human_agent.handle_human_feedback(
         KernelArguments(human_feedback_json=human_feedback_json)
     )

src/backend/kernel_agents/agent_base.py

@@ -457,11 +457,11 @@ async def kernel_wrapper(kernel_arguments: KernelArguments = None, **kwargs) ->
         return kernel_wrapper
 
     @staticmethod
-    def load_tools_config(agent_type: str, config_path: Optional[str] = None) -> Dict[str, Any]:
+    def load_tools_config(filename: str, config_path: Optional[str] = None) -> Dict[str, Any]:
         """Load tools configuration from a JSON file.
         
         Args:
-            agent_type: The type of agent (e.g., "marketing", "hr")
+            filename: The filename without extension (e.g., "hr", "marketing")
             config_path: Optional explicit path to the configuration file
             
         Returns:
@@ -471,16 +471,26 @@ def load_tools_config(agent_type: str, config_path: Optional[str] = None) -> Dic
             # Default path relative to the tools directory
             current_dir = os.path.dirname(os.path.abspath(__file__))
             backend_dir = os.path.dirname(current_dir)  # Just one level up to get to backend dir
-            config_path = os.path.join(backend_dir, "tools", f"{agent_type}_tools.json")
+            
+            # Normalize filename to avoid issues with spaces and capitalization
+            # Convert "Hr Agent" to "hr" and "TechSupport Agent" to "tech_support"
+            logging.debug(f"Normalizing filename: {filename}")
+            normalized_filename = filename.replace(" ", "_").replace("-", "_").lower()
+            # If it ends with "_agent", remove it
+            if normalized_filename.endswith("_agent"):
+                normalized_filename = normalized_filename[:-6]
+            logging
+            config_path = os.path.join(backend_dir, "tools", f"{normalized_filename}_tools.json")
+            logging.debug(f"Looking for tools config at: {config_path}")
 
         try:
             with open(config_path, "r") as f:
                 return json.load(f)
         except Exception as e:
-            logging.error(f"Error loading {agent_type} tools configuration: {e}")
+            logging.error(f"Error loading {filename} tools configuration: {e}")
             # Return empty default configuration
             return {
-                "agent_name": f"{agent_type.capitalize()}Agent",
+                "agent_name": f"{filename.capitalize()}Agent",
                 "system_message": "You are an AI assistant",
                 "tools": []
             }