Merge pull request #549 from phenobarbital/codex/add-tenant-attribute-to-crew

Add tenant isolation for Crew storage (Redis, Manager, Handlers)

Author: phenobarbital

parrot/handlers/crew/execution_handler.py

@@ -557,12 +557,22 @@ async def execute_crew(self, data: Dict[str, Any]):
             query = data.get('query')
             if not query:
                 return self.error(response={"message": "query is required"}, status=400)
+            tenant = data.get('tenant')
+            if not tenant:
+                self.logger.warning(
+                    "Missing 'tenant' in crew execution request; rejecting to avoid defaulting to 'global'."
+                )
+                return self.error(response={"message": "tenant is required"}, status=400)
 
             if not self.bot_manager:
                 return self.error(response={"message": "BotManager not available"}, status=500)
 
             # Load Crew
-            crew, crew_def = await self.bot_manager.get_crew(crew_id, as_new=True)
+            crew, crew_def = await self.bot_manager.get_crew(
+                crew_id,
+                as_new=True,
+                tenant=tenant
+            )
             if not crew:
                 return self.error(response={"message": f"Crew '{crew_id}' not found"}, status=404)
 
@@ -590,6 +600,7 @@ async def execute_crew(self, data: Dict[str, Any]):
 
             # Store crew name in metadata for future persistence
             job.metadata['crew_name'] = crew_def.name
+            job.metadata['tenant'] = crew_def.tenant
 
             # Cache the running crew
             self._active_crews[job_id] = crew

parrot/handlers/crew/handler.py

@@ -230,6 +230,7 @@ async def upload(self):
                     {
                         "message": "Crew uploaded and created successfully",
                         "crew_id": crew_def.crew_id,
+                        "tenant": crew_def.tenant,
                         "name": crew_def.name,
                         "execution_mode": crew_def.execution_mode.value,  # pylint: disable=E1101  #noqa
                         "agents": [agent.agent_id for agent in crew_def.agents],
@@ -285,6 +286,7 @@ async def put(self):
             # Parse request body
             data = await self.request.json()
             crew_def = CrewDefinition(**data)
+            tenant = crew_def.tenant
 
             # Validate bot manager availability
             if not self.bot_manager:
@@ -296,7 +298,7 @@ async def put(self):
                 )
             # if crew_id is provided, then is an update
             if url_crew_id:
-                existing_crew = await self.bot_manager.get_crew(url_crew_id)
+                existing_crew = await self.bot_manager.get_crew(url_crew_id, tenant=tenant)
                 if not existing_crew:
                     return self.error(
                         response={
@@ -311,7 +313,7 @@ async def put(self):
                 crew_def.updated_at = None  # Will be set on save
 
                 # Remove old crew
-                await self.bot_manager.remove_crew(url_crew_id)
+                await self.bot_manager.remove_crew(url_crew_id, tenant=tenant)
 
                 self.logger.info(f"Updating crew '{url_crew_id}'")
 
@@ -335,6 +337,7 @@ async def put(self):
                     {
                         "message": f"Crew {action} successfully",
                         "crew_id": crew_def.crew_id,
+                        "tenant": crew_def.tenant,
                         "name": crew_def.name,
                         "execution_mode": crew_def.execution_mode.value,  # pylint: disable=E1101
                         "agents": [agent.agent_id for agent in crew_def.agents],
@@ -380,6 +383,7 @@ async def get(self):
             match_params = self.match_parameters(self.request)
             crew_id = match_params.get('id') or qs.get('crew_id')
             crew_name = qs.get('name')
+            tenant = qs.get('tenant') or "global"
 
             if not self.bot_manager:
                 return self.error(
@@ -390,7 +394,7 @@ async def get(self):
             # Get specific crew
             if crew_name or crew_id:
                 identifier = crew_name or crew_id
-                crew_data = await self.bot_manager.get_crew(identifier)
+                crew_data = await self.bot_manager.get_crew(identifier, tenant=tenant)
 
                 if not crew_data:
                     return self.error(
@@ -403,6 +407,7 @@ async def get(self):
                 crew, crew_def = crew_data
                 return self.json_response({
                     "crew_id": crew_def.crew_id,
+                    "tenant": crew_def.tenant,
                     "name": crew_def.name,
                     "description": crew_def.description,
                     "execution_mode": crew_def.execution_mode.value,
@@ -421,12 +426,13 @@ async def get(self):
             await self.bot_manager.sync_crews()
 
             # List all crews
-            crews = self.bot_manager.list_crews()
+            crews = self.bot_manager.list_crews(tenant=tenant)
             crew_list = []
 
             crew_list.extend(
                 {
                     "crew_id": crew_def.crew_id,
+                    "tenant": crew_def.tenant,
                     "name": crew_def.name,
                     "description": crew_def.description,
                     "execution_mode": crew_def.execution_mode.value,
@@ -467,6 +473,7 @@ async def delete(self):
             qs = self.get_arguments(self.request)
             crew_id = match_params.get('id') or qs.get('crew_id')
             crew_name = qs.get('name')
+            tenant = qs.get('tenant') or "global"
 
             if not crew_name and not crew_id:
                 return self.error(
@@ -483,15 +490,15 @@ async def delete(self):
             identifier = crew_name or crew_id
 
             # Check if exists first
-            crew_data = await self.bot_manager.get_crew(identifier)
+            crew_data = await self.bot_manager.get_crew(identifier, tenant=tenant)
             if not crew_data:
                 return self.error(
                     response={"message": f"Crew '{identifier}' not found"},
                     status=404
                 )
 
             # Remove crew
-            await self.bot_manager.remove_crew(identifier)
+            await self.bot_manager.remove_crew(identifier, tenant=tenant)
 
             return self.json_response({
                 "message": f"Crew '{identifier}' deleted successfully"

parrot/handlers/crew/models.py

@@ -69,6 +69,10 @@ class CrewDefinition(BaseModel):
         default_factory=lambda: str(uuid.uuid4()),
         description="Unique identifier for the crew"
     )
+    tenant: str = Field(
+        default="global",
+        description="Tenant identifier for crew isolation"
+    )
     name: str = Field(description="Name of the crew")
     description: Optional[str] = Field(
         default=None,