Versions: * arcade-mcp\==1.0.0rc1 * arcade-mcp-server\==1.0.0rc1 * arcade-core\==2.5.0rc1 * arcade-tdk\==2.6.0rc1 * arcade-serve\==2.2.0rc1 ### Summary Adds first-class MCP support across Arcade, introduces a new MCP server and CLI, unifies the project under the arcade-mcp name, overhauls templates/scaffolding, and improves developer tooling, secrets management, and examples. ### Highlights - **MCP Server & Core** - New MCP server with stdio and HTTP/SSE transports, session management, resumability, and lifecycle handling. - FastAPI-like `MCPApp` for building servers with lazy init; integrated worker+MCP HTTP app option. - Middleware system (logging and error handling), robust exception hierarchy, and Pydantic-based settings. - Async-safe managers for tools, resources, and prompts backed by registries and locks. - Developer-facing, transport-agnostic runtime context interfaces (logs, tools, prompts, resources, sampling, UI, notifications). - Conversion from Arcade ToolDefinition to MCP tool schema; OpenAI JSON tool schema converter. - Parser supports `@app.tool`/`@app.tool(...)` decorators. - **CLI** - New `mcp` command to run MCP servers with stdio or HTTP/SSE. - New `secret` command to set/list/unset tool secrets (supports .env input, preserves original casing for lookups). - `new` command refactored; option to create a full toolkit package with scaffolding. - `chat` command removed. - `serve.py` imports updated to `arcade_serve.fastapi.telemetry`; version retrieval now uses `arcade-mcp`. - `show.py` refactor to use new local catalog utilities. - `display_tool_details` improved: adds “Default” column and handles nested properties. - **Configuration & Discovery** - New `configure.py` to set up Claude Desktop, Cursor, and VS Code to connect to local or Arcade Cloud MCP servers. - Discovery utilities to find/install toolkits, build `ToolCatalog`s, analyze files for tools, load kits from directories (pyproject parsing), and build minimal toolkits. - Better handling of provider API key resolution and evaluation suite loading. - **Templates & Scaffolding** - Reorganized template structure (minimal vs full); moved `.pre-commit-config.yaml`, `.ruff.toml`, license, Makefile, README, tests, and tools layout to correct paths. - Minimal template adds `.env.example` for runtime secret injection. - Template pyproject updated for MCP servers; includes sample server with greeting and secret-reveal tools. - Authorization flow in templates simplified. - **Repo-wide Renaming & Examples** - Migrates references from `arcade-ai` to `arcade-mcp` across READMEs, scripts, and package metadata. - Examples updated (LangChain/LangGraph/AI SDK/TypeScript) and package name changed to `arcade-mcp-sdk`. - **Evals & Core Utilities** - Evals now use OpenAI tooling format (`OpenAIToolList`, `to_openai`); `tool_eval` takes `provider_api_key`. - Core utilities: fixed `does_function_return_value` by dedenting before parse; version bump to `2.5.0rc1` and dependency cleanup. - **Tooling & CI** - `setup-uv-env` action splits toolkit vs contrib dependency installation. - Pre-commit: excludes `libs/arcade-mcp-server/mkdocs.yml` and `libs/tests/` from YAML and Ruff hooks; Ruff per-file ignores (e.g., C901 in `libs/**/*.py`, TRY400 in server docs paths). - Makefile updates for uv env setup, quality checks, tests, builds, and new `shell` target. - Added Makefile to MCP server library to streamline dev workflow. - **Cleanup** - Removed `claude.json` config. - Simplified stdio entrypoint; removed unused imports (`arcade_gmail`, `arcade_search`). ### Breaking Changes - **CLI**: `chat` command removed; use `mcp`, `secret`, and updated `new`. - **Naming**: All users should update references from `arcade-ai` to `arcade-mcp`. - **Templates**: File paths moved; downstream scripts referencing old template locations may need updates. ### Getting Started - Run an MCP server: - `arcade mcp --stdio --toolkits your_toolkit` - `arcade mcp --http --toolkits your_toolkit` - Manage secrets: - `arcade secret set your_toolkit KEY=value` - `arcade secret list your_toolkit` - `arcade secret unset your_toolkit KEY` - Configure clients: - `arcade configure` to set up Claude Desktop, Cursor, and VS Code for local/Arcade Cloud MCP. --------- Co-authored-by: Sam Partee <sam@arcade-ai.com> Co-authored-by: Shub <125150494+shubcodes@users.noreply.github.com>
130 lines
5.4 KiB
Python
130 lines
5.4 KiB
Python
import logging
|
|
import os
|
|
import urllib.parse
|
|
from typing import Optional
|
|
|
|
from fastapi import FastAPI
|
|
from opentelemetry import _logs, trace
|
|
from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
|
|
from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter
|
|
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
|
|
from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
|
|
from opentelemetry.metrics import Meter, get_meter_provider, set_meter_provider
|
|
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
|
|
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
|
|
from opentelemetry.sdk.metrics import MeterProvider
|
|
from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
|
|
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
|
|
from opentelemetry.sdk.trace import TracerProvider
|
|
from opentelemetry.sdk.trace.export import BatchSpanProcessor
|
|
|
|
|
|
class ShutdownError(Exception):
|
|
pass
|
|
|
|
|
|
class OTELHandler:
|
|
def __init__(self, enable: bool = True, log_level: int = logging.INFO):
|
|
self.enable = enable
|
|
self.log_level = log_level
|
|
self._tracer_provider: Optional[TracerProvider] = None
|
|
self._tracer_span_exporter: Optional[OTLPSpanExporter] = None
|
|
self._meter_provider: Optional[MeterProvider] = None
|
|
self._meter_reader: Optional[PeriodicExportingMetricReader] = None
|
|
self._otlp_metric_exporter: Optional[OTLPMetricExporter] = None
|
|
self._logger_provider: Optional[LoggerProvider] = None
|
|
self._log_processor: Optional[BatchLogRecordProcessor] = None
|
|
self.environment = os.environ.get("ARCADE_ENVIRONMENT", "local")
|
|
|
|
def instrument_app(self, app: FastAPI) -> None:
|
|
if self.enable:
|
|
logging.info(
|
|
"🔎 Initializing OpenTelemetry. Use environment variables to configure the connection"
|
|
)
|
|
self.resource = Resource(
|
|
attributes={SERVICE_NAME: "arcade-worker", "environment": self.environment}
|
|
)
|
|
|
|
self._init_tracer()
|
|
self._init_metrics()
|
|
self._init_logging(self.log_level)
|
|
FastAPIInstrumentor().instrument_app(app)
|
|
|
|
def _init_tracer(self) -> None:
|
|
self._tracer_provider = TracerProvider(resource=self.resource)
|
|
trace.set_tracer_provider(self._tracer_provider)
|
|
|
|
# Create an OTLP exporter
|
|
self._tracer_span_exporter = OTLPSpanExporter()
|
|
|
|
try:
|
|
self._tracer_span_exporter.export([trace.get_tracer(__name__).start_span("ping")])
|
|
except Exception as e:
|
|
raise ConnectionError(
|
|
f"Could not connect to OpenTelemetry Tracer endpoint. Check OpenTelemetry configuration or disable: {e}"
|
|
)
|
|
|
|
# Create a batch span processor and add the exporter
|
|
span_processor = BatchSpanProcessor(self._tracer_span_exporter)
|
|
self._tracer_provider.add_span_processor(span_processor)
|
|
|
|
def _init_metrics(self) -> None:
|
|
self._otlp_metric_exporter = OTLPMetricExporter()
|
|
|
|
self._meter_reader = PeriodicExportingMetricReader(self._otlp_metric_exporter)
|
|
|
|
self._meter_provider = MeterProvider(
|
|
metric_readers=[self._meter_reader], resource=self.resource
|
|
)
|
|
|
|
set_meter_provider(self._meter_provider)
|
|
|
|
def get_meter(self) -> Meter:
|
|
return get_meter_provider().get_meter(__name__)
|
|
|
|
def _init_logging(self, log_level: int) -> None:
|
|
otlp_log_exporter = OTLPLogExporter()
|
|
|
|
self._logger_provider = LoggerProvider(resource=self.resource)
|
|
_logs.set_logger_provider(self._logger_provider)
|
|
|
|
# Create a batch span processor and add the exporter
|
|
self._log_processor = BatchLogRecordProcessor(otlp_log_exporter)
|
|
self._logger_provider.add_log_record_processor(self._log_processor)
|
|
|
|
handler = LoggingHandler(level=log_level, logger_provider=self._logger_provider)
|
|
logging.getLogger().addHandler(handler)
|
|
|
|
# Create a filter for urllib3 connection logs related to OpenTelemetry
|
|
class OTELConnectionFilter(logging.Filter):
|
|
def filter(self, record: logging.LogRecord) -> bool:
|
|
# Filter out connection logs to OpenTelemetry endpoints
|
|
parsed_url = urllib.parse.urlparse(
|
|
os.environ.get("OTEL_EXPORTER_OTLP_ENDPOINT", "")
|
|
)
|
|
domain = parsed_url.netloc.split(":")[0]
|
|
return not (domain and domain in str(getattr(record, "args", ())))
|
|
|
|
# Apply the filter to the urllib3 logger
|
|
urllib3_logger = logging.getLogger("urllib3.connectionpool")
|
|
urllib3_logger.addFilter(OTELConnectionFilter())
|
|
|
|
def _shutdown_tracer(self) -> None:
|
|
if self._tracer_span_exporter is None:
|
|
raise ShutdownError("Tracer provider not initialized. Failed to shutdown")
|
|
self._tracer_span_exporter.shutdown()
|
|
|
|
def _shutdown_metrics(self) -> None:
|
|
if self._otlp_metric_exporter is None:
|
|
raise ShutdownError("Meter provider not initialized. Failed to shutdown")
|
|
self._otlp_metric_exporter.shutdown()
|
|
|
|
def _shutdown_logging(self) -> None:
|
|
if self._logger_provider is None:
|
|
raise ShutdownError("Log provider not initialized. Failed to shutdown")
|
|
self._logger_provider.shutdown()
|
|
|
|
def shutdown(self) -> None:
|
|
self._shutdown_tracer()
|
|
self._shutdown_metrics()
|
|
self._shutdown_logging()
|