SDK: Fully qualified tool names (#47)

In this PR:
- Handle and require fully-qualified tool names `Toolkit.ToolName` in
the actor

Also, unrelated changes/fixes:
- Cleaned up the logic around actor secrets and `$ARCADE_ACTOR_SECRET`
- Removes experimental Flask actor for now

Note: Must be merged along with
ArcadeAI/Engine#87

Author: nbarbettini

.vscode/launch.json

@@ -6,23 +6,22 @@
       "type": "python",
       "request": "launch",
       "module": "uvicorn",
-      "args": ["main:app", "--app-dir", "${workspaceFolder}/examples/fastapi/arcade_example_fastapi"],
+      "args": ["main:app", "--app-dir", "${workspaceFolder}/examples/fastapi/arcade_example_fastapi", "--port", "8002"],
       "jinja": true,
       "justMyCode": true,
       "cwd": "${workspaceFolder}/examples/fastapi/arcade_example_fastapi"
     },
     {
-      "name": "Debug `arcade dev`",
+      "name": "Debug `arcade dev --no-auth`",
       "type": "python",
       "request": "launch",
       "program": "${workspaceFolder}/arcade/run_cli.py",
-      "args": ["dev"],
+      "args": ["dev", "--no-auth"],
       "console": "integratedTerminal",
       "jinja": true,
       "justMyCode": true,
       "cwd": "${workspaceFolder}"
     },
-    ,
     {
       "name": "Debug `arcade chat -h localhost`",
       "type": "python",
@@ -33,6 +32,17 @@
       "jinja": true,
       "justMyCode": true,
       "cwd": "${workspaceFolder}"
+    },
+    {
+      "name": "Debug `arcade evals -d`",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/arcade/run_cli.py",
+      "args": ["evals", "-d"],
+      "console": "integratedTerminal",
+      "jinja": true,
+      "justMyCode": true,
+      "cwd": "${workspaceFolder}"
     }
   ]
 }

arcade/arcade/actor/core/base.py

@@ -1,3 +1,5 @@
+import logging
+import os
 import time
 from datetime import datetime
 from typing import Any, Callable, ClassVar
@@ -17,6 +19,8 @@
     ToolDefinition,
 )
 
+logger = logging.getLogger(__name__)
+
 
 class BaseActor(Actor):
     """
@@ -32,25 +36,48 @@ class BaseActor(Actor):
         HealthCheckComponent,
     )
 
-    def __init__(self, secret: str, disable_auth: bool = False) -> None:
+    def __init__(self, secret: str | None = None, disable_auth: bool = False) -> None:
         """
         Initialize the BaseActor with an empty ToolCatalog.
+        If no secret is provided, the actor will use the ARCADE_ACTOR_SECRET environment variable.
         """
         self.catalog = ToolCatalog()
         self.disable_auth = disable_auth
-        self.secret = secret
+        if disable_auth:
+            logger.warning(
+                "Warning: Actor is running without authentication. Not recommended for production."
+            )
+
+        self.secret = self._set_secret(secret, disable_auth)
+
+    def _set_secret(self, secret: str | None, disable_auth: bool) -> str:
+        if disable_auth:
+            return ""
+
+        # If secret is provided, use it
+        if secret:
+            return secret
+
+        # If secret is not provided, try to get it from environment variables
+        env_secret = os.environ.get("ARCADE_ACTOR_SECRET")
+        if env_secret:
+            return env_secret
+
+        raise ValueError(
+            "No secret provided for actor. Set the ARCADE_ACTOR_SECRET environment variable."
+        )
 
     def get_catalog(self) -> list[ToolDefinition]:
         """
         Get the catalog as a list of ToolDefinitions.
         """
         return [tool.definition for tool in self.catalog]
 
-    def register_tool(self, tool: Callable) -> None:
+    def register_tool(self, tool: Callable, toolkit_name: str | None = None) -> None:
         """
         Register a tool to the catalog.
         """
-        self.catalog.add_tool(tool)
+        self.catalog.add_tool(tool, toolkit_name)
 
     def register_toolkit(self, toolkit: Toolkit) -> None:
         """
@@ -62,12 +89,14 @@ async def call_tool(self, tool_request: ToolCallRequest) -> ToolCallResponse:
         """
         Call (invoke) a tool using the ToolExecutor.
         """
-        tool_name = tool_request.tool.name
-        tool = self.catalog.get_tool(tool_name)
-        if not tool:
-            raise ValueError(f"Tool {tool_name} not found in catalog.")
+        tool_fqname = tool_request.tool.get_fully_qualified_name()
 
-        materialized_tool = self.catalog[tool_name]
+        try:
+            materialized_tool = self.catalog.get_tool(tool_fqname)
+        except KeyError:
+            raise ValueError(
+                f"Tool {tool_fqname} not found in catalog with toolkit version {tool_request.tool.version}."
+            )
 
         start_time = time.time()
 
@@ -95,7 +124,7 @@ def health_check(self) -> dict[str, Any]:
         """
         Provide a health check that serves as a heartbeat of actor health.
         """
-        return {"status": "ok", "tool_count": len(self.catalog.tools.keys())}
+        return {"status": "ok", "tool_count": len(self.catalog)}
 
     def register_routes(self, router: Router) -> None:
         """

arcade/arcade/actor/fastapi/actor.py

@@ -18,10 +18,12 @@ class FastAPIActor(BaseActor):
     An Arcade Actor that is hosted inside a FastAPI app.
     """
 
-    def __init__(self, app: FastAPI, *, secret: str, disable_auth: bool = False) -> None:
+    def __init__(
+        self, app: FastAPI, secret: str | None = None, *, disable_auth: bool = False
+    ) -> None:
         """
-        Initialize the FastAPIActor with a FastAPI app
-        instance and an empty ToolCatalog.
+        Initialize the FastAPIActor with a FastAPI app instance.
+        If no secret is provided, the actor will use the ARCADE_ACTOR_SECRET environment variable.
         """
         super().__init__(secret, disable_auth)
         self.app = app

arcade/arcade/actor/flask/__init__.py

@@ -295,13 +295,6 @@ def dev(
     Starts the actor with host, port, and reload options. Uses
     Uvicorn as ASGI actor. Parameters allow runtime configuration.
     """
-
-    if disable_auth:
-        console.print(
-            "⚠️ Actor authentication is disabled. Not recommended for production.",
-            style="bold yellow",
-        )
-
     from arcade.cli.serve import serve_default_actor
 
     try:

arcade/arcade/actor/flask/actor.py

@@ -49,10 +49,10 @@ def serve_default_actor(
     else:
         logger.info("Serving the following toolkits:")
         for toolkit in toolkits:
-            logger.info(f"  - {toolkit.name} ({toolkit.package_name})")
+            logger.info(f"  - {toolkit.name} ({toolkit.package_name}): {len(toolkit.tools)} tools")
 
     actor_secret = os.environ.get("ARCADE_ACTOR_SECRET")
-    if not actor_secret:
+    if not disable_auth and not actor_secret:
         logger.warning(
             "Warning: ARCADE_ACTOR_SECRET environment variable is not set. Using 'dev' as the actor secret.",
         )