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>
142 lines
5 KiB
Python
142 lines
5 KiB
Python
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
from arcade_serve.fastapi.telemetry import OTELHandler, ShutdownError
|
|
from fastapi import FastAPI
|
|
|
|
|
|
@pytest.fixture
|
|
def app():
|
|
return FastAPI()
|
|
|
|
|
|
@pytest.fixture
|
|
def handler_disabled(app):
|
|
return OTELHandler(enable=False)
|
|
|
|
|
|
@patch("arcade_serve.fastapi.telemetry.logging")
|
|
@patch("arcade_serve.fastapi.telemetry.FastAPIInstrumentor")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPLogExporter")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPMetricExporter")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPSpanExporter")
|
|
def test_init_with_enable_true(
|
|
mock_span_exporter,
|
|
mock_metric_exporter,
|
|
mock_log_exporter,
|
|
mock_instrumentor,
|
|
mock_logging,
|
|
app,
|
|
):
|
|
# Mock the methods that may cause network calls
|
|
mock_span_exporter.return_value.shutdown = MagicMock()
|
|
mock_metric_exporter.return_value.shutdown = MagicMock()
|
|
mock_log_exporter.return_value.shutdown = MagicMock()
|
|
|
|
# Initialize OTELHandler within the scope of the mocks
|
|
handler = OTELHandler(enable=True)
|
|
handler.instrument_app(app)
|
|
|
|
# Verify that the resource is set correctly
|
|
assert handler.resource.attributes["service.name"] == "arcade-worker"
|
|
assert "environment" in handler.resource.attributes
|
|
|
|
# Verify that initialization methods are called
|
|
assert handler._tracer_provider is not None
|
|
assert handler._tracer_span_exporter is not None
|
|
assert handler._meter_provider is not None
|
|
assert handler._meter_reader is not None
|
|
assert handler._logger_provider is not None
|
|
assert handler._log_processor is not None
|
|
|
|
# Verify that FastAPIInstrumentor is used
|
|
mock_instrumentor.return_value.instrument_app.assert_called_once_with(app)
|
|
|
|
|
|
@patch("arcade_serve.fastapi.telemetry.logging")
|
|
@patch("arcade_serve.fastapi.telemetry.FastAPIInstrumentor")
|
|
def test_init_with_enable_false(mock_instrumentor, mock_logging, app):
|
|
handler = OTELHandler(enable=False)
|
|
handler.instrument_app(app)
|
|
|
|
# Verify that resources are not initialized
|
|
assert handler._tracer_provider is None
|
|
assert handler._tracer_span_exporter is None
|
|
assert handler._meter_provider is None
|
|
assert handler._meter_reader is None
|
|
assert handler._logger_provider is None
|
|
assert handler._log_processor is None
|
|
|
|
# Verify that FastAPIInstrumentor is not called
|
|
mock_instrumentor.return_value.instrument_app.assert_not_called()
|
|
|
|
|
|
def test_init_tracer_export_exception(app):
|
|
# Simulate an exception during exporter initialization
|
|
|
|
with pytest.raises(ConnectionError) as exc_info:
|
|
handler = OTELHandler(enable=True)
|
|
handler.instrument_app(app)
|
|
|
|
assert "Could not connect to OpenTelemetry Tracer endpoint" in str(exc_info.value)
|
|
|
|
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPLogExporter")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPMetricExporter")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPSpanExporter")
|
|
def test_shutdown(mock_span_exporter, mock_metric_exporter, mock_log_exporter, app):
|
|
# Mock the shutdown methods
|
|
mock_span_exporter.return_value.shutdown = MagicMock()
|
|
mock_metric_exporter.return_value.shutdown = MagicMock()
|
|
mock_log_exporter.return_value.shutdown = MagicMock()
|
|
|
|
handler = OTELHandler(enable=True)
|
|
handler.instrument_app(app)
|
|
|
|
# Call shutdown method
|
|
handler.shutdown()
|
|
|
|
# Verify that shutdown methods are called
|
|
mock_span_exporter.return_value.shutdown.assert_called_once()
|
|
mock_metric_exporter.return_value.shutdown.assert_called_once()
|
|
mock_log_exporter.return_value.shutdown.assert_called_once()
|
|
|
|
|
|
def test_shutdown_tracer_not_initialized(handler_disabled):
|
|
with pytest.raises(ShutdownError) as exc_info:
|
|
handler_disabled._shutdown_tracer()
|
|
assert "Tracer provider not initialized" in str(exc_info.value)
|
|
|
|
|
|
def test_shutdown_metrics_not_initialized(handler_disabled):
|
|
with pytest.raises(ShutdownError) as exc_info:
|
|
handler_disabled._shutdown_metrics()
|
|
assert "Meter provider not initialized" in str(exc_info.value)
|
|
|
|
|
|
def test_shutdown_logging_not_initialized(handler_disabled):
|
|
with pytest.raises(ShutdownError) as exc_info:
|
|
handler_disabled._shutdown_logging()
|
|
assert "Log provider not initialized" in str(exc_info.value)
|
|
|
|
|
|
@patch("arcade_serve.fastapi.telemetry.get_meter_provider")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPLogExporter")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPMetricExporter")
|
|
@patch("arcade_serve.fastapi.telemetry.OTLPSpanExporter")
|
|
def test_get_meter(
|
|
mock_span_exporter, mock_metric_exporter, mock_log_exporter, mock_get_meter_provider, app
|
|
):
|
|
# Mock the methods that may cause network calls
|
|
mock_span_exporter.return_value.shutdown = MagicMock()
|
|
mock_metric_exporter.return_value.shutdown = MagicMock()
|
|
mock_log_exporter.return_value.shutdown = MagicMock()
|
|
|
|
handler = OTELHandler(enable=True)
|
|
handler.instrument_app(app)
|
|
|
|
# Call get_meter method
|
|
handler.get_meter()
|
|
|
|
# Verify that get_meter_provider is called
|
|
mock_get_meter_provider.assert_called_once()
|