kaiyuan/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-06-02 00:57:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid cow cli import side effects

Browse Source
This commit is contained in:
jimmyzhuu
2026-04-29 16:04:48 +08:00
parent 9eeca70292
commit 7cd7bd1a48
2 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
plugins/cow_cli/cow_cli.py
View File

@@ -42,49 +42,6 @@ CLI_ONLY_COMMANDS = {"start", "stop", "restart"}
CHAT_ONLY_COMMANDS = set() # context is allowed in both, but behaves differently
_COW_CLI_SET_PLUGIN_PATH = plugins.instance.current_plugin_path is None
if _COW_CLI_SET_PLUGIN_PATH:
plugins.instance.current_plugin_path = os.path.dirname(__file__)
class CowCli:
@staticmethod
def _resolve_bot_type_for_model(model_name: str) -> str:
"""Resolve bot_type from model name, reusing AgentBridge mapping."""
from common import const
_EXACT = {
"wenxin": const.BAIDU, "wenxin-4": const.BAIDU,
"xunfei": const.XUNFEI, const.QWEN: const.QWEN_DASHSCOPE,
const.QIANFAN: const.QIANFAN,
const.MODELSCOPE: const.MODELSCOPE,
const.MOONSHOT: const.MOONSHOT,
"moonshot-v1-8k": const.MOONSHOT, "moonshot-v1-32k": const.MOONSHOT,
"moonshot-v1-128k": const.MOONSHOT,
}
_PREFIX = [
("qwen", const.QWEN_DASHSCOPE), ("qwq", const.QWEN_DASHSCOPE),
("qvq", const.QWEN_DASHSCOPE),
("gemini", const.GEMINI), ("glm", const.ZHIPU_AI),
("claude", const.CLAUDEAPI),
("moonshot", const.MOONSHOT), ("kimi", const.MOONSHOT),
("doubao", const.DOUBAO), ("deepseek", const.DEEPSEEK),
("ernie", const.QIANFAN),
]
if not model_name:
return const.OPENAI
if model_name in _EXACT:
return _EXACT[model_name]
if model_name.lower().startswith("minimax") or model_name in ["abab6.5-chat"]:
return const.MiniMax
if model_name in [const.QWEN_TURBO, const.QWEN_PLUS, const.QWEN_MAX]:
return const.QWEN_DASHSCOPE
lowered_model = model_name.lower()
for prefix, btype in _PREFIX:
if lowered_model.startswith(prefix):
return btype
return const.OPENAI
@plugins.register(
name="cow_cli",
desc="Handle cow/slash commands in chat messages",
@@ -471,7 +428,39 @@ class CowCliPlugin(Plugin):
@staticmethod
def _resolve_bot_type_for_model(model_name: str) -> str:
return CowCli._resolve_bot_type_for_model(model_name)
"""Resolve bot_type from model name, reusing AgentBridge mapping."""
from common import const
_EXACT = {
"wenxin": const.BAIDU, "wenxin-4": const.BAIDU,
"xunfei": const.XUNFEI, const.QWEN: const.QWEN_DASHSCOPE,
const.QIANFAN: const.QIANFAN,
const.MODELSCOPE: const.MODELSCOPE,
const.MOONSHOT: const.MOONSHOT,
"moonshot-v1-8k": const.MOONSHOT, "moonshot-v1-32k": const.MOONSHOT,
"moonshot-v1-128k": const.MOONSHOT,
}
_PREFIX = [
("qwen", const.QWEN_DASHSCOPE), ("qwq", const.QWEN_DASHSCOPE),
("qvq", const.QWEN_DASHSCOPE),
("gemini", const.GEMINI), ("glm", const.ZHIPU_AI),
("claude", const.CLAUDEAPI),
("moonshot", const.MOONSHOT), ("kimi", const.MOONSHOT),
("doubao", const.DOUBAO), ("deepseek", const.DEEPSEEK),
("ernie", const.QIANFAN),
]
if not model_name:
return const.OPENAI
if model_name in _EXACT:
return _EXACT[model_name]
if model_name.lower().startswith("minimax") or model_name in ["abab6.5-chat"]:
return const.MiniMax
if model_name in [const.QWEN_TURBO, const.QWEN_PLUS, const.QWEN_MAX]:
return const.QWEN_DASHSCOPE
lowered_model = model_name.lower()
for prefix, btype in _PREFIX:
if lowered_model.startswith(prefix):
return btype
return const.OPENAI
# ------------------------------------------------------------------
# install-browser (shared logic with cow install-browser CLI)
@@ -1186,7 +1175,3 @@ class CowCliPlugin(Plugin):
def get_help_text(self, **kwargs):
return "在对话中使用 /help 或 cow help 查看可用命令"
if _COW_CLI_SET_PLUGIN_PATH:
plugins.instance.current_plugin_path = None

16
tests/test_qianfan_provider.py
View File

@@ -54,14 +54,24 @@ class TestQianfanConstantsAndRouting(unittest.TestCase):
def test_cow_cli_routes_ernie_models_to_qianfan(self):
from common import const
from plugins.cow_cli.cow_cli import CowCli
import plugins
old_plugin_path = plugins.instance.current_plugin_path
plugins.instance.current_plugin_path = os.path.join(
os.path.dirname(__file__), "..", "plugins", "cow_cli"
)
try:
import plugins.cow_cli.cow_cli
cow_cli_plugin = plugins.instance.plugins["COW_CLI"]
finally:
plugins.instance.current_plugin_path = old_plugin_path
self.assertEqual(
CowCli._resolve_bot_type_for_model("ernie-4.5-turbo-128k"),
cow_cli_plugin._resolve_bot_type_for_model("ernie-4.5-turbo-128k"),
const.QIANFAN,
)
self.assertEqual(
CowCli._resolve_bot_type_for_model("qianfan"),
cow_cli_plugin._resolve_bot_type_for_model("qianfan"),
const.QIANFAN,
)