diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..d90ccf7 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Python: personal-mcp entrypoint", + "type": "debugpy", + "request": "launch", + "module": "personal_mcp.__main__", + "cwd": "${workspaceFolder}", + "console": "integratedTerminal", + "justMyCode": true, + "env": { + "PYTHONUNBUFFERED": "1" + }, + "args": [ "--port", "8766", "--reload" ] + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7fffb57..0d25f2b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -51,13 +51,7 @@ "command": "uv", "args": [ "run", - "uvicorn", - "personal_mcp.main:create_app", - "--factory", - "--host", - "127.0.0.1", - "--port", - "8000", + "personal-mcp", "--reload" ], "options": { diff --git a/Dockerfile b/Dockerfile index 1e483d0..00daf11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,57 +1,52 @@ FROM python:3.14-slim AS builder -COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ -ENV PYTHONDONTWRITEBYTECODE=1 \ - PYTHONUNBUFFERED=1 \ +ENV PYTHONUNBUFFERED=1 \ + UV_SYSTEM_CERTS=1 \ + UV_PYTHON_DOWNLOADS=0 \ + UV_NO_MANAGED_PYTHON=1 \ + UV_SYSTEM_PYTHON=1 \ + UV_PROJECT_ENVIRONMENT=/usr/local \ UV_COMPILE_BYTECODE=1 \ - UV_LINK_MODE=copy \ - UV_LOCKED=1 + UV_NO_DEV=1 \ + UV_LOCKED=1 \ + UV_LINK_MODE=copy + +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ WORKDIR /app RUN --mount=type=cache,target=/root/.cache/uv \ --mount=type=bind,source=zensical.toml,target=zensical.toml \ - --mount=type=bind,source=docs/,target=docs/ \ - uvx zensical build + --mount=type=bind,source=src/personal_mcp/docs/,target=src/personal_mcp/docs/ \ + uvx zensical build --clean --strict RUN --mount=type=cache,target=/root/.cache/uv \ --mount=type=bind,source=uv.lock,target=uv.lock \ --mount=type=bind,source=pyproject.toml,target=pyproject.toml \ uv sync --no-install-project -# COPY --chown=appuser:appuser . /app +COPY pyproject.toml uv.lock README.md /app/ +COPY ./src /app/src -# RUN --mount=type=cache,target=/root/.cache/uv \ -# uv sync --no-editable +RUN --mount=type=cache,target=/root/.cache/uv \ + uv sync FROM python:3.14-slim AS runtime ENV PYTHONDONTWRITEBYTECODE=1 \ - PYTHONUNBUFFERED=1 \ - PATH="/app/.venv/bin:$PATH" \ - PERSONAL_MCP_HOST=0.0.0.0 \ - PERSONAL_MCP_PORT=8765 \ - PERSONAL_MCP_RELOAD=false \ - PERSONAL_MCP_SITE_DIR=/app/site - -WORKDIR /app - -EXPOSE 8765 + PYTHONUNBUFFERED=1 RUN groupadd --system --gid 1001 appuser && \ useradd --system --uid 1001 --gid appuser appuser -COPY --from=ghcr.io/astral-sh/uv:latest --chown=appuser:appuser /uv /uvx /bin/ -COPY --from=builder --chown=appuser:appuser /app/.venv /app/.venv -COPY --from=builder --chown=appuser:appuser /app/site /app/site -COPY --chown=appuser:appuser ./docs /app/docs +WORKDIR /app -RUN --mount=type=cache,target=/root/.cache/uv \ - --mount=type=bind,source=uv.lock,target=uv.lock \ - --mount=type=bind,source=pyproject.toml,target=pyproject.toml \ - --mount=type=bind,source=src/,target=src/ \ - uv sync --no-editable --refresh-package prompts +RUN chown appuser:appuser /app + +COPY --from=builder --chown=appuser:appuser /usr/local/lib /usr/local/lib +COPY --from=builder --chown=appuser:appuser /usr/local/bin /usr/local/bin +COPY --from=builder --chown=appuser:appuser /app /app USER appuser -ENTRYPOINT ["python", "-m", "personal_mcp"] \ No newline at end of file +ENTRYPOINT ["/usr/local/bin/personal-mcp"] diff --git a/README.md b/README.md new file mode 100644 index 0000000..774cfac --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# JSL MCP + +```shell +uv run mcp-stdio +``` + +```shell +uv run fastmcp list --command "uv run mcp-stdio" --prompts +``` + +```shell +uv run fastmcp call --command "uv run mcp-stdio" \ + --target authoring --prompt \ + --input-json '{"artifact_type":"prompt","artifact_id":"release-notes","goal":"Create a reusable release-notes workflow."}' \ + --json +``` \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 5434646..4c61203 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,8 +1,13 @@ services: - personal-mcp: - build: - context: . - dockerfile: Dockerfile + app: + image: personal-mcp:latest + build: . restart: unless-stopped ports: - "8765:8765" + environment: + PERSONAL_MCP_PORT: 8765 + PERSONAL_MCP_HOST: 0.0.0.0 + PERSONAL_MCP_RELOAD: 1 + volumes: + - ./src:/app/src:ro diff --git a/pyproject.toml b/pyproject.toml index 6e6006d..07a7884 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "prompts" +name = "personal_mcp" version = "2.0.0" requires-python = ">=3.12" dependencies = [ @@ -17,13 +17,11 @@ constraint-dependencies = ["fastmcp-slim==4.0.0b4"] [project.scripts] personal-mcp = "personal_mcp.__main__:main" +mcp-stdio = "personal_mcp.mcp:run_stdio" [build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" - -[tool.hatch.build.targets.wheel] -packages = ["src/personal_mcp"] +requires = ["uv_build>=0.12.7,<0.13"] +build-backend = "uv_build" [dependency-groups] dev = [ @@ -37,6 +35,7 @@ test = [ "pytest>=9.1.1", "pytest-asyncio>=1.4.0", "pytest-cov>=7.1.0", + "pytest-xprocess>=1.0.2", "pyyaml>=6.0.2", ] @@ -52,3 +51,4 @@ markers = [ [tool.ty.src] include = ["src", "tests"] +exclude = ["src/personal_mcp/docs/skills/*/examples/*.py"] diff --git a/src/personal_mcp/__main__.py b/src/personal_mcp/__main__.py index fcee77c..7b5f164 100644 --- a/src/personal_mcp/__main__.py +++ b/src/personal_mcp/__main__.py @@ -7,7 +7,7 @@ def main(cli: bool = True) -> None: """Run the root MCP server.""" settings = get_settings(cli=cli) uvicorn.run( - "personal_mcp.web.app:create_app", + "personal_mcp.app:create_app", factory=True, host=settings.host, port=settings.port, diff --git a/src/personal_mcp/app.py b/src/personal_mcp/app.py index 7da1a63..33d8627 100644 --- a/src/personal_mcp/app.py +++ b/src/personal_mcp/app.py @@ -8,6 +8,7 @@ from fastapi import Response from fastapi import status from fastapi.responses import RedirectResponse from fastapi.staticfiles import StaticFiles +from fastmcp.utilities.lifespan import combine_lifespans from .config import Settings from .config import get_settings @@ -16,7 +17,9 @@ from .mcp import create_mcp def create_app(settings: Settings | None = None) -> FastAPI: runtime_settings = settings if settings is not None else get_settings() + docs_route = runtime_settings.mounts.docs.rstrip("/") or "/docs" mcp_app = create_mcp().http_app( + path="/", json_response=True, stateless_http=True, transport="http", @@ -26,9 +29,23 @@ def create_app(settings: Settings | None = None) -> FastAPI: docs_url=None, redoc_url=None, openapi_url=None, - lifespan=app_lifespan, + lifespan=combine_lifespans(app_lifespan, mcp_app.lifespan), ) app.state.settings = runtime_settings + + async def redirect_root_to_docs() -> RedirectResponse: + return RedirectResponse( + url=docs_route, + status_code=status.HTTP_307_TEMPORARY_REDIRECT, + ) + + app.add_api_route( + "/", + redirect_root_to_docs, + methods=["GET", "HEAD"], + include_in_schema=False, + ) + app.mount(runtime_settings.mounts.mcp, mcp_app, name="mcp") return app diff --git a/tests/conftest.py b/tests/conftest.py index e69de29..d793b11 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -0,0 +1,47 @@ +import socket +import sys +from collections.abc import Iterator + +import pytest +from xprocess import ProcessStarter +from xprocess import XProcess + +SERVER_HOST = "127.0.0.1" + + +@pytest.fixture +def fastapi_server_url(xprocess: XProcess, unused_tcp_port: int) -> Iterator[str]: + class ServerStarter(ProcessStarter): + timeout = 10 + terminate_on_interrupt = True + + @property + def args(self) -> list[str]: + return [ + sys.executable, + "-m", + "uvicorn", + "personal_mcp.app:create_app", + "--factory", + "--host", + SERVER_HOST, + "--port", + str(unused_tcp_port), + "--log-level", + "warning", + "--no-access-log", + ] + + def startup_check(self) -> bool: + try: + with socket.create_connection((SERVER_HOST, unused_tcp_port), timeout=0.1): + return True + except OSError: + return False + + process_name = f"personal-mcp-http-{unused_tcp_port}" + xprocess.ensure(process_name, ServerStarter) + try: + yield f"http://{SERVER_HOST}:{unused_tcp_port}/mcp" + finally: + xprocess.getinfo(process_name).terminate() diff --git a/tests/test_http.py b/tests/test_http.py new file mode 100644 index 0000000..3ae311b --- /dev/null +++ b/tests/test_http.py @@ -0,0 +1,11 @@ +import pytest +from fastmcp import Client +from fastmcp.client.transports import StreamableHttpTransport +from test_stdio import assert_server_contract + + +@pytest.mark.integration +async def test_fastapi_server_enumerates_and_reads_content(fastapi_server_url: str) -> None: + transport = StreamableHttpTransport(fastapi_server_url) + async with Client(transport) as client: + await assert_server_contract(client) diff --git a/tests/test_stdio.py b/tests/test_stdio.py new file mode 100644 index 0000000..6c1b0e1 --- /dev/null +++ b/tests/test_stdio.py @@ -0,0 +1,40 @@ +import sys +from pathlib import Path + +import pytest +from fastmcp import Client +from fastmcp.client.transports import StdioTransport +from mcp_types import TextResourceContents + + +async def assert_server_contract(client: Client) -> None: + resources = {str(resource.uri) for resource in await client.list_resources()} + templates = {str(template.uri_template) for template in await client.list_resource_templates()} + prompts = {prompt.name for prompt in await client.list_prompts()} + + assert await client.list_tools() == [] + assert "skill://pytesting/SKILL.md" in resources + assert "resource://docs/{path*}" in templates + assert "skill://pytesting/{path*}" in templates + assert "pytest-fill-scaffold" in prompts + + skill_content = await client.read_resource("skill://pytesting/SKILL.md") + docs_content = await client.read_resource("resource://docs/index.md") + + assert isinstance(skill_content[0], TextResourceContents) + assert "# Pytesting" in skill_content[0].text + assert isinstance(docs_content[0], TextResourceContents) + assert '"format": "markdown"' in docs_content[0].text + + +@pytest.mark.integration +async def test_stdio_server_enumerates_and_reads_content() -> None: + transport = StdioTransport( + command=sys.executable, + args=["-m", "personal_mcp.mcp"], + cwd=str(Path(__file__).parent.parent), + keep_alive=False, + ) + + async with Client(transport) as client: + await assert_server_contract(client) diff --git a/uv.lock b/uv.lock index aefbb54..f09d66e 100644 --- a/uv.lock +++ b/uv.lock @@ -1130,6 +1130,7 @@ test = [ { name = "pytest" }, { name = "pytest-asyncio" }, { name = "pytest-cov" }, + { name = "pytest-xprocess" }, { name = "pyyaml" }, ] @@ -1156,6 +1157,7 @@ test = [ { name = "pytest", specifier = ">=9.1.1" }, { name = "pytest-asyncio", specifier = ">=1.4.0" }, { name = "pytest-cov", specifier = ">=7.1.0" }, + { name = "pytest-xprocess", specifier = ">=1.0.2" }, { name = "pyyaml", specifier = ">=6.0.2" }, ] @@ -1494,6 +1496,19 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9d/7a/d968e294073affff457b041c2be9868a40c1c71f4a35fcc1e45e5493067b/pytest_cov-7.1.0-py3-none-any.whl", hash = "sha256:a0461110b7865f9a271aa1b51e516c9a95de9d696734a2f71e3e78f46e1d4678", size = 22876, upload-time = "2026-03-21T20:11:14.438Z" }, ] +[[package]] +name = "pytest-xprocess" +version = "1.0.2" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "psutil" }, + { name = "pytest" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/27/6f/e53d349445b4280f6b47bbed87127e994f331c335377d5e72407b376ad46/pytest-xprocess-1.0.2.tar.gz", hash = "sha256:15e270637586eabc56755ee5fcc81c48bdb46ba7ef7c0d5b1b64302d080cc60f", size = 13232, upload-time = "2024-05-19T16:12:21.819Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/63/cf/91b94238c843bfbae0a6674df45015aa3908b91454c496b2eb29e7991255/pytest_xprocess-1.0.2-py3-none-any.whl", hash = "sha256:0b0444d1f789fd9b4ba8b6b38b1d0139f226ab14091db2698a0521c1770523dd", size = 9628, upload-time = "2024-05-19T16:12:19.773Z" }, +] + [[package]] name = "python-discovery" version = "1.5.1"