Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

app/api/dialog.py

@@ -9,7 +9,8 @@ from app.service.dialog import get_dialog_list
 
 dialog_router = APIRouter()
 
+
 @dialog_router.get("/list", response_model=Response)
-async def dialog_list(role:str="", current_user: UserModel = Depends(get_current_user),
-                          db=Depends(get_db)):
-    return Response(code=200, msg="", data = await get_dialog_list(db, role, current_user.id))
+async def dialog_list(current_user: UserModel = Depends(get_current_user),
+                      db=Depends(get_db)):
+    return Response(code=200, msg="", data=await get_dialog_list(db, current_user.id))

app/service/dialog.py

@@ -1,27 +1,29 @@
 from datetime import datetime
 
-from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel
+from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table
 from app.models.user_model import UserModel
 from Log import logger
 
 
-async def get_dialog_list(db, role, user_id):
-    if role == "admin":
-        dialog_list = db.query(DialogModel).all()
+async def get_dialog_list(db, user_id):
+    user = db.query(UserModel).filter(UserModel.id == user_id).first()
+    if user is None:
+        return {"rows": []}
+    if user.permission == "admin":
+        query = db.query(DialogModel)
     else:
-        user = db.query(UserModel).filter(UserModel.id == user_id).first()
-
         group_list = [i.id for i in user.groups]
-
-        dialog_list = db.query(DialogModel).filter(DialogModel.tenant_id == user_id).all()
-        kld_set = set([i.id for i in dialog_list])
-        for group in db.query(GroupModel).filter(GroupModel.id.in_(group_list)).all():
-            for k in group.dialogs:
-                if k.id not in kld_set:
-                    dialog_list.append(k)
-                    kld_set.add(k.id)
-
-    return {"rows": [kld.to_json() for kld in dialog_list]}
+        query = db.query(DialogModel)
+        query = query.filter(DialogModel.tenant_id == user_id)
+        query = query.union(
+            db.query(DialogModel).join(
+                group_dialog_table,
+                DialogModel.id == group_dialog_table.c.dialog_id
+            ).filter(
+                group_dialog_table.c.group_id.in_(group_list)
+            )
+        )
+    return {"rows": [kld.to_json() for kld in query.all()]}
 
 
 async def update_session_history(db, data: dict, user_id):