Update agent.py

agent.py

@@ -342,27 +342,8 @@ class MagAgent:
             max_tokens=8192
         )
 
-        # Add explicit managed_agent template validation
-        required_managed_agent_vars = {'task', 'question_analysis', 'subtasks', 'validation_rules'}
-        if missing_vars := required_managed_agent_vars - set(self.prompt_templates["managed_agent"]["variables"]):
-            raise ValueError(f"Missing required variables in managed_agent template: {missing_vars}")
-
-        # Verify template contains actual task placeholder
-        if "{task}" not in self.prompt_templates["managed_agent"]["template"]:
-            raise ConfigurationError("Managed agent template missing {task} placeholder")
-
-        print("Managed Agent Template:", self.prompt_templates["managed_agent"]["template"])
         
-        self.tools = [
-            UniversalLoader(),
-            CrossVerifiedSearch(),  # Replaces individual search tools
-            ValidatedExcelReader(),
-            VisitWebpageTool(),
-            DownloadTaskAttachmentTool(),
-            SpeechToTextTool(),
-        ]
-
-        # Initialize with default prompts as nested dictionaries
+        # Initialize with default prompts FIRST
         self.prompt_templates = {
             "system_prompt": {
                 "template": "You are Magus...",
@@ -385,12 +366,13 @@ class MagAgent:
             "final_answer": {
                 "template": "Final Verified Answer...",
                 "variables": ["sources", "answer"]
-                }
+            }
         }
         
+        # THEN load custom prompts
         try:
             with open("prompts.yaml") as f:
-                user_prompts = yaml.safe_load(f) 
+                user_prompts = yaml.safe_load(f)
                 
                 if isinstance(user_prompts, dict):
                     for key in self.prompt_templates:
@@ -401,6 +383,7 @@ class MagAgent:
                                 if k in ['template', 'variables']
                             })
                             
+                            # Merge additional keys
                             for template_key in user_prompts[key].keys():
                                 if template_key not in ['template', 'variables']:
                                     self.prompt_templates[key][template_key] = user_prompts[key][template_key]
@@ -410,16 +393,27 @@ class MagAgent:
         except Exception as e:
             print(f"Error loading prompts.yaml: {str(e)}. Using default templates")
 
+        # NOW perform validations
         # Final validation
         required_keys = {'system_prompt', 'managed_agent', 'planning', 'final_answer'}
         if missing := required_keys - self.prompt_templates.keys():
             raise ValueError(f"Missing required prompt templates: {missing}")
 
-        # Replace sub_template validation with:
+        # Managed agent validation
+        required_managed_agent_vars = {'task', 'question_analysis', 'subtasks', 'validation_rules'}
+        if missing_vars := required_managed_agent_vars - set(self.prompt_templates["managed_agent"]["variables"]):
+            raise ValueError(f"Missing required variables in managed_agent template: {missing_vars}")
+
+        if "{task}" not in self.prompt_templates["managed_agent"]["template"]:
+            raise ValueError("Managed agent template missing {task} placeholder")
+
+        # Planning validation
         required_planning_templates = {'initial_plan', 'initial_facts'}
         if missing := required_planning_templates - self.prompt_templates['planning'].keys():
-            raise ValueError(f"Missing required planning templates: {missing}")        
-
+            raise ValueError(f"Missing required planning templates: {missing}")
+        
+        print("Managed Agent Template:", self.prompt_templates["managed_agent"]["template"])
+        
         print("Loaded prompt templates:")  # Debug line
         for name, template in self.prompt_templates.items():
             print(f"{name}:")
@@ -427,6 +421,16 @@ class MagAgent:
             if 'sub_templates' in template:
                 print(f"Sub-templates: {list(template['sub_templates'].keys())}")
             print("---")
+
+        # THEN initialize tools and agent
+        self.tools = [
+            UniversalLoader(),
+            CrossVerifiedSearch(),
+            ValidatedExcelReader(),
+            VisitWebpageTool(),
+            DownloadTaskAttachmentTool(),
+            SpeechToTextTool(),
+        ]
         
         self.agent = CodeAgent(
             model=self.model,