enh/refac: deprecate USER_POOL

backend/open_webui/routers/channels.py

@@ -10,7 +10,6 @@ from pydantic import BaseModel
 from open_webui.socket.main import (
     sio,
     get_user_ids_from_room,
-    get_active_status_by_user_id,
 )
 from open_webui.models.users import (
     UserIdNameResponse,
@@ -99,10 +98,7 @@ async def get_channels(user=Depends(get_verified_user)):
             ]
             users = [
                 UserIdNameStatusResponse(
-                    **{
-                        **user.model_dump(),
-                        "is_active": get_active_status_by_user_id(user.id),
-                    }
+                    **{**user.model_dump(), "is_active": Users.is_user_active(user.id)}
                 )
                 for user in Users.get_users_by_user_ids(user_ids)
             ]
@@ -284,7 +280,7 @@ async def get_channel_members_by_id(
         return {
             "users": [
                 UserModelResponse(
-                    **user.model_dump(), is_active=get_active_status_by_user_id(user.id)
+                    **user.model_dump(), is_active=Users.is_user_active(user.id)
                 )
                 for user in users
             ],
@@ -316,7 +312,7 @@ async def get_channel_members_by_id(
         return {
             "users": [
                 UserModelResponse(
-                    **user.model_dump(), is_active=get_active_status_by_user_id(user.id)
+                    **user.model_dump(), is_active=Users.is_user_active(user.id)
                 )
                 for user in users
             ],

backend/open_webui/routers/users.py

@@ -26,12 +26,6 @@ from open_webui.models.users import (
     UserUpdateForm,
 )
 
-
-from open_webui.socket.main import (
-    get_active_status_by_user_id,
-    get_active_user_ids,
-    get_user_active_status,
-)
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.env import SRC_LOG_LEVELS, STATIC_DIR
 
@@ -51,23 +45,6 @@ log.setLevel(SRC_LOG_LEVELS["MODELS"])
 router = APIRouter()
 
 
-############################
-# GetActiveUsers
-############################
-
-
-@router.get("/active")
-async def get_active_users(
-    user=Depends(get_verified_user),
-):
-    """
-    Get a list of active users.
-    """
-    return {
-        "user_ids": get_active_user_ids(),
-    }
-
-
 ############################
 # GetUsers
 ############################
@@ -364,7 +341,7 @@ async def update_user_info_by_session_user(
 class UserActiveResponse(BaseModel):
     name: str
     profile_image_url: Optional[str] = None
-    active: Optional[bool] = None
+    is_active: bool
     model_config = ConfigDict(extra="allow")
 
 
@@ -390,7 +367,7 @@ async def get_user_by_id(user_id: str, user=Depends(get_verified_user)):
             **{
                 "id": user.id,
                 "name": user.name,
-                "active": get_active_status_by_user_id(user_id),
+                "is_active": Users.is_user_active(user_id),
             }
         )
     else:
@@ -457,7 +434,7 @@ async def get_user_profile_image_by_id(user_id: str, user=Depends(get_verified_u
 @router.get("/{user_id}/active", response_model=dict)
 async def get_user_active_status_by_id(user_id: str, user=Depends(get_verified_user)):
     return {
-        "active": get_user_active_status(user_id),
+        "active": Users.is_user_active(user_id),
     }