fixup! ✨(summary) add multi-tenant support and v2 tasks / API

Author: FloChehab

src/summary/summary/api/route/tasks_v2.py

@@ -7,21 +7,19 @@
     process_audio_transcribe_v2_task,
     summarize_v2_task,
 )
-from summary.core.config import get_settings
+from summary.core.config import AuthorizedTenant
 from summary.core.models import SummarizeTaskV2Request, TranscribeTaskV2Request
-from summary.core.security import verify_tenant_api_key
+from summary.core.security import verify_tenant_api_key_v2
 
-router_tasks_v2 = APIRouter(prefix="/tasks")
-settings = get_settings()
+router_tasks_v2 = APIRouter()
 
 
 @router_tasks_v2.post("/async/transcribe")
 async def create_transcribe_task_v2(
     request: TranscribeTaskV2Request,
-    tenant_api_key: str = Depends(verify_tenant_api_key),
+    request_tenant: AuthorizedTenant = Depends(verify_tenant_api_key_v2),
 ):
     """Create a transcription task."""
-    request_tenant = settings.get_authorized_tenant(api_key=tenant_api_key)
     task = process_audio_transcribe_v2_task.apply_async(
         args=[{**request.model_dump(), "tenant_id": request_tenant.id}]
     )
@@ -32,10 +30,9 @@ async def create_transcribe_task_v2(
 @router_tasks_v2.post("/async/summarize")
 async def create_summarize_task_v2(
     request: SummarizeTaskV2Request,
-    tenant_api_key: str = Depends(verify_tenant_api_key),
+    request_tenant: AuthorizedTenant = Depends(verify_tenant_api_key_v2),
 ):
     """Create a summarization task."""
-    request_tenant = settings.get_authorized_tenant(api_key=tenant_api_key)
     task = summarize_v2_task.apply_async(
         args=[{**request.model_dump(), "tenant_id": request_tenant.id}]
     )
@@ -46,11 +43,11 @@ async def create_summarize_task_v2(
 @router_tasks_v2.get("/async/transcribe/{task_id}")
 @router_tasks_v2.get("/async/summarize/{task_id}")
 async def get_task_status(
-    task_id: str, tenant_api_key: str = Depends(verify_tenant_api_key)
+    task_id: str,
+    request_tenant: AuthorizedTenant = Depends(verify_tenant_api_key_v2),
 ):
     """Check task status by ID."""
     task = AsyncResult(task_id)
-    request_tenant = settings.get_authorized_tenant(api_key=tenant_api_key)
     try:
         if (
             isinstance(task.args, (list, tuple))

src/summary/summary/core/security.py

@@ -17,3 +17,14 @@ def verify_tenant_api_key(
     if api_key not in settings.authorized_tenant_api_keys:
         raise HTTPException(status_code=403, detail="Unauthorized")
     return api_key
+
+
+def verify_tenant_api_key_v2(
+    settings: SettingsDeps,
+    credentials: HTTPAuthorizationCredentials = Security(security),  # noqa: B008
+):
+    """Verify the bearer api_key from the Authorization header."""
+    api_key = credentials.credentials
+    if api_key not in settings.authorized_tenant_api_keys:
+        raise HTTPException(status_code=403, detail="Unauthorized")
+    return settings.get_authorized_tenant(api_key=api_key)

src/summary/tests/api/test_api_tasks_v2.py

@@ -0,0 +1,130 @@
+"""Integration tests for the V2 task API endpoints."""
+
+from unittest.mock import MagicMock, patch
+
+
+class TestTasksV2:
+    """Tests for the /tasks async V2 endpoints."""
+
+    @patch(
+        "summary.api.route.tasks_v2.process_audio_transcribe_v2_task.apply_async",
+        return_value=MagicMock(id="transcribe-task-id-abc"),
+    )
+    def test_create_transcribe_task_v2_returns_task_id(self, mock_apply_async, client):
+        """POST /async/transcribe creates a task and injects tenant_id."""
+        response = client.post(
+            "/api/v2/async/transcribe",
+            headers={"Authorization": "Bearer test-api-token"},
+            json={
+                "remote_id": "remote-001",
+                "remote_owner_id": "owner-123",
+                "cloud_storage_url": "https://example.com/audio.mp3",
+                "language": "en",
+                "context_language": "fr",
+            },
+        )
+
+        assert response.status_code == 200
+        assert response.json() == {
+            "id": "transcribe-task-id-abc",
+            "message": "Transcribe task created",
+        }
+
+        args = mock_apply_async.call_args.kwargs["args"]
+        assert args == [
+            {
+                "remote_id": "remote-001",
+                "remote_owner_id": "owner-123",
+                "cloud_storage_url": "https://example.com/audio.mp3",
+                "language": "en",
+                "context_language": "fr",
+                "tenant_id": "test-tenant",
+            }
+        ]
+
+    @patch(
+        "summary.api.route.tasks_v2.summarize_v2_task.apply_async",
+        return_value=MagicMock(id="summarize-task-id-abc"),
+    )
+    def test_create_summarize_task_v2_returns_task_id(self, mock_apply_async, client):
+        """POST /async/summarize creates a task and injects tenant_id."""
+        response = client.post(
+            "/api/v2/async/summarize",
+            headers={"Authorization": "Bearer test-api-token"},
+            json={
+                "remote_id": "remote-002",
+                "remote_owner_id": "owner-456",
+                "content": "This is a long meeting transcript to summarize.",
+            },
+        )
+
+        assert response.status_code == 200
+        assert response.json() == {
+            "id": "summarize-task-id-abc",
+            "message": "Summarize task created",
+        }
+
+        args = mock_apply_async.call_args.kwargs["args"]
+        assert args == [
+            {
+                "remote_id": "remote-002",
+                "remote_owner_id": "owner-456",
+                "content": "This is a long meeting transcript to summarize.",
+                "tenant_id": "test-tenant",
+            }
+        ]
+
+    @patch("summary.api.route.tasks_v2.AsyncResult")
+    def test_get_transcribe_task_status_returns_status_for_same_tenant(
+        self, mock_async_result, client
+    ):
+        """GET /async/transcribe/{id} returns status when tenant matches."""
+        mock_async_result.return_value = MagicMock(
+            status="PENDING",
+            args=[{"tenant_id": "test-tenant"}],
+        )
+
+        response = client.get(
+            "/api/v2/async/transcribe/task-id-abc",
+            headers={"Authorization": "Bearer test-api-token"},
+        )
+
+        assert response.status_code == 200
+        assert response.json() == {"id": "task-id-abc", "status": "PENDING"}
+
+        mock_async_result.assert_called_once_with("task-id-abc")
+
+    @patch("summary.api.route.tasks_v2.AsyncResult")
+    def test_get_summarize_task_status_returns_status_for_same_tenant(
+        self, mock_async_result, client
+    ):
+        """GET /async/summarize/{id} returns status when tenant matches."""
+        mock_async_result.return_value = MagicMock(
+            status="SUCCESS",
+            args=[{"tenant_id": "test-tenant"}],
+        )
+
+        response = client.get(
+            "/api/v2/async/summarize/task-id-abc",
+            headers={"Authorization": "Bearer test-api-token"},
+        )
+
+        assert response.status_code == 200
+        assert response.json() == {"id": "task-id-abc", "status": "SUCCESS"}
+
+        mock_async_result.assert_called_once_with("task-id-abc")
+
+    @patch("summary.api.route.tasks_v2.AsyncResult")
+    def test_get_task_status_returns_404_when_args_are_missing(
+        self, mock_async_result, client
+    ):
+        """GET /async/.../{id} returns 404 when task args are invalid."""
+        mock_async_result.return_value = MagicMock(status="SUCCESS", args=None)
+
+        response = client.get(
+            "/api/v2/async/transcribe/task-id-abc",
+            headers={"Authorization": "Bearer test-api-token"},
+        )
+
+        assert response.status_code == 404
+        assert response.json() == {"detail": "Not found"}