Fixed bugs in new model

Author: marktayl1

src/backend/v3/models/models.py

@@ -1,13 +1,24 @@
-from typing import Any, List
+import uuid
+from datetime import datetime, timezone
+from enum import Enum
+from typing import List, Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 
+class PlanStatus(str, Enum):
+    CREATED = "created"
+    QUEUED = "queued"
+    RUNNING = "running" 
+    COMPLETED = "completed"
+    FAILED = "failed"
+    CANCELLED = "cancelled"
+
 class MStep(BaseModel):
     """model of a step in a plan"""
     _agent: str = ""
     action: str = ""
-    
+
     @property
     def agent(self):
         return self._agent
@@ -16,15 +27,32 @@ def agent(self):
     def agent(self, value):
         self._agent = value if value is not None else ""
 
-
 class MPlan(BaseModel):
-    """model of a plan"""
-    session_id: str = ""
-    user_id: str = ""
-    team_id: str = ""
-    plan_id: str = ""
-    user_request: str = ""
+    id: str = Field(default_factory=lambda: str(uuid.uuid4()))
+    session_id: Optional[str] = None
+    team_id: Optional[str] = None
+    user_id: Optional[str] = None
+    overall_status: PlanStatus = PlanStatus.CREATED
+    progress: int = 0  # 0-100 percentage
+    current_step: Optional[str] = None
+    result: Optional[str] = None
+    error_message: Optional[str] = None
+    created_at: datetime = Field(datetime.now(timezone.utc))
+    updated_at: datetime = Field(datetime.now(timezone.utc))
+    estimated_completion: Optional[datetime] = None
+    user_request: Optional[str] = None
     team: List[str] = []
-    facts: str = ""
-    steps: List[MStep] = []
+    facts: Optional[str] = None
+    steps: List[MStep] = Field(default_factory=list)
+
+# class MPlan(BaseModel):
+#     """model of a plan"""
+#     session_id: str = ""
+#     user_id: str = ""
+#     team_id: str = ""
+#     plan_id: str = ""
+#     user_request: str = ""
+#     team: List[str] = []
+#     facts: str = ""
+#     steps: List[MStep] = []
 

src/backend/v3/orchestration/human_approval_manager.py

@@ -108,70 +108,6 @@ async def _get_plan_approval_with_details(self, task: str, participant_descripti
             else:
                 print("Please enter 'y' for yes, 'n' for no, or 'details' for more info")
 
-    # def _show_detailed_plan_info(self, task: str, participant_descriptions: dict, plan: Any = None):
-        """Show detailed information about the planned execution."""
-        print("\n📖 Detailed Plan Information:")
-        print("-" * 80)
-        
-        # Show the actual plan details if provided
-        if plan:
-            print("🔍 Plan Content Analysis:")
-            try:
-                if hasattr(plan, 'content') and plan.content:
-                    # Parse the plan into structured JSON format
-                    parsed_plan = self._parse_plan_to_json(plan.content, participant_descriptions)
-                    
-                    print("  📊 Structured Analysis:")
-                    print(f"    Task Summary: {parsed_plan['plan_description']['task_summary']}")
-                    print(f"    Complexity: {parsed_plan['plan_description']['complexity_assessment']}")
-                    print(f"    Total Steps: {len(parsed_plan['steps'])}")
-                    
-                    print("  📋 Step-by-Step Breakdown:")
-                    for step in parsed_plan['steps']:
-                        print(f"    {step['step_number']}. [{step['step_agent']}]")
-                        print(f"       Action: {step['step_prompt']}")
-                    
-                    print("  📄 Raw Plan Content:")
-                    content_lines = plan.content.split('\n')
-                    for line in content_lines:
-                        if line.strip():
-                            print(f"    → {line.strip()}")
-                            
-                elif hasattr(plan, '__dict__'):
-                    print("  Plan object attributes:")
-                    for key, value in plan.__dict__.items():
-                        print(f"    {key}: {str(value)[:100]}...")
-            except Exception as e:
-                print(f"  Error analyzing plan: {e}")
-        
-        # Analyze task type and show expected flow
-        task_lower = task.lower()
-        
-        if any(word in task_lower for word in ['research', 'find', 'search', 'current', 'latest']):
-            print("\n🔍 Research-Heavy Task Detected:")
-            print("  → Research Agent will search for current information")
-            print("  → May use Bing search tools and MCP capabilities")
-            print("  → Results will be analyzed by Reasoning Agent")
-            
-        if any(word in task_lower for word in ['analyze', 'calculate', 'data', 'metrics', 'chart']):
-            print("\n🔢 Analysis Task Detected:")
-            print("  → Coder Agent will process and analyze data")
-            print("  → May create visualizations and calculations")
-            print("  → Research Agent may gather supporting data")
-            
-        if any(word in task_lower for word in ['design', 'plan', 'strategy', 'recommend']):
-            print("\n🧠 Strategic Planning Task Detected:")
-            print("  → Reasoning Agent will lead strategic analysis")
-            print("  → Research Agent will gather best practices")
-            print("  → Comprehensive recommendations will be provided")
-        
-        print(f"\n👥 Available Agents:")
-        for agent_name, description in participant_descriptions.items():
-            print(f"  • {agent_name}: {description}")
-        
-        print(f"\n📝 Task: {task}")
-        print("\nThe Magentic Manager will automatically coordinate these agents")
-        print("based on the task requirements and agent capabilities.")
 
     def plan_to_obj(self, magentic_context, ledger) -> MPlan:
         """