gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

Browse Source
This commit is contained in:
SengokuCola
2025-04-14 22:27:28 +08:00
parent bf3c6d04d6 bd66ae272e
commit 200755dc8c
6 changed files with 54 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/do_tool/tool_can_use/get_current_task.py
View File

@@ -57,5 +57,3 @@ class GetCurrentTaskTool(BaseTool):
task_info = f"在 {start_time} 到 {end_time} 之间没有找到日程信息"
return {"name": "get_current_task", "content": f"日程信息: {task_info}"}

5
src/do_tool/tool_can_use/get_time_date.py
View File

@@ -5,6 +5,7 @@ from datetime import datetime
logger = get_module_logger("get_time_date")
class GetCurrentDateTimeTool(BaseTool):
"""获取当前时间、日期、年份和星期的工具"""
@@ -33,7 +34,5 @@ class GetCurrentDateTimeTool(BaseTool):
return {
"name": "get_current_date_time",
"content": f"当前时间: {current_time}, 日期: {current_date}, 年份: {current_year}, 星期: {current_weekday}"
"content": f"当前时间: {current_time}, 日期: {current_date}, 年份: {current_year}, 星期: {current_weekday}",
}

20
src/do_tool/tool_use.py
View File

@@ -22,7 +22,9 @@ class ToolUser:
model=global_config.llm_tool_use, temperature=0.2, max_tokens=1000, request_type="tool_use"
)
async def _build_tool_prompt(self, message_txt: str, sender_name: str, chat_stream: ChatStream, subheartflow: SubHeartflow = None):
async def _build_tool_prompt(
self, message_txt: str, sender_name: str, chat_stream: ChatStream, subheartflow: SubHeartflow = None
):
"""构建工具使用的提示词
Args:
@@ -104,7 +106,9 @@ class ToolUser:
logger.error(f"执行工具调用时发生错误: {str(e)}")
return None
async def use_tool(self, message_txt: str, sender_name: str, chat_stream: ChatStream, subheartflow: SubHeartflow = None):
async def use_tool(
self, message_txt: str, sender_name: str, chat_stream: ChatStream, subheartflow: SubHeartflow = None
):
"""使用工具辅助思考，判断是否需要额外信息
Args:
@@ -117,12 +121,7 @@ class ToolUser:
"""
try:
# 构建提示词
prompt = await self._build_tool_prompt(
message_txt,
sender_name,
chat_stream,
subheartflow
)
prompt = await self._build_tool_prompt(message_txt, sender_name, chat_stream, subheartflow)
# 定义可用工具
tools = self._define_tools()
@@ -170,10 +169,7 @@ class ToolUser:
tool_name = result["name"]
if tool_name not in structured_info:
structured_info[tool_name] = []
structured_info[tool_name].append({
"name": result["name"],
"content": result["content"]
})
structured_info[tool_name].append({"name": result["name"], "content": result["content"]})
# 如果有工具结果，返回结构化的信息
if structured_info:

23
src/heart_flow/observation.py
View File

@@ -6,8 +6,10 @@ from src.plugins.config.config import global_config
from src.common.database import db
from src.common.logger import get_module_logger
import traceback
logger = get_module_logger("observation")
# 所有观察的基类
class Observation:
def __init__(self, observe_type, observe_id):
@@ -43,19 +45,19 @@ class ChattingObservation(Observation):
)
# 进行一次观察 返回观察结果observe_info
def get_observe_info(self, ids = None):
def get_observe_info(self, ids=None):
if ids:
mid_memory_str = ""
for id in ids:
print(f"id：{id}")
try:
for mid_memory in self.mid_memorys:
if mid_memory['id'] == id:
if mid_memory["id"] == id:
mid_memory_by_id = mid_memory
msg_str = ""
for msg in mid_memory_by_id['messages']:
for msg in mid_memory_by_id["messages"]:
msg_str += f"{msg['detailed_plain_text']}"
time_diff = int((datetime.now().timestamp() - mid_memory_by_id['created_at']) / 60)
time_diff = int((datetime.now().timestamp() - mid_memory_by_id["created_at"]) / 60)
mid_memory_str += f"距离现在{time_diff}分钟前：\n{msg_str}\n"
except Exception as e:
logger.error(f"获取mid_memory_id失败: {e}")
@@ -71,8 +73,7 @@ class ChattingObservation(Observation):
async def observe(self):
# 查找新消息
new_messages = list(
db.messages.find({"chat_id": self.chat_id, "time": {"$gt": self.last_observe_time}})
.sort("time", 1)
db.messages.find({"chat_id": self.chat_id, "time": {"$gt": self.last_observe_time}}).sort("time", 1)
) # 按时间正序排列
if not new_messages:
@@ -116,7 +117,7 @@ class ChattingObservation(Observation):
"messages": oldest_messages,
"timestamps": oldest_timestamps,
"chat_id": self.chat_id,
"created_at": datetime.now().timestamp()
"created_at": datetime.now().timestamp(),
}
# print(f"mid_memory：{mid_memory}")
# 存入内存中的 mid_memorys
@@ -126,11 +127,10 @@ class ChattingObservation(Observation):
mid_memory_str = "之前聊天的内容概括是：\n"
for mid_memory in self.mid_memorys:
time_diff = int((datetime.now().timestamp() - mid_memory['created_at']) / 60)
time_diff = int((datetime.now().timestamp() - mid_memory["created_at"]) / 60)
mid_memory_str += f"距离现在{time_diff}分钟前(聊天记录id:{mid_memory['id']})：{mid_memory['theme']}\n"
self.mid_memory_info = mid_memory_str
self.updating_old = False
# print(f"处理后self.talking_message：{self.talking_message}")
@@ -139,14 +139,9 @@ class ChattingObservation(Observation):
now_message_str += self.translate_message_list_to_str(talking_message=self.talking_message)
self.now_message_info = now_message_str
logger.debug(f"压缩早期记忆：{self.mid_memory_info}\n现在聊天内容：{self.now_message_info}")
async def update_talking_summary(self, new_messages_str):
prompt = ""
# prompt += f"{personality_info}"
prompt += f"你的名字叫：{self.name}\n，标识'{self.name}'的都是你自己说的话"

4
src/heart_flow/sub_heartflow.py
View File

@@ -150,7 +150,9 @@ class SubHeartflow:
observation = self.observations[0]
await observation.observe()
async def do_thinking_before_reply(self, message_txt: str, sender_name: str, chat_stream: ChatStream, extra_info: str, obs_id: int = None):
async def do_thinking_before_reply(
self, message_txt: str, sender_name: str, chat_stream: ChatStream, extra_info: str, obs_id: int = None
):
current_thinking_info = self.current_mind
mood_info = self.current_state.mood
# mood_info = "你很生气，很愤怒"

28
src/plugins/chat_module/think_flow_chat/think_flow_chat.py
View File

@@ -260,7 +260,6 @@ class ThinkFlowChat:
info_catcher.catch_after_observe(timing_results["观察"])
# 思考前使用工具
update_relationship = ""
get_mid_memory_id = []
@@ -271,7 +270,8 @@ class ThinkFlowChat:
message.processed_plain_text,
message.message_info.user_info.user_nickname,
chat,
heartflow.get_subheartflow(chat.stream_id))
heartflow.get_subheartflow(chat.stream_id),
)
# 如果工具被使用且获得了结果，将收集到的信息合并到思考中
# collected_info = ""
if tool_result.get("used_tools", False):
@@ -285,19 +285,18 @@ class ThinkFlowChat:
for tool_name, tool_data in tool_result_info.items():
# tool_result_info += f"\n{tool_name} 相关信息:\n"
# for item in tool_data:
# tool_result_info += f"- {item['name']}: {item['content']}\n"
# tool_result_info += f"- {item['name']}: {item['content']}\n"
# 特殊判定：mid_chat_mem
if tool_name == "mid_chat_mem":
for mid_memory in tool_data:
get_mid_memory_id.append(mid_memory['content'])
get_mid_memory_id.append(mid_memory["content"])
# 特殊判定：change_mood
if tool_name == "change_mood":
for mood in tool_data:
self.mood_manager.update_mood_from_emotion(
mood['content'],
global_config.mood_intensity_factor
mood["content"], global_config.mood_intensity_factor
)
# 特殊判定：change_relationship
@@ -311,14 +310,10 @@ class ThinkFlowChat:
# 处理关系更新
if update_relationship:
stance, emotion = await self.gpt._get_emotion_tags_with_reason(
"你还没有回复",
message.processed_plain_text,
update_relationship
"你还没有回复", message.processed_plain_text, update_relationship
)
await relationship_manager.calculate_update_relationship_value(
chat_stream=message.chat_stream,
label=emotion,
stance=stance
chat_stream=message.chat_stream, label=emotion, stance=stance
)
# 思考前脑内状态
@@ -330,8 +325,8 @@ class ThinkFlowChat:
message_txt=message.processed_plain_text,
sender_name=message.message_info.user_info.user_nickname,
chat_stream=chat,
obs_id = get_mid_memory_id,
extra_info=tool_result_info
obs_id=get_mid_memory_id,
extra_info=tool_result_info,
)
except Exception as e:
logger.error(f"心流思考前脑内状态失败: {e}")
@@ -366,7 +361,6 @@ class ThinkFlowChat:
except Exception as e:
logger.error(f"心流处理表情包失败: {e}")
try:
with Timer("思考后脑内状态更新", timing_results):
stream_id = message.chat_stream.stream_id
@@ -376,7 +370,9 @@ class ThinkFlowChat:
stream_id, limit=global_config.MAX_CONTEXT_SIZE, combine=True
)
await heartflow.get_subheartflow(stream_id).do_thinking_after_reply(response_set, chat_talking_prompt,tool_result_info)
await heartflow.get_subheartflow(stream_id).do_thinking_after_reply(
response_set, chat_talking_prompt, tool_result_info
)
except Exception as e:
logger.error(f"心流思考后脑内状态更新失败: {e}")