diff --git a/pkg/openai/dprompt.py b/pkg/openai/dprompt.py index 4812d9f5..e45ab9ed 100644 --- a/pkg/openai/dprompt.py +++ b/pkg/openai/dprompt.py @@ -102,6 +102,15 @@ def get_prompt(name: str = None) -> str: for key in default_dict: if key.lower().startswith(name.lower()): - return default_dict[key], None, None + return [ + { + "role":"user", + "content":default_dict[key] + }, + { + "role":"assistant", + "content":"好的。" + } + ], None, None raise KeyError("未找到默认情景预设: " + name) diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py index 5f33a95f..2fbda748 100644 --- a/pkg/qqbot/manager.py +++ b/pkg/qqbot/manager.py @@ -23,7 +23,7 @@ import pkg.plugin.models as plugin_models # 检查消息是否符合泛响应匹配机制 -def check_response_rule(text: str, event): +def check_response_rule(text: str): config = pkg.utils.context.get_config() if not hasattr(config, 'response_rules'): return False, '' @@ -318,7 +318,7 @@ class QQBotManager: # 直接调用 reply = process() else: - check, result = check_response_rule(str(event.message_chain).strip(), event) + check, result = check_response_rule(str(event.message_chain).strip()) if check: reply = process(result.strip())