From 3b1bf7da6771bd1d6852d3dcc1f906d5ae5c95d1 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 12 三月 2025 13:49:12 +0800
Subject: [PATCH] 增加内容优化
---
app/service/group.py | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/app/service/group.py b/app/service/group.py
index 0c6eb77..c65dbd8 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -1,23 +1,26 @@
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, role_key:str, user_id):
- logger.info("-------------------------group_list----------------------------------")
- query = db.query(GroupModel).filter(GroupModel.creator==user_id)
+async def group_list(db, page_size: int, page_index: int, keyword: str):
+ # logger.info("-------------------------group_list----------------------------------")
+ query = db.query(GroupModel)
# if role_key != "admin":
# query.filter(GroupModel.creator==user_id)
if keyword:
query = query.filter(GroupModel.group_name.like('%{}%'.format(keyword)))
- items = query.order_by(GroupModel.id.desc()).limit(page_size).offset(
- (page_index - 1) * page_size).all()
+ total = query.count()
+ items = query.order_by(GroupModel.id.desc()).limit(page_size).offset((page_index - 1) * page_size)
- return {"total": query.count(), "items": [item.to_json() for item in items]}
+ return {"total":total , "items": [item.to_json() for item in items.all()]}
async def create_group(db, group_name: str, group_description: str, user_id):
@@ -58,14 +61,15 @@
async def get_group_users(db, group_id):
not_group_user = []
in_group_user = []
- user_list = [u.id for i in
- db.query(GroupModel).filter(GroupModel.id.__eq__(group_id)).all() for u in i.users]
- for u in db.query(UserModel.id, UserModel.username).filter(UserModel.permission!="admin").order_by(UserModel.id.desc()).all():
+ 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(
+ and_(UserModel.permission != "admin", UserModel.status != 2)
+ ).order_by(UserModel.id.desc()).all():
if u.id in user_list:
- in_group_user.append({"user_id": u.id, "user_name": u.username})
+ in_group_user.append({"userId": u.id, "userName": u.username})
else:
- not_group_user.append({"user_id": u.id, "user_name": u.username})
- return {"in_group": in_group_user, "not_in_group": not_group_user}
+ not_group_user.append({"userId": u.id, "userName": u.username})
+ return {"inGroup": in_group_user, "notInGroup": not_group_user}
async def save_user_to_group(db, user_id, group_id, user_list):
@@ -112,10 +116,10 @@
return False
return True
-async def save_group_resource(db, user_id, group_id, agents, dialogs, knowledges):
+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.agents = [db.get(CanvasModel, user) for user in agents]
+
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