From 633a8ed975625851f23398f896594581c179f612 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期一, 23 十二月 2024 09:45:50 +0800 Subject: [PATCH] mysql链接数量 --- app/task/fetch_agent.py | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py index 6373653..303d8f6 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): @@ -210,14 +211,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() @@ -233,8 +234,8 @@ 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 +245,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 +270,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: @@ -343,7 +346,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() -- Gitblit v1.8.0