From 4b7523022206b36868de19315aa821400197d7ad Mon Sep 17 00:00:00 2001
From: oss-agent-shin <279349115+oss-agent-shin@users.noreply.github.com>
Date: Wed, 6 May 2026 22:39:08 +0000
Subject: [PATCH] Add tag activity database guard

Co-authored-by: ishaan-berri <ishaan-berri@users.noreply.github.com>
---
 .../tag_management_endpoints.py               |  3 +++
 .../test_tag_management_endpoints.py          | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/litellm/proxy/management_endpoints/tag_management_endpoints.py b/litellm/proxy/management_endpoints/tag_management_endpoints.py
index 9b8163e598e..0a0297daa11 100644
--- a/litellm/proxy/management_endpoints/tag_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/tag_management_endpoints.py
@@ -640,6 +640,9 @@ async def get_tag_daily_activity(
     """
     from litellm.proxy.proxy_server import prisma_client
 
+    if prisma_client is None:
+        raise HTTPException(status_code=500, detail="Database not connected")
+
     # Convert comma-separated tags string to list if provided
     tag_list = tags.split(",") if tags else None
     scoped_api_key_filter = await _get_tag_daily_activity_api_key_filter(
diff --git a/tests/test_litellm/proxy/management_endpoints/test_tag_management_endpoints.py b/tests/test_litellm/proxy/management_endpoints/test_tag_management_endpoints.py
index 802ae91e9a5..d4667c0c378 100644
--- a/tests/test_litellm/proxy/management_endpoints/test_tag_management_endpoints.py
+++ b/tests/test_litellm/proxy/management_endpoints/test_tag_management_endpoints.py
@@ -645,6 +645,33 @@ async def test_internal_user_tag_daily_activity_without_any_scoped_keys_returns_
         mock_get_daily_activity.assert_not_awaited()
 
 
+@pytest.mark.asyncio
+async def test_get_tag_daily_activity_requires_database_connection():
+    """
+    Tag daily activity should fail with the same explicit DB error used by other
+    tag endpoints instead of raising an AttributeError during scope resolution.
+    """
+    from litellm.proxy.management_endpoints.tag_management_endpoints import (
+        get_tag_daily_activity,
+    )
+
+    mock_user_auth = UserAPIKeyAuth(
+        user_id="internal-user-123",
+        user_role=LitellmUserRoles.INTERNAL_USER,
+    )
+
+    with patch("litellm.proxy.proxy_server.prisma_client", None):
+        with pytest.raises(HTTPException) as exc_info:
+            await get_tag_daily_activity(
+                start_date="2025-01-01",
+                end_date="2025-01-31",
+                user_api_key_dict=mock_user_auth,
+            )
+
+    assert exc_info.value.status_code == 500
+    assert exc_info.value.detail == "Database not connected"
+
+
 @pytest.mark.asyncio
 async def test_get_deployments_by_model_id():
     """