From e26a7859a8900b152e10961d91fa6ad19a8deb9c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 三月 2025 14:41:27 +0800
Subject: [PATCH] 首页通用对话增加
---
app/task/fetch_agent.py | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index a5a7bfb..8ad5215 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -9,7 +9,7 @@
from app.config.config import settings
from app.config.const import RAGFLOW, BISHENG, DIFY, ENV_CONF_PATH, Dialog_STATSU_DELETE, Dialog_STATSU_ON
-from app.models import KnowledgeModel
+from app.models import KnowledgeModel, ComplexChatDao
from app.models.dialog_model import DialogModel
from app.models.user_model import UserAppModel
from app.models.agent_model import AgentModel
@@ -239,7 +239,7 @@
db.close()
-def get_data_from_ragflow_v2(names: List[str], tenant_id) -> List[Dict]:
+def get_data_from_ragflow_v2(base_db, names: List[str], tenant_id) -> List[Dict]:
db = SessionRagflow()
para = {
"user_input_form": [],
@@ -251,6 +251,8 @@
}
}
try:
+ chat_ids = ComplexChatDao(base_db).get_complex_chat_ids()
+ # print(chat_ids)
if names:
query = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id) \
.filter(Dialog.name.in_(names), Dialog.status == "1")
@@ -261,15 +263,17 @@
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", "parameters": para} for row in results]
+ "user_id": str(row[4]), "mode": "agent-dialog", "parameters": para} for row in results if row[0] not in chat_ids]
return formatted_results
finally:
db.close()
-def get_data_from_dy_v2(names: List[str]) -> List[Dict]:
+def get_data_from_dy_v2(base_db, names: List[str]) -> List[Dict]:
db = SessionDify()
try:
+ chat_ids = ComplexChatDao(base_db).get_complex_chat_ids()
+ # print(chat_ids)
if names:
query = db.query(DfApps.id, DfApps.name, DfApps.description, DfApps.status, DfApps.tenant_id, DfApps.mode) \
.filter(DfApps.name.in_(names))
@@ -279,7 +283,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], "parameters": {}} for row in results]
+ "user_id": str(row[4]), "mode": row[5], "parameters": {}} for row in results if str(row[0]) not in chat_ids]
return formatted_results
finally:
db.close()
@@ -342,11 +346,11 @@
for app in app_register:
try:
if app["id"] == RAGFLOW:
- ragflow_data = get_data_from_ragflow_v2([], app["name"])
+ ragflow_data = get_data_from_ragflow_v2(db, [], app["name"])
if ragflow_data:
update_ids_in_local_v2(ragflow_data, "1")
elif app["id"] == DIFY:
- dify_data = get_data_from_dy_v2([])
+ dify_data = get_data_from_dy_v2(db, [])
if dify_data:
update_ids_in_local_v2(dify_data, "4")
except Exception as e:
--
Gitblit v1.8.0