feat: folder ui

backend/open_webui/apps/webui/models/chats.py

@@ -33,6 +33,7 @@ class Chat(Base):
     pinned = Column(Boolean, default=False, nullable=True)
 
     meta = Column(JSON, server_default="{}")
+    folder_id = Column(Text, nullable=True)
 
 
 class ChatModel(BaseModel):
@@ -51,6 +52,7 @@ class ChatModel(BaseModel):
     pinned: Optional[bool] = False
 
     meta: dict = {}
+    folder_id: Optional[str] = None
 
 
 ####################
@@ -512,6 +514,29 @@ class ChatTable:
             # Validate and return chats
             return [ChatModel.model_validate(chat) for chat in all_chats]
 
+    def get_chats_by_folder_id_and_user_id(
+        self, folder_id: str, user_id: str
+    ) -> list[ChatModel]:
+        with get_db() as db:
+            all_chats = (
+                db.query(Chat).filter_by(folder_id=folder_id, user_id=user_id).all()
+            )
+            return [ChatModel.model_validate(chat) for chat in all_chats]
+
+    def update_chat_folder_id_by_id_and_user_id(
+        self, id: str, user_id: str, folder_id: str
+    ) -> Optional[ChatModel]:
+        try:
+            with get_db() as db:
+                chat = db.get(Chat, id)
+                chat.folder_id = folder_id
+                chat.updated_at = int(time.time())
+                db.commit()
+                db.refresh(chat)
+                return ChatModel.model_validate(chat)
+        except Exception:
+            return None
+
     def get_chat_tags_by_id_and_user_id(self, id: str, user_id: str) -> list[TagModel]:
         with get_db() as db:
             chat = db.get(Chat, id)

backend/open_webui/apps/webui/models/folders.py

@@ -22,7 +22,6 @@ log.setLevel(SRC_LOG_LEVELS["MODELS"])
 class FolderItems(BaseModel):
     chat_ids: Optional[list[str]] = None
     file_ids: Optional[list[str]] = None
-    folder_ids: Optional[list[str]] = None
 
     model_config = ConfigDict(extra="allow")
 
@@ -52,6 +51,21 @@ class FolderModel(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
 
+####################
+# Forms
+####################
+
+
+class FolderForm(BaseModel):
+    name: str
+    model_config = ConfigDict(extra="allow")
+
+
+class FolderItemsUpdateForm(BaseModel):
+    items: FolderItems
+    model_config = ConfigDict(extra="allow")
+
+
 class FolderTable:
     def insert_new_folder(self, name: str, user_id: str) -> Optional[FolderModel]:
         with get_db() as db:
@@ -96,7 +110,59 @@ class FolderTable:
                 for folder in db.query(Folder).filter_by(user_id=user_id).all()
             ]
 
-    def update_folder_by_name_and_user_id(
+    def get_folders_by_parent_id_and_user_id(self, parent_id: str, user_id: str):
+        with get_db() as db:
+            return [
+                FolderModel.model_validate(folder)
+                for folder in db.query(Folder)
+                .filter_by(parent_id=parent_id, user_id=user_id)
+                .all()
+            ]
+
+    def update_folder_parent_id_by_id_and_user_id(
+        self,
+        id: str,
+        user_id: str,
+        parent_id: str,
+    ) -> Optional[FolderModel]:
+        try:
+            with get_db() as db:
+                folder = db.query(Folder).filter_by(id=id, user_id=user_id).first()
+                folder.parent_id = parent_id
+                folder.updated_at = int(time.time())
+
+                db.commit()
+
+                return FolderModel.model_validate(folder)
+        except Exception as e:
+            log.error(f"update_folder: {e}")
+            return
+
+    def update_folder_name_by_name_and_user_id(
+        self, name: str, user_id: str, new_name: str
+    ) -> Optional[FolderModel]:
+        try:
+            id = name.lower()
+            new_id = new_name.lower()
+            with get_db() as db:
+                # Check if new folder name already exists
+                folder = db.query(Folder).filter_by(id=new_id, user_id=user_id).first()
+                if folder:
+                    return None
+
+                folder = db.query(Folder).filter_by(id=id, user_id=user_id).first()
+                folder.id = new_id
+                folder.name = new_name
+                folder.updated_at = int(time.time())
+
+                db.commit()
+
+                return FolderModel.model_validate(folder)
+        except Exception as e:
+            log.error(f"update_folder: {e}")
+            return
+
+    def update_folder_items_by_name_and_user_id(
         self, name: str, user_id: str, items: FolderItems
     ) -> Optional[FolderModel]:
         try: