From 0650b889a36d9b9fd42415b9b9819676f839ae9b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 08 四月 2025 09:54:09 +0800
Subject: [PATCH] 首页会话-模型修改
---
app/service/v2/chat.py | 176 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 37 deletions(-)
diff --git a/app/service/v2/chat.py b/app/service/v2/chat.py
index 9f83c63..ec8b5a2 100644
--- a/app/service/v2/chat.py
+++ b/app/service/v2/chat.py
@@ -1,4 +1,5 @@
import asyncio
+import datetime
import io
import json
import time
@@ -10,7 +11,7 @@
from Log import logger
from app.config.agent_base_url import RG_CHAT_DIALOG, DF_CHAT_AGENT, DF_CHAT_PARAMETERS, RG_CHAT_SESSIONS, \
- DF_CHAT_WORKFLOW, DF_UPLOAD_FILE, RG_ORIGINAL_URL
+ DF_CHAT_WORKFLOW, DF_UPLOAD_FILE, RG_ORIGINAL_URL, RG_CHAT_UPDATE_URL, DF_WORKFLOW_DRAFT, DF_WORKFLOW_PUBLISH
from app.config.config import settings
from app.config.const import *
from app.models import DialogModel, ApiTokenModel, UserTokenModel, ComplexChatSessionDao, ChatDataRequest, \
@@ -34,7 +35,7 @@
async def add_session_log(db, session_id: str, question: str, chat_id: str, user_id, event_type: str,
- conversation_id: str, agent_type, query: dict=None):
+ conversation_id: str, agent_type, query: dict = None):
try:
session = await ChatSessionDao(db).update_or_insert_by_id(
session_id=session_id,
@@ -65,6 +66,10 @@
return app_token.token
return ""
+async def get_workflow_token(db):
+ user_token = db.query(UserTokenModel).filter(UserTokenModel.id == workflow_server).first()
+ return user_token.access_token if user_token else ""
+
async def add_chat_token(db, data):
try:
@@ -88,7 +93,6 @@
return ChatAgent(), url
-
async def get_user_kb(db, user_id: int, kb_ids: list) -> list:
res = []
user = db.query(UserModel).filter(UserModel.id == user_id).first()
@@ -97,11 +101,12 @@
query = db.query(KnowledgeModel)
if user.permission != "admin":
klg_list = [j.id for i in user.groups for j in i.knowledges]
- for i in db.query(KnowledgeUserModel).filter(KnowledgeUserModel.user_id == user_id, KnowledgeUserModel.status == 1).all():
+ for i in db.query(KnowledgeUserModel).filter(KnowledgeUserModel.user_id == user_id,
+ KnowledgeUserModel.status == 1).all():
if i.kb_id not in klg_list:
klg_list.append(i.kb_id)
query = query.filter(or_(KnowledgeModel.id.in_(klg_list), KnowledgeModel.tenant_id == str(user_id)))
- kb_list= query.all()
+ kb_list = query.all()
for kb in kb_list:
if kb.id in kb_ids:
if kb.permission == "team":
@@ -120,7 +125,8 @@
kb_id = await get_user_kb(db, user_id, kb_ids)
if not kb_id:
yield "data: " + json.dumps({"message": smart_message_error,
- "error": "\n**ERROR**: The agent has no knowledge base to work with!", "status": http_400},
+ "error": "\n**ERROR**: The agent has no knowledge base to work with!",
+ "status": http_400},
ensure_ascii=False) + "\n\n"
return
chat = ChatDialog()
@@ -285,15 +291,11 @@
"error": error}, conversation_id)
-
-
async def service_chat_basic(db, chat_id: str, chat_data: ChatData, session_id: str, user_id, mode: str):
-
if chat_id == basic_report_talk:
complex_chat = await ComplexChatDao(db).get_complex_chat_by_mode(chat_data.report_mode)
if complex_chat:
...
-
async def service_chat_parameters(db, chat_id, user_id):
@@ -328,9 +330,8 @@
session_log = await ChatSessionDao(db).get_session_by_id(session_id)
if not session_log:
return {}
- log_info =session_log.log_to_json()
- if session_log.event_type == complex_chat:
-
+ log_info = session_log.log_to_json()
+ if session_log.event_type == complex_chat:
total, message_list = await ComplexChatSessionDao(db).get_session_list(session_id)
log_info["message"] = [message.log_to_json() for message in message_list[::-1]]
@@ -478,7 +479,8 @@
return records
-async def add_complex_log(db, message_id, chat_id, session_id, chat_mode, query, user_id, mode, agent_type, message_type, conversation_id="", node_data=None, query_data=None):
+async def add_complex_log(db, message_id, chat_id, session_id, chat_mode, query, user_id, mode, agent_type,
+ message_type, conversation_id="", node_data=None, query_data=None):
if not node_data:
node_data = []
if not query_data:
@@ -493,22 +495,23 @@
if session:
conversation_id = session.conversation_id
await complex_log.create_session(message_id,
- chat_id=chat_id,
- session_id=session_id,
- chat_mode=chat_mode,
- message_type=message_type,
- content=query,
- event_type=mode,
- tenant_id=user_id,
- conversation_id=conversation_id,
- node_data=json.dumps(node_data),
- query=json.dumps(query_data),
- agent_type=agent_type)
+ chat_id=chat_id,
+ session_id=session_id,
+ chat_mode=chat_mode,
+ message_type=message_type,
+ content=query,
+ event_type=mode,
+ tenant_id=user_id,
+ conversation_id=conversation_id,
+ node_data=json.dumps(node_data),
+ query=json.dumps(query_data),
+ agent_type=agent_type)
return conversation_id, True
except Exception as e:
logger.error(e)
return conversation_id, False
+
async def add_query_files(db, message_id):
query = {}
@@ -516,6 +519,7 @@
if complex_log:
query = json.loads(complex_log.query)
return query.get("files", [])
+
async def service_complex_chat(db, chat_id, mode, user_id, chat_request: ChatDataRequest):
answer_event = ""
@@ -527,7 +531,7 @@
task_id = ""
error = ""
node_list = []
- reference= {}
+ reference = {}
conversation_id = ""
query_data = chat_request.to_dict()
new_message_id = str(uuid.uuid4())
@@ -539,9 +543,12 @@
if not files and chat_request.parentId:
files = await add_query_files(db, chat_request.parentId)
if chat_request.chatMode != complex_content_optimization_chat:
- await add_session_log(db, chat_request.sessionId, chat_request.query if chat_request.query else "鏈懡鍚嶄細璇�", chat_id, user_id,
- mode, "", DF_TYPE)
- conversation_id, message = await add_complex_log(db, new_message_id, chat_id, chat_request.sessionId, chat_request.chatMode, chat_request.query, user_id, mode, DF_TYPE, 1, query_data=query_data)
+ await add_session_log(db, chat_request.sessionId, chat_request.query if chat_request.query else "鏈懡鍚嶄細璇�",
+ chat_id, user_id,
+ mode, "", DF_TYPE)
+ conversation_id, message = await add_complex_log(db, new_message_id, chat_id, chat_request.sessionId,
+ chat_request.chatMode, chat_request.query, user_id, mode,
+ DF_TYPE, 1, query_data=query_data)
if not message:
yield "data: " + json.dumps({"message": smart_message_error,
"error": "\n**ERROR**: 鍒涘缓浼氳瘽澶辫触锛�", "status": http_500},
@@ -555,7 +562,7 @@
session = await service_chat_sessions(db, chat_id, chat_request.query)
# print(session)
if not session or session.get("code") != 0:
- yield "data: " + json.dumps(
+ yield "data: " + json.dumps(
{"message": smart_message_error, "error": "\n**ERROR**: chat agent error", "status": http_500})
return
conversation_id = session.get("data", {}).get("id")
@@ -563,7 +570,9 @@
url = settings.fwr_base_url + RG_CHAT_DIALOG.format(chat_id)
chat = ChatDialog()
try:
- async for ans in chat.chat_completions(url, await chat.complex_request_data(chat_request.query, chat_request.knowledgeId, conversation_id),
+ async for ans in chat.chat_completions(url, await chat.complex_request_data(chat_request.query,
+ chat_request.knowledgeId,
+ conversation_id),
await chat.get_headers(token)):
data = {}
error = ""
@@ -587,9 +596,9 @@
reference = data.get("reference", {})
event = smart_message_cover
message_str = "data: " + json.dumps(
- {"event": event, "data": data, "error": error, "status": status, "message_id":message_id,
- "parent_id": new_message_id,
- "session_id": chat_request.sessionId},
+ {"event": event, "data": data, "error": error, "status": status, "message_id": message_id,
+ "parent_id": new_message_id,
+ "session_id": chat_request.sessionId},
ensure_ascii=False) + "\n\n"
for i in range(0, len(message_str), max_chunk_size):
chunk = message_str[i:i + max_chunk_size]
@@ -608,7 +617,9 @@
token = await get_chat_token(db, chat_id)
chat, url = await get_chat_object(mode)
async for ans in chat.chat_completions(url,
- await chat.complex_request_data(chat_request.query, conversation_id, str(user_id), files=files, inputs=inputs),
+ await chat.complex_request_data(chat_request.query, conversation_id,
+ str(user_id), files=files,
+ inputs=inputs),
await chat.get_headers(token)):
# print(ans)
data = {}
@@ -662,7 +673,8 @@
continue
yield "data: " + json.dumps(
- {"event": event, "data": data, "error": error, "status": status, "task_id": task_id, "message_id":message_id,
+ {"event": event, "data": data, "error": error, "status": status, "task_id": task_id,
+ "message_id": message_id,
"parent_id": new_message_id,
"session_id": chat_request.sessionId},
ensure_ascii=False) + "\n\n"
@@ -682,7 +694,11 @@
# "node_list": node_list, "task_id": task_id, "id": message_id,
# "error": error}, conversation_id)
if message_id:
- await add_complex_log(db, message_id, chat_id, chat_request.sessionId, chat_request.chatMode, answer_event or answer_agent or answer_workflow or answer_dialog or error, user_id, mode, DF_TYPE, 2, conversation_id, node_data=node_list or reference, query_data=query_data)
+ await add_complex_log(db, message_id, chat_id, chat_request.sessionId, chat_request.chatMode,
+ answer_event or answer_agent or answer_workflow or answer_dialog or error, user_id,
+ mode, DF_TYPE, 2, conversation_id, node_data=node_list or reference,
+ query_data=query_data)
+
async def service_complex_upload(db, chat_id, file, user_id):
files = []
@@ -706,6 +722,92 @@
logger.error(e)
return json.dumps(files) if files else ""
+
+async def service_complex_model(db, chat_type, model_type, model_name, model_provider):
+ if chat_type == 1 and model_type == 1:
+ return await set_dialog_model(db, complex_knowledge_chat, model_name)
+ elif chat_type == 1 and model_type == 2:
+ return await set_dialog_model(db, complex_knowledge_chat_deep, model_name, model_provider)
+ else:
+ if model_type == 1:
+ chats = [complex_dialog_chat, complex_network_chat, complex_mindmap_chat, complex_content_optimization_chat]
+ else:
+ chats = [complex_dialog_chat, complex_network_chat]
+ return await set_workflow_model(db,chats
+ , # , complex_network_chat, complex_mindmap_chat, complex_content_optimization_chat
+ model_type, model_name, model_provider)
+
+
+async def set_dialog_model(db, chat_mode, model_name, model_provider):
+ chat = await ComplexChatDao(db).get_complex_chat_by_mode(chat_mode)
+ if chat:
+ access_token = await get_chat_token(db, rg_api_token)
+ url = settings.fwr_base_url + RG_CHAT_UPDATE_URL.format(chat.id)
+ chat_base = ChatBaseApply()
+ payload = {
+ "name": chat.name,
+ "llm": {
+ "model_name": model_name
+ }
+ }
+ response = await chat_base.chat_put(url, payload, await chat_base.get_headers(access_token))
+ # print(response)
+ if not response:
+ return "鏈嶅姟寮傚父,淇敼澶辫触锛�"
+ await ComplexChatDao(db).update_complex_chat_by_id(chat.id, {"chat_model": model_name, "chat_model_ds": model_name, "chat_provider": model_provider, "update_date": datetime.datetime.now()})
+ return ""
+
+async def set_workflow_model(db, chat_modes, model_type, model_name, model_provider):
+ chat_base = ChatBaseApply()
+ token = await get_workflow_token(db)
+ for chat_mode in chat_modes:
+ chat = await ComplexChatDao(db).get_complex_chat_by_mode(chat_mode)
+ if chat:
+
+ get_draft_url = settings.dify_base_url + DF_WORKFLOW_DRAFT.format(chat.id)
+ draft_data = await chat_base.chat_get(get_draft_url, {}, await chat_base.get_headers(token))
+ if draft_data:
+ graph = draft_data.get("graph")
+ for node in graph.get("nodes"):
+ if node.get("data", {}).get("type") == "llm":
+ if model_type == 1 and "娣卞害鎼滅储" not in node.get("data", {}).get("title"):
+ node["data"]["model"]["name"] = model_name
+ node["data"]["model"]["provider"] = model_provider
+ elif model_type == 2 and "娣卞害鎼滅储" in node.get("data", {}).get("title"):
+ node["data"]["model"]["name"] = model_name
+ node["data"]["model"]["provider"] = model_provider
+
+ draft_data_query = {"conversation_variables": draft_data.get("conversation_variables"),
+ "environment_variables": draft_data.get("environment_variables"),
+ "hash": draft_data.get("hash"),
+ "features": draft_data.get("features"),
+ "graph": graph}
+ set_draft_data = await chat_base.chat_post(get_draft_url, draft_data_query, await chat_base.get_headers(token))
+ if set_draft_data and set_draft_data.get("result") == "success":
+ publish_url = settings.dify_base_url + DF_WORKFLOW_PUBLISH.format(chat.id)
+ publish_data = await chat_base.chat_post(publish_url, {}, await chat_base.get_headers(token))
+ if publish_data and publish_data.get("result") == "success":
+ update_kwargs = {"chat_provider": model_provider, "update_date": datetime.datetime.now()}
+ if model_type == 1:
+ update_kwargs["chat_model"] = model_name
+ else:
+ update_kwargs["chat_model_ds"] = model_name
+ await ComplexChatDao(db).update_complex_chat_by_id(chat.id, update_kwargs)
+
+
+async def service_get_complex_model(db):
+ res = {}
+ for complexs in await ComplexChatDao(db).aget_complex_chat():
+ if complexs.chat_mode == complex_knowledge_chat:
+ res["dialog"] = {"modelName": complexs.chat_model, "modelProvider": complexs.chat_provider}
+ elif complexs.chat_mode == complex_knowledge_chat_deep:
+ res["dialog_ds"] = {"modelName": complexs.chat_model_ds, "modelProvider": complexs.chat_provider}
+ else:
+ res["workflow"] = {"modelName": complexs.chat_model, "modelProvider": complexs.chat_provider}
+ res["workflow_ds"] = {"modelName": complexs.chat_model_ds, "modelProvider": complexs.chat_provider}
+
+ return json.dumps(res)
+
if __name__ == "__main__":
q = json.dumps({"query": "璁惧", "dataset_ids": ["fc68db52f43111efb94a0242ac120004"]})
top_k = 2
--
Gitblit v1.8.0