From f6b2863303625ef7ef3809c4e08edbd2e0b4530b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 25 二月 2025 11:19:57 +0800
Subject: [PATCH] 鉴权
---
app/task/fetch_agent.py | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index f361265..fde6d3a 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -8,7 +8,7 @@
from sqlalchemy.orm import sessionmaker, Session
from app.config.config import settings
-from app.config.const import RAGFLOW, BISHENG, DIFY, ENV_CONF_PATH
+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.dialog_model import DialogModel
from app.models.user_model import UserAppModel
@@ -64,6 +64,7 @@
description = Column(Text) # 璇存槑
status = Column(String(1)) # 鐘舵��
doc_num = Column(Integer) # 鏂囨。
+ embd_id = Column(String(128)) # 鏂囨。
class RgUserTenant(Base):
@@ -163,7 +164,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')
]
@@ -238,7 +239,7 @@
db.close()
-def get_data_from_ragflow_v2(names: List[str]) -> List[Dict]:
+def get_data_from_ragflow_v2(names: List[str], tenant_id) -> List[Dict]:
db = SessionRagflow()
para = {
"user_input_form": [],
@@ -255,7 +256,7 @@
.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")
+ Dialog.status == "1", Dialog.tenant_id == tenant_id)
results = query.all()
formatted_results = [
@@ -296,6 +297,10 @@
existing_agent.name = row["name"]
existing_agent.description = row["description"]
existing_agent.mode = row["mode"]
+ 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"],
@@ -306,7 +311,7 @@
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.query(DialogModel).filter_by(id=dialog.id).update({"status": Dialog_STATSU_DELETE})
db.commit()
except IntegrityError:
db.rollback()
@@ -315,12 +320,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]
@@ -335,18 +340,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([], app["name"])
+ if ragflow_data:
+ update_ids_in_local_v2(ragflow_data, "1")
+ elif app["id"] == DIFY:
+ dify_data = get_data_from_dy_v2([])
+ 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)}")
@@ -392,10 +396,10 @@
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()
@@ -407,7 +411,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:
@@ -490,7 +494,7 @@
import_type_table(db, node)
print("add resourceType record successfully")
else:
- print("sync resources successfully")
+ print("sync resourcesType successfully")
if db.query(ResourceModel).count() == 0:
with open(os.path.join(ENV_CONF_PATH, "resource.json"), 'r', encoding='utf-8') as file:
json_data = json.load(file)
--
Gitblit v1.8.0