From f95f801f35aa201cbaffd7d881c07edc9398b570 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 03 三月 2025 16:03:51 +0800
Subject: [PATCH] 增加外接知识库中转接口
---
app/service/dialog.py | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/app/service/dialog.py b/app/service/dialog.py
index 26d1e19..34e4711 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -5,13 +5,14 @@
from app.config.agent_base_url import DF_CHAT_PARAMETERS, DF_CHAT_API_KEY
from app.config.config import settings
-from app.config.const import Dialog_STATSU_DELETE, DF_TYPE, Dialog_STATSU_ON, workflow_server
+from app.config.const import Dialog_STATSU_DELETE, DF_TYPE, Dialog_STATSU_ON, workflow_server, RG_TYPE
from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table, LabelWorkerModel, \
LabelModel, ApiTokenModel
from app.models.user_model import UserModel, UserTokenModel
from Log import logger
from app.service.v2.app_driver.chat_data import ChatBaseApply
from app.service.v2.chat import get_chat_token, add_chat_token, get_app_token
+from app.task.fetch_agent import get_one_from_ragflow_dialog
async def get_dialog_list(db, user_id, keyword, label, status, page_size, page_index):
@@ -24,14 +25,15 @@
else:
query = query.filter(DialogModel.status != Dialog_STATSU_DELETE)
id_list = []
+ # if label:
+ # id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id==label).all()]
+ if user.permission != "admin":
+ dia_list = [j.id for i in user.groups for j in i.dialogs]
+ query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
+ # else:
if label:
id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id == label).all()]
- if user.permission != "admin":
- dia_list = [j.id for i in user.groups for j in i.dialogs if not label or j.id in id_list]
- query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
- else:
- if label:
- query = query.filter(or_(DialogModel.id.in_(id_list)))
+ query = query.filter(DialogModel.id.in_(id_list))
if keyword:
query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
@@ -96,10 +98,19 @@
async def create_dialog_service(db, dialog_id, dialog_name, description, icon, dialog_type, mode, user_id):
+ para = {
+ "user_input_form": [],
+ "retriever_resource": {
+ "enabled": True
+ },
+ "file_upload": {
+ "enabled": False
+ }
+ }
try:
dialog_model = DialogModel(id=dialog_id, name=dialog_name, description=description, icon=icon,
dialog_type=dialog_type, tenant_id=user_id, mode=mode, update_date=datetime.now(),
- create_date=datetime.now())
+ create_date=datetime.now(), parameters=json.dumps(para))
db.add(dialog_model)
db.commit()
db.refresh(dialog_model)
@@ -120,17 +131,18 @@
chat = ChatBaseApply()
token = await get_chat_token(db, dialog_id)
if not token:
- workflow = await get_app_token(db, workflow_server)
- if workflow:
+ access_token = await get_app_token(db, workflow_server)
+ # print(workflow)
+ if access_token:
url = settings.dify_base_url + DF_CHAT_API_KEY.format(dialog_id)
- param = await chat.chat_get(url, {}, await chat.get_headers(workflow.access_token))
+ param = await chat.chat_get(url, {}, await chat.get_headers(access_token))
if param and param.get("data"):
token = param.get("data", [{}])[0].get("token")
token_id = param.get("data", [{}])[0].get("id")
await add_chat_token(db, {"id":token_id, "app_id": dialog_id, "type":"app", "token": token})
# dialog.parameters = json.dumps(param)
else:
- param = await chat.chat_post(url, {}, await chat.get_headers(workflow.access_token))
+ param = await chat.chat_post(url, {}, await chat.get_headers(access_token))
if param:
token = param.get("token")
token_id = param.get("id")
@@ -162,9 +174,14 @@
return True
-async def update_dialog_icon_service(db, dialog_id, icon):
+async def update_dialog_icon_service(db, dialog_id, icon, name, description):
+ update = {"icon": icon, "update_date": datetime.now()}
+ if name:
+ update["name"] = name
+ if description or description == "":
+ update["description"] = description
try:
- db.query(DialogModel).filter_by(id=dialog_id).update({"icon": icon, "update_date": datetime.now()})
+ db.query(DialogModel).filter_by(id=dialog_id).update(update)
db.commit()
except Exception as e:
logger.error(e)
@@ -178,16 +195,14 @@
if user is None:
return {"rows": []}
query = db.query(DialogModel).filter(DialogModel.status != Dialog_STATSU_DELETE)
- id_list = []
+ if user.permission != "admin":
+ dia_list = [j.id for i in user.groups for j in i.dialogs]
+ query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
+
if label:
id_list = set(
[i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id.in_(label)).all()])
- if user.permission != "admin":
- dia_list = [j.id for i in user.groups for j in i.dialogs if not label or j.id in id_list]
- query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
- else:
- if label:
- query = query.filter(or_(DialogModel.id.in_(id_list)))
+ query = query.filter(DialogModel.id.in_(id_list))
if keyword:
query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
@@ -219,3 +234,23 @@
r["user"] = user_dict.get(r["user_id"], {})
r["label"] = label_dict.get(r["id"], [])
return {"total": total, "rows": rows}
+
+
+
+async def sync_dialog_service(db, dialog_id):
+ dialog = db.query(DialogModel).filter(DialogModel.id == dialog_id).first()
+ if dialog and dialog.dialog_type == RG_TYPE:
+ try:
+ app_dialog = get_one_from_ragflow_dialog(dialog_id)
+ if app_dialog:
+ dialog.name = app_dialog["name"]
+ dialog.description = app_dialog["description"]
+ dialog.update_date = datetime.now()
+ db.add(dialog)
+ db.commit()
+ db.refresh(dialog)
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
--
Gitblit v1.8.0