Merge pull request #640 from Fr4nc3/macae-rfp-af-101725

Macae rfp af 101725

Author: Fr4nc3

src/backend/common/database/cosmosdb.py

@@ -12,6 +12,7 @@
     AgentMessage,
     AgentMessageData,
     BaseDataModel,
+    CurrentTeamAgent,
     DataType,
     Plan,
     Step,
@@ -491,3 +492,46 @@ async def get_agent_messages(self, plan_id: str) -> List[AgentMessageData]:
         ]
 
         return await self.query_items(query, parameters, AgentMessageData)
+
+    async def add_team_agent(self, team_agent: CurrentTeamAgent) -> None:
+        """Add an agent message to the database."""
+        await self.delete_team_agent(team_agent.team_id, team_agent.agent_name) # Ensure no duplicates
+        await self.add_item(team_agent)
+
+    async def delete_team_agent(self, team_id: str, agent_name: str) -> None:
+        """Delete the current team for a user."""
+        query = "SELECT c.id, c.session_id FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type AND c.agent_name=@agent_name"
+
+        params = [
+            {"name": "@team_id", "value": team_id},
+            {"name": "@agent_name", "value": agent_name},
+            {"name": "@data_type", "value": DataType.current_team_agent},
+        ]
+        items = self.container.query_items(query=query, parameters=params)
+        print("Items to delete:", items)
+        if items:
+            async for doc in items:
+                try:
+                    await self.container.delete_item(
+                        doc["id"], partition_key=doc["session_id"]
+                    )
+                except Exception as e:
+                    self.logger.warning(
+                        "Failed deleting current team doc %s: %s", doc.get("id"), e
+                    )
+
+        return True
+
+    async def get_team_agent(
+        self, team_id: str, agent_name: str
+    ) -> Optional[CurrentTeamAgent]:
+        """Retrieve a team agent by team_id and agent_name."""
+        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type AND c.agent_name=@agent_name"
+        params = [
+            {"name": "@team_id", "value": team_id},
+            {"name": "@agent_name", "value": agent_name},
+            {"name": "@data_type", "value": DataType.current_team_agent},
+        ]
+
+        results = await self.query_items(query, params, CurrentTeamAgent)
+        return results[0] if results else None

src/backend/common/database/database_base.py

@@ -8,6 +8,7 @@
 from ..models.messages_af import (
     AgentMessageData,
     BaseDataModel,
+    CurrentTeamAgent,
     Plan,
     Step,
     TeamConfiguration,
@@ -231,3 +232,20 @@ async def update_agent_message(self, message: AgentMessageData) -> None:
     async def get_agent_messages(self, plan_id: str) -> Optional[AgentMessageData]:
         """Retrieve agent messages by plan_id."""
         pass
+
+    @abstractmethod
+    async def add_team_agent(self, team_agent: CurrentTeamAgent) -> None:
+        """Add an agent message to the database."""
+        pass
+
+    @abstractmethod
+    async def delete_team_agent(self, team_id: str, agent_name: str) -> None:
+        """Delete a team agent from the database."""
+        pass
+
+    @abstractmethod
+    async def get_team_agent(
+        self, team_id: str, agent_name: str
+    ) -> Optional[CurrentTeamAgent]:
+        """Retrieve a team agent by team_id and agent_name."""
+        pass

src/backend/common/models/messages_af.py

@@ -22,6 +22,7 @@ class DataType(str, Enum):
     agent_message = "agent_message"
     team_config = "team_config"
     user_current_team = "user_current_team"
+    current_team_agent = "current_team_agent"
     m_plan = "m_plan"
     m_plan_message = "m_plan_message"
 
@@ -111,6 +112,17 @@ class UserCurrentTeam(BaseDataModel):
     user_id: str
     team_id: str
 
+class CurrentTeamAgent(BaseDataModel):
+    """Represents the current agent of a user."""
+    data_type: Literal[DataType.current_team_agent] = DataType.current_team_agent
+    team_id: str
+    team_name: str
+    agent_name: str
+    agent_description: str
+    agent_instructions: str
+    agent_foundry_id: str
+
+
 
 class Plan(BaseDataModel):
     """Represents a plan containing multiple steps."""

src/backend/common/utils/utils_af.py

@@ -3,13 +3,40 @@
 import logging
 
 # Converted import path (agent_framework version of FoundryAgentTemplate)
+from common.database.database_base import DatabaseBase
+from common.models.messages_af import TeamConfiguration
+from v4.common.services.team_service import TeamService
 from v4.magentic_agents.foundry_agent import FoundryAgentTemplate  # formerly v4.magentic_agents.foundry_agent
 from v4.config.agent_registry import agent_registry
 from common.config.app_config import config
 logging.basicConfig(level=logging.INFO)
 
-
-async def create_RAI_agent() -> FoundryAgentTemplate:
+async def find_first_available_team(team_service: TeamService, user_id: str) -> str:
+    """
+    Check teams in priority order (4 to 1) and return the first available team ID.
+    Priority: RFP (4) -> Retail (3) -> Marketing (2) -> HR (1)
+    """
+    team_priority_order = [
+        "00000000-0000-0000-0000-000000000004",  # RFP
+        "00000000-0000-0000-0000-000000000003",  # Retail
+        "00000000-0000-0000-0000-000000000002",  # Marketing
+        "00000000-0000-0000-0000-000000000001",  # HR
+    ]
+
+    for team_id in team_priority_order:
+        try:
+            team_config = await team_service.get_team_configuration(team_id, user_id)
+            if team_config is not None:
+                print(f"Found available team: {team_id}")
+                return team_id
+        except Exception as e:
+            print(f"Error checking team {team_id}: {str(e)}")
+            continue
+
+    print("No teams found in priority order")
+    return None
+
+async def create_RAI_agent(team: TeamConfiguration, memory_store: DatabaseBase) -> FoundryAgentTemplate:
     """Create and initialize a FoundryAgentTemplate for Responsible AI (RAI) checks."""
     agent_name = "RAIAgent"
     agent_description = "A comprehensive research assistant for integration testing"
@@ -26,7 +53,11 @@ async def create_RAI_agent() -> FoundryAgentTemplate:
         "- Is completely meaningless, incoherent, or appears to be spam\n"
         "Respond with 'TRUE' if the input violates any rules and should be blocked, otherwise respond with 'FALSE'."
     )
+    
     model_deployment_name = config.AZURE_OPENAI_DEPLOYMENT_NAME
+    team.team_id = "rai_team"  # Use a fixed team ID for RAI agent
+    team.name = "RAI Team"
+    team.description = "Team responsible for Responsible AI checks"
     agent = FoundryAgentTemplate(
         agent_name=agent_name,
         agent_description=agent_description,
@@ -36,6 +67,8 @@ async def create_RAI_agent() -> FoundryAgentTemplate:
         project_endpoint=config.AZURE_AI_PROJECT_ENDPOINT,
         mcp_config=None,
         search_config=None,
+        team_config=team,
+        memory_store=memory_store,
     )
 
     await agent.open()
@@ -78,14 +111,14 @@ async def _get_agent_response(agent: FoundryAgentTemplate, query: str) -> str:
         return "TRUE"  # Default to blocking on error
 
 
-async def rai_success(description: str) -> bool:
+async def rai_success(description: str, team_config: TeamConfiguration,  memory_store: DatabaseBase) -> bool:
     """
     Run a RAI compliance check on the provided description using the RAIAgent.
     Returns True if content is safe (should proceed), False if it should be blocked.
     """
     agent: FoundryAgentTemplate | None = None
     try:
-        agent = await create_RAI_agent()
+        agent = await create_RAI_agent(team_config, memory_store)
         if not agent:
             logging.error("Failed to instantiate RAIAgent.")
             return False
@@ -112,7 +145,7 @@ async def rai_success(description: str) -> bool:
                 pass
 
 
-async def rai_validate_team_config(team_config_json: dict) -> tuple[bool, str]:
+async def rai_validate_team_config(team_config_json: dict, team_config: TeamConfiguration,  memory_store: DatabaseBase) -> tuple[bool, str]:
     """
     Validate a team configuration for RAI compliance.
 
@@ -154,7 +187,7 @@ async def rai_validate_team_config(team_config_json: dict) -> tuple[bool, str]:
         if not combined:
             return False, "Team configuration contains no readable text content."
 
-        if not await rai_success(combined):
+        if not await rai_success(combined, team_config, memory_store):
             return (
                 False,
                 "Team configuration contains inappropriate content and cannot be uploaded.",