From b9c7727dc6fbb3789f063c0616ef9392311fecb2 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 二月 2025 10:58:14 +0800
Subject: [PATCH] merge master
---
app/task/fetch_agent.py | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index 8cb7e5a..f394dc2 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -163,7 +163,7 @@
('basic_excel_talk', 6, '鏅鸿兘鏁版嵁', 'BASIC', 'excelTalk'),
('basic_question_talk', 7, '鍑洪缁勫嵎', 'BASIC', 'questionTalk'),
('9d75142a-66eb-4e23-b7d4-03efe4584915', 8, '灏忔暟缁樺浘', 'DIFY', 'imageTalk'),
- ('basic_paper_talk', 9, '鏂囨。鍑哄嵎', 'BASIC', 'paperTalk'),
+ ('2f6ddf93-7ba6-4b2d-b991-d96421404600', 9, '鏂囨。鍑哄嵎', 'DIFY', 'paperTalk'),
('basic_report_clean', 10, '鏂囨。鎶ュ憡', 'DIFY', 'reportWorkflow')
]
@@ -240,6 +240,15 @@
def get_data_from_ragflow_v2(names: List[str]) -> List[Dict]:
db = SessionRagflow()
+ para = {
+ "user_input_form": [],
+ "retriever_resource": {
+ "enabled": True
+ },
+ "file_upload": {
+ "enabled": False
+ }
+ }
try:
if names:
query = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id) \
@@ -251,13 +260,13 @@
results = query.all()
formatted_results = [
{"id": row[0], "name": row[1], "description": row[2], "status": "1" if row[3] == "1" else "2",
- "user_id": str(row[4]), "mode": "agent-dialog"} for row in results]
+ "user_id": str(row[4]), "mode": "agent-dialog", "parameters": para} for row in results]
return formatted_results
finally:
db.close()
-def get_data_from_dify_v2(names: List[str]) -> List[Dict]:
+def get_data_from_dy_v2(names: List[str]) -> List[Dict]:
db = SessionDify()
try:
if names:
@@ -269,7 +278,7 @@
results = query.all()
formatted_results = [
{"id": str(row[0]), "name": row[1], "description": row[2], "status": "1",
- "user_id": str(row[4]), "mode": row[5]} for row in results]
+ "user_id": str(row[4]), "mode": row[5], "parameters": {}} for row in results]
return formatted_results
finally:
db.close()
@@ -286,14 +295,12 @@
if existing_agent:
existing_agent.name = row["name"]
existing_agent.description = row["description"]
- # existing_agent.status = row["status"]
existing_agent.mode = row["mode"]
- # existing_agent.tenant_id = get_rag_user_id(db, row["user_id"], type_dict[dialog_type])
else:
existing = DialogModel(id=row["id"], status=row["status"], name=row["name"],
description=row["description"],
tenant_id=get_rag_user_id(db, row["user_id"], type_dict[dialog_type]),
- dialog_type=dialog_type, mode=row["mode"])
+ dialog_type=dialog_type, mode=row["mode"], parameters=json.dumps(row["parameters"]))
db.add(existing)
db.commit()
for dialog in db.query(DialogModel).filter_by(dialog_type=dialog_type).all():
@@ -332,12 +339,12 @@
ragflow_data = get_data_from_ragflow_v2([])
if ragflow_data:
update_ids_in_local_v2(ragflow_data, "1")
- elif app["id"] == BISHENG:
- bisheng_data = get_data_from_bisheng_v2([])
- if bisheng_data:
- update_ids_in_local_v2(bisheng_data, "2")
+ # elif app["id"] == BISHENG:
+ # bisheng_data = get_data_from_bisheng_v2([])
+ # if bisheng_data:
+ # update_ids_in_local_v2(bisheng_data, "2")
elif app["id"] == DIFY:
- dify_data = get_data_from_dify_v2([])
+ dify_data = get_data_from_dy_v2([])
if dify_data:
update_ids_in_local_v2(dify_data, "4")
print("v2 Agents synchronized successfully")
--
Gitblit v1.8.0