From 282a631b9ceee9a634ee1d93751a5254ed37ccef Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 18 三月 2025 10:10:48 +0800
Subject: [PATCH] 首页知识库对话-rg
---
app/task/fetch_agent.py | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index bee4790..295b7b0 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
@@ -43,6 +43,7 @@
status = Column(String(1), nullable=False)
description = Column(String(255), nullable=False)
tenant_id = Column(String(36), nullable=False)
+ kb_ids = Column(String(128), nullable=False)
class DfApps(Base):
@@ -64,6 +65,7 @@
description = Column(Text) # 璇存槑
status = Column(String(1)) # 鐘舵��
doc_num = Column(Integer) # 鏂囨。
+ embd_id = Column(String(128)) # 鏂囨。
class RgUserTenant(Base):
@@ -238,7 +240,7 @@
db.close()
-def get_data_from_ragflow_v2(names: List[str]) -> List[Dict]:
+def get_data_from_ragflow_v2(base_db, names: List[str], tenant_id) -> List[Dict]:
db = SessionRagflow()
para = {
"user_input_form": [],
@@ -250,25 +252,29 @@
}
}
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")
else:
- query = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id).filter(
- Dialog.status == "1")
+ query = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id, Dialog.kb_ids).filter(
+ Dialog.status == "1", Dialog.tenant_id == tenant_id)
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, "kb_ids": row[5]} 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))
@@ -278,7 +284,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()
@@ -296,13 +302,14 @@
existing_agent.name = row["name"]
existing_agent.description = row["description"]
existing_agent.mode = row["mode"]
+ existing_agent.kb_ids = row.get("kb_ids", "")
if existing_agent.status == Dialog_STATSU_DELETE:
existing_agent.status = Dialog_STATSU_ON
if row["parameters"]:
existing_agent.parameters = json.dumps(row["parameters"])
else:
existing = DialogModel(id=row["id"], status=row["status"], name=row["name"],
- description=row["description"],
+ description=row["description"], kb_ids=row.get("kb_ids", ""),
tenant_id=get_rag_user_id(db, row["user_id"], type_dict[dialog_type]),
dialog_type=dialog_type, mode=row["mode"], parameters=json.dumps(row["parameters"]))
db.add(existing)
@@ -319,12 +326,12 @@
db.close()
-def get_data_from_ragflow_knowledge():
+def get_data_from_ragflow_knowledge(tenant_id):
db = SessionRagflow()
try:
results = db.query(RgKnowledge.id, RgKnowledge.name, RgKnowledge.description, RgKnowledge.status,
- RgKnowledge.tenant_id, RgKnowledge.doc_num, RgKnowledge.permission).all()
+ RgKnowledge.tenant_id, RgKnowledge.doc_num, RgKnowledge.permission).filter(RgKnowledge.tenant_id==tenant_id).all()
formatted_results = [
{"id": row[0], "name": row[1], "description": row[2], "status": str(row[3]),
"user_id": str(row[4]), "doc_num": row[5], "permission": row[6]} for row in results]
@@ -339,18 +346,17 @@
try:
app_register = AppRegisterDao(db).get_apps()
for app in app_register:
- if app["id"] == RAGFLOW:
- 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"] == DIFY:
- dify_data = get_data_from_dy_v2([])
- if dify_data:
- update_ids_in_local_v2(dify_data, "4")
+ try:
+ if app["id"] == RAGFLOW:
+ 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(db, [])
+ if dify_data:
+ update_ids_in_local_v2(dify_data, "4")
+ except Exception as e:
+ print(f"Failed to sync agents: {str(e)}")
print("v2 Agents synchronized successfully")
except Exception as e:
print(f"v2 Failed to sync agents: {str(e)}")
@@ -396,10 +402,21 @@
try:
row = db.query(RgKnowledge.id, RgKnowledge.name, RgKnowledge.description, RgKnowledge.status,
- RgKnowledge.tenant_id, RgKnowledge.doc_num, RgKnowledge.permission).filter(
+ RgKnowledge.tenant_id, RgKnowledge.doc_num, RgKnowledge.permission, RgKnowledge.embd_id).filter(
RgKnowledge.id == klg_id).first()
return {"id": row[0], "name": row[1], "description": row[2], "status": str(row[3]),
- "user_id": str(row[4]), "doc_num": row[5], "permission": row[6]} if row else {}
+ "user_id": str(row[4]), "doc_num": row[5], "permission": row[6], "embd_id": row[7]} if row else {}
+ finally:
+ db.close()
+
+
+def get_one_from_ragflow_dialog(dialog_id):
+ db = SessionRagflow()
+ try:
+ row = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id, Dialog.kb_ids) \
+ .filter(Dialog.id==dialog_id).first()
+ return {"id": row[0], "name": row[1], "description": row[2], "status": str(row[3]),
+ "user_id": str(row[4]), "kb_ids": row[5]} if row else {}
finally:
db.close()
@@ -411,7 +428,7 @@
app_register = AppRegisterDao(db).get_apps()
for app in app_register:
if app["id"] == RAGFLOW:
- ragflow_data = get_data_from_ragflow_knowledge()
+ ragflow_data = get_data_from_ragflow_knowledge(app["name"])
if ragflow_data:
update_ids_in_local_knowledge(ragflow_data, "1")
# elif app["id"] == BISHENG:
--
Gitblit v1.8.0