Personal AI, On Personal Devices
Python
fix: register all tool modules so they appear in web UI (#99) (#107)
Jon Saad-Falcon406c115a5280
diff --git a/src/openjarvis/tools/__init__.py b/src/openjarvis/tools/__init__.pyindex 0c407a3a..522e5fde 100644--- a/src/openjarvis/tools/__init__.py+++ b/src/openjarvis/tools/__init__.py@@ -91,4 +91,44 @@ try:except ImportError:pass+try:+ import openjarvis.tools.file_write # noqa: F401+except ImportError:+ pass++try:+ import openjarvis.tools.apply_patch # noqa: F401+except ImportError:+ pass++try:+ import openjarvis.tools.git_tool # noqa: F401+except ImportError:+ pass++try:+ import openjarvis.tools.db_query # noqa: F401+except ImportError:+ pass++try:+ import openjarvis.tools.pdf_tool # noqa: F401+except ImportError:+ pass++try:+ import openjarvis.tools.image_tool # noqa: F401+except ImportError:+ pass++try:+ import openjarvis.tools.audio_tool # noqa: F401+except ImportError:+ pass++try:+ import openjarvis.tools.knowledge_tools # noqa: F401+except ImportError:+ pass+__all__ = ["BaseTool", "ToolExecutor", "ToolSpec"]diff --git a/tests/tools/test_tool_registration.py b/tests/tools/test_tool_registration.pynew file mode 100644index 00000000..1369678b--- /dev/null+++ b/tests/tools/test_tool_registration.py@@ -0,0 +1,102 @@+"""Verify that importing openjarvis.tools registers all built-in tools."""++from __future__ import annotations++import importlib+import sys++from openjarvis.core.registry import ToolRegistry++# Every tool name that should be registered after importing the package.+EXPECTED_TOOLS = {+ # calculator.py+ "calculator",+ # think.py+ "think",+ # retrieval.py+ "retrieval",+ # llm_tool.py+ "llm",+ # file_read.py+ "file_read",+ # file_write.py+ "file_write",+ # web_search.py+ "web_search",+ # code_interpreter.py+ "code_interpreter",+ # code_interpreter_docker.py+ "code_interpreter_docker",+ # repl.py+ "repl",+ # storage_tools.py+ "memory_store",+ "memory_retrieve",+ "memory_search",+ "memory_index",+ # channel_tools.py+ "channel_send",+ "channel_list",+ "channel_status",+ # http_request.py+ "http_request",+ # shell_exec.py+ "shell_exec",+ # memory_manage.py+ "memory_manage",+ # user_profile_manage.py+ "user_profile_manage",+ # skill_manage.py+ "skill_manage",+ # apply_patch.py+ "apply_patch",+ # git_tool.py+ "git_status",+ "git_diff",+ "git_commit",+ "git_log",+ # db_query.py+ "db_query",+ # pdf_tool.py+ "pdf_extract",+ # image_tool.py+ "image_generate",+ # audio_tool.py+ "audio_transcribe",+ # knowledge_tools.py+ "kg_add_entity",+ "kg_add_relation",+ "kg_query",+ "kg_neighbors",+}+++def _reload_tool_modules() -> None:+ """Reload all openjarvis.tools.* submodules to re-trigger @register decorators.++ The autouse ``_clean_registries`` fixture clears all registries before each+ test. A plain ``import openjarvis.tools`` won't re-register because the+ submodules are already cached in ``sys.modules``. We must reload the+ individual submodules so their class-level ``@ToolRegistry.register``+ decorators execute again.+ """+ for mod_name in list(sys.modules):+ if (+ mod_name.startswith("openjarvis.tools.")+ and not mod_name.endswith("_stubs")+ and not mod_name.endswith("agent_tools")+ ):+ try:+ importlib.reload(sys.modules[mod_name])+ except Exception:+ pass+++def test_all_builtin_tools_registered():+ _reload_tool_modules()++ registered = set(ToolRegistry.keys())+ missing = EXPECTED_TOOLS - registered+ assert not missing, (+ f"Tools not registered (missing import in __init__.py?): {sorted(missing)}"+ )