From caf3362be82383e13d3bde384492fee42278e6e8 Mon Sep 17 00:00:00 2001
From: Classic298 <27028174+Classic298@users.noreply.github.com>
Date: Sun, 8 Mar 2026 23:11:12 +0100
Subject: [PATCH] fix: add missing group_id filter to analytics token usage
 query (#22167)

The get_token_usage_by_user query lacked group_id filtering, while the
companion get_message_count_by_user query already supported it. When an
admin filtered analytics by user group, message counts were correctly
scoped to the group but token usage totals included data from all users.

Add the group_id parameter and subquery filter to get_token_usage_by_user,
matching the pattern used by get_message_count_by_user and other analytics
queries, and pass group_id through from the analytics endpoint.
---
 backend/open_webui/models/chat_messages.py | 9 +++++++++
 backend/open_webui/routers/analytics.py    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/backend/open_webui/models/chat_messages.py b/backend/open_webui/models/chat_messages.py
index b707ab358b..00609ce7f0 100644
--- a/backend/open_webui/models/chat_messages.py
+++ b/backend/open_webui/models/chat_messages.py
@@ -420,11 +420,13 @@ class ChatMessageTable:
         self,
         start_date: Optional[int] = None,
         end_date: Optional[int] = None,
+        group_id: Optional[str] = None,
         db: Optional[Session] = None,
     ) -> dict[str, dict]:
         """Aggregate token usage by user using database-level aggregation."""
         with get_db_context(db) as db:
             from sqlalchemy import func, cast, Integer
+            from open_webui.models.groups import GroupMember
 
             dialect = db.bind.dialect.name
 
@@ -464,6 +466,13 @@ class ChatMessageTable:
                 query = query.filter(ChatMessage.created_at >= start_date)
             if end_date:
                 query = query.filter(ChatMessage.created_at <= end_date)
+            if group_id:
+                group_users = (
+                    db.query(GroupMember.user_id)
+                    .filter(GroupMember.group_id == group_id)
+                    .subquery()
+                )
+                query = query.filter(ChatMessage.user_id.in_(group_users))
 
             results = query.group_by(ChatMessage.user_id).all()
 
diff --git a/backend/open_webui/routers/analytics.py b/backend/open_webui/routers/analytics.py
index 1bd12f7bdb..9579845a49 100644
--- a/backend/open_webui/routers/analytics.py
+++ b/backend/open_webui/routers/analytics.py
@@ -86,7 +86,7 @@ async def get_user_analytics(
         start_date=start_date, end_date=end_date, group_id=group_id, db=db
     )
     token_usage = ChatMessages.get_token_usage_by_user(
-        start_date=start_date, end_date=end_date, db=db
+        start_date=start_date, end_date=end_date, group_id=group_id, db=db
     )
 
     # Get user info for top users