From 5eff7ec9d00fa835a76c354bad7cc7f284d28b11 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 26 十二月 2024 13:51:27 +0800
Subject: [PATCH] 新增用户增加rg数据同步
---
app/task/fetch_agent.py | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index ea9a2e6..8507bee 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -49,6 +49,7 @@
status = Column(String(16), nullable=False)
description = Column(Text, nullable=False)
tenant_id = Column(String(36), nullable=False)
+ mode = Column(String(36), nullable=False)
class RgKnowledge(Base):
@@ -60,6 +61,15 @@
description = Column(Text) # 璇存槑
status = Column(String(1)) # 鐘舵��
doc_num = Column(Integer) # 鏂囨。
+
+
+class RgUserTenant(Base):
+ __tablename__ = 'user_tenant'
+ id = Column(String(36), primary_key=True) # id
+ tenant_id = Column(String(32)) # 鍚嶇О
+ user_id = Column(String(32))
+ role = Column(String(32)) # 鍒涘缓浜篿d
+
# 瑙ｆ瀽鍚嶅瓧
def parse_names(names_str: str) -> List[str]:
@@ -210,14 +220,14 @@
try:
if names:
query = db.query(Flow.id, Flow.name, Flow.description, Flow.status, Flow.user_id) \
- .filter(Flow.name.in_(names))
+ .filter(Flow.name.in_(names), Flow.status=="1")
else:
- query = db.query(Flow.id, Flow.name, Flow.description, Flow.status, Flow.user_id)
+ query = db.query(Flow.id, Flow.name, Flow.description, Flow.status, Flow.user_id).filter(Flow.status=="1")
results = query.all()
# print(f"Executing query: {query}")
# 鏍煎紡鍖杋d涓篣UID
- formatted_results = [{"id":format_uuid(row[0]), "name": row[1], "description": row[2], "status": "1" if row[3] ==2 else "0", "user_id": str(row[4])} for row in results]
+ formatted_results = [{"id":row[0], "name": row[1], "description": row[2], "status": row[3], "user_id": str(row[4]), "mode": "agent-dialog"} for row in results]
return formatted_results
finally:
db.close()
@@ -227,14 +237,14 @@
try:
if names:
query = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id) \
- .filter( Dialog.name.in_(names))
+ .filter( Dialog.name.in_(names), Dialog.status == "1")
else:
- query = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id)
+ query = db.query(Dialog.id, Dialog.name, Dialog.description, Dialog.status, Dialog.tenant_id).filter( Dialog.status == "1")
results = query.all()
formatted_results = [
- {"id": format_uuid(row[0]), "name": row[1], "description": row[2], "status": str(row[3]) if row[3] ==1 else "2",
- "user_id": str(row[4])} for row in 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]
return formatted_results
finally:
db.close()
@@ -244,15 +254,15 @@
db = SessionDify()
try:
if names:
- query = db.query(DfApps.id, DfApps.name, DfApps.description, DfApps.status, DfApps.tenant_id) \
+ query = db.query(DfApps.id, DfApps.name, DfApps.description, DfApps.status, DfApps.tenant_id, DfApps.mode) \
.filter( DfApps.name.in_(names))
else:
- query = db.query(DfApps.id, DfApps.name, DfApps.description, DfApps.status, DfApps.tenant_id)
+ query = db.query(DfApps.id, DfApps.name, DfApps.description, DfApps.status, DfApps.tenant_id, DfApps.mode)
results = query.all()
formatted_results = [
{"id": str(row[0]), "name": row[1], "description": row[2], "status": "1",
- "user_id": str(row[4])} for row in results]
+ "user_id": str(row[4]), "mode": row[5]} for row in results]
return formatted_results
finally:
db.close()
@@ -269,15 +279,17 @@
existing_agent = db.query(DialogModel).filter_by(id=row["id"]).first()
if existing_agent:
existing_agent.name = row["name"]
- existing_agent.status = row["status"]
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)
+ 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"])
db.add(existing)
db.commit()
for dialog in db.query(DialogModel).filter_by(dialog_type=dialog_type).all():
if dialog.id not in agent_id_list:
+ # print(dialog.id)
db.query(DialogModel).filter_by(id=dialog.id).update({"status": "2"})
db.commit()
except IntegrityError:
@@ -318,9 +330,11 @@
dify_data = get_data_from_dify_v2([])
if dify_data:
update_ids_in_local_v2(dify_data, "4")
- print("Agents synchronized successfully")
+ print("v2 Agents synchronized successfully")
except Exception as e:
- print(f"Failed to sync agents: {str(e)}")
+ print(f"v2 Failed to sync agents: {str(e)}")
+ finally:
+ db.close()
def update_ids_in_local_knowledge(data, klg_type):
type_dict = {"1": RAGFLOW, "2": BISHENG, "4": DIFY}
@@ -343,7 +357,7 @@
knowledge_type=1, permission=row["permission"], documents=row["doc_num"])
db.add(existing)
db.commit()
- for dialog in db.query(KnowledgeModel).filter_by(knowledge_type=type_dict[klg_type]).all():
+ for dialog in db.query(KnowledgeModel).filter_by(knowledge_type=klg_type).all():
if dialog.id not in agent_id_list:
db.query(KnowledgeModel).filter_by(id=dialog.id).delete()
db.commit()
@@ -380,11 +394,27 @@
# elif app["id"] == DIFY:
# dify_data = get_data_from_dify_v2([])
# update_ids_in_local_v2(dify_data, "4")
- print("Agents synchronized successfully")
+ print("sync knowledge successfully")
except Exception as e:
- print(f"Failed to sync agents: {str(e)}")
+ print(f"Failed to sync knowledge: {str(e)}")
+ finally:
+ db.close()
+
+
+def update_ragflow_user_tenant(user_id: str):
+ db = SessionRagflow()
+ try:
+ if user_id:
+ db.query(RgUserTenant).filter( RgUserTenant.user_id==user_id, RgUserTenant.role=="invite").update({"role": "normal"})
+ db.query(RgUserTenant).filter( RgUserTenant.tenant_id==user_id, RgUserTenant.role=="invite").update({"role": "normal"})
+ else:
+ db.query(RgUserTenant).filter(RgUserTenant.role=="invite").update({"role": "normal"})
+ db.commit()
+ finally:
+ db.close()
if __name__ == "__main__":
- a = get_data_from_dify_v2([])
- print(a)
+ # a = get_data_from_dify_v2([])
+ # print(a)
+ update_ragflow_user_tenant("")
--
Gitblit v1.8.0