From 9c5293052b670ca6bf677b1577707b9f46cd89cd Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 25 十二月 2024 15:57:14 +0800
Subject: [PATCH] create_user修改
---
app/service/group.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/service/group.py b/app/service/group.py
index ab8368e..474084b 100644
--- a/app/service/group.py
+++ b/app/service/group.py
@@ -1,5 +1,7 @@
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
@@ -15,10 +17,9 @@
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_dict() for item in items.all()]}
+ 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):
@@ -115,7 +116,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