From 91062dda27e06bf29eaa78eff47ba505ad19b7a2 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期三, 18 十二月 2024 16:00:31 +0800 Subject: [PATCH] 机构接口优化 --- app/service/knowledge.py | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/service/knowledge.py b/app/service/knowledge.py index 66634a6..7131186 100644 --- a/app/service/knowledge.py +++ b/app/service/knowledge.py @@ -3,21 +3,24 @@ from app.models import KnowledgeModel, group_knowledge_table from app.models.user_model import UserModel from Log import logger +from app.task.fetch_agent import get_one_from_ragflow_knowledge -async def get_knowledge_list(db, user_id, keyword, page_size, page_index): +async def get_knowledge_list(db, user_id, keyword, page_size, page_index, status, knowledge, location): user = db.query(UserModel).filter(UserModel.id == user_id).first() if user is None: return {"rows": []} - query = db.query(KnowledgeModel) + 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(KnowledgeModel.permission == "team") if keyword: query = query.filter(KnowledgeModel.name.like('%{}%'.format(keyword))) total = query.count() if page_size: - query = query.limit(page_size).offset((page_index - 1) * 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()]} @@ -33,3 +36,36 @@ return False return True + +async def sync_knowledge_service(db, klg_id): + knowledge = db.query(KnowledgeModel).filter(KnowledgeModel.id == klg_id).first() + if knowledge: + try: + app_knowledge = get_one_from_ragflow_knowledge(klg_id) + if app_knowledge: + knowledge.name = app_knowledge["name"] + knowledge.description = app_knowledge["description"] + knowledge.permission = app_knowledge["permission"] + knowledge.documents = app_knowledge["doc_num"] + knowledge.status = app_knowledge["status"] + db.add(knowledge) + db.commit() + db.refresh(knowledge) + except Exception as e: + logger.error(e) + db.rollback() + return False + return True + + +async def delete_knowledge_service(db, klg_id): + + try: + db.query(KnowledgeModel).filter(KnowledgeModel.id==klg_id).delete() + db.commit() + except Exception as e: + logger.error(e) + db.rollback() + return False + return True + -- Gitblit v1.8.0