added some preliminary unit testing for ListToolHandler, tool property, and get_tool() functions

Author: abmercer

tests/extension/mockextensions/mockext_tool.py

@@ -0,0 +1,22 @@
+"""A mock extension exposing a structured tool."""
+
+def jupyter_server_extension_tools():
+    return {
+        "mock_tool": {
+            "metadata": {
+                "name": "mock_tool",
+                "description": "A mock tool for testing.",
+                "inputSchema": {
+                    "type": "object",
+                    "properties": {
+                        "input": {"type": "string"}
+                    },
+                    "required": ["input"]
+                }
+            },
+            "callable": lambda input: f"Echo: {input}"
+        }
+    }
+
+def _load_jupyter_server_extension(serverapp):
+    serverapp.log.info("Loaded mock tool extension.")

tests/extension/mockextensions/mockext_tool_dupes.py

@@ -0,0 +1,21 @@
+"""A mock extension that defines a duplicate tool name to test conflict handling."""
+
+def jupyter_server_extension_tools():
+    return {
+        "mock_tool": {  # <-- duplicate on purpose
+            "metadata": {
+                "name": "mock_tool",
+                "description": "Conflicting tool name.",
+                "inputSchema": {
+                    "type": "object",
+                    "properties": {
+                        "input": {"type": "string"}
+                    }
+                }
+            },
+            "callable": lambda input: f"Echo again: {input}"
+        }
+    }
+
+def _load_jupyter_server_extension(serverapp):
+    serverapp.log.info("Loaded dupe tool extension.")

tests/extension/mockextensions/mockext_tool_schema.py

@@ -0,0 +1,39 @@
+"""A mock extension that provides a custom validation schema."""
+
+OPENAI_TOOL_SCHEMA = {
+    "type": "object",
+    "properties": {
+        "name": {"type": "string"},
+        "description": {"type": "string"},
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "input": {"type": "string"}
+            },
+            "required": ["input"]
+        }
+    },
+    "required": ["name", "parameters"]
+}
+
+def jupyter_server_extension_tools():
+    tools = {
+        "openai_style_tool": {
+            "metadata": {
+                "name": "openai_style_tool",
+                "description": "Tool using OpenAI-style parameters",
+                "parameters": {
+                    "type": "object",
+                    "properties": {
+                        "input": {"type": "string"}
+                    },
+                    "required": ["input"]
+                }
+            },
+            "callable": lambda input: f"Got {input}"
+        }
+    }
+    return (tools, OPENAI_TOOL_SCHEMA)
+
+def _load_jupyter_server_extension(serverapp):
+    serverapp.log.info("Loaded mock custom-schema extension.")

tests/extension/test_manager.py

@@ -167,3 +167,28 @@ def test_disable_no_import(jp_serverapp, has_app):
     assert ext_pkg.extension_points == {}
     assert ext_pkg.version == ""
     assert ext_pkg.metadata == []
+
+
+def test_extension_point_tools_default_schema():
+    ep = ExtensionPoint(metadata={"module": "tests.extension.mockextensions.mockext_tool"})
+    assert "mock_tool" in ep.tools
+
+
+def test_extension_point_tools_custom_schema():
+    ep = ExtensionPoint(metadata={"module": "tests.extension.mockextensions.mockext_customschema"})
+    assert "openai_style_tool" in ep.tools
+    metadata = ep.tools["openai_style_tool"]["metadata"]
+    assert "parameters" in metadata
+
+
+def test_extension_manager_duplicate_tool_name_raises(jp_serverapp):
+    from jupyter_server.extension.manager import ExtensionManager
+
+    manager = ExtensionManager(serverapp=jp_serverapp)
+    manager.add_extension("tests.extension.mockextensions.mockext_tool", enabled=True)
+    manager.add_extension("tests.extension.mockextensions.mockext_dupes", enabled=True)
+    manager.link_all_extensions()
+
+    with pytest.raises(ValueError, match="Duplicate tool name detected: 'mock_tool'"):
+        manager.get_tools()
+

tests/services/tools/test_api.py

@@ -0,0 +1,29 @@
+import json
+import pytest
+
+@pytest.fixture
+def jp_server_config():
+    return {
+        "ServerApp": {
+            "jpserver_extensions": {
+                "tests.extension.mockextensions.mockext_tool": True,
+                "tests.extension.mockextensions.mockext_customschema": True,
+            }
+        }
+    }
+
+@pytest.mark.asyncio
+async def test_multiple_tools_present(jp_fetch):
+    response = await jp_fetch("api", "tools", method="GET")
+    assert response.code == 200
+
+    body = json.loads(response.body.decode())
+    tools = body["discovered_tools"]
+
+    # Check default schema tool
+    assert "mock_tool" in tools
+    assert "inputSchema" in tools["mock_tool"]
+
+    # Check custom schema tool
+    assert "openai_style_tool" in tools
+    assert "parameters" in tools["openai_style_tool"]

tests/test_serverapp.py

@@ -644,6 +644,24 @@ def test_immutable_cache_trait():
     assert serverapp.web_app.settings["static_immutable_cache"] == ["/test/immutable"]
 
 
+# testing get_tools
+def test_serverapp_get_tools_empty(jp_serverapp):
+    # testing the default empty state
+    tools = jp_serverapp.get_tools()
+    assert tools == {}
+
+def test_serverapp_get_tools(jp_serverapp):
+    jp_serverapp.extension_manager.add_extension(
+        "tests.extension.mockextensions.mockext_tool", enabled=True
+    )
+    jp_serverapp.extension_manager.link_all_extensions()
+
+    tools = jp_serverapp.get_tools()
+    assert "mock_tool" in tools
+    metadata = tools["mock_tool"]["metadata"]
+    assert metadata["name"] == "mock_tool"
+
+
 def test():
     pass