From 57239055391b0c2891180739b78c535a17851aac Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 14 十一月 2024 10:21:11 +0800
Subject: [PATCH] 组资源配置
---
app/service/group.py | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/app/service/group.py b/app/service/group.py
index cc05127..d7845fa 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -1,4 +1,5 @@
from app.config.config import settings
+from app.models import CanvasModel, DialogModel, KnowledgeModel
from app.models.group_model import GroupModel
from app.models.user_model import UserModel
from app.service.ragflow import RagflowService
@@ -8,9 +9,9 @@
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)
- if role_key != "admin":
- query.filter(GroupModel.creator==user_id)
+ query = db.query(GroupModel).filter(GroupModel.creator==user_id)
+ # 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(
@@ -107,4 +108,16 @@
except Exception as e:
logger.error(e)
return False
+ return True
+
+async def save_group_resource(db, user_id, group_id, agents, 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()
+ except Exception as e:
+ logger.error(e)
+ return False
return True
\ No newline at end of file
--
Gitblit v1.8.0