### Overview Major restructuring from monolithic `arcade-ai` package to modular library architecture with standardized uv-based dependency management.  ### New Package Structure - **`arcade-tdk`** - Lightweight toolkit development kit (core decorators, auth) - **`arcade-core`** - Core execution engine and catalog functionality - **`arcade-serve`** - FastAPI/MCP server components - **`arcade-ai`** - Meta package that includes CLI functionality. Optionally include evals via the `evals` extra. Optionally include all packages via the `all` extra. ### Key Benefits - **Lighter Dependencies**: Toolkits now depend only on `arcade-tdk` (~2 deps) vs full `arcade-ai` (~30+ deps) - **Faster Builds**: uv provides 10-100x faster dependency resolution and installation - **Better Modularity**: Clear separation of concerns, consumers import only what they need - **Standard Tooling**: Eliminates custom poetry scripts, uses standard Python packaging ### Migration Impact - All 20 toolkits converted from poetry → uv with `arcade-tdk` dependencies plus `arcade-ai[evals]` and `arcade-serve` dev dependencies. When developing locally, devs should install toolkits via `make install-local`. - Modern Python 3.10+ type hints throughout - Standardized build system with hatchling backend - Enhanced Makefile with robust toolkit management commands - Removed `arcade dev` CLI command - Reduce the number of files created by `arcade new` and add an option to not generate a tests and evals folder. This foundation enables faster development cycles and cleaner dependency chains for the growing toolkit ecosystem. ### Todo After this PR is merged - [ ] Post-merge workflow(s) (release & publish containers, etc) - [ ] Release order plan. @EricGustin suggests releasing in the following order: 1. `arcade-core` version 0.1.0 2. `arcade-serve` version 0.1.0 and `arcade-tdk` version 0.1.0 3. `arcade-ai` version 2.0.0 4. Patch release for all toolkits (all changes in toolkits are internal refactors) - [ ] [Update docs](https://github.com/ArcadeAI/docs/pull/318) --------- Co-authored-by: Eric Gustin <eric@arcade.dev> Co-authored-by: Eric Gustin <34000337+EricGustin@users.noreply.github.com>
111 lines
3.4 KiB
Python
111 lines
3.4 KiB
Python
import json
|
|
from typing import Any, Callable
|
|
|
|
from fastapi import Depends, FastAPI, Request
|
|
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
|
from opentelemetry.metrics import Meter
|
|
|
|
from arcade_serve.core.base import (
|
|
BaseWorker,
|
|
Router,
|
|
)
|
|
from arcade_serve.core.common import RequestData, ResponseData, WorkerComponent
|
|
from arcade_serve.fastapi.auth import validate_engine_request
|
|
from arcade_serve.utils import is_async_callable
|
|
|
|
|
|
class FastAPIWorker(BaseWorker):
|
|
"""
|
|
An Arcade Worker that is hosted inside a FastAPI app.
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
app: FastAPI,
|
|
secret: str | None = None,
|
|
*,
|
|
disable_auth: bool = False,
|
|
otel_meter: Meter | None = None,
|
|
) -> None:
|
|
"""
|
|
Initialize the FastAPIWorker with a FastAPI app instance.
|
|
If no secret is provided, the worker will use the ARCADE_WORKER_SECRET environment variable.
|
|
|
|
Args:
|
|
app: The FastAPI app to host the worker in
|
|
secret: Optional secret for authorization
|
|
disable_auth: Whether to disable authorization
|
|
otel_meter: Optional OpenTelemetry meter
|
|
"""
|
|
super().__init__(secret, disable_auth, otel_meter)
|
|
self.app = app
|
|
self.router = FastAPIRouter(app, self)
|
|
self.register_routes(self.router)
|
|
|
|
# Initialize components
|
|
self.components: list[WorkerComponent] = []
|
|
|
|
|
|
security = HTTPBearer() # Authorization: Bearer <xxx>
|
|
|
|
|
|
class FastAPIRouter(Router):
|
|
def __init__(self, app: FastAPI, worker: BaseWorker) -> None:
|
|
self.app = app
|
|
self.worker = worker
|
|
|
|
def _wrap_handler(self, handler: Callable, require_auth: bool = True) -> Callable:
|
|
"""
|
|
Wrap the handler to handle FastAPI-specific request and response.
|
|
"""
|
|
|
|
use_auth_for_route = not self.worker.disable_auth and require_auth
|
|
|
|
def call_validate_engine_request(worker_secret: str) -> Callable:
|
|
async def dependency(
|
|
credentials: HTTPAuthorizationCredentials = Depends(security),
|
|
) -> None:
|
|
await validate_engine_request(worker_secret, credentials)
|
|
|
|
return dependency
|
|
|
|
async def wrapped_handler(
|
|
request: Request,
|
|
_: None = Depends(call_validate_engine_request(self.worker.secret))
|
|
if use_auth_for_route
|
|
else None,
|
|
) -> Any:
|
|
body_str = await request.body()
|
|
body_json = json.loads(body_str) if body_str else {}
|
|
request_data = RequestData(
|
|
path=request.url.path,
|
|
method=request.method,
|
|
body_json=body_json,
|
|
)
|
|
if is_async_callable(handler):
|
|
return await handler(request_data)
|
|
else:
|
|
return handler(request_data)
|
|
|
|
return wrapped_handler
|
|
|
|
def add_route(
|
|
self,
|
|
endpoint_path: str,
|
|
handler: Callable,
|
|
method: str,
|
|
require_auth: bool = True,
|
|
response_type: type[ResponseData] | None = None,
|
|
**kwargs: Any,
|
|
) -> None:
|
|
"""
|
|
Add a route to the FastAPI application.
|
|
"""
|
|
self.app.add_api_route(
|
|
f"{self.worker.base_path}/{endpoint_path}",
|
|
self._wrap_handler(handler, require_auth),
|
|
methods=[method],
|
|
response_model=response_type,
|
|
# **kwargs to pass to FastAPI
|
|
**kwargs,
|
|
)
|