From 5a11a870e2abb5201f62c253ca811e52035864ed Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 10 一月 2025 18:25:13 +0800
Subject: [PATCH] 知识库选择返回自己创建的
---
app/service/knowledge.py | 92 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/app/service/knowledge.py b/app/service/knowledge.py
index c0121fa..e175f87 100644
--- a/app/service/knowledge.py
+++ b/app/service/knowledge.py
@@ -1,26 +1,88 @@
-from app.models import KnowledgeModel, GroupModel
+from datetime import datetime
+
+from sqlalchemy import or_
+
+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):
+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": []}
- if user.permission == "admin":
- kld_list = db.query(KnowledgeModel).all()
- else:
- user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ 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.id.in_(klg_list), KnowledgeModel.tenant_id == str(user_id)))
- group_list = [i.id for i in user.groups]
+ if location:
+ query = query.filter(or_(KnowledgeModel.permission == "team", KnowledgeModel.tenant_id == str(user_id)))
- kld_list = db.query(KnowledgeModel).filter(KnowledgeModel.tenant_id == user_id).all()
- kld_set = set([i.id for i in kld_list])
- for group in db.query(GroupModel).filter(GroupModel.id.in_(group_list)).all():
- for k in group.knowledges:
- if k.id not in kld_set:
- kld_list.append(k)
- kld_set.add(k.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 {"rows": [kld.to_json() for kld in kld_list]}
+
+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)
+ db.commit()
+ db.refresh(dialog_model)
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ 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"]
+ knowledge.update_date = datetime.now()
+ 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
+
+
+
+async def update_knowledge_icon_service(db, klg_id, icon):
+ try:
+ db.query(KnowledgeModel).filter_by(id=klg_id).update({"icon":icon, "update_date": datetime.now()})
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
--
Gitblit v1.8.0