diff --git a/src/do_tool/tool_can_use/__init__.py b/src/do_tool/tool_can_use/__init__.py index cc196d07a..3189d2897 100644 --- a/src/do_tool/tool_can_use/__init__.py +++ b/src/do_tool/tool_can_use/__init__.py @@ -7,5 +7,14 @@ from src.do_tool.tool_can_use.base_tool import ( TOOL_REGISTRY ) +__all__ = [ + 'BaseTool', + 'register_tool', + 'discover_tools', + 'get_all_tool_definitions', + 'get_tool_instance', + 'TOOL_REGISTRY' +] + # 自动发现并注册工具 -discover_tools() \ No newline at end of file +discover_tools() \ No newline at end of file diff --git a/src/do_tool/tool_can_use/base_tool.py b/src/do_tool/tool_can_use/base_tool.py index 03aac5e4c..c8c80ebe8 100644 --- a/src/do_tool/tool_can_use/base_tool.py +++ b/src/do_tool/tool_can_use/base_tool.py @@ -1,4 +1,4 @@ -from typing import Dict, List, Any, Optional, Union, Type +from typing import Dict, List, Any, Optional, Type import inspect import importlib import pkgutil @@ -73,13 +73,9 @@ def discover_tools(): # 获取当前目录路径 current_dir = os.path.dirname(os.path.abspath(__file__)) package_name = os.path.basename(current_dir) - parent_dir = os.path.dirname(current_dir) - - # 导入当前包 - package = importlib.import_module(f"src.do_tool.{package_name}") # 遍历包中的所有模块 - for _, module_name, is_pkg in pkgutil.iter_modules([current_dir]): + for _, module_name, _ in pkgutil.iter_modules([current_dir]): # 跳过当前模块和__pycache__ if module_name == "base_tool" or module_name.startswith("__"): continue @@ -88,7 +84,7 @@ def discover_tools(): module = importlib.import_module(f"src.do_tool.{package_name}.{module_name}") # 查找模块中的工具类 - for name, obj in inspect.getmembers(module): + for _, obj in inspect.getmembers(module): if inspect.isclass(obj) and issubclass(obj, BaseTool) and obj != BaseTool: register_tool(obj) @@ -116,4 +112,4 @@ def get_tool_instance(tool_name: str) -> Optional[BaseTool]: tool_class = TOOL_REGISTRY.get(tool_name) if not tool_class: return None - return tool_class() \ No newline at end of file + return tool_class() \ No newline at end of file diff --git a/src/do_tool/tool_can_use/get_knowledge.py b/src/do_tool/tool_can_use/get_knowledge.py index 06ea7a91b..fa17dfbf6 100644 --- a/src/do_tool/tool_can_use/get_knowledge.py +++ b/src/do_tool/tool_can_use/get_knowledge.py @@ -2,7 +2,7 @@ from src.do_tool.tool_can_use.base_tool import BaseTool, register_tool from src.plugins.chat.utils import get_embedding from src.common.database import db from src.common.logger import get_module_logger -from typing import Dict, Any, Union, List +from typing import Dict, Any, Union logger = get_module_logger("get_knowledge_tool") diff --git a/src/do_tool/tool_use.py b/src/do_tool/tool_use.py index a2e23ab21..95118f79f 100644 --- a/src/do_tool/tool_use.py +++ b/src/do_tool/tool_use.py @@ -5,7 +5,6 @@ from src.common.database import db import time import json from src.common.logger import get_module_logger -from typing import Union from src.do_tool.tool_can_use import get_all_tool_definitions, get_tool_instance logger = get_module_logger("tool_use") diff --git a/src/heart_flow/observation.py b/src/heart_flow/observation.py index f507374cb..55ab9db11 100644 --- a/src/heart_flow/observation.py +++ b/src/heart_flow/observation.py @@ -4,8 +4,6 @@ from datetime import datetime from src.plugins.models.utils_model import LLM_request from src.plugins.config.config import global_config from src.common.database import db -from src.individuality.individuality import Individuality -import random # 所有观察的基类 diff --git a/src/heart_flow/sub_heartflow.py b/src/heart_flow/sub_heartflow.py index baa20c64f..9cf2e2ea2 100644 --- a/src/heart_flow/sub_heartflow.py +++ b/src/heart_flow/sub_heartflow.py @@ -5,18 +5,17 @@ from src.plugins.models.utils_model import LLM_request from src.plugins.config.config import global_config import re import time -from src.plugins.schedule.schedule_generator import bot_schedule -from src.plugins.memory_system.Hippocampus import HippocampusManager +# from src.plugins.schedule.schedule_generator import bot_schedule +# from src.plugins.memory_system.Hippocampus import HippocampusManager from src.common.logger import get_module_logger, LogConfig, SUB_HEARTFLOW_STYLE_CONFIG # noqa: E402 -from src.plugins.chat.utils import get_embedding -from src.common.database import db -from typing import Union +# from src.plugins.chat.utils import get_embedding +# from src.common.database import db +# from typing import Union from src.individuality.individuality import Individuality import random from src.plugins.chat.chat_stream import ChatStream from src.plugins.person_info.relationship_manager import relationship_manager from src.plugins.chat.utils import get_recent_group_speaker -import json from src.do_tool.tool_use import ToolUser subheartflow_config = LogConfig( diff --git a/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py b/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py index 0e00eea95..43b0db219 100644 --- a/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py +++ b/src/plugins/chat_module/think_flow_chat/think_flow_prompt_builder.py @@ -108,7 +108,7 @@ class PromptBuilder: individuality = Individuality.get_instance() prompt_personality = individuality.get_prompt(type="personality", x_person=2, level=1) - prompt_identity = individuality.get_prompt(type="identity", x_person=2, level=1) + # prompt_identity = individuality.get_prompt(type="identity", x_person=2, level=1) # 日程构建 @@ -166,7 +166,7 @@ class PromptBuilder: ) -> tuple[str, str]: individuality = Individuality.get_instance() - prompt_personality = individuality.get_prompt(type="personality", x_person=2, level=1) + # prompt_personality = individuality.get_prompt(type="personality", x_person=2, level=1) prompt_identity = individuality.get_prompt(type="identity", x_person=2, level=1)