From 2de123f271d054f11030137bec38d8764b11eaa1 Mon Sep 17 00:00:00 2001
From: Eric Gustin <34000337+EricGustin@users.noreply.github.com>
Date: Fri, 2 May 2025 12:38:58 -0800
Subject: [PATCH] Fix local worker toolkit registration (#387)

This PR fixes two bugs:
1. `serve_default_worker` was not registering toolkits to the worker
(non mcp). This caused workers created during `arcade workerup` and
`arcade serve` to have 0 tools.
2. We were logging the number of files in the toolkit as the number of
tools in the toolkit.
---
 arcade/arcade/cli/serve.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/arcade/arcade/cli/serve.py b/arcade/arcade/cli/serve.py
index 4c378b2b..6220a7f6 100644
--- a/arcade/arcade/cli/serve.py
+++ b/arcade/arcade/cli/serve.py
@@ -239,13 +239,20 @@ def serve_default_worker(
 
     toolkits = discover_toolkits()
     logger.info("Serving the following toolkits:")
+    toolkit_tool_counts: dict[str, int] = {}
+    for toolkit in toolkits:
+        for _, tools in toolkit.tools.items():
+            toolkit_tool_counts[toolkit.name] = toolkit_tool_counts.get(toolkit.name, 0) + len(
+                tools
+            )
     for toolkit in toolkits:
         if debug:
-            for name, tools in toolkit.tools.items():
+            logger.info(f"{toolkit.name}: ({toolkit_tool_counts.get(toolkit.name, 0)} tools)")
+            for filename, tools in toolkit.tools.items():
                 for tool in tools:
-                    logger.info(f"  - {name}: {tool}")
+                    logger.info(f"  - {filename}: {tool}")
         else:
-            logger.info(f"  - {toolkit.name}: {len(toolkit.tools)} tools")
+            logger.info(f"  - {toolkit.name}: {toolkit_tool_counts.get(toolkit.name, 0)} tools")
 
     # --- MCP stdio --------------------------------------------------
     if mcp:
@@ -267,18 +274,23 @@ def serve_default_worker(
     secret = os.getenv("ARCADE_WORKER_SECRET", None)
     if secret is None:
         logger.warning("No secret found for Arcade Worker")
-        logger.info("Setting secret to 'dev'. Set this in production")
+        logger.info(
+            "Setting ARCADE_WORKER_SECRET environment variable to 'dev'. Set this in production"
+        )
         secret = "dev"  # noqa: S105
 
     otel_handler = OTELHandler(
         app, enable=enable_otel, log_level=logging.DEBUG if debug else logging.INFO
     )
-    _ = FastAPIWorker(
+    worker = FastAPIWorker(
         app=app,
         secret=secret,
         disable_auth=disable_auth,
         otel_meter=otel_handler.get_meter(),
     )
+    for toolkit in toolkits:
+        worker.register_toolkit(toolkit)
+
     _run_fastapi_server(
         app,
         host=host,