Merge branch 'macae-rfp-agent-framework' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into psl-v4infrachanges

Author: Dhruvkumar-Microsoft

data/agent_teams/retail.json

@@ -19,8 +19,6 @@
       "use_bing": false,
       "use_reasoning": false,
       "index_name": "macae-retail-customer-index",
-      "index_foundry_name": "",
-      "index_endpoint": "",
       "coding_tools": false
     },
     {
@@ -45,8 +43,8 @@
       "name": "AnalysisRecommendationAgent",
       "deployment_name": "o4-mini",
       "icon": "",
-      "system_message": "You are a reasoning agent that can analyze customer data and provide recommendations for improving customer satisfaction and retention. You do not have access to any data sources, but you can reason based on the information provided to you by other agents. Use your reasoning skills to identify patterns, trends, and insights that can help improve customer satisfaction and retention. Provide actionable recommendations based on your analysis. You have access to other agents that can answer questions and provide data about customers, products, orders, inventory, and fulfilment. Use these agents to gather information as needed.",
-      "description": "A reasoning agent that can analyze customer data and provide recommendations for improving customer satisfaction and retention.",
+      "system_message": "You are a reasoning agent that can analyze customer and order data and provide recommendations for improving customer satisfaction and retention. You do not have access to any data sources, but you can reason based on the information provided to you by other agents. Use your reasoning skills to identify patterns, trends, and insights that can help improve customer satisfaction and retention. Provide actionable recommendations based on your analysis. You have access to other agents that can answer questions and provide data about customers, products, orders, inventory, and fulfilment. Use these agents to gather information as needed.",
+      "description": "A reasoning agent that can analyze customer and order data and provide recommendations for improving customer satisfaction and retention.",
       "use_rag": false,
       "use_mcp": false,
       "use_bing": false,

data/agent_teams/rfp_analysis_team.json

@@ -39,8 +39,6 @@
       "use_bing": false,
       "use_reasoning": false,
       "index_name": "macae-rfp-index",
-      "index_foundry_name": "",
-      "index_endpoint": "",
       "coding_tools": false
     },
     {
@@ -56,8 +54,6 @@
       "use_bing": false,
       "use_reasoning": false,
       "index_name": "macae-rfp-index",
-      "index_foundry_name": "",
-      "index_endpoint": "",
       "coding_tools": false
     }
   ],

src/backend/common/database/database_base.py

@@ -21,25 +21,30 @@ class DatabaseBase(ABC):
     @abstractmethod
     async def initialize(self) -> None:
         """Initialize the database client and create containers if needed."""
+        pass
 
     @abstractmethod
     async def close(self) -> None:
         """Close database connection."""
+        pass
 
     # Core CRUD Operations
     @abstractmethod
     async def add_item(self, item: BaseDataModel) -> None:
         """Add an item to the database."""
+        pass
 
     @abstractmethod
     async def update_item(self, item: BaseDataModel) -> None:
         """Update an item in the database."""
+        pass
 
     @abstractmethod
     async def get_item_by_id(
         self, item_id: str, partition_key: str, model_class: Type[BaseDataModel]
     ) -> Optional[BaseDataModel]:
         """Retrieve an item by its ID and partition key."""
+        pass
 
     @abstractmethod
     async def query_items(
@@ -49,92 +54,113 @@ async def query_items(
         model_class: Type[BaseDataModel],
     ) -> List[BaseDataModel]:
         """Query items from the database and return a list of model instances."""
+        pass
 
     @abstractmethod
     async def delete_item(self, item_id: str, partition_key: str) -> None:
         """Delete an item from the database."""
+        pass
 
     # Plan Operations
     @abstractmethod
     async def add_plan(self, plan: Plan) -> None:
         """Add a plan to the database."""
+        pass
 
     @abstractmethod
     async def update_plan(self, plan: Plan) -> None:
         """Update a plan in the database."""
+        pass
 
     @abstractmethod
     async def get_plan_by_plan_id(self, plan_id: str) -> Optional[Plan]:
         """Retrieve a plan by plan_id."""
+        pass
 
     @abstractmethod
     async def get_plan(self, plan_id: str) -> Optional[Plan]:
         """Retrieve a plan by plan_id."""
+        pass
 
     @abstractmethod
     async def get_all_plans(self) -> List[Plan]:
         """Retrieve all plans for the user."""
+        pass
 
     @abstractmethod
     async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
         """Retrieve all plans for a specific team."""
+        pass
 
     @abstractmethod
     async def get_all_plans_by_team_id_status(
         self, user_id: str, team_id: str, status: str
     ) -> List[Plan]:
         """Retrieve all plans for a specific team."""
+        pass
 
     # Step Operations
     @abstractmethod
     async def add_step(self, step: Step) -> None:
         """Add a step to the database."""
+        pass
 
     @abstractmethod
     async def update_step(self, step: Step) -> None:
         """Update a step in the database."""
+        pass
 
     @abstractmethod
     async def get_steps_by_plan(self, plan_id: str) -> List[Step]:
         """Retrieve all steps for a plan."""
+        pass
 
     @abstractmethod
     async def get_step(self, step_id: str, session_id: str) -> Optional[Step]:
         """Retrieve a step by step_id and session_id."""
+        pass
 
     # Team Operations
     @abstractmethod
     async def add_team(self, team: TeamConfiguration) -> None:
         """Add a team configuration to the database."""
+        pass
 
     @abstractmethod
     async def update_team(self, team: TeamConfiguration) -> None:
         """Update a team configuration in the database."""
+        pass
 
     @abstractmethod
     async def get_team(self, team_id: str) -> Optional[TeamConfiguration]:
         """Retrieve a team configuration by team_id."""
+        pass
 
     @abstractmethod
     async def get_team_by_id(self, team_id: str) -> Optional[TeamConfiguration]:
         """Retrieve a team configuration by internal id."""
+        pass
 
     @abstractmethod
     async def get_all_teams(self) -> List[TeamConfiguration]:
         """Retrieve all team configurations for the given user."""
+        pass
 
     @abstractmethod
     async def delete_team(self, team_id: str) -> bool:
         """Delete a team configuration by team_id and return True if deleted."""
+        pass
 
     # Data Management Operations
     @abstractmethod
     async def get_data_by_type(self, data_type: str) -> List[BaseDataModel]:
         """Retrieve all data of a specific type."""
+        pass
 
     @abstractmethod
     async def get_all_items(self) -> List[Dict[str, Any]]:
         """Retrieve all items as dictionaries."""
+        pass
 
     # Context Manager Support
     async def __aenter__(self):
@@ -149,47 +175,59 @@ async def __aexit__(self, exc_type, exc, tb):
     @abstractmethod
     async def get_steps_for_plan(self, plan_id: str) -> List[Step]:
         """Convenience method aliasing get_steps_by_plan for compatibility."""
+        pass
 
     @abstractmethod
     async def get_current_team(self, user_id: str) -> Optional[UserCurrentTeam]:
         """Retrieve the current team for a user."""
+        pass
 
     @abstractmethod
     async def delete_current_team(self, user_id: str) -> Optional[UserCurrentTeam]:
         """Retrieve the current team for a user."""
+        pass
 
     @abstractmethod
     async def set_current_team(self, current_team: UserCurrentTeam) -> None:
+        """Set the current team for a user."""
         pass
 
     @abstractmethod
     async def update_current_team(self, current_team: UserCurrentTeam) -> None:
         """Update the current team for a user."""
+        pass
 
     @abstractmethod
     async def delete_plan_by_plan_id(self, plan_id: str) -> bool:
-        """Retrieve the current team for a user."""
+        """Delete a plan by plan_id and return True if deleted."""
+        pass
 
     @abstractmethod
     async def add_mplan(self, mplan: messages.MPlan) -> None:
-        """Add a team configuration to the database."""
+        """Add an mplan configuration to the database."""
+        pass
 
     @abstractmethod
     async def update_mplan(self, mplan: messages.MPlan) -> None:
-        """Update a team configuration in the database."""
+        """Update an mplan configuration in the database."""
+        pass
 
     @abstractmethod
     async def get_mplan(self, plan_id: str) -> Optional[messages.MPlan]:
-        """Retrieve a mplan configuration by plan_id."""
+        """Retrieve an mplan configuration by plan_id."""
+        pass
 
     @abstractmethod
     async def add_agent_message(self, message: AgentMessageData) -> None:
+        """Add an agent message to the database."""
         pass
 
     @abstractmethod
     async def update_agent_message(self, message: AgentMessageData) -> None:
         """Update an agent message in the database."""
+        pass
 
     @abstractmethod
     async def get_agent_messages(self, plan_id: str) -> Optional[AgentMessageData]:
-        """Retrieve an agent message by message_id."""
+        """Retrieve agent messages by plan_id."""
+        pass

src/backend/v4/magentic_agents/proxy_agent.py

@@ -81,7 +81,6 @@ def get_new_thread(self, **kwargs: Any) -> AgentThread:
             A new AgentThread instance
         """
         return AgentThread(**kwargs)
-
     async def run(
         self,
         messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
@@ -161,7 +160,7 @@ async def _invoke_stream_internal(
         )
         logger.debug("ProxyAgent: Message text: %s", message_text[:100])
 
-        clarification_req_text = f"I need clarification about: {message_text}"
+        clarification_req_text = f"{message_text}"
         clarification_request = UserClarificationRequest(
             question=clarification_req_text,
             request_id=str(uuid.uuid4()),