Merge pull request #96 from cbcoutinho/refactor/server

Refactor server tools and resources

Author: cbcoutinho

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
 - repo: https://github.com/commitizen-tools/commitizen
-  rev: v4.8.2
+  rev: v4.8.3
   hooks:
   - id: commitizen
   - id: commitizen-branch
     stages:
     - pre-push
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.2
+  rev: v0.12.5
   hooks:
     - id: ruff-check
     - id: ruff-format

Dockerfile

@@ -6,4 +6,4 @@ COPY . .
 
 RUN uv sync --locked --no-dev
 
-CMD ["/app/.venv/bin/mcp", "run", "--transport", "sse", "/app/nextcloud_mcp_server/server.py:mcp"]
+CMD ["/app/.venv/bin/mcp", "run", "--transport", "sse", "/app/nextcloud_mcp_server/app.py:mcp"]

README.md

@@ -243,6 +243,7 @@ NEXTCLOUD_PASSWORD=your_nextcloud_app_password_or_login_password
 *   `NEXTCLOUD_HOST`: The full URL of your Nextcloud instance.
 *   `NEXTCLOUD_USERNAME`: Your Nextcloud username.
 *   `NEXTCLOUD_PASSWORD`: **Important:** It is highly recommended to use a dedicated Nextcloud App Password for security. You can generate one in your Nextcloud Security settings. Alternatively, you can use your regular login password, but this is less secure.
+*   `FASTMCP_HOST`: _Optional:_ By default FastMCP binds to localhost. Use this variable to set a different binding address (e.g. `0.0.0.0`)
 
 ## Running the Server
 
@@ -255,10 +256,12 @@ Ensure your environment variables are loaded, then run the server using `mcp run
 export $(grep -v '^#' .env | xargs)
 
 # Run the server
-mcp run --transport sse nextcloud_mcp_server.server:mcp
+mcp run --transport sse nextcloud_mcp_server.app:mcp
 ```
 
-The server will start, typically listening on `http://0.0.0.0:8000`.
+The server will start, typically listening on `http://localhost:8000`.
+
+> NOTE: To make the server bind to a different address, use the FASTMCP_HOST environmental variable
 
 ### Using Docker
 

app-hooks/post-installation/install-calendar-app.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e  # Exit on any error
+
+echo "Installing and configuring Calendar app..."
+
+# Enable calendar app
+php /var/www/html/occ app:enable calendar
+
+# Wait for calendar app to be fully initialized
+echo "Waiting for calendar app to initialize..."
+sleep 5
+
+# Ensure maintenance mode is off before calendar operations
+php /var/www/html/occ maintenance:mode --off
+
+# Sync DAV system to ensure proper initialization
+echo "Syncing DAV system..."
+php /var/www/html/occ dav:sync-system-addressbook
+
+# Repair calendar app to ensure proper setup
+echo "Repairing calendar app..."
+php /var/www/html/occ maintenance:repair --include-expensive
+
+# Final wait to ensure CalDAV service is fully ready
+echo "Final CalDAV initialization wait..."
+sleep 5
+
+echo "Calendar app installation complete!"

docker-compose.yml

@@ -52,6 +52,7 @@ services:
       - NEXTCLOUD_HOST=http://app:80
       - NEXTCLOUD_USERNAME=admin
       - NEXTCLOUD_PASSWORD=admin
+      - FASTMCP_HOST=0.0.0.0
 
 volumes:
   nextcloud:

nextcloud_mcp_server/app.py

@@ -0,0 +1,62 @@
+import logging
+from collections.abc import AsyncIterator
+from contextlib import asynccontextmanager
+from dataclasses import dataclass
+
+from mcp.server.fastmcp import Context, FastMCP
+
+from nextcloud_mcp_server.client import NextcloudClient
+from nextcloud_mcp_server.config import setup_logging
+from nextcloud_mcp_server.server import (
+    configure_calendar_tools,
+    configure_notes_tools,
+    configure_tables_tools,
+    configure_webdav_tools,
+)
+
+setup_logging()
+
+
+@dataclass
+class AppContext:
+    client: NextcloudClient
+
+
+@asynccontextmanager
+async def app_lifespan(server: FastMCP) -> AsyncIterator[AppContext]:
+    """Manage application lifecycle with type-safe context"""
+    # Initialize on startup
+    logging.info("Creating Nextcloud client")
+    client = NextcloudClient.from_env()
+    logging.info("Client initialization wait complete.")
+    try:
+        yield AppContext(client=client)
+    finally:
+        # Cleanup on shutdown
+        await client.close()
+
+
+# Create an MCP server
+mcp = FastMCP("Nextcloud MCP", lifespan=app_lifespan)
+
+logger = logging.getLogger(__name__)
+
+
+@mcp.resource("nc://capabilities")
+async def nc_get_capabilities():
+    """Get the Nextcloud Host capabilities"""
+    ctx: Context = (
+        mcp.get_context()
+    )  # https://github.com/modelcontextprotocol/python-sdk/issues/244
+    client: NextcloudClient = ctx.request_context.lifespan_context.client
+    return await client.capabilities()
+
+
+configure_notes_tools(mcp)
+configure_tables_tools(mcp)
+configure_webdav_tools(mcp)
+configure_calendar_tools(mcp)
+
+
+def run():
+    mcp.run()

nextcloud_mcp_server/client/__init__.py

@@ -1,18 +1,13 @@
-import os
-from httpx import (
-    AsyncClient,
-    Auth,
-    BasicAuth,
-    Request,
-    Response,
-)
 import logging
+import os
+
+from httpx import AsyncClient, Auth, BasicAuth, Request, Response
 
+from ..controllers.notes_search import NotesSearchController
+from .calendar import CalendarClient
 from .notes import NotesClient
-from .webdav import WebDAVClient
 from .tables import TablesClient
-from .calendar import CalendarClient
-from ..controllers.notes_search import NotesSearchController
+from .webdav import WebDAVClient
 
 logger = logging.getLogger(__name__)
 

nextcloud_mcp_server/client/base.py

@@ -1,8 +1,9 @@
 """Base client for Nextcloud operations with shared authentication."""
 
+import logging
 from abc import ABC
+
 from httpx import AsyncClient
-import logging
 
 logger = logging.getLogger(__name__)