From af86455055918d26a0f6eebc270074c4863db0be Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 07 三月 2025 09:57:19 +0800
Subject: [PATCH] 增加深度思考逻辑
---
app/service/v2/chat.py | 2 +-
app/service/v2/mindmap.py | 9 +++++++--
app/service/user.py | 4 ++--
app/config/env_conf/menu_conf.json | 14 +-------------
app/models/v2/chat.py | 1 +
5 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/app/config/env_conf/menu_conf.json b/app/config/env_conf/menu_conf.json
index 9418fb8..04bd3b0 100644
--- a/app/config/env_conf/menu_conf.json
+++ b/app/config/env_conf/menu_conf.json
@@ -146,19 +146,7 @@
"rank": 91,
"dialog": [
{
- "id": "87b8e17c-594d-424f-b9f8-0b56036904c9",
- "chat_id": "basic_report_clean",
- "chat_type": "reportWorkflow",
- "agentType": 4
- },
- {
- "id": "61d26deb-9371-4f9c-b61b-b9f9a24a9188",
- "chat_id": "basic_report_clean",
- "chat_type": "reportWorkflow",
- "agentType": 4
- },
- {
- "id": "d6eea92d-444a-4658-b9e7-9ab7bd5cb19d",
+ "id": "basic_report_talk",
"chat_id": "basic_report_clean",
"chat_type": "reportWorkflow",
"agentType": 4
diff --git a/app/models/v2/chat.py b/app/models/v2/chat.py
index 1240c85..86d7ea4 100644
--- a/app/models/v2/chat.py
+++ b/app/models/v2/chat.py
@@ -37,6 +37,7 @@
"chatMode": self.chatMode,
"knowledgeId": self.knowledgeId,
"files": self.files,
+ "isDeep": self.isDeep,
}
diff --git a/app/service/user.py b/app/service/user.py
index 7a63ff8..fe8aeb9 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -3,7 +3,7 @@
from datetime import datetime
from app.api import pwd_context
from app.config.const import RAGFLOW, BISHENG, DIFY, USER_STATSU_DELETE, ROLE_STATUS_ON, DEPT_STATUS_ON, \
- Dialog_STATSU_ON
+ Dialog_STATSU_ON, USER_STATSU_ON
from app.models import RoleModel, GroupModel, AgentType, role_resource_table, DialogModel, OrganizationModel, \
ResourceModel
from app.models.menu_model import WebMenuModel, MenuCapacityModel
@@ -269,7 +269,7 @@
menu_list = db.query(WebMenuModel.id, WebMenuModel.title, WebMenuModel.describe, WebMenuModel.icon, WebMenuModel.desc,WebMenuModel.rank,
WebMenuModel.img, MenuCapacityModel.capacity_id, MenuCapacityModel.capacity_type, MenuCapacityModel.chat_id.label("agentId"), MenuCapacityModel.chat_type).outerjoin(
MenuCapacityModel, WebMenuModel.id == MenuCapacityModel.menu_id).outerjoin(
- DialogModel, MenuCapacityModel.capacity_id == DialogModel.id).filter(DialogModel.status=="1").all()
+ DialogModel, MenuCapacityModel.capacity_id == DialogModel.id).filter(DialogModel.status==USER_STATSU_ON).all()
for menu in menu_list:
menu_dict[menu.id] = menu_dict.get(menu.id, []) + [menu]
diff --git a/app/service/v2/chat.py b/app/service/v2/chat.py
index 05a37be..83ea02a 100644
--- a/app/service/v2/chat.py
+++ b/app/service/v2/chat.py
@@ -486,7 +486,7 @@
async for ans in chat.chat_completions(url,
await chat.complex_request_data(chat_request.query, conversation_id, str(user_id), files=chat_request.files, inputs=inputs),
await chat.get_headers(token)):
- # print(ans)
+ print(ans)
data = {}
status = http_200
conversation_id = ans.get("conversation_id")
diff --git a/app/service/v2/mindmap.py b/app/service/v2/mindmap.py
index dd5b994..79620f5 100644
--- a/app/service/v2/mindmap.py
+++ b/app/service/v2/mindmap.py
@@ -73,8 +73,9 @@
token = await get_chat_token(db, session.chat_id)
chat = ChatAgent()
url = settings.dify_base_url + DF_CHAT_AGENT
+ chat_request = json.loads(session.query)
if session.mindmap:
- chat_request = json.loads(session.query)
+
inputs = {"is_deep": chat_request.get("isDeep", 1)}
if session.chat_mode == complex_knowledge_chat:
inputs["query_json"] = json.dumps(
@@ -96,9 +97,12 @@
return res
else:
mindmap_query = session.content
-
+ # print("-----------------", mindmap_query)
try:
+ if chat_request.get("isDeep", 1) == 2:
+ mindmap_query = mindmap_query.split("</think>")[-1]
mindmap_str = ""
+ # print("mindmap_query", mindmap_query)
token = await get_chat_token(db, mindmap_chat_id)
async for ans in chat.chat_completions(url,
await chat.complex_request_data(mindmap_query, "",
@@ -114,6 +118,7 @@
except Exception as e:
logger.error(e)
return res
+ # print(mindmap_str)
if "```json" in mindmap_str:
mindmap_list = mindmap_str.split("```")
mindmap_str = mindmap_list[1].lstrip("json")
--
Gitblit v1.8.0