mirror of https://github.com/Mai-with-u/MaiBot.git
import fix
parent
77995cb369
commit
df7f422ef7
|
|
@ -439,7 +439,6 @@ class HeartFChatting:
|
||||||
message_id_list=message_id_list,
|
message_id_list=message_id_list,
|
||||||
)
|
)
|
||||||
|
|
||||||
from src.plugin_system.core.event_manager import event_manager
|
|
||||||
# 触发 ON_PLAN 事件
|
# 触发 ON_PLAN 事件
|
||||||
result = await event_manager.trigger_event("on_plan", {
|
result = await event_manager.trigger_event("on_plan", {
|
||||||
"prompt": prompt_info[0],
|
"prompt": prompt_info[0],
|
||||||
|
|
|
||||||
|
|
@ -224,7 +224,6 @@ class DefaultReplyer:
|
||||||
llm_response.model = model_name
|
llm_response.model = model_name
|
||||||
llm_response.tool_calls = tool_call
|
llm_response.tool_calls = tool_call
|
||||||
|
|
||||||
from src.plugin_system.core.event_manager import event_manager
|
|
||||||
# 触发 AFTER_LLM 事件
|
# 触发 AFTER_LLM 事件
|
||||||
if not from_plugin:
|
if not from_plugin:
|
||||||
result = await event_manager.trigger_event("after_llm",prompt=prompt,llm_response=llm_response,stream_id=stream_id)
|
result = await event_manager.trigger_event("after_llm",prompt=prompt,llm_response=llm_response,stream_id=stream_id)
|
||||||
|
|
|
||||||
|
|
@ -96,10 +96,10 @@ class BaseEvent:
|
||||||
if not isinstance(result, HandlerResult):
|
if not isinstance(result, HandlerResult):
|
||||||
# 兼容旧版本,将元组转换为HandlerResult
|
# 兼容旧版本,将元组转换为HandlerResult
|
||||||
success, continue_process, message = result
|
success, continue_process, message = result
|
||||||
result = HandlerResult(success, continue_process, message or "", getattr(subscriber, 'handler_name', 'unkown_handler'))
|
result = HandlerResult(success, continue_process, message or "", getattr(subscriber, 'handler_name', 'unknown_handler'))
|
||||||
elif not result.handler_name:
|
elif not result.handler_name:
|
||||||
# 补充handler_name
|
# 补充handler_name
|
||||||
result.handler_name = getattr(subscriber, 'handler_name', 'unkown_handler')
|
result.handler_name = getattr(subscriber, 'handler_name', 'unknown_handler')
|
||||||
results.append(result)
|
results.append(result)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
# 处理执行异常
|
# 处理执行异常
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue