moved ListToolInforHandler to separate service, fixed doc strings, cleaned up comments

Author: abmercer

jupyter_server/extension/manager.py

@@ -130,8 +130,11 @@ def module(self):
         return self._module
 
     @property
-    def tools(self):
-        """Structured tools exposed by this extension point, if any."""
+    def tools(self): 
+        """Structured tools exposed by this extension point, if any.
+
+        Searches for a `jupyter_server_extension_tools` function on the extension module or app.
+        """
         loc = self.app or self.module
         if not loc:
             return {}
@@ -499,15 +502,15 @@ def load_all_extensions(self):
             self.load_extension(name)
 
     def get_tools(self) -> Dict[str, Any]:
-        """Aggregate tools from all extensions that expose them."""
+        """Aggregate and return structured tools (with metadata) from all enabled extensions."""
         all_tools = {}
 
         for ext_name, ext_pkg in self.extensions.items():
             if not ext_pkg.enabled:
                 continue
 
             for point in ext_pkg.extension_points.values():
-                for name, tool in point.tools.items():  # <— new property!
+                for name, tool in point.tools.items(): 
                     if name in all_tools:
                         raise ValueError(f"Duplicate tool name detected: '{name}'")
                     all_tools[name] = tool

jupyter_server/serverapp.py

@@ -2540,8 +2540,9 @@ def load_server_extensions(self) -> None:
         """
         self.extension_manager.load_all_extensions()
 
-    # is this how I would expose it? and Is this a good name?
-    def get_tools(self):
+
+    def get_tools(self): 
+        """Aggregate and return tools + tool metadata from all the extensions that expose them."""
         return self.extension_manager.get_tools()
 
     def init_mime_overrides(self) -> None:

jupyter_server/services/contents/handlers.py

@@ -424,13 +424,6 @@ async def post(self, path=""):
         self.finish()
 
 
-# Somehow this doesn't feel like the right service for this to go in?
-class ListToolInfoHandler(APIHandler):
-    @web.authenticated
-    async def get(self):
-        tools = self.serverapp.extension_manager.discover_tools()
-        self.finish({"discovered_tools": tools})
-
 
 # -----------------------------------------------------------------------------
 # URL to handler mappings
@@ -449,5 +442,4 @@ async def get(self):
     (r"/api/contents%s/trust" % path_regex, TrustNotebooksHandler),
     (r"/api/contents%s" % path_regex, ContentsHandler),
     (r"/api/notebooks/?(.*)", NotebooksRedirectHandler),
-    (r"/api/tools", ListToolInfoHandler),
 ]

jupyter_server/services/tools/handlers.py

@@ -0,0 +1,14 @@
+from tornado import web
+from jupyter_server.base.handlers import APIHandler
+
+class ListToolInfoHandler(APIHandler):
+    @web.authenticated
+    async def get(self):
+        tools = self.serverapp.extension_manager.discover_tools()
+        self.finish({"discovered_tools": tools}) 
+
+
+
+default_handlers = [
+        (r"/api/tools", ListToolInfoHandler),
+]