From c4338024c90cd36a330d42194bb553525828fa3b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 14 二月 2025 16:28:10 +0800
Subject: [PATCH] 问题优化
---
app/service/knowledge.py | 90 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/app/service/knowledge.py b/app/service/knowledge.py
index 91022c3..e175f87 100644
--- a/app/service/knowledge.py
+++ b/app/service/knowledge.py
@@ -1,30 +1,88 @@
+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, 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": []}
- if user.permission == "admin":
- query = db.query(KnowledgeModel)
- else:
- group_list = [i.id for i in user.groups]
- query = db.query(KnowledgeModel)
- query = query.filter(KnowledgeModel.tenant_id == user_id)
+ 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)))
- query = query.union(
- db.query(KnowledgeModel).join(
- group_knowledge_table,
- KnowledgeModel.id == group_knowledge_table.c.knowledge_id
- ).filter(
- group_knowledge_table.c.group_id.in_(group_list)
- )
- )
+ 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.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()]}
+
+
+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