fix: Ruff
This commit is contained in:
@@ -7,5 +7,14 @@ from src.do_tool.tool_can_use.base_tool import (
|
|||||||
TOOL_REGISTRY
|
TOOL_REGISTRY
|
||||||
)
|
)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
'BaseTool',
|
||||||
|
'register_tool',
|
||||||
|
'discover_tools',
|
||||||
|
'get_all_tool_definitions',
|
||||||
|
'get_tool_instance',
|
||||||
|
'TOOL_REGISTRY'
|
||||||
|
]
|
||||||
|
|
||||||
# 自动发现并注册工具
|
# 自动发现并注册工具
|
||||||
discover_tools()
|
discover_tools()
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Dict, List, Any, Optional, Union, Type
|
from typing import Dict, List, Any, Optional, Type
|
||||||
import inspect
|
import inspect
|
||||||
import importlib
|
import importlib
|
||||||
import pkgutil
|
import pkgutil
|
||||||
@@ -73,13 +73,9 @@ def discover_tools():
|
|||||||
# 获取当前目录路径
|
# 获取当前目录路径
|
||||||
current_dir = os.path.dirname(os.path.abspath(__file__))
|
current_dir = os.path.dirname(os.path.abspath(__file__))
|
||||||
package_name = os.path.basename(current_dir)
|
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__
|
# 跳过当前模块和__pycache__
|
||||||
if module_name == "base_tool" or module_name.startswith("__"):
|
if module_name == "base_tool" or module_name.startswith("__"):
|
||||||
continue
|
continue
|
||||||
@@ -88,7 +84,7 @@ def discover_tools():
|
|||||||
module = importlib.import_module(f"src.do_tool.{package_name}.{module_name}")
|
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:
|
if inspect.isclass(obj) and issubclass(obj, BaseTool) and obj != BaseTool:
|
||||||
register_tool(obj)
|
register_tool(obj)
|
||||||
|
|
||||||
@@ -116,4 +112,4 @@ def get_tool_instance(tool_name: str) -> Optional[BaseTool]:
|
|||||||
tool_class = TOOL_REGISTRY.get(tool_name)
|
tool_class = TOOL_REGISTRY.get(tool_name)
|
||||||
if not tool_class:
|
if not tool_class:
|
||||||
return None
|
return None
|
||||||
return tool_class()
|
return tool_class()
|
||||||
@@ -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.plugins.chat.utils import get_embedding
|
||||||
from src.common.database import db
|
from src.common.database import db
|
||||||
from src.common.logger import get_module_logger
|
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")
|
logger = get_module_logger("get_knowledge_tool")
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ from src.common.database import db
|
|||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
from src.common.logger import get_module_logger
|
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
|
from src.do_tool.tool_can_use import get_all_tool_definitions, get_tool_instance
|
||||||
|
|
||||||
logger = get_module_logger("tool_use")
|
logger = get_module_logger("tool_use")
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ from datetime import datetime
|
|||||||
from src.plugins.models.utils_model import LLM_request
|
from src.plugins.models.utils_model import LLM_request
|
||||||
from src.plugins.config.config import global_config
|
from src.plugins.config.config import global_config
|
||||||
from src.common.database import db
|
from src.common.database import db
|
||||||
from src.individuality.individuality import Individuality
|
|
||||||
import random
|
|
||||||
|
|
||||||
|
|
||||||
# 所有观察的基类
|
# 所有观察的基类
|
||||||
|
|||||||
@@ -5,18 +5,17 @@ from src.plugins.models.utils_model import LLM_request
|
|||||||
from src.plugins.config.config import global_config
|
from src.plugins.config.config import global_config
|
||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
from src.plugins.schedule.schedule_generator import bot_schedule
|
# from src.plugins.schedule.schedule_generator import bot_schedule
|
||||||
from src.plugins.memory_system.Hippocampus import HippocampusManager
|
# 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.common.logger import get_module_logger, LogConfig, SUB_HEARTFLOW_STYLE_CONFIG # noqa: E402
|
||||||
from src.plugins.chat.utils import get_embedding
|
# from src.plugins.chat.utils import get_embedding
|
||||||
from src.common.database import db
|
# from src.common.database import db
|
||||||
from typing import Union
|
# from typing import Union
|
||||||
from src.individuality.individuality import Individuality
|
from src.individuality.individuality import Individuality
|
||||||
import random
|
import random
|
||||||
from src.plugins.chat.chat_stream import ChatStream
|
from src.plugins.chat.chat_stream import ChatStream
|
||||||
from src.plugins.person_info.relationship_manager import relationship_manager
|
from src.plugins.person_info.relationship_manager import relationship_manager
|
||||||
from src.plugins.chat.utils import get_recent_group_speaker
|
from src.plugins.chat.utils import get_recent_group_speaker
|
||||||
import json
|
|
||||||
from src.do_tool.tool_use import ToolUser
|
from src.do_tool.tool_use import ToolUser
|
||||||
|
|
||||||
subheartflow_config = LogConfig(
|
subheartflow_config = LogConfig(
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ class PromptBuilder:
|
|||||||
|
|
||||||
individuality = Individuality.get_instance()
|
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)
|
# prompt_identity = individuality.get_prompt(type="identity", x_person=2, level=1)
|
||||||
|
|
||||||
|
|
||||||
# 日程构建
|
# 日程构建
|
||||||
@@ -166,7 +166,7 @@ class PromptBuilder:
|
|||||||
) -> tuple[str, str]:
|
) -> tuple[str, str]:
|
||||||
|
|
||||||
individuality = Individuality.get_instance()
|
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)
|
prompt_identity = individuality.get_prompt(type="identity", x_person=2, level=1)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user