refac

backend/open_webui/models/chat_messages.py

@@ -313,7 +313,6 @@ class ChatMessageTable:
             stmt = select(ChatMessage.model_id, func.count(ChatMessage.id).label('count')).filter(
                 ChatMessage.role == 'assistant',
                 ChatMessage.model_id.isnot(None),
-                ~ChatMessage.user_id.like('shared-%'),
             )
 
             if start_date:
@@ -368,7 +367,6 @@ class ChatMessageTable:
                 ChatMessage.role == 'assistant',
                 ChatMessage.model_id.isnot(None),
                 ChatMessage.usage.isnot(None),
-                ~ChatMessage.user_id.like('shared-%'),
             )
 
             if start_date:
@@ -430,7 +428,6 @@ class ChatMessageTable:
                 ChatMessage.role == 'assistant',
                 ChatMessage.user_id.isnot(None),
                 ChatMessage.usage.isnot(None),
-                ~ChatMessage.user_id.like('shared-%'),
             )
 
             if start_date:
@@ -465,7 +462,7 @@ class ChatMessageTable:
             from open_webui.models.groups import GroupMember
 
             stmt = select(ChatMessage.user_id, func.count(ChatMessage.id).label('count')).filter(
-                ~ChatMessage.user_id.like('shared-%')
+                ChatMessage.role == 'assistant',
             )
 
             if start_date:
@@ -491,7 +488,7 @@ class ChatMessageTable:
             from open_webui.models.groups import GroupMember
 
             stmt = select(ChatMessage.chat_id, func.count(ChatMessage.id).label('count')).filter(
-                ~ChatMessage.user_id.like('shared-%')
+                ChatMessage.role == 'assistant',
             )
 
             if start_date:
@@ -521,7 +518,6 @@ class ChatMessageTable:
             stmt = select(ChatMessage.created_at, ChatMessage.model_id).filter(
                 ChatMessage.role == 'assistant',
                 ChatMessage.model_id.isnot(None),
-                ~ChatMessage.user_id.like('shared-%'),
             )
 
             if start_date:
@@ -568,7 +564,6 @@ class ChatMessageTable:
             stmt = select(ChatMessage.created_at, ChatMessage.model_id).filter(
                 ChatMessage.role == 'assistant',
                 ChatMessage.model_id.isnot(None),
-                ~ChatMessage.user_id.like('shared-%'),
             )
 
             if start_date:

backend/open_webui/routers/users.py

@@ -14,7 +14,7 @@ from open_webui.models.auths import Auths
 from open_webui.models.oauth_sessions import OAuthSessions
 
 from open_webui.models.groups import Groups
-from open_webui.models.chats import Chats
+
 from open_webui.models.users import (
     UserModel,
     UserGroupIdsModel,
@@ -414,18 +414,6 @@ class UserActiveResponse(UserStatus):
 
 @router.get('/{user_id}', response_model=UserActiveResponse)
 async def get_user_by_id(user_id: str, user=Depends(get_admin_user), db: AsyncSession = Depends(get_async_session)):
-    # Check if user_id is a shared chat
-    # If it is, get the user_id from the chat
-    if user_id.startswith('shared-'):
-        chat_id = user_id.replace('shared-', '')
-        chat = await Chats.get_chat_by_id(chat_id)
-        if chat:
-            user_id = chat.user_id
-        else:
-            raise HTTPException(
-                status_code=status.HTTP_400_BAD_REQUEST,
-                detail=ERROR_MESSAGES.USER_NOT_FOUND,
-            )
 
     user = await Users.get_user_by_id(user_id, db=db)
     if user: