refac

backend/open_webui/routers/automations.py

@@ -16,6 +16,7 @@ from open_webui.models.automations import (
     Automations,
 )
 from open_webui.models.config import Config
+from open_webui.models.folders import Folders
 from open_webui.utils.access_control import has_permission
 from open_webui.utils.auth import get_admin_user, get_verified_user
 from open_webui.utils.automations import (
@@ -56,16 +57,11 @@ async def check_automations_permission(request, user):
 
 
 def check_automation_access(automation, user):
-    if not automation:
+    if not automation or user.id != automation.user_id:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
             detail=ERROR_MESSAGES.NOT_FOUND,
         )
-    if user.role != 'admin' and user.id != automation.user_id:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail=ERROR_MESSAGES.UNAUTHORIZED,
-        )
 
 
 async def check_automation_limits(request, user, rrule_str: str, db, is_create: bool = False):
@@ -97,6 +93,17 @@ async def check_automation_limits(request, user, rrule_str: str, db, is_create:
                 )
 
 
+async def check_automation_folder_access(folder_id: Optional[str], user, db: AsyncSession):
+    if folder_id is None:
+        return
+    folder = await Folders.get_folder_by_id_and_user_id(folder_id, user.id, db=db)
+    if not folder:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+
 async def enrich_automation(automation: AutomationModel, db: AsyncSession, tz: str = None) -> AutomationResponse:
     """Full enrichment for single-item views (includes next_runs computation)."""
     last_run = await AutomationRuns.get_latest(automation.id, db=db)
@@ -117,6 +124,7 @@ async def get_automation_items(
     request: Request,
     query: Optional[str] = None,
     status: Optional[str] = None,
+    folder_id: Optional[str] = None,
     page: Optional[int] = 1,
     user=Depends(get_verified_user),
     db: AsyncSession = Depends(get_async_session),
@@ -130,6 +138,7 @@ async def get_automation_items(
         user_id=user.id,
         query=query,
         status=status,
+        folder_id=folder_id,
         skip=skip,
         limit=limit,
         db=db,
@@ -164,6 +173,7 @@ async def create_new_automation(
     db: AsyncSession = Depends(get_async_session),
 ):
     await check_automations_permission(request, user)
+    await check_automation_folder_access(form_data.folder_id, user, db)
     try:
         validate_rrule(form_data.data.rrule, tz=user.timezone)
     except ValueError as e:
@@ -182,7 +192,7 @@ async def create_new_automation(
         EVENTS.AUTOMATION_CREATED,
         actor=user,
         subject_id=automation.id,
-        data={'name': automation.name, 'is_active': automation.is_active},
+        data={'name': automation.name, 'is_active': automation.is_active, 'folder_id': automation.folder_id},
     )
     return response
 
@@ -221,6 +231,7 @@ async def update_automation_by_id(
     await check_automations_permission(request, user)
     automation = await Automations.get_by_id(id, db=db)
     check_automation_access(automation, user)
+    await check_automation_folder_access(form_data.folder_id, user, db)
 
     try:
         validate_rrule(form_data.data.rrule, tz=user.timezone)
@@ -240,7 +251,7 @@ async def update_automation_by_id(
         EVENTS.AUTOMATION_UPDATED,
         actor=user,
         subject_id=updated.id,
-        data={'name': updated.name, 'is_active': updated.is_active},
+        data={'name': updated.name, 'is_active': updated.is_active, 'folder_id': updated.folder_id},
     )
     return response
 

backend/open_webui/routers/folders.py

@@ -12,6 +12,7 @@ from open_webui.config import UPLOAD_DIR
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.events import EVENTS, publish_event
 from open_webui.internal.db import get_async_session
+from open_webui.models.chat_messages import ChatMessages
 from open_webui.models.config import Config
 from open_webui.models.chats import Chats
 from open_webui.models.folders import (
@@ -22,6 +23,7 @@ from open_webui.models.folders import (
     FolderUpdateForm,
 )
 from open_webui.models.access_grants import AccessGrants
+from open_webui.models.automations import Automations
 from open_webui.models.groups import Groups
 from open_webui.models.users import Users
 from open_webui.utils.access_control import has_permission
@@ -30,6 +32,7 @@ from open_webui.utils.access_control import (
 )
 from open_webui.utils.access_control.files import get_accessible_folder_files
 from open_webui.utils.auth import get_admin_user, get_verified_user
+from open_webui.tasks import has_active_tasks
 from pydantic import BaseModel
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -92,9 +95,26 @@ async def get_folders(
                     folder.id, user.id, FolderUpdateForm(data=folder.data), db=db
                 )
 
-        folder_list.append(FolderNameIdResponse(**folder.model_dump()))
+        folder_list.append(folder)
 
-    return folder_list
+    direct_unread_counts = await Chats.count_unread_by_folder_ids(
+        user.id, [folder.id for folder in folder_list], db=db
+    )
+    parent_by_id = {folder.id: folder.parent_id for folder in folder_list}
+    unread_counts = dict.fromkeys(parent_by_id.keys(), 0)
+    for unread_folder_id, unread_count in direct_unread_counts.items():
+        current_id = unread_folder_id
+        seen = set()
+        while current_id and current_id not in seen:
+            seen.add(current_id)
+            if current_id in unread_counts:
+                unread_counts[current_id] += unread_count
+            current_id = parent_by_id.get(current_id)
+
+    return [
+        FolderNameIdResponse(**folder.model_dump(), unread_count=unread_counts.get(folder.id, 0))
+        for folder in folder_list
+    ]
 
 
 ############################
@@ -529,6 +549,9 @@ async def get_shared_folder_chats(
             u = await Users.get_user_by_id(uid, db=db)
             owner_cache[uid] = u.name if u else 'Unknown'
         chat['owner_name'] = owner_cache[uid]
+        chat['active'] = False
+        if await has_active_tasks(request.app.state.redis, chat['id']):
+            chat['active'] = await ChatMessages.has_unfinished_assistant_by_chat_id(chat['id'], db=db)
 
     response = {
         'chats': [{**chat, 'readonly': chat['user_id'] != user.id} for chat in chats],
@@ -607,6 +630,8 @@ async def delete_folder_by_id(
                     # Clean up access grants for this folder
                     await AccessGrants.revoke_all_access('folder', folder_id, db=db)
 
+                await Automations.clear_folder_ids(folder_owner_id, folder_ids, db=db)
+
                 await publish_event(
                     request,
                     EVENTS.FOLDER_DELETED,