Browse Source

首页智能体中心过滤掉自研类型

zhaoqingang 1 year ago
parent
commit
e078028f1a
2 changed files with 6 additions and 3 deletions
  1. 2 1
      app/api/dialog.py
  2. 4 2
      app/service/dialog.py

+ 2 - 1
app/api/dialog.py

@@ -17,13 +17,14 @@ async def dialog_list(current: int,
                       keyword: str = "",
                       keyword: str = "",
                       label: int = 0,
                       label: int = 0,
                       status: str ="",
                       status: str ="",
+                      mode: int = 0,
                       current_user: UserModel = Depends(get_current_user),
                       current_user: UserModel = Depends(get_current_user),
                       db=Depends(get_db)):
                       db=Depends(get_db)):
     if current and not pageSize:
     if current and not pageSize:
         return Response(code=400, msg="缺少参数")
         return Response(code=400, msg="缺少参数")
     if status and status not in ["0", "1"]:
     if status and status not in ["0", "1"]:
         return Response(code=400, msg="Parameter status exception")
         return Response(code=400, msg="Parameter status exception")
-    return Response(code=200, msg="", data=await get_dialog_list(db, current_user.id, keyword, label, status, pageSize, current))
+    return Response(code=200, msg="", data=await get_dialog_list(db, current_user.id, keyword, label, status, pageSize, current,mode))
 
 
 
 
 @dialog_router.post("/create", response_model=Response)
 @dialog_router.post("/create", response_model=Response)

+ 4 - 2
app/service/dialog.py

@@ -5,7 +5,7 @@ from sqlalchemy import or_
 
 
 from app.config.agent_base_url import DF_CHAT_PARAMETERS, DF_CHAT_API_KEY
 from app.config.agent_base_url import DF_CHAT_PARAMETERS, DF_CHAT_API_KEY
 from app.config.config import settings
 from app.config.config import settings
-from app.config.const import Dialog_STATSU_DELETE, DF_TYPE, Dialog_STATSU_ON, workflow_server, RG_TYPE
+from app.config.const import Dialog_STATSU_DELETE, DF_TYPE, Dialog_STATSU_ON, workflow_server, RG_TYPE, basic_chat
 from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table, LabelWorkerModel, \
 from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table, LabelWorkerModel, \
     LabelModel, ApiTokenModel
     LabelModel, ApiTokenModel
 from app.models.user_model import UserModel, UserTokenModel
 from app.models.user_model import UserModel, UserTokenModel
@@ -15,7 +15,7 @@ from app.service.v2.chat import get_chat_token, add_chat_token, get_app_token
 from app.task.fetch_agent import get_one_from_ragflow_dialog
 from app.task.fetch_agent import get_one_from_ragflow_dialog
 
 
 
 
-async def get_dialog_list(db, user_id, keyword, label, status, page_size, page_index):
+async def get_dialog_list(db, user_id, keyword, label, status, page_size, page_index, mode):
     user = db.query(UserModel).filter(UserModel.id == user_id).first()
     user = db.query(UserModel).filter(UserModel.id == user_id).first()
     if user is None:
     if user is None:
         return {"rows": []}
         return {"rows": []}
@@ -24,6 +24,8 @@ async def get_dialog_list(db, user_id, keyword, label, status, page_size, page_i
         query = query.filter(DialogModel.status == status)
         query = query.filter(DialogModel.status == status)
     else:
     else:
         query = query.filter(DialogModel.status != Dialog_STATSU_DELETE)
         query = query.filter(DialogModel.status != Dialog_STATSU_DELETE)
+    if mode:
+        query = query.filter(DialogModel.mode != basic_chat)
     id_list = []
     id_list = []
     # if label:
     # if label:
     #     id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id==label).all()]
     #     id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id==label).all()]