From 226202d6eee6480f3386c6295be26fad42940cc8 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期五, 28 三月 2025 09:41:39 +0800 Subject: [PATCH] 知识库分享,历史记录文件 --- app/service/knowledge.py | 63 +++++++++++++++++++++++++++++-- 1 files changed, 58 insertions(+), 5 deletions(-) diff --git a/app/service/knowledge.py b/app/service/knowledge.py index 7c40272..880b68b 100644 --- a/app/service/knowledge.py +++ b/app/service/knowledge.py @@ -2,7 +2,7 @@ from sqlalchemy import or_ -from app.models import KnowledgeModel, group_knowledge_table +from app.models import KnowledgeModel, group_knowledge_table, KnowledgeUserModel from app.models.user_model import UserModel from Log import logger from app.task.fetch_agent import get_one_from_ragflow_knowledge @@ -15,21 +15,29 @@ query = db.query(KnowledgeModel).filter(KnowledgeModel.knowledge_type==knowledge) if user.permission != "admin": klg_list = [j.id for i in user.groups for j in i.knowledges] - query = query.filter(or_(KnowledgeModel.tenant_id == user_id, KnowledgeModel.id.in_(klg_list))) - if location: - query = query.filter(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == user_id)) + for i in db.query(KnowledgeUserModel).filter(KnowledgeUserModel.user_id == user_id, KnowledgeUserModel.status == 1).all(): + if i.kb_id not in klg_list: + klg_list.append(i.kb_id) + query = query.filter(or_(KnowledgeModel.id.in_(klg_list), KnowledgeModel.tenant_id == str(user_id))) + + if location: + query = query.filter(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == str(user_id))) + if keyword: query = query.filter(KnowledgeModel.name.like('%{}%'.format(keyword))) total = query.count() if page_size: query = query.order_by(KnowledgeModel.update_date.desc()).limit(page_size).offset((page_index - 1) * page_size) - return {"total": total, "rows": [kld.to_json() for kld in query.all()]} + return {"total": total, "rows": [kld.to_json(str(user_id) if user.permission != "admin" else "admin") for kld in query.all()]} async def create_knowledge_service(db, klg_id, name, description, icon, klg_type, user_id): try: dialog_model = KnowledgeModel(id=klg_id,name=name, description=description,icon=icon, knowledge_type=klg_type, tenant_id=user_id,update_date=datetime.now(),create_date=datetime.now()) db.add(dialog_model) + kb_user = KnowledgeUserModel(kb_id=klg_id, user_id=user_id, status=1, update_date=datetime.now(), + create_date=datetime.now()) + db.add(kb_user) db.commit() db.refresh(dialog_model) except Exception as e: @@ -50,6 +58,7 @@ knowledge.permission = app_knowledge["permission"] knowledge.documents = app_knowledge["doc_num"] knowledge.status = app_knowledge["status"] + knowledge.embd_id = app_knowledge["embd_id"] knowledge.update_date = datetime.now() db.add(knowledge) db.commit() @@ -84,3 +93,47 @@ return False return True + + +async def get_knowledge_users_service(db, kb_id, user_id, page, page_size, member): + kb_user_list = [] + user_ids = [] + kb_info = db.query(KnowledgeModel).filter(KnowledgeModel.id == kb_id).first() + query = db.query(KnowledgeUserModel).filter(KnowledgeUserModel.kb_id == kb_id) + if member: + query = query.filter(KnowledgeUserModel.user_id != user_id) + total = query.count() + + for kld in query.limit(page_size).offset((page - 1) * page_size).all(): + user_ids.append(kld.user_id) + print(kb_info.tenant_id) + kb_user_list.append(kld.to_json(kb_info.tenant_id)) + user = {i.id: i.username for i in db.query(UserModel).filter(UserModel.id.in_(user_ids)).all()} + for kld in kb_user_list: + kld["username"] = user.get(kld["user_id"], "") + return {"total": total, "rows": kb_user_list} + + +async def set_knowledge_owner_service(db, kb_id, user_id, u_id): + try: + db.query(KnowledgeModel).filter_by(id=kb_id).update({"tenant_id": str(user_id), "update_date": datetime.now()}) + db.commit() + except Exception as e: + logger.error(e) + db.rollback() + return False + return True + + +async def add_knowledge_user_service(db, kb_id, user_id): + try: + + kb_user = KnowledgeUserModel(kb_id=kb_id, user_id=user_id, status=1, update_date=datetime.now(), + create_date=datetime.now()) + db.add(kb_user) + db.commit() + except Exception as e: + logger.error(e) + db.rollback() + return False + return True \ No newline at end of file -- Gitblit v1.8.0