fix:ruff
This commit is contained in:
@@ -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.core import component_registry, events_manager # 导入新插件系统
|
||||||
from src.plugin_system.base import BaseCommand, EventType
|
from src.plugin_system.base import BaseCommand, EventType
|
||||||
from src.mais4u.mais4u_chat.s4u_msg_processor import S4UMessageProcessor
|
from src.mais4u.mais4u_chat.s4u_msg_processor import S4UMessageProcessor
|
||||||
from src.llm_models.utils_model import LLMRequest
|
|
||||||
|
|
||||||
# 定义日志配置
|
# 定义日志配置
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
import random
|
|
||||||
from src.chat.message_receive.message import MessageRecv
|
from src.chat.message_receive.message import MessageRecv
|
||||||
from src.llm_models.utils_model import LLMRequest
|
from src.llm_models.utils_model import LLMRequest
|
||||||
from src.common.logger import get_logger
|
from src.common.logger import get_logger
|
||||||
|
|||||||
@@ -486,7 +486,7 @@ class S4UChat:
|
|||||||
logger.info(f"[S4U] 开始为消息生成文本和音频流: '{message.processed_plain_text[:30]}...'")
|
logger.info(f"[S4U] 开始为消息生成文本和音频流: '{message.processed_plain_text[:30]}...'")
|
||||||
|
|
||||||
if s4u_config.enable_streaming_output:
|
if s4u_config.enable_streaming_output:
|
||||||
logger.info(f"[S4U] 开始流式输出")
|
logger.info("[S4U] 开始流式输出")
|
||||||
# 流式输出,边生成边发送
|
# 流式输出,边生成边发送
|
||||||
gen = self.gpt.generate_response(message, "")
|
gen = self.gpt.generate_response(message, "")
|
||||||
async for chunk in gen:
|
async for chunk in gen:
|
||||||
@@ -494,7 +494,7 @@ class S4UChat:
|
|||||||
await sender_container.add_message(chunk)
|
await sender_container.add_message(chunk)
|
||||||
total_chars_sent += len(chunk)
|
total_chars_sent += len(chunk)
|
||||||
else:
|
else:
|
||||||
logger.info(f"[S4U] 开始一次性输出")
|
logger.info("[S4U] 开始一次性输出")
|
||||||
# 一次性输出,先收集所有chunk
|
# 一次性输出,先收集所有chunk
|
||||||
all_chunks = []
|
all_chunks = []
|
||||||
gen = self.gpt.generate_response(message, "")
|
gen = self.gpt.generate_response(message, "")
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ from src.config.config import global_config
|
|||||||
from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
|
from src.chat.utils.prompt_builder import Prompt, global_prompt_manager
|
||||||
from src.manager.async_task_manager import AsyncTask, async_task_manager
|
from src.manager.async_task_manager import AsyncTask, async_task_manager
|
||||||
from src.plugin_system.apis import send_api
|
from src.plugin_system.apis import send_api
|
||||||
|
from src.mais4u.constant_s4u import ENABLE_THINKING
|
||||||
|
|
||||||
"""
|
"""
|
||||||
情绪管理系统使用说明:
|
情绪管理系统使用说明:
|
||||||
@@ -446,9 +447,8 @@ class MoodManager:
|
|||||||
# 发送初始情绪状态到ws端
|
# 发送初始情绪状态到ws端
|
||||||
asyncio.create_task(new_mood.send_emotion_update(new_mood.mood_values))
|
asyncio.create_task(new_mood.send_emotion_update(new_mood.mood_values))
|
||||||
|
|
||||||
|
if ENABLE_THINKING:
|
||||||
init_prompt()
|
init_prompt()
|
||||||
|
mood_manager = MoodManager()
|
||||||
mood_manager = MoodManager()
|
|
||||||
|
|
||||||
"""全局情绪管理器"""
|
"""全局情绪管理器"""
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from typing import Tuple
|
|||||||
|
|
||||||
from src.chat.memory_system.Hippocampus import hippocampus_manager
|
from src.chat.memory_system.Hippocampus import hippocampus_manager
|
||||||
from src.chat.message_receive.message import MessageRecv, MessageRecvS4U
|
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.storage import MessageStorage
|
||||||
from src.chat.message_receive.chat_stream import get_chat_manager
|
from src.chat.message_receive.chat_stream import get_chat_manager
|
||||||
from src.chat.utils.timer_calculator import Timer
|
from src.chat.utils.timer_calculator import Timer
|
||||||
|
|||||||
@@ -49,19 +49,19 @@ class S4UStreamGenerator:
|
|||||||
self.chat_stream =None
|
self.chat_stream =None
|
||||||
|
|
||||||
async def build_last_internal_message(self,message:MessageRecvS4U,previous_reply_context:str = ""):
|
async def build_last_internal_message(self,message:MessageRecvS4U,previous_reply_context:str = ""):
|
||||||
person_id = PersonInfoManager.get_person_id(
|
# person_id = PersonInfoManager.get_person_id(
|
||||||
message.chat_stream.user_info.platform, message.chat_stream.user_info.user_id
|
# message.chat_stream.user_info.platform, message.chat_stream.user_info.user_id
|
||||||
)
|
# )
|
||||||
person_info_manager = get_person_info_manager()
|
# person_info_manager = get_person_info_manager()
|
||||||
person_name = await person_info_manager.get_value(person_id, "person_name")
|
# person_name = await person_info_manager.get_value(person_id, "person_name")
|
||||||
|
|
||||||
if message.chat_stream.user_info.user_nickname:
|
# if message.chat_stream.user_info.user_nickname:
|
||||||
if person_name:
|
# if person_name:
|
||||||
sender_name = f"[{message.chat_stream.user_info.user_nickname}](你叫ta{person_name})"
|
# sender_name = f"[{message.chat_stream.user_info.user_nickname}](你叫ta{person_name})"
|
||||||
else:
|
# else:
|
||||||
sender_name = f"[{message.chat_stream.user_info.user_nickname}]"
|
# sender_name = f"[{message.chat_stream.user_info.user_nickname}]"
|
||||||
else:
|
# else:
|
||||||
sender_name = f"用户({message.chat_stream.user_info.user_id})"
|
# sender_name = f"用户({message.chat_stream.user_info.user_id})"
|
||||||
|
|
||||||
# 构建prompt
|
# 构建prompt
|
||||||
if previous_reply_context:
|
if previous_reply_context:
|
||||||
|
|||||||
@@ -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.common.logger import get_logger
|
||||||
from src.plugin_system.apis import send_api
|
from src.plugin_system.apis import send_api
|
||||||
|
|||||||
@@ -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.llm_models.utils_model import LLMRequest
|
||||||
from src.common.logger import get_logger
|
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.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
|
from src.plugin_system.apis import send_api
|
||||||
logger = get_logger(__name__)
|
logger = get_logger(__name__)
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from typing import List, Type, Tuple, Union
|
|||||||
from .plugin_base import PluginBase
|
from .plugin_base import PluginBase
|
||||||
|
|
||||||
from src.common.logger import get_logger
|
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_action import BaseAction
|
||||||
from .base_command import BaseCommand
|
from .base_command import BaseCommand
|
||||||
from .base_events_handler import BaseEventHandler
|
from .base_events_handler import BaseEventHandler
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from src.plugin_system.apis import message_api
|
|||||||
from src.config.config import global_config
|
from src.config.config import global_config
|
||||||
|
|
||||||
|
|
||||||
logger = get_logger("core_actions")
|
logger = get_logger("no_reply_action")
|
||||||
|
|
||||||
|
|
||||||
class NoReplyAction(BaseAction):
|
class NoReplyAction(BaseAction):
|
||||||
|
|||||||
Reference in New Issue
Block a user