From 7cd4e904ca17ea95247baf70bfc97f0d730510ce Mon Sep 17 00:00:00 2001 From: Junyan Qin Date: Mon, 24 Feb 2025 12:17:33 +0800 Subject: [PATCH] perf: add converting options for dify thinking tips (#1108) --- .../migrations/m033_dify_thinking_config.py | 26 +++++++++++++++++++ pkg/core/stages/migrate.py | 2 +- pkg/provider/runners/difysvapi.py | 22 ++++++++++++++-- templates/provider.json | 3 +++ templates/schema/provider.json | 14 ++++++++++ 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 pkg/core/migrations/m033_dify_thinking_config.py diff --git a/pkg/core/migrations/m033_dify_thinking_config.py b/pkg/core/migrations/m033_dify_thinking_config.py new file mode 100644 index 00000000..1f663b46 --- /dev/null +++ b/pkg/core/migrations/m033_dify_thinking_config.py @@ -0,0 +1,26 @@ +from __future__ import annotations + +from .. import migration + + +@migration.migration_class("dify-thinking-config", 33) +class DifyThinkingConfigMigration(migration.Migration): + """迁移""" + + async def need_migrate(self) -> bool: + """判断当前环境是否需要运行此迁移""" + + if 'options' not in self.ap.provider_cfg.data["dify-service-api"]: + return True + + if 'convert-thinking-tips' not in self.ap.provider_cfg.data["dify-service-api"]["options"]: + return True + + return False + + async def run(self): + """执行迁移""" + self.ap.provider_cfg.data["dify-service-api"]["options"] = { + "convert-thinking-tips": "plain" + } + await self.ap.provider_cfg.dump_config() diff --git a/pkg/core/stages/migrate.py b/pkg/core/stages/migrate.py index 3e66e589..d317596e 100644 --- a/pkg/core/stages/migrate.py +++ b/pkg/core/stages/migrate.py @@ -11,7 +11,7 @@ from ..migrations import m015_gitee_ai_config, m016_dify_service_api, m017_dify_ from ..migrations import m020_wecom_config, m021_lark_config, m022_lmstudio_config, m023_siliconflow_config, m024_discord_config, m025_gewechat_config from ..migrations import m026_qqofficial_config, m027_wx_official_account_config, m028_aliyun_requester_config from ..migrations import m029_dashscope_app_api_config, m030_lark_config_cmpl, m031_dingtalk_config, m032_volcark_config - +from ..migrations import m033_dify_thinking_config @stage.stage_class("MigrationStage") class MigrationStage(stage.BootingStage): diff --git a/pkg/provider/runners/difysvapi.py b/pkg/provider/runners/difysvapi.py index 5c3f19bd..9db1e98f 100644 --- a/pkg/provider/runners/difysvapi.py +++ b/pkg/provider/runners/difysvapi.py @@ -3,6 +3,7 @@ from __future__ import annotations import typing import json import uuid +import re import base64 import aiohttp @@ -41,6 +42,23 @@ class DifyServiceAPIRunner(runner.RequestRunner): base_url=self.ap.provider_cfg.data["dify-service-api"]["base-url"], ) + def _try_convert_thinking(self, resp_text: str) -> str: + """尝试转换 Dify 的思考提示""" + if not resp_text.startswith("
Thinking... "): + return resp_text + + if self.ap.provider_cfg.data["dify-service-api"]["options"]["convert-thinking-tips"] == "original": + return resp_text + + if self.ap.provider_cfg.data["dify-service-api"]["options"]["convert-thinking-tips"] == "remove": + return re.sub(r'
Thinking... .*?
', '', resp_text, flags=re.DOTALL) + + if self.ap.provider_cfg.data["dify-service-api"]["options"]["convert-thinking-tips"] == "plain": + pattern = r'
Thinking... (.*?)
' + thinking_text = re.search(pattern, resp_text, flags=re.DOTALL) + content_text = re.sub(pattern, '', resp_text, flags=re.DOTALL) + return f"{thinking_text.group(1)}\n{content_text}" + async def _preprocess_user_message( self, query: core_entities.Query ) -> tuple[str, list[str]]: @@ -109,7 +127,7 @@ class DifyServiceAPIRunner(runner.RequestRunner): if chunk['data']['node_type'] == 'answer': yield llm_entities.Message( role="assistant", - content=chunk['data']['outputs']['answer'], + content=self._try_convert_thinking(chunk['data']['outputs']['answer']), ) elif mode == "basic": if chunk['event'] == 'message': @@ -117,7 +135,7 @@ class DifyServiceAPIRunner(runner.RequestRunner): elif chunk['event'] == 'message_end': yield llm_entities.Message( role="assistant", - content=basic_mode_pending_chunk, + content=self._try_convert_thinking(basic_mode_pending_chunk), ) basic_mode_pending_chunk = '' diff --git a/templates/provider.json b/templates/provider.json index cceb3b68..76aa0218 100644 --- a/templates/provider.json +++ b/templates/provider.json @@ -106,6 +106,9 @@ "dify-service-api": { "base-url": "https://api.dify.ai/v1", "app-type": "chat", + "options": { + "convert-thinking-tips": "plain" + }, "chat": { "api-key": "app-1234567890", "timeout": 120 diff --git a/templates/schema/provider.json b/templates/schema/provider.json index ae799b2c..0d2d2f01 100644 --- a/templates/schema/provider.json +++ b/templates/schema/provider.json @@ -404,6 +404,20 @@ "enum": ["chat", "workflow", "agent"], "default": "chat" }, + "options": { + "type": "object", + "title": "Dify Service API 配置选项", + "properties": { + "convert-thinking-tips": { + "type": "string", + "title": "转换思考提示", + "description": "设置转换思考提示。值为 original 时，不转换思考提示；值为 plain 时，将思考提示转换为类似 DeepSeek 官方的...格式；值为 remove 时，删除思考提示", + "enum": ["original", "plain", "remove"], + "default": "plain" + } + } + }, + "chat": { "type": "object", "title": "聊天助手 API 参数",