fix: prompts delete

backend/open_webui/models/prompts.py

@@ -259,7 +259,6 @@ class PromptsTable:
 
             # Join with User table for user filtering and sorting
             query = db.query(Prompt, User).outerjoin(User, User.id == Prompt.user_id)
-            query = query.filter(Prompt.is_active == True)
 
             if filter:
                 query_key = filter.get("query")
@@ -562,43 +561,24 @@ class PromptsTable:
         except Exception:
             return None
 
-    def delete_prompt_by_command(
-        self, command: str, db: Optional[Session] = None
-    ) -> bool:
-        """Soft delete a prompt by setting is_active to False."""
-        try:
-            with get_db_context(db) as db:
-                prompt = db.query(Prompt).filter_by(command=command).first()
-                if prompt:
-                    PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
-                    AccessGrants.revoke_all_access("prompt", prompt.id, db=db)
-
-                    prompt.is_active = False
-                    prompt.updated_at = int(time.time())
-                    db.commit()
-                    return True
-                return False
-        except Exception:
-            return False
-
-    def delete_prompt_by_id(self, prompt_id: str, db: Optional[Session] = None) -> bool:
-        """Soft delete a prompt by setting is_active to False."""
+    def toggle_prompt_active(
+        self, prompt_id: str, db: Optional[Session] = None
+    ) -> Optional[PromptModel]:
+        """Toggle the is_active flag on a prompt."""
         try:
             with get_db_context(db) as db:
                 prompt = db.query(Prompt).filter_by(id=prompt_id).first()
                 if prompt:
-                    PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
-                    AccessGrants.revoke_all_access("prompt", prompt.id, db=db)
-
-                    prompt.is_active = False
+                    prompt.is_active = not prompt.is_active
                     prompt.updated_at = int(time.time())
                     db.commit()
-                    return True
-                return False
+                    db.refresh(prompt)
+                    return self._to_prompt_model(prompt, db=db)
+                return None
         except Exception:
-            return False
+            return None
 
-    def hard_delete_prompt_by_command(
+    def delete_prompt_by_command(
         self, command: str, db: Optional[Session] = None
     ) -> bool:
         """Permanently delete a prompt and its history."""
@@ -609,8 +589,23 @@ class PromptsTable:
                     PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
                     AccessGrants.revoke_all_access("prompt", prompt.id, db=db)
 
-                    # Delete prompt
-                    db.query(Prompt).filter_by(command=command).delete()
+                    db.delete(prompt)
+                    db.commit()
+                    return True
+                return False
+        except Exception:
+            return False
+
+    def delete_prompt_by_id(self, prompt_id: str, db: Optional[Session] = None) -> bool:
+        """Permanently delete a prompt and its history."""
+        try:
+            with get_db_context(db) as db:
+                prompt = db.query(Prompt).filter_by(id=prompt_id).first()
+                if prompt:
+                    PromptHistories.delete_history_by_prompt_id(prompt.id, db=db)
+                    AccessGrants.revoke_all_access("prompt", prompt.id, db=db)
+
+                    db.delete(prompt)
                     db.commit()
                     return True
                 return False

backend/open_webui/routers/prompts.py

@@ -497,6 +497,48 @@ async def update_prompt_access_by_id(
     return Prompts.get_prompt_by_id(prompt_id, db=db)
 
 
+############################
+# TogglePromptActiveById
+############################
+
+
+@router.post("/id/{prompt_id}/toggle", response_model=Optional[PromptModel])
+async def toggle_prompt_active(
+    prompt_id: str, user=Depends(get_verified_user), db: Session = Depends(get_session)
+):
+    prompt = Prompts.get_prompt_by_id(prompt_id, db=db)
+
+    if not prompt:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=ERROR_MESSAGES.NOT_FOUND,
+        )
+
+    if (
+        prompt.user_id != user.id
+        and not AccessGrants.has_access(
+            user_id=user.id,
+            resource_type="prompt",
+            resource_id=prompt.id,
+            permission="write",
+            db=db,
+        )
+        and user.role != "admin"
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
+        )
+
+    result = Prompts.toggle_prompt_active(prompt.id, db=db)
+    if result:
+        return result
+    raise HTTPException(
+        status_code=status.HTTP_400_BAD_REQUEST,
+        detail=ERROR_MESSAGES.DEFAULT(),
+    )
+
+
 ############################
 # DeletePromptById
 ############################