From e26a7859a8900b152e10961d91fa6ad19a8deb9c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 三月 2025 14:41:27 +0800
Subject: [PATCH] 首页通用对话增加
---
app/service/group.py | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app/service/group.py b/app/service/group.py
index 7218e3a..c65dbd8 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -1,10 +1,13 @@
from app.config.config import settings
-from app.models import CanvasModel, DialogModel, KnowledgeModel
+from app.models.dialog_model import DialogModel
+from app.models.knowledge_model import KnowledgeModel
+from app.models.llm_model import CommonLlmModel
from app.models.group_model import GroupModel
from app.models.user_model import UserModel
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token
from Log import logger
+from sqlalchemy import and_
async def group_list(db, page_size: int, page_index: int, keyword: str):
@@ -15,7 +18,6 @@
if keyword:
query = query.filter(GroupModel.group_name.like('%{}%'.format(keyword)))
total = query.count()
- print(total)
items = query.order_by(GroupModel.id.desc()).limit(page_size).offset((page_index - 1) * page_size)
return {"total":total , "items": [item.to_json() for item in items.all()]}
@@ -60,7 +62,9 @@
not_group_user = []
in_group_user = []
user_list = [u.id for u in db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).first().users]
- for u in db.query(UserModel.id, UserModel.username,UserModel.permission).filter(UserModel.permission!="admin").order_by(UserModel.id.desc()).all():
+ for u in db.query(UserModel.id, UserModel.username, UserModel.permission).filter(
+ and_(UserModel.permission != "admin", UserModel.status != 2)
+ ).order_by(UserModel.id.desc()).all():
if u.id in user_list:
in_group_user.append({"userId": u.id, "userName": u.username})
else:
@@ -115,7 +119,7 @@
async def save_group_resource(db, user_id, group_id, llms, dialogs, knowledges):
try:
group = db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).first()
- group.llms = [db.get(CommonLlmModel, user) for user in llms]
+
group.dialogs = [db.get(DialogModel, user) for user in dialogs]
group.knowledges = [db.get(KnowledgeModel, user) for user in knowledges]
db.commit()
--
Gitblit v1.8.0