diff --git a/src/chat/message_receive/bot.py b/src/chat/message_receive/bot.py index d229fc94f..91c954033 100644 --- a/src/chat/message_receive/bot.py +++ b/src/chat/message_receive/bot.py @@ -16,7 +16,6 @@ from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.plugin_system.core import component_registry, events_manager # 导入新插件系统 from src.plugin_system.base import BaseCommand, EventType from src.mais4u.mais4u_chat.s4u_msg_processor import S4UMessageProcessor -from src.llm_models.utils_model import LLMRequest # 定义日志配置 diff --git a/src/individuality/template_scene.json b/src/individuality/not_using/template_scene.json similarity index 100% rename from src/individuality/template_scene.json rename to src/individuality/not_using/template_scene.json diff --git a/src/mais4u/mais4u_chat/body_emotion_action_manager.py b/src/mais4u/mais4u_chat/body_emotion_action_manager.py index e67cc7e38..e7380822d 100644 --- a/src/mais4u/mais4u_chat/body_emotion_action_manager.py +++ b/src/mais4u/mais4u_chat/body_emotion_action_manager.py @@ -1,6 +1,5 @@ import json import time -import random from src.chat.message_receive.message import MessageRecv from src.llm_models.utils_model import LLMRequest from src.common.logger import get_logger diff --git a/src/mais4u/mais4u_chat/s4u_chat.py b/src/mais4u/mais4u_chat/s4u_chat.py index 832c1f788..414a09b6e 100644 --- a/src/mais4u/mais4u_chat/s4u_chat.py +++ b/src/mais4u/mais4u_chat/s4u_chat.py @@ -486,7 +486,7 @@ class S4UChat: logger.info(f"[S4U] 开始为消息生成文本和音频流: '{message.processed_plain_text[:30]}...'") if s4u_config.enable_streaming_output: - logger.info(f"[S4U] 开始流式输出") + logger.info("[S4U] 开始流式输出") # 流式输出，边生成边发送 gen = self.gpt.generate_response(message, "") async for chunk in gen: @@ -494,7 +494,7 @@ class S4UChat: await sender_container.add_message(chunk) total_chars_sent += len(chunk) else: - logger.info(f"[S4U] 开始一次性输出") + logger.info("[S4U] 开始一次性输出") # 一次性输出，先收集所有chunk all_chunks = [] gen = self.gpt.generate_response(message, "") diff --git a/src/mais4u/mais4u_chat/s4u_mood_manager.py b/src/mais4u/mais4u_chat/s4u_mood_manager.py index ffa0b3b01..6b91a91d9 100644 --- a/src/mais4u/mais4u_chat/s4u_mood_manager.py +++ b/src/mais4u/mais4u_chat/s4u_mood_manager.py @@ -10,6 +10,7 @@ from src.config.config import global_config from src.chat.utils.prompt_builder import Prompt, global_prompt_manager from src.manager.async_task_manager import AsyncTask, async_task_manager from src.plugin_system.apis import send_api +from src.mais4u.constant_s4u import ENABLE_THINKING """ 情绪管理系统使用说明： @@ -446,9 +447,8 @@ class MoodManager: # 发送初始情绪状态到ws端 asyncio.create_task(new_mood.send_emotion_update(new_mood.mood_values)) - -init_prompt() - -mood_manager = MoodManager() +if ENABLE_THINKING: + init_prompt() + mood_manager = MoodManager() """全局情绪管理器""" diff --git a/src/mais4u/mais4u_chat/s4u_msg_processor.py b/src/mais4u/mais4u_chat/s4u_msg_processor.py index 7e5d8e438..cbc7d3fac 100644 --- a/src/mais4u/mais4u_chat/s4u_msg_processor.py +++ b/src/mais4u/mais4u_chat/s4u_msg_processor.py @@ -4,7 +4,7 @@ from typing import Tuple from src.chat.memory_system.Hippocampus import hippocampus_manager from src.chat.message_receive.message import MessageRecv, MessageRecvS4U -from maim_message.message_base import GroupInfo,UserInfo +from maim_message.message_base import GroupInfo from src.chat.message_receive.storage import MessageStorage from src.chat.message_receive.chat_stream import get_chat_manager from src.chat.utils.timer_calculator import Timer diff --git a/src/mais4u/mais4u_chat/s4u_stream_generator.py b/src/mais4u/mais4u_chat/s4u_stream_generator.py index a7c96a254..7bab7e73e 100644 --- a/src/mais4u/mais4u_chat/s4u_stream_generator.py +++ b/src/mais4u/mais4u_chat/s4u_stream_generator.py @@ -49,19 +49,19 @@ class S4UStreamGenerator: self.chat_stream =None async def build_last_internal_message(self,message:MessageRecvS4U,previous_reply_context:str = ""): - person_id = PersonInfoManager.get_person_id( - message.chat_stream.user_info.platform, message.chat_stream.user_info.user_id - ) - person_info_manager = get_person_info_manager() - person_name = await person_info_manager.get_value(person_id, "person_name") + # person_id = PersonInfoManager.get_person_id( + # message.chat_stream.user_info.platform, message.chat_stream.user_info.user_id + # ) + # person_info_manager = get_person_info_manager() + # person_name = await person_info_manager.get_value(person_id, "person_name") - if message.chat_stream.user_info.user_nickname: - if person_name: - sender_name = f"[{message.chat_stream.user_info.user_nickname}]（你叫ta{person_name}）" - else: - sender_name = f"[{message.chat_stream.user_info.user_nickname}]" - else: - sender_name = f"用户({message.chat_stream.user_info.user_id})" + # if message.chat_stream.user_info.user_nickname: + # if person_name: + # sender_name = f"[{message.chat_stream.user_info.user_nickname}]（你叫ta{person_name}）" + # else: + # sender_name = f"[{message.chat_stream.user_info.user_nickname}]" + # else: + # sender_name = f"用户({message.chat_stream.user_info.user_id})" # 构建prompt if previous_reply_context: diff --git a/src/mais4u/mais4u_chat/s4u_watching_manager.py b/src/mais4u/mais4u_chat/s4u_watching_manager.py index f02a1da3a..62ef6d86a 100644 --- a/src/mais4u/mais4u_chat/s4u_watching_manager.py +++ b/src/mais4u/mais4u_chat/s4u_watching_manager.py @@ -1,7 +1,3 @@ -import asyncio -import time -from enum import Enum -from typing import Optional from src.common.logger import get_logger from src.plugin_system.apis import send_api diff --git a/src/mais4u/mais4u_chat/yes_or_no.py b/src/mais4u/mais4u_chat/yes_or_no.py index 9e234082d..edc200f65 100644 --- a/src/mais4u/mais4u_chat/yes_or_no.py +++ b/src/mais4u/mais4u_chat/yes_or_no.py @@ -1,16 +1,6 @@ -import json -import time -import random -from src.chat.message_receive.message import MessageRecv from src.llm_models.utils_model import LLMRequest from src.common.logger import get_logger -from src.chat.utils.chat_message_builder import build_readable_messages, get_raw_msg_by_timestamp_with_chat_inclusive from src.config.config import global_config -from src.chat.utils.prompt_builder import Prompt, global_prompt_manager -from src.manager.async_task_manager import AsyncTask, async_task_manager -from src.plugin_system.apis import send_api -from json_repair import repair_json -from src.mais4u.s4u_config import s4u_config from src.plugin_system.apis import send_api logger = get_logger(__name__) diff --git a/src/plugin_system/base/base_plugin.py b/src/plugin_system/base/base_plugin.py index 1e6841eba..3cf82390e 100644 --- a/src/plugin_system/base/base_plugin.py +++ b/src/plugin_system/base/base_plugin.py @@ -3,7 +3,7 @@ from typing import List, Type, Tuple, Union from .plugin_base import PluginBase from src.common.logger import get_logger -from src.plugin_system.base.component_types import ComponentInfo, ActionInfo, CommandInfo, EventHandlerInfo +from src.plugin_system.base.component_types import ActionInfo, CommandInfo, EventHandlerInfo from .base_action import BaseAction from .base_command import BaseCommand from .base_events_handler import BaseEventHandler diff --git a/src/plugins/built_in/core_actions/no_reply.py b/src/plugins/built_in/core_actions/no_reply.py index f275bfc42..e9fad9107 100644 --- a/src/plugins/built_in/core_actions/no_reply.py +++ b/src/plugins/built_in/core_actions/no_reply.py @@ -13,7 +13,7 @@ from src.plugin_system.apis import message_api from src.config.config import global_config -logger = get_logger("core_actions") +logger = get_logger("no_reply_action") class NoReplyAction(BaseAction):