refac/enh: db session sharing

backend/open_webui/routers/prompts.py

@@ -11,6 +11,8 @@ from open_webui.constants import ERROR_MESSAGES
 from open_webui.utils.auth import get_admin_user, get_verified_user
 from open_webui.utils.access_control import has_access, has_permission
 from open_webui.config import BYPASS_ADMIN_ACCESS_CONTROL
+from open_webui.internal.db import get_session
+from sqlalchemy.orm import Session
 
 router = APIRouter()
 
@@ -20,21 +22,21 @@ router = APIRouter()
 
 
 @router.get("/", response_model=list[PromptModel])
-async def get_prompts(user=Depends(get_verified_user)):
+async def get_prompts(user=Depends(get_verified_user), db: Session = Depends(get_session)):
     if user.role == "admin" and BYPASS_ADMIN_ACCESS_CONTROL:
-        prompts = Prompts.get_prompts()
+        prompts = Prompts.get_prompts(db=db)
     else:
-        prompts = Prompts.get_prompts_by_user_id(user.id, "read")
+        prompts = Prompts.get_prompts_by_user_id(user.id, "read", db=db)
 
     return prompts
 
 
 @router.get("/list", response_model=list[PromptUserResponse])
-async def get_prompt_list(user=Depends(get_verified_user)):
+async def get_prompt_list(user=Depends(get_verified_user), db: Session = Depends(get_session)):
     if user.role == "admin" and BYPASS_ADMIN_ACCESS_CONTROL:
-        prompts = Prompts.get_prompts()
+        prompts = Prompts.get_prompts(db=db)
     else:
-        prompts = Prompts.get_prompts_by_user_id(user.id, "write")
+        prompts = Prompts.get_prompts_by_user_id(user.id, "write", db=db)
 
     return prompts
 
@@ -46,16 +48,17 @@ async def get_prompt_list(user=Depends(get_verified_user)):
 
 @router.post("/create", response_model=Optional[PromptModel])
 async def create_new_prompt(
-    request: Request, form_data: PromptForm, user=Depends(get_verified_user)
+    request: Request, form_data: PromptForm, user=Depends(get_verified_user), db: Session = Depends(get_session)
 ):
     if user.role != "admin" and not (
         has_permission(
-            user.id, "workspace.prompts", request.app.state.config.USER_PERMISSIONS
+            user.id, "workspace.prompts", request.app.state.config.USER_PERMISSIONS, db=db
         )
         or has_permission(
             user.id,
             "workspace.prompts_import",
             request.app.state.config.USER_PERMISSIONS,
+            db=db,
         )
     ):
         raise HTTPException(
@@ -63,9 +66,9 @@ async def create_new_prompt(
             detail=ERROR_MESSAGES.UNAUTHORIZED,
         )
 
-    prompt = Prompts.get_prompt_by_command(form_data.command)
+    prompt = Prompts.get_prompt_by_command(form_data.command, db=db)
     if prompt is None:
-        prompt = Prompts.insert_new_prompt(user.id, form_data)
+        prompt = Prompts.insert_new_prompt(user.id, form_data, db=db)
 
         if prompt:
             return prompt
@@ -85,14 +88,14 @@ async def create_new_prompt(
 
 
 @router.get("/command/{command}", response_model=Optional[PromptModel])
-async def get_prompt_by_command(command: str, user=Depends(get_verified_user)):
-    prompt = Prompts.get_prompt_by_command(f"/{command}")
+async def get_prompt_by_command(command: str, user=Depends(get_verified_user), db: Session = Depends(get_session)):
+    prompt = Prompts.get_prompt_by_command(f"/{command}", db=db)
 
     if prompt:
         if (
             user.role == "admin"
             or prompt.user_id == user.id
-            or has_access(user.id, "read", prompt.access_control)
+            or has_access(user.id, "read", prompt.access_control, db=db)
         ):
             return prompt
     else:
@@ -112,8 +115,9 @@ async def update_prompt_by_command(
     command: str,
     form_data: PromptForm,
     user=Depends(get_verified_user),
+    db: Session = Depends(get_session),
 ):
-    prompt = Prompts.get_prompt_by_command(f"/{command}")
+    prompt = Prompts.get_prompt_by_command(f"/{command}", db=db)
     if not prompt:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -123,7 +127,7 @@ async def update_prompt_by_command(
     # Is the user the original creator, in a group with write access, or an admin
     if (
         prompt.user_id != user.id
-        and not has_access(user.id, "write", prompt.access_control)
+        and not has_access(user.id, "write", prompt.access_control, db=db)
         and user.role != "admin"
     ):
         raise HTTPException(
@@ -131,7 +135,7 @@ async def update_prompt_by_command(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
-    prompt = Prompts.update_prompt_by_command(f"/{command}", form_data)
+    prompt = Prompts.update_prompt_by_command(f"/{command}", form_data, db=db)
     if prompt:
         return prompt
     else:
@@ -147,8 +151,8 @@ async def update_prompt_by_command(
 
 
 @router.delete("/command/{command}/delete", response_model=bool)
-async def delete_prompt_by_command(command: str, user=Depends(get_verified_user)):
-    prompt = Prompts.get_prompt_by_command(f"/{command}")
+async def delete_prompt_by_command(command: str, user=Depends(get_verified_user), db: Session = Depends(get_session)):
+    prompt = Prompts.get_prompt_by_command(f"/{command}", db=db)
     if not prompt:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -157,7 +161,7 @@ async def delete_prompt_by_command(command: str, user=Depends(get_verified_user)
 
     if (
         prompt.user_id != user.id
-        and not has_access(user.id, "write", prompt.access_control)
+        and not has_access(user.id, "write", prompt.access_control, db=db)
         and user.role != "admin"
     ):
         raise HTTPException(
@@ -165,5 +169,5 @@ async def delete_prompt_by_command(command: str, user=Depends(get_verified_user)
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
-    result = Prompts.delete_prompt_by_command(f"/{command}")
+    result = Prompts.delete_prompt_by_command(f"/{command}", db=db)
     return result