refac

backend/open_webui/models/automations.py

@@ -21,6 +21,7 @@ class Automation(Base):
 
     id = Column(Text, primary_key=True)
     user_id = Column(Text, nullable=False)
+    folder_id = Column(Text, nullable=True)
     name = Column(Text, nullable=False)
     data = Column(JSON, nullable=False)  # {prompt, model_id, rrule}
     meta = Column(JSON, nullable=True)
@@ -31,7 +32,10 @@ class Automation(Base):
     created_at = Column(BigInteger, nullable=False)
     updated_at = Column(BigInteger, nullable=False)
 
-    __table_args__ = (Index('ix_automation_next_run', 'next_run_at'),)
+    __table_args__ = (
+        Index('ix_automation_next_run', 'next_run_at'),
+        Index('ix_automation_user_folder', 'user_id', 'folder_id'),
+    )
 
 
 class AutomationRun(Base):
@@ -72,6 +76,7 @@ class AutomationModel(BaseModel):
 
     id: str
     user_id: str
+    folder_id: Optional[str] = None
     name: str
     data: dict
     meta: Optional[dict] = None
@@ -96,6 +101,7 @@ class AutomationRunModel(BaseModel):
 
 class AutomationForm(BaseModel):
     name: str
+    folder_id: Optional[str] = None
     data: AutomationData
     meta: Optional[dict] = None
     is_active: Optional[bool] = True
@@ -129,6 +135,7 @@ class AutomationTable:
             row = Automation(
                 id=str(uuid4()),
                 user_id=user_id,
+                folder_id=form.folder_id,
                 name=form.name,
                 data=form.data.model_dump(),
                 meta=form.meta,
@@ -164,6 +171,7 @@ class AutomationTable:
         user_id: str,
         query: Optional[str] = None,
         status: Optional[str] = None,
+        folder_id: Optional[str] = None,
         skip: int = 0,
         limit: int = 30,
         db: Optional[AsyncSession] = None,
@@ -171,6 +179,9 @@ class AutomationTable:
         async with get_async_db_context(db) as db:
             stmt = select(Automation).filter_by(user_id=user_id)
 
+            if folder_id is not None:
+                stmt = stmt.filter(Automation.folder_id == (folder_id or None))
+
             if query:
                 search = f'%{query}%'
                 # Search in name and prompt inside JSON data
@@ -216,6 +227,7 @@ class AutomationTable:
             if not row:
                 return None
             row.name = form.name
+            row.folder_id = form.folder_id
             row.data = form.data.model_dump()
             row.meta = form.meta
             if form.is_active is not None:
@@ -225,6 +237,23 @@ class AutomationTable:
             await db.commit()
             return AutomationModel.model_validate(row)
 
+    async def clear_folder_ids(
+        self,
+        user_id: str,
+        folder_ids: list[str],
+        db: Optional[AsyncSession] = None,
+    ) -> int:
+        if not folder_ids:
+            return 0
+        async with get_async_db_context(db) as db:
+            result = await db.execute(
+                update(Automation)
+                .where(Automation.user_id == user_id, Automation.folder_id.in_(folder_ids))
+                .values(folder_id=None, updated_at=int(time.time_ns()))
+            )
+            await db.commit()
+            return result.rowcount or 0
+
     async def toggle(
         self,
         id: str,

backend/open_webui/models/chats.py

@@ -27,6 +27,7 @@ from sqlalchemy import (
     UniqueConstraint,
     and_,
     delete,
+    exists,
     func,
     or_,
     select,
@@ -1435,6 +1436,37 @@ class ChatTable:
         except Exception:
             return None
 
+    async def count_unread_by_folder_ids(
+        self,
+        user_id: str,
+        folder_ids: list[str],
+        db: AsyncSession | None = None,
+    ) -> dict[str, int]:
+        if not folder_ids:
+            return {}
+
+        unfinished_assistant = (
+            select(ChatMessage.id)
+            .where(ChatMessage.chat_id == Chat.id)
+            .where(ChatMessage.role == 'assistant')
+            .where(ChatMessage.done.is_(False))
+            .exists()
+        )
+
+        async with get_async_db_context(db) as session:
+            result = await session.execute(
+                select(Chat.folder_id, func.count(Chat.id))
+                .where(
+                    Chat.user_id == user_id,
+                    Chat.folder_id.in_(folder_ids),
+                    Chat.archived == False,
+                    Chat.updated_at > func.coalesce(Chat.last_read_at, 0),
+                    ~unfinished_assistant,
+                )
+                .group_by(Chat.folder_id)
+            )
+            return {folder_id: count for folder_id, count in result.all() if folder_id}
+
     async def get_chats(self, skip: int = 0, limit: int = 50, db: AsyncSession | None = None) -> list[ChatModel]:
         async with get_async_db_context(db) as session:
             stmt = select(Chat).where(Chat.meta['internal'].as_boolean().is_not(True))

backend/open_webui/models/folders.py

@@ -58,6 +58,7 @@ class FolderNameIdResponse(BaseModel):
     meta: Optional[FolderMetadataResponse] = None
     parent_id: Optional[str] = None
     is_expanded: bool = False
+    unread_count: int = 0
     created_at: int
     updated_at: int