Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| be466abc0c | |||
| 8956945e9d | |||
| a9f3e1b00d | |||
| a5e3f949c2 | |||
| 69fccb496a | |||
| 6bdbb6ea6c | |||
| 0b8a3aa646 | |||
| ed270bb926 | |||
| 56e5298cce | |||
| 2bcfd3d7ee | |||
| 75235d6013 | |||
| 19631838bb | |||
| 3cab343416 | |||
| 1a253af1c0 | |||
| b81fe6dfa0 | |||
| 2a5b12343c | |||
| 66d306708d | |||
| e7598a5467 | |||
| fb6aa954b6 | |||
| 02ad283a01 | |||
| 13ba9ef2e6 | |||
| 4767e88d2b | |||
| e38d0a8bdc | |||
| 1dca929983 | |||
| 6a2bd4d274 | |||
| c91001d7e1 | |||
| 83748a27da | |||
| 3ddeeab67f | |||
| a2c78ee1ef | |||
| 1e19061ee0 | |||
| 2e078498b1 | |||
| 7291c930c4 | |||
| b8191c134a | |||
| 09061d9e4f | |||
| 2d3cb85fb2 | |||
| 442e82e994 | |||
| 9bd95a8b17 |
@@ -1,13 +1,13 @@
|
|||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/commitizen-tools/commitizen
|
- repo: https://github.com/commitizen-tools/commitizen
|
||||||
rev: v4.8.2
|
rev: v4.8.3
|
||||||
hooks:
|
hooks:
|
||||||
- id: commitizen
|
- id: commitizen
|
||||||
- id: commitizen-branch
|
- id: commitizen-branch
|
||||||
stages:
|
stages:
|
||||||
- pre-push
|
- pre-push
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
rev: v0.12.2
|
rev: v0.12.5
|
||||||
hooks:
|
hooks:
|
||||||
- id: ruff-check
|
- id: ruff-check
|
||||||
- id: ruff-format
|
- id: ruff-format
|
||||||
|
|||||||
+16
-13
@@ -1,25 +1,28 @@
|
|||||||
## [Unreleased]
|
## v0.6.0 (2025-07-29)
|
||||||
|
|
||||||
### Feat
|
### Feat
|
||||||
|
|
||||||
- **webdav**: Add complete file system support with directory browsing, file read/write, and resource management
|
- **calendar**: add comprehensive Calendar app support via CalDAV protocol
|
||||||
- **webdav**: Add `nc_webdav_list_directory` tool for browsing any NextCloud directory
|
|
||||||
- **webdav**: Add `nc_webdav_read_file` tool with automatic text/binary content handling
|
|
||||||
- **webdav**: Add `nc_webdav_write_file` tool supporting text and base64 binary content
|
|
||||||
- **webdav**: Add `nc_webdav_create_directory` tool for creating directories
|
|
||||||
- **webdav**: Add `nc_webdav_delete_resource` tool for deleting files and directories
|
|
||||||
- **webdav**: Add XML parsing for WebDAV PROPFIND responses with metadata extraction
|
|
||||||
|
|
||||||
### Fix
|
### Fix
|
||||||
|
|
||||||
- **types**: Improve type annotations throughout codebase for better IDE support
|
- apply ruff formatting to pass CI checks
|
||||||
- **types**: Fix Context parameter ordering in MCP tools (required before optional)
|
- **calendar**: address PR feedback from maintainer
|
||||||
- **types**: Add proper type hints for WebDAV client methods
|
|
||||||
|
|
||||||
### Refactor
|
### Refactor
|
||||||
|
|
||||||
- **webdav**: Extend WebDAV client beyond Notes attachments to general file operations
|
- **calendar**: optimize logging for production readiness
|
||||||
- **server**: Enhance error handling and logging for WebDAV operations
|
|
||||||
|
## v0.5.0 (2025-07-26)
|
||||||
|
|
||||||
|
### Feat
|
||||||
|
|
||||||
|
- Update webdav client create_directory method to handle recursive directories
|
||||||
|
- **webdav**: add complete file system support
|
||||||
|
|
||||||
|
### Fix
|
||||||
|
|
||||||
|
- apply ruff formatting to test_webdav_operations.py
|
||||||
|
|
||||||
## v0.4.1 (2025-07-10)
|
## v0.4.1 (2025-07-10)
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM ghcr.io/astral-sh/uv:0.8.3-python3.11-alpine@sha256:886c19178558b951bbb9cb242deb94e7e37f9cba5d0dc018cd210ccd6b5116db
|
FROM ghcr.io/astral-sh/uv:0.8.4-python3.11-alpine@sha256:f2c5b953b713f455bcac4429303bb21d7d2547d56a64e1a7b2517cc9f0563f0f
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -6,4 +6,4 @@ COPY . .
|
|||||||
|
|
||||||
RUN uv sync --locked --no-dev
|
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"]
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ The server provides integration with multiple Nextcloud apps, enabling LLMs to i
|
|||||||
| App | Support Status | Description |
|
| App | Support Status | Description |
|
||||||
|-----|----------------|-------------|
|
|-----|----------------|-------------|
|
||||||
| **Notes** | ✅ Full Support | Create, read, update, delete, and search notes. Handle attachments via WebDAV. |
|
| **Notes** | ✅ Full Support | Create, read, update, delete, and search notes. Handle attachments via WebDAV. |
|
||||||
|
| **Calendar** | ✅ Full Support | Complete calendar integration - create, update, delete events. Support for recurring events, reminders, attendees, and all-day events via CalDAV. |
|
||||||
| **Tables** | ⚠️ Row Operations | Read table schemas and perform CRUD operations on table rows. Table management not yet supported. |
|
| **Tables** | ⚠️ Row Operations | Read table schemas and perform CRUD operations on table rows. Table management not yet supported. |
|
||||||
| **Files (WebDAV)** | ✅ Full Support | Complete file system access - browse directories, read/write files, create/delete resources. |
|
| **Files (WebDAV)** | ✅ Full Support | Complete file system access - browse directories, read/write files, create/delete resources. |
|
||||||
|
|
||||||
@@ -29,6 +30,22 @@ The server provides integration with multiple Nextcloud apps, enabling LLMs to i
|
|||||||
| `nc_notes_delete_note` | Delete a note by ID |
|
| `nc_notes_delete_note` | Delete a note by ID |
|
||||||
| `nc_notes_search_notes` | Search notes by title or content |
|
| `nc_notes_search_notes` | Search notes by title or content |
|
||||||
|
|
||||||
|
### Calendar Tools
|
||||||
|
|
||||||
|
| Tool | Description |
|
||||||
|
|------|-------------|
|
||||||
|
| `nc_calendar_list_calendars` | List all available calendars for the user |
|
||||||
|
| `nc_calendar_create_event` | Create a comprehensive calendar event with full feature support (recurring, reminders, attendees, etc.) |
|
||||||
|
| `nc_calendar_list_events` | **Enhanced:** List events with advanced filtering (min attendees, duration, categories, status, search across all calendars) |
|
||||||
|
| `nc_calendar_get_event` | Get detailed information about a specific event |
|
||||||
|
| `nc_calendar_update_event` | Update any aspect of an existing event |
|
||||||
|
| `nc_calendar_delete_event` | Delete a calendar event |
|
||||||
|
| `nc_calendar_create_meeting` | Quick meeting creation with smart defaults |
|
||||||
|
| `nc_calendar_get_upcoming_events` | Get upcoming events in the next N days |
|
||||||
|
| `nc_calendar_find_availability` | **New:** Intelligent availability finder - find free time slots for meetings with attendee conflict detection |
|
||||||
|
| `nc_calendar_bulk_operations` | **New:** Bulk update, delete, or move events matching filter criteria |
|
||||||
|
| `nc_calendar_manage_calendar` | **New:** Create, delete, and manage calendar properties |
|
||||||
|
|
||||||
### Tables Tools
|
### Tables Tools
|
||||||
|
|
||||||
| Tool | Description |
|
| Tool | Description |
|
||||||
@@ -89,6 +106,98 @@ await nc_webdav_write_file("NewProject/docs/notes.md", "# My Notes\n\nContent he
|
|||||||
await nc_webdav_delete_resource("old_file.txt")
|
await nc_webdav_delete_resource("old_file.txt")
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Calendar Integration
|
||||||
|
|
||||||
|
The server provides comprehensive calendar integration through CalDAV, enabling you to:
|
||||||
|
|
||||||
|
- List all available calendars
|
||||||
|
- Create, read, update, and delete calendar events
|
||||||
|
- Handle recurring events with RRULE support
|
||||||
|
- Manage event reminders and notifications
|
||||||
|
- Support all-day and timed events
|
||||||
|
- Handle attendees and meeting invitations
|
||||||
|
- Organize events with categories and priorities
|
||||||
|
|
||||||
|
**Usage Examples:**
|
||||||
|
|
||||||
|
```python
|
||||||
|
# List available calendars
|
||||||
|
calendars = await nc_calendar_list_calendars()
|
||||||
|
|
||||||
|
# Create a simple event
|
||||||
|
await nc_calendar_create_event(
|
||||||
|
calendar_name="personal",
|
||||||
|
title="Team Meeting",
|
||||||
|
start_datetime="2025-07-28T14:00:00",
|
||||||
|
end_datetime="2025-07-28T15:00:00",
|
||||||
|
description="Weekly team sync",
|
||||||
|
location="Conference Room A"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create a recurring weekly meeting
|
||||||
|
await nc_calendar_create_event(
|
||||||
|
calendar_name="work",
|
||||||
|
title="Weekly Standup",
|
||||||
|
start_datetime="2025-07-28T09:00:00",
|
||||||
|
end_datetime="2025-07-28T09:30:00",
|
||||||
|
recurring=True,
|
||||||
|
recurrence_rule="FREQ=WEEKLY;BYDAY=MO"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Quick meeting creation
|
||||||
|
await nc_calendar_create_meeting(
|
||||||
|
title="Client Call",
|
||||||
|
date="2025-07-28",
|
||||||
|
time="15:00",
|
||||||
|
duration_minutes=60,
|
||||||
|
attendees="client@example.com,colleague@company.com"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Get upcoming events
|
||||||
|
events = await nc_calendar_get_upcoming_events(days_ahead=7)
|
||||||
|
|
||||||
|
# Advanced search - find all meetings with 5+ attendees lasting 2+ hours
|
||||||
|
long_meetings = await nc_calendar_list_events(
|
||||||
|
calendar_name="", # Search all calendars
|
||||||
|
search_all_calendars=True,
|
||||||
|
start_date="2025-07-01",
|
||||||
|
end_date="2025-07-31",
|
||||||
|
min_attendees=5,
|
||||||
|
min_duration_minutes=120,
|
||||||
|
title_contains="meeting"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Find availability for a 1-hour meeting with specific attendees
|
||||||
|
availability = await nc_calendar_find_availability(
|
||||||
|
duration_minutes=60,
|
||||||
|
attendees="sarah@company.com,mike@company.com",
|
||||||
|
date_range_start="2025-07-28",
|
||||||
|
date_range_end="2025-08-04",
|
||||||
|
business_hours_only=True,
|
||||||
|
exclude_weekends=True,
|
||||||
|
preferred_times="09:00-12:00,14:00-17:00"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Bulk update all team meetings to new location
|
||||||
|
bulk_result = await nc_calendar_bulk_operations(
|
||||||
|
operation="update",
|
||||||
|
title_contains="team meeting",
|
||||||
|
start_date="2025-08-01",
|
||||||
|
end_date="2025-08-31",
|
||||||
|
new_location="Conference Room B",
|
||||||
|
new_reminder_minutes=15
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create a new project calendar
|
||||||
|
new_calendar = await nc_calendar_manage_calendar(
|
||||||
|
action="create",
|
||||||
|
calendar_name="project-alpha",
|
||||||
|
display_name="Project Alpha Calendar",
|
||||||
|
description="Calendar for Project Alpha team",
|
||||||
|
color="#FF5722"
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
### Note Attachments
|
### Note Attachments
|
||||||
|
|
||||||
This server supports adding and retrieving note attachments via WebDAV. Please note the following behavior regarding attachments:
|
This server supports adding and retrieving note attachments via WebDAV. Please note the following behavior regarding attachments:
|
||||||
@@ -134,6 +243,7 @@ NEXTCLOUD_PASSWORD=your_nextcloud_app_password_or_login_password
|
|||||||
* `NEXTCLOUD_HOST`: The full URL of your Nextcloud instance.
|
* `NEXTCLOUD_HOST`: The full URL of your Nextcloud instance.
|
||||||
* `NEXTCLOUD_USERNAME`: Your Nextcloud username.
|
* `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.
|
* `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
|
## Running the Server
|
||||||
|
|
||||||
@@ -146,10 +256,12 @@ Ensure your environment variables are loaded, then run the server using `mcp run
|
|||||||
export $(grep -v '^#' .env | xargs)
|
export $(grep -v '^#' .env | xargs)
|
||||||
|
|
||||||
# Run the server
|
# 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
|
### Using Docker
|
||||||
|
|
||||||
|
|||||||
+29
@@ -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!"
|
||||||
+3
-2
@@ -17,11 +17,11 @@ services:
|
|||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
# Note: Redis is an external service. You can find more information about the configuration here:
|
||||||
# https://hub.docker.com/_/redis
|
# https://hub.docker.com/_/redis
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine@sha256:d12963afb039f10c1fa933187e0d60a128b4d355bc4575d6c143674b38b28019
|
image: redis:alpine@sha256:25c0ae32c6c2301798579f5944af53729766a18eff5660bbef196fc2e6214a9c
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:31.0.7@sha256:31d564f5f9f43f2aed0633854a2abd39155f85aa156997f7252f5af908efa99b
|
image: nextcloud:31.0.7@sha256:81dc361f8f216d8acff20bd3dea2226fb6cea883c277505cbb2ddd6327c867fa
|
||||||
#user: www-data:www-data
|
#user: www-data:www-data
|
||||||
restart: always
|
restart: always
|
||||||
#post_start:
|
#post_start:
|
||||||
@@ -52,6 +52,7 @@ services:
|
|||||||
- NEXTCLOUD_HOST=http://app:80
|
- NEXTCLOUD_HOST=http://app:80
|
||||||
- NEXTCLOUD_USERNAME=admin
|
- NEXTCLOUD_USERNAME=admin
|
||||||
- NEXTCLOUD_PASSWORD=admin
|
- NEXTCLOUD_PASSWORD=admin
|
||||||
|
- FASTMCP_HOST=0.0.0.0
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
nextcloud:
|
nextcloud:
|
||||||
|
|||||||
@@ -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()
|
||||||
@@ -1,17 +1,13 @@
|
|||||||
import os
|
|
||||||
from httpx import (
|
|
||||||
AsyncClient,
|
|
||||||
Auth,
|
|
||||||
BasicAuth,
|
|
||||||
Request,
|
|
||||||
Response,
|
|
||||||
)
|
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
|
|
||||||
|
from httpx import AsyncClient, Auth, BasicAuth, Request, Response
|
||||||
|
|
||||||
from .notes import NotesClient
|
|
||||||
from .webdav import WebDAVClient
|
|
||||||
from .tables import TablesClient
|
|
||||||
from ..controllers.notes_search import NotesSearchController
|
from ..controllers.notes_search import NotesSearchController
|
||||||
|
from .calendar import CalendarClient
|
||||||
|
from .notes import NotesClient
|
||||||
|
from .tables import TablesClient
|
||||||
|
from .webdav import WebDAVClient
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -46,6 +42,7 @@ class NextcloudClient:
|
|||||||
self.notes = NotesClient(self._client, username)
|
self.notes = NotesClient(self._client, username)
|
||||||
self.webdav = WebDAVClient(self._client, username)
|
self.webdav = WebDAVClient(self._client, username)
|
||||||
self.tables = TablesClient(self._client, username)
|
self.tables = TablesClient(self._client, username)
|
||||||
|
self.calendar = CalendarClient(self._client, username)
|
||||||
|
|
||||||
# Initialize controllers
|
# Initialize controllers
|
||||||
self._notes_search = NotesSearchController()
|
self._notes_search = NotesSearchController()
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
"""Base client for Nextcloud operations with shared authentication."""
|
"""Base client for Nextcloud operations with shared authentication."""
|
||||||
|
|
||||||
from abc import ABC
|
|
||||||
from httpx import AsyncClient
|
|
||||||
import logging
|
import logging
|
||||||
|
from abc import ABC
|
||||||
|
|
||||||
|
from httpx import AsyncClient
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,951 @@
|
|||||||
|
"""CalDAV client for NextCloud calendar operations."""
|
||||||
|
|
||||||
|
import datetime as dt
|
||||||
|
import logging
|
||||||
|
import uuid
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
from typing import Any, Dict, List, Optional, Tuple
|
||||||
|
|
||||||
|
from httpx import HTTPStatusError
|
||||||
|
from icalendar import Alarm, Calendar
|
||||||
|
from icalendar import Event as ICalEvent
|
||||||
|
from icalendar import vRecur
|
||||||
|
|
||||||
|
from .base import BaseNextcloudClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class CalendarClient(BaseNextcloudClient):
|
||||||
|
"""Client for NextCloud CalDAV calendar operations."""
|
||||||
|
|
||||||
|
def _get_caldav_base_path(self) -> str:
|
||||||
|
"""Helper to get the base CalDAV path for calendars."""
|
||||||
|
return f"/remote.php/dav/calendars/{self.username}"
|
||||||
|
|
||||||
|
def _get_principals_path(self) -> str:
|
||||||
|
"""Helper to get the principals path for the user."""
|
||||||
|
return f"/remote.php/dav/principals/users/{self.username}"
|
||||||
|
|
||||||
|
async def list_calendars(self) -> List[Dict[str, Any]]:
|
||||||
|
"""List all available calendars for the user."""
|
||||||
|
caldav_path = self._get_caldav_base_path()
|
||||||
|
|
||||||
|
propfind_body = """<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<d:propfind xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/">
|
||||||
|
<d:prop>
|
||||||
|
<d:displayname/>
|
||||||
|
<d:resourcetype/>
|
||||||
|
<c:calendar-description/>
|
||||||
|
<cs:calendar-color/>
|
||||||
|
<c:supported-calendar-component-set/>
|
||||||
|
</d:prop>
|
||||||
|
</d:propfind>"""
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"Depth": "1",
|
||||||
|
"Content-Type": "application/xml",
|
||||||
|
"Accept": "application/xml",
|
||||||
|
}
|
||||||
|
|
||||||
|
response = await self._make_request(
|
||||||
|
"PROPFIND", caldav_path, content=propfind_body, headers=headers
|
||||||
|
)
|
||||||
|
|
||||||
|
# Parse XML response
|
||||||
|
root = ET.fromstring(response.content)
|
||||||
|
calendars = []
|
||||||
|
|
||||||
|
for response_elem in root.findall(".//{DAV:}response"):
|
||||||
|
href = response_elem.find(".//{DAV:}href")
|
||||||
|
if href is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
href_text = href.text or ""
|
||||||
|
if not href_text.endswith("/"):
|
||||||
|
continue # Skip non-calendar resources
|
||||||
|
|
||||||
|
# Extract calendar name from href
|
||||||
|
calendar_name = href_text.rstrip("/").split("/")[-1]
|
||||||
|
if not calendar_name or calendar_name == self.username:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Get properties
|
||||||
|
propstat = response_elem.find(".//{DAV:}propstat")
|
||||||
|
if propstat is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
prop = propstat.find(".//{DAV:}prop")
|
||||||
|
if prop is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Check if it's a calendar resource
|
||||||
|
resourcetype = prop.find(".//{DAV:}resourcetype")
|
||||||
|
is_calendar = (
|
||||||
|
resourcetype is not None
|
||||||
|
and resourcetype.find(".//{urn:ietf:params:xml:ns:caldav}calendar")
|
||||||
|
is not None
|
||||||
|
)
|
||||||
|
|
||||||
|
if not is_calendar:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Extract calendar properties
|
||||||
|
displayname_elem = prop.find(".//{DAV:}displayname")
|
||||||
|
displayname = (
|
||||||
|
displayname_elem.text if displayname_elem is not None else calendar_name
|
||||||
|
)
|
||||||
|
|
||||||
|
description_elem = prop.find(
|
||||||
|
".//{urn:ietf:params:xml:ns:caldav}calendar-description"
|
||||||
|
)
|
||||||
|
description = description_elem.text if description_elem is not None else ""
|
||||||
|
|
||||||
|
color_elem = prop.find(".//{http://calendarserver.org/ns/}calendar-color")
|
||||||
|
color = color_elem.text if color_elem is not None else "#1976D2"
|
||||||
|
|
||||||
|
calendars.append(
|
||||||
|
{
|
||||||
|
"name": calendar_name,
|
||||||
|
"display_name": displayname,
|
||||||
|
"description": description,
|
||||||
|
"color": color,
|
||||||
|
"href": href_text,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.debug(f"Found {len(calendars)} calendars")
|
||||||
|
return calendars
|
||||||
|
|
||||||
|
async def get_calendar_events(
|
||||||
|
self,
|
||||||
|
calendar_name: str,
|
||||||
|
start_datetime: Optional[dt.datetime] = None,
|
||||||
|
end_datetime: Optional[dt.datetime] = None,
|
||||||
|
limit: int = 50,
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
"""List events in a calendar within date range."""
|
||||||
|
calendar_path = f"{self._get_caldav_base_path()}/{calendar_name}/"
|
||||||
|
|
||||||
|
# Build time range filter if dates provided
|
||||||
|
time_range_filter = ""
|
||||||
|
if start_datetime or end_datetime:
|
||||||
|
# Convert datetime objects to CalDAV format (YYYYMMDDTHHMMSSZ)
|
||||||
|
start_dt = (
|
||||||
|
start_datetime.strftime("%Y%m%dT%H%M%SZ")
|
||||||
|
if start_datetime
|
||||||
|
else "19700101T000000Z"
|
||||||
|
)
|
||||||
|
end_dt = (
|
||||||
|
end_datetime.strftime("%Y%m%dT%H%M%SZ")
|
||||||
|
if end_datetime
|
||||||
|
else "20301231T235959Z"
|
||||||
|
)
|
||||||
|
time_range_filter = f"""
|
||||||
|
<c:time-range start="{start_dt}" end="{end_dt}"/>
|
||||||
|
"""
|
||||||
|
|
||||||
|
report_body = f"""<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<c:calendar-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
|
||||||
|
<d:prop>
|
||||||
|
<d:getetag/>
|
||||||
|
<c:calendar-data/>
|
||||||
|
</d:prop>
|
||||||
|
<c:filter>
|
||||||
|
<c:comp-filter name="VCALENDAR">
|
||||||
|
<c:comp-filter name="VEVENT">
|
||||||
|
{time_range_filter}
|
||||||
|
</c:comp-filter>
|
||||||
|
</c:comp-filter>
|
||||||
|
</c:filter>
|
||||||
|
</c:calendar-query>"""
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"Depth": "1",
|
||||||
|
"Content-Type": "application/xml",
|
||||||
|
"Accept": "application/xml",
|
||||||
|
}
|
||||||
|
|
||||||
|
response = await self._make_request(
|
||||||
|
"REPORT", calendar_path, content=report_body, headers=headers
|
||||||
|
)
|
||||||
|
|
||||||
|
# Parse XML response and extract events
|
||||||
|
root = ET.fromstring(response.content)
|
||||||
|
events = []
|
||||||
|
|
||||||
|
for response_elem in root.findall(".//{DAV:}response"):
|
||||||
|
href = response_elem.find(".//{DAV:}href")
|
||||||
|
if href is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
propstat = response_elem.find(".//{DAV:}propstat")
|
||||||
|
if propstat is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
prop = propstat.find(".//{DAV:}prop")
|
||||||
|
if prop is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
calendar_data = prop.find(".//{urn:ietf:params:xml:ns:caldav}calendar-data")
|
||||||
|
etag_elem = prop.find(".//{DAV:}getetag")
|
||||||
|
|
||||||
|
if calendar_data is not None and calendar_data.text:
|
||||||
|
event_data = self._parse_ical_event(calendar_data.text)
|
||||||
|
if event_data:
|
||||||
|
event_data["href"] = href.text
|
||||||
|
event_data["etag"] = etag_elem.text if etag_elem is not None else ""
|
||||||
|
events.append(event_data)
|
||||||
|
|
||||||
|
if len(events) >= limit:
|
||||||
|
break
|
||||||
|
|
||||||
|
logger.debug(f"Found {len(events)} events")
|
||||||
|
return events
|
||||||
|
|
||||||
|
async def create_event(
|
||||||
|
self, calendar_name: str, event_data: Dict[str, Any]
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Create a new calendar event with comprehensive features."""
|
||||||
|
event_uid = str(uuid.uuid4())
|
||||||
|
event_filename = f"{event_uid}.ics"
|
||||||
|
event_path = f"{self._get_caldav_base_path()}/{calendar_name}/{event_filename}"
|
||||||
|
|
||||||
|
# Create iCalendar event
|
||||||
|
ical_content = self._create_ical_event(event_data, event_uid)
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"Content-Type": "text/calendar; charset=utf-8",
|
||||||
|
"If-None-Match": "*", # Ensure we're creating, not updating
|
||||||
|
}
|
||||||
|
|
||||||
|
response = await self._make_request(
|
||||||
|
"PUT", event_path, content=ical_content, headers=headers
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.debug(f"Created event {event_uid}")
|
||||||
|
return {
|
||||||
|
"uid": event_uid,
|
||||||
|
"href": event_path,
|
||||||
|
"etag": response.headers.get("etag", ""),
|
||||||
|
"status_code": response.status_code,
|
||||||
|
}
|
||||||
|
|
||||||
|
async def update_event(
|
||||||
|
self,
|
||||||
|
calendar_name: str,
|
||||||
|
event_uid: str,
|
||||||
|
event_data: Dict[str, Any],
|
||||||
|
etag: str = "",
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Update an existing calendar event."""
|
||||||
|
event_filename = f"{event_uid}.ics"
|
||||||
|
event_path = f"{self._get_caldav_base_path()}/{calendar_name}/{event_filename}"
|
||||||
|
|
||||||
|
# Get existing event data to merge with updates
|
||||||
|
existing_event_data = {}
|
||||||
|
if not etag:
|
||||||
|
try:
|
||||||
|
existing_event_data, current_etag = await self.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
etag = current_etag
|
||||||
|
except Exception:
|
||||||
|
# Continue without etag if we can't get it
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Merge existing data with new data (new data takes precedence)
|
||||||
|
merged_data = {**existing_event_data, **event_data}
|
||||||
|
|
||||||
|
# Create updated iCalendar event
|
||||||
|
ical_content = self._create_ical_event(merged_data, event_uid)
|
||||||
|
|
||||||
|
headers = {
|
||||||
|
"Content-Type": "text/calendar; charset=utf-8",
|
||||||
|
}
|
||||||
|
if etag:
|
||||||
|
headers["If-Match"] = etag
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await self._make_request(
|
||||||
|
"PUT", event_path, content=ical_content, headers=headers
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.debug(f"Updated event {event_uid}")
|
||||||
|
return {
|
||||||
|
"uid": event_uid,
|
||||||
|
"href": event_path,
|
||||||
|
"etag": response.headers.get("etag", ""),
|
||||||
|
"status_code": response.status_code,
|
||||||
|
}
|
||||||
|
|
||||||
|
except HTTPStatusError as e:
|
||||||
|
logger.error(f"HTTP error updating event: {e}")
|
||||||
|
raise e
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unexpected error updating event: {e}")
|
||||||
|
raise e
|
||||||
|
|
||||||
|
async def delete_event(self, calendar_name: str, event_uid: str) -> Dict[str, Any]:
|
||||||
|
"""Delete a calendar event."""
|
||||||
|
event_filename = f"{event_uid}.ics"
|
||||||
|
event_path = f"{self._get_caldav_base_path()}/{calendar_name}/{event_filename}"
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await self._make_request("DELETE", event_path)
|
||||||
|
|
||||||
|
logger.debug(f"Deleted event {event_uid}")
|
||||||
|
return {"status_code": response.status_code}
|
||||||
|
|
||||||
|
except HTTPStatusError as e:
|
||||||
|
if e.response.status_code == 404:
|
||||||
|
logger.debug(f"Event {event_uid} not found")
|
||||||
|
return {"status_code": 404}
|
||||||
|
logger.error(f"HTTP error deleting event: {e}")
|
||||||
|
raise e
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unexpected error deleting event: {e}")
|
||||||
|
raise e
|
||||||
|
|
||||||
|
async def get_event(
|
||||||
|
self, calendar_name: str, event_uid: str
|
||||||
|
) -> Tuple[Dict[str, Any], str]:
|
||||||
|
"""Get detailed information about a specific event."""
|
||||||
|
event_filename = f"{event_uid}.ics"
|
||||||
|
event_path = f"{self._get_caldav_base_path()}/{calendar_name}/{event_filename}"
|
||||||
|
|
||||||
|
headers = {"Accept": "text/calendar"}
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = await self._make_request("GET", event_path, headers=headers)
|
||||||
|
|
||||||
|
etag = response.headers.get("etag", "")
|
||||||
|
event_data = self._parse_ical_event(response.text)
|
||||||
|
|
||||||
|
if not event_data:
|
||||||
|
raise ValueError(f"Failed to parse event data for {event_uid}")
|
||||||
|
|
||||||
|
event_data["href"] = event_path
|
||||||
|
event_data["etag"] = etag
|
||||||
|
|
||||||
|
logger.debug(f"Retrieved event {event_uid}")
|
||||||
|
return event_data, etag
|
||||||
|
|
||||||
|
except HTTPStatusError as e:
|
||||||
|
logger.error(f"HTTP error getting event: {e}")
|
||||||
|
raise e
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unexpected error getting event: {e}")
|
||||||
|
raise e
|
||||||
|
|
||||||
|
def _create_ical_event(self, event_data: Dict[str, Any], event_uid: str) -> str:
|
||||||
|
"""Create iCalendar content from event data."""
|
||||||
|
cal = Calendar()
|
||||||
|
cal.add("prodid", "-//NextCloud MCP Server//EN")
|
||||||
|
cal.add("version", "2.0")
|
||||||
|
|
||||||
|
event = ICalEvent()
|
||||||
|
event.add("uid", event_uid)
|
||||||
|
event.add("summary", event_data.get("title", ""))
|
||||||
|
event.add("description", event_data.get("description", ""))
|
||||||
|
event.add("location", event_data.get("location", ""))
|
||||||
|
|
||||||
|
# Handle dates/times
|
||||||
|
start_str = event_data.get("start_datetime", "")
|
||||||
|
end_str = event_data.get("end_datetime", "")
|
||||||
|
all_day = event_data.get("all_day", False)
|
||||||
|
|
||||||
|
if start_str: # Only parse if start_datetime is provided
|
||||||
|
if all_day:
|
||||||
|
start_date = dt.datetime.fromisoformat(start_str.split("T")[0]).date()
|
||||||
|
event.add("dtstart", start_date)
|
||||||
|
if end_str:
|
||||||
|
end_date = dt.datetime.fromisoformat(end_str.split("T")[0]).date()
|
||||||
|
event.add("dtend", end_date)
|
||||||
|
else:
|
||||||
|
start_dt = dt.datetime.fromisoformat(start_str.replace("Z", "+00:00"))
|
||||||
|
event.add("dtstart", start_dt)
|
||||||
|
if end_str:
|
||||||
|
end_dt = dt.datetime.fromisoformat(end_str.replace("Z", "+00:00"))
|
||||||
|
event.add("dtend", end_dt)
|
||||||
|
|
||||||
|
# Add categories
|
||||||
|
categories = event_data.get("categories", "")
|
||||||
|
if categories:
|
||||||
|
event.add("categories", categories.split(","))
|
||||||
|
|
||||||
|
# Add priority and status
|
||||||
|
priority = event_data.get("priority", 5)
|
||||||
|
event.add("priority", priority)
|
||||||
|
|
||||||
|
status = event_data.get("status", "CONFIRMED")
|
||||||
|
event.add("status", status)
|
||||||
|
|
||||||
|
# Add privacy classification
|
||||||
|
privacy = event_data.get("privacy", "PUBLIC")
|
||||||
|
event.add("class", privacy)
|
||||||
|
|
||||||
|
# Add URL
|
||||||
|
url = event_data.get("url", "")
|
||||||
|
if url:
|
||||||
|
event.add("url", url)
|
||||||
|
|
||||||
|
# Handle recurrence
|
||||||
|
recurring = event_data.get("recurring", False)
|
||||||
|
if recurring:
|
||||||
|
recurrence_rule = event_data.get("recurrence_rule", "")
|
||||||
|
if recurrence_rule:
|
||||||
|
event.add("rrule", vRecur.from_ical(recurrence_rule))
|
||||||
|
|
||||||
|
# Add alarms/reminders
|
||||||
|
reminder_minutes = event_data.get("reminder_minutes", 0)
|
||||||
|
if reminder_minutes > 0:
|
||||||
|
alarm = Alarm()
|
||||||
|
alarm.add("action", "DISPLAY")
|
||||||
|
alarm.add("description", "Event reminder")
|
||||||
|
alarm.add("trigger", dt.timedelta(minutes=-reminder_minutes))
|
||||||
|
event.add_component(alarm)
|
||||||
|
|
||||||
|
# Add attendees
|
||||||
|
attendees = event_data.get("attendees", "")
|
||||||
|
if attendees:
|
||||||
|
for email in attendees.split(","):
|
||||||
|
if email.strip():
|
||||||
|
event.add("attendee", f"mailto:{email.strip()}")
|
||||||
|
|
||||||
|
# Add timestamps
|
||||||
|
now = dt.datetime.now(dt.UTC)
|
||||||
|
event.add("created", now)
|
||||||
|
event.add("dtstamp", now)
|
||||||
|
event.add("last-modified", now)
|
||||||
|
|
||||||
|
cal.add_component(event)
|
||||||
|
return cal.to_ical().decode("utf-8")
|
||||||
|
|
||||||
|
def _parse_ical_event(self, ical_text: str) -> Optional[Dict[str, Any]]:
|
||||||
|
"""Parse iCalendar text and extract event data."""
|
||||||
|
try:
|
||||||
|
cal = Calendar.from_ical(ical_text)
|
||||||
|
for component in cal.walk():
|
||||||
|
if component.name == "VEVENT":
|
||||||
|
event_data = {
|
||||||
|
"uid": str(component.get("uid", "")),
|
||||||
|
"title": str(component.get("summary", "")),
|
||||||
|
"description": str(component.get("description", "")),
|
||||||
|
"location": str(component.get("location", "")),
|
||||||
|
"status": str(component.get("status", "CONFIRMED")),
|
||||||
|
"priority": int(component.get("priority", 5)),
|
||||||
|
"privacy": str(component.get("class", "PUBLIC")),
|
||||||
|
"url": str(component.get("url", "")),
|
||||||
|
}
|
||||||
|
|
||||||
|
# Handle dates
|
||||||
|
dtstart = component.get("dtstart")
|
||||||
|
if dtstart:
|
||||||
|
if isinstance(dtstart.dt, dt.date) and not isinstance(
|
||||||
|
dtstart.dt, dt.datetime
|
||||||
|
):
|
||||||
|
event_data["start_datetime"] = dtstart.dt.isoformat()
|
||||||
|
event_data["all_day"] = True
|
||||||
|
else:
|
||||||
|
event_data["start_datetime"] = dtstart.dt.isoformat()
|
||||||
|
event_data["all_day"] = False
|
||||||
|
|
||||||
|
dtend = component.get("dtend")
|
||||||
|
if dtend:
|
||||||
|
if isinstance(dtend.dt, dt.date) and not isinstance(
|
||||||
|
dtend.dt, dt.datetime
|
||||||
|
):
|
||||||
|
event_data["end_datetime"] = dtend.dt.isoformat()
|
||||||
|
else:
|
||||||
|
event_data["end_datetime"] = dtend.dt.isoformat()
|
||||||
|
|
||||||
|
# Handle categories
|
||||||
|
categories = component.get("categories")
|
||||||
|
if categories:
|
||||||
|
event_data["categories"] = self._extract_categories(categories)
|
||||||
|
|
||||||
|
# Handle recurrence
|
||||||
|
rrule = component.get("rrule")
|
||||||
|
if rrule:
|
||||||
|
event_data["recurring"] = True
|
||||||
|
event_data["recurrence_rule"] = str(rrule)
|
||||||
|
|
||||||
|
# Handle attendees
|
||||||
|
attendees = []
|
||||||
|
for attendee in component.get("attendee", []):
|
||||||
|
if isinstance(attendee, list):
|
||||||
|
attendees.extend(
|
||||||
|
str(a).replace("mailto:", "") for a in attendee
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
attendees.append(str(attendee).replace("mailto:", ""))
|
||||||
|
if attendees:
|
||||||
|
event_data["attendees"] = ",".join(attendees)
|
||||||
|
|
||||||
|
return event_data
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error parsing iCalendar: {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _extract_categories(self, categories_obj) -> str:
|
||||||
|
"""Extract categories from icalendar object to string."""
|
||||||
|
if not categories_obj:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Handle icalendar vCategory objects
|
||||||
|
if hasattr(categories_obj, "cats"):
|
||||||
|
# vCategory object has a 'cats' attribute that's a list
|
||||||
|
return ", ".join(str(cat) for cat in categories_obj.cats)
|
||||||
|
elif hasattr(categories_obj, "__iter__") and not isinstance(
|
||||||
|
categories_obj, str
|
||||||
|
):
|
||||||
|
# Handle lists or other iterables
|
||||||
|
return ", ".join(str(cat) for cat in categories_obj)
|
||||||
|
else:
|
||||||
|
# Handle strings or other objects
|
||||||
|
return str(categories_obj)
|
||||||
|
except Exception:
|
||||||
|
# Fallback to string conversion
|
||||||
|
return str(categories_obj)
|
||||||
|
|
||||||
|
async def search_events_across_calendars(
|
||||||
|
self,
|
||||||
|
start_datetime: Optional[dt.datetime] = None,
|
||||||
|
end_datetime: Optional[dt.datetime] = None,
|
||||||
|
filters: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
"""Search events across all calendars with advanced filtering."""
|
||||||
|
try:
|
||||||
|
calendars = await self.list_calendars()
|
||||||
|
all_events = []
|
||||||
|
|
||||||
|
for calendar in calendars:
|
||||||
|
try:
|
||||||
|
events = await self.get_calendar_events(
|
||||||
|
calendar["name"], start_datetime, end_datetime
|
||||||
|
)
|
||||||
|
|
||||||
|
# Apply filters if provided
|
||||||
|
if filters:
|
||||||
|
events = self._apply_event_filters(events, filters)
|
||||||
|
|
||||||
|
# Add calendar info to each event
|
||||||
|
for event in events:
|
||||||
|
event["calendar_name"] = calendar["name"]
|
||||||
|
event["calendar_display_name"] = calendar.get(
|
||||||
|
"display_name", calendar["name"]
|
||||||
|
)
|
||||||
|
|
||||||
|
all_events.extend(events)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(
|
||||||
|
f"Error getting events from calendar {calendar['name']}: {e}"
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
|
return all_events
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error searching events across calendars: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
def _apply_event_filters(
|
||||||
|
self, events: List[Dict[str, Any]], filters: Dict[str, Any]
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
"""Apply advanced filters to event list."""
|
||||||
|
filtered_events = []
|
||||||
|
|
||||||
|
for event in events:
|
||||||
|
# Skip if event doesn't match filters
|
||||||
|
if not self._event_matches_filters(event, filters):
|
||||||
|
continue
|
||||||
|
filtered_events.append(event)
|
||||||
|
|
||||||
|
return filtered_events
|
||||||
|
|
||||||
|
def _event_matches_filters(
|
||||||
|
self, event: Dict[str, Any], filters: Dict[str, Any]
|
||||||
|
) -> bool:
|
||||||
|
"""Check if an event matches the provided filters."""
|
||||||
|
try:
|
||||||
|
# Filter by minimum attendees
|
||||||
|
if "min_attendees" in filters:
|
||||||
|
attendees = event.get("attendees", "")
|
||||||
|
attendee_count = len(attendees.split(",")) if attendees else 0
|
||||||
|
if attendee_count < filters["min_attendees"]:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Filter by minimum duration
|
||||||
|
if "min_duration_minutes" in filters:
|
||||||
|
start_str = event.get("start_datetime", "")
|
||||||
|
end_str = event.get("end_datetime", "")
|
||||||
|
if start_str and end_str:
|
||||||
|
try:
|
||||||
|
start_dt = dt.datetime.fromisoformat(
|
||||||
|
start_str.replace("Z", "+00:00")
|
||||||
|
)
|
||||||
|
end_dt = dt.datetime.fromisoformat(
|
||||||
|
end_str.replace("Z", "+00:00")
|
||||||
|
)
|
||||||
|
duration_minutes = (end_dt - start_dt).total_seconds() / 60
|
||||||
|
if duration_minutes < filters["min_duration_minutes"]:
|
||||||
|
return False
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Filter by categories
|
||||||
|
if "categories" in filters:
|
||||||
|
event_categories = event.get("categories", "").lower()
|
||||||
|
required_categories = [cat.lower() for cat in filters["categories"]]
|
||||||
|
if not any(cat in event_categories for cat in required_categories):
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Filter by status
|
||||||
|
if "status" in filters:
|
||||||
|
if event.get("status", "").upper() != filters["status"].upper():
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Filter by title contains
|
||||||
|
if "title_contains" in filters:
|
||||||
|
title = event.get("title", "").lower()
|
||||||
|
search_term = filters["title_contains"].lower()
|
||||||
|
if search_term not in title:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Filter by location contains
|
||||||
|
if "location_contains" in filters:
|
||||||
|
location = event.get("location", "").lower()
|
||||||
|
search_term = filters["location_contains"].lower()
|
||||||
|
if search_term not in location:
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception:
|
||||||
|
# If filtering fails, include the event
|
||||||
|
return True
|
||||||
|
|
||||||
|
async def find_availability(
|
||||||
|
self,
|
||||||
|
duration_minutes: int,
|
||||||
|
attendees: Optional[List[str]] = None,
|
||||||
|
start_datetime: Optional[dt.datetime] = None,
|
||||||
|
end_datetime: Optional[dt.datetime] = None,
|
||||||
|
constraints: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
"""Find available time slots for scheduling."""
|
||||||
|
try:
|
||||||
|
# Set default date range if not provided
|
||||||
|
if not start_datetime:
|
||||||
|
start_datetime = dt.datetime.now()
|
||||||
|
if not end_datetime:
|
||||||
|
end_datetime = dt.datetime.now() + dt.timedelta(days=7)
|
||||||
|
|
||||||
|
# Get all events in the date range
|
||||||
|
busy_events = await self.search_events_across_calendars(
|
||||||
|
start_datetime=start_datetime, end_datetime=end_datetime
|
||||||
|
)
|
||||||
|
|
||||||
|
# Filter events for relevant attendees if specified
|
||||||
|
if attendees:
|
||||||
|
relevant_events = []
|
||||||
|
for event in busy_events:
|
||||||
|
event_attendees = event.get("attendees", "").lower()
|
||||||
|
if any(
|
||||||
|
attendee.lower() in event_attendees for attendee in attendees
|
||||||
|
):
|
||||||
|
relevant_events.append(event)
|
||||||
|
busy_events = relevant_events
|
||||||
|
|
||||||
|
# Apply constraints
|
||||||
|
constraints = constraints or {}
|
||||||
|
business_hours_only = constraints.get("business_hours_only", False)
|
||||||
|
exclude_weekends = constraints.get("exclude_weekends", False)
|
||||||
|
preferred_times = constraints.get("preferred_times", [])
|
||||||
|
|
||||||
|
# Generate time slots
|
||||||
|
available_slots = self._generate_available_slots(
|
||||||
|
busy_events,
|
||||||
|
duration_minutes,
|
||||||
|
start_datetime,
|
||||||
|
end_datetime,
|
||||||
|
business_hours_only,
|
||||||
|
exclude_weekends,
|
||||||
|
preferred_times,
|
||||||
|
)
|
||||||
|
|
||||||
|
return available_slots
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error finding availability: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
def _generate_available_slots(
|
||||||
|
self,
|
||||||
|
busy_events: List[Dict[str, Any]],
|
||||||
|
duration_minutes: int,
|
||||||
|
start_datetime: dt.datetime,
|
||||||
|
end_datetime: dt.datetime,
|
||||||
|
business_hours_only: bool,
|
||||||
|
exclude_weekends: bool,
|
||||||
|
preferred_times: List[str],
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
"""Generate available time slots."""
|
||||||
|
available_slots = []
|
||||||
|
|
||||||
|
try:
|
||||||
|
current_date = start_datetime.replace(
|
||||||
|
hour=0, minute=0, second=0, microsecond=0
|
||||||
|
)
|
||||||
|
end_date_dt = end_datetime.replace(
|
||||||
|
hour=23, minute=59, second=59, microsecond=999999
|
||||||
|
)
|
||||||
|
|
||||||
|
while current_date <= end_date_dt:
|
||||||
|
# Skip weekends if requested
|
||||||
|
if exclude_weekends and current_date.weekday() >= 5:
|
||||||
|
current_date += dt.timedelta(days=1)
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Generate slots for this day
|
||||||
|
day_slots = self._generate_day_slots(
|
||||||
|
current_date,
|
||||||
|
busy_events,
|
||||||
|
duration_minutes,
|
||||||
|
business_hours_only,
|
||||||
|
preferred_times,
|
||||||
|
)
|
||||||
|
available_slots.extend(day_slots)
|
||||||
|
|
||||||
|
current_date += dt.timedelta(days=1)
|
||||||
|
|
||||||
|
return available_slots[:10] # Limit to 10 slots
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error generating available slots: {e}")
|
||||||
|
return []
|
||||||
|
|
||||||
|
def _generate_day_slots(
|
||||||
|
self,
|
||||||
|
date: dt.datetime,
|
||||||
|
busy_events: List[Dict[str, Any]],
|
||||||
|
duration_minutes: int,
|
||||||
|
business_hours_only: bool,
|
||||||
|
preferred_times: List[str],
|
||||||
|
) -> List[Dict[str, Any]]:
|
||||||
|
"""Generate available slots for a specific day."""
|
||||||
|
slots = []
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Define working hours
|
||||||
|
if business_hours_only:
|
||||||
|
start_hour, end_hour = 9, 17
|
||||||
|
else:
|
||||||
|
start_hour, end_hour = 8, 20
|
||||||
|
|
||||||
|
# Get busy periods for this day
|
||||||
|
day_busy_periods = []
|
||||||
|
for event in busy_events:
|
||||||
|
try:
|
||||||
|
event_start = dt.datetime.fromisoformat(
|
||||||
|
event["start_datetime"].replace("Z", "+00:00")
|
||||||
|
)
|
||||||
|
event_end = dt.datetime.fromisoformat(
|
||||||
|
event["end_datetime"].replace("Z", "+00:00")
|
||||||
|
)
|
||||||
|
|
||||||
|
# Check if event is on this day
|
||||||
|
if event_start.date() == date.date():
|
||||||
|
day_busy_periods.append((event_start.time(), event_end.time()))
|
||||||
|
except Exception:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Sort busy periods
|
||||||
|
day_busy_periods.sort()
|
||||||
|
|
||||||
|
# Generate potential slots
|
||||||
|
current_time = date.replace(
|
||||||
|
hour=start_hour, minute=0, second=0, microsecond=0
|
||||||
|
)
|
||||||
|
end_time = date.replace(hour=end_hour, minute=0, second=0, microsecond=0)
|
||||||
|
slot_duration = dt.timedelta(minutes=duration_minutes)
|
||||||
|
|
||||||
|
while current_time + slot_duration <= end_time:
|
||||||
|
slot_end = current_time + slot_duration
|
||||||
|
|
||||||
|
# Check if slot conflicts with any busy period
|
||||||
|
if not self._slot_conflicts(
|
||||||
|
current_time.time(), slot_end.time(), day_busy_periods
|
||||||
|
):
|
||||||
|
# Check preferred times if specified
|
||||||
|
if not preferred_times or self._slot_in_preferred_times(
|
||||||
|
current_time.time(), preferred_times
|
||||||
|
):
|
||||||
|
slots.append(
|
||||||
|
{
|
||||||
|
"start_datetime": current_time.isoformat(),
|
||||||
|
"end_datetime": slot_end.isoformat(),
|
||||||
|
"duration_minutes": duration_minutes,
|
||||||
|
"date": date.date().isoformat(),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
current_time += dt.timedelta(minutes=30) # 30-minute increments
|
||||||
|
|
||||||
|
return slots
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error generating day slots: {e}")
|
||||||
|
return []
|
||||||
|
|
||||||
|
def _slot_conflicts(self, slot_start, slot_end, busy_periods):
|
||||||
|
"""Check if a time slot conflicts with busy periods."""
|
||||||
|
for busy_start, busy_end in busy_periods:
|
||||||
|
if slot_start < busy_end and slot_end > busy_start:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
def _slot_in_preferred_times(self, slot_start, preferred_times):
|
||||||
|
"""Check if slot falls within preferred time ranges."""
|
||||||
|
if not preferred_times:
|
||||||
|
return True
|
||||||
|
|
||||||
|
for time_range in preferred_times:
|
||||||
|
try:
|
||||||
|
start_str, end_str = time_range.split("-")
|
||||||
|
pref_start = dt.datetime.strptime(start_str, "%H:%M").time()
|
||||||
|
pref_end = dt.datetime.strptime(end_str, "%H:%M").time()
|
||||||
|
|
||||||
|
if pref_start <= slot_start <= pref_end:
|
||||||
|
return True
|
||||||
|
except Exception:
|
||||||
|
continue
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def bulk_update_events(
|
||||||
|
self, filter_criteria: Dict[str, Any], update_data: Dict[str, Any]
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Bulk update events matching filter criteria."""
|
||||||
|
try:
|
||||||
|
# Convert string dates to datetime objects if present
|
||||||
|
start_datetime = None
|
||||||
|
end_datetime = None
|
||||||
|
if "start_date" in filter_criteria and filter_criteria["start_date"]:
|
||||||
|
start_datetime = dt.datetime.fromisoformat(
|
||||||
|
filter_criteria["start_date"]
|
||||||
|
)
|
||||||
|
if "end_date" in filter_criteria and filter_criteria["end_date"]:
|
||||||
|
end_datetime = dt.datetime.fromisoformat(filter_criteria["end_date"])
|
||||||
|
|
||||||
|
# Find events matching criteria
|
||||||
|
events = await self.search_events_across_calendars(
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
filters=filter_criteria,
|
||||||
|
)
|
||||||
|
|
||||||
|
updated_count = 0
|
||||||
|
failed_count = 0
|
||||||
|
results = []
|
||||||
|
|
||||||
|
for event in events:
|
||||||
|
try:
|
||||||
|
# Update the event
|
||||||
|
await self.update_event(
|
||||||
|
event["calendar_name"], event["uid"], update_data
|
||||||
|
)
|
||||||
|
updated_count += 1
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"uid": event["uid"],
|
||||||
|
"status": "updated",
|
||||||
|
"title": event.get("title", ""),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
failed_count += 1
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"uid": event["uid"],
|
||||||
|
"status": "failed",
|
||||||
|
"error": str(e),
|
||||||
|
"title": event.get("title", ""),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"total_found": len(events),
|
||||||
|
"updated_count": updated_count,
|
||||||
|
"failed_count": failed_count,
|
||||||
|
"results": results,
|
||||||
|
}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error in bulk update: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
async def create_calendar(
|
||||||
|
self,
|
||||||
|
calendar_name: str,
|
||||||
|
display_name: str = "",
|
||||||
|
description: str = "",
|
||||||
|
color: str = "#1976D2",
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Create a new calendar."""
|
||||||
|
try:
|
||||||
|
# Calendar creation via CalDAV MKCALENDAR
|
||||||
|
calendar_path = f"{self._get_caldav_base_path()}/{calendar_name}/"
|
||||||
|
|
||||||
|
# Create MKCALENDAR body
|
||||||
|
mkcol_body = f"""<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<mkcalendar xmlns="urn:ietf:params:xml:ns:caldav" xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
|
||||||
|
<d:set>
|
||||||
|
<d:prop>
|
||||||
|
<d:displayname>{display_name or calendar_name}</d:displayname>
|
||||||
|
<cs:calendar-color>{color}</cs:calendar-color>
|
||||||
|
<caldav:calendar-description xmlns:caldav="urn:ietf:params:xml:ns:caldav">{description}</caldav:calendar-description>
|
||||||
|
<caldav:supported-calendar-component-set xmlns:caldav="urn:ietf:params:xml:ns:caldav">
|
||||||
|
<caldav:comp name="VEVENT"/>
|
||||||
|
</caldav:supported-calendar-component-set>
|
||||||
|
</d:prop>
|
||||||
|
</d:set>
|
||||||
|
</mkcalendar>"""
|
||||||
|
|
||||||
|
headers = {"Content-Type": "application/xml", "Depth": "0"}
|
||||||
|
|
||||||
|
response = await self._make_request(
|
||||||
|
"MKCALENDAR", calendar_path, content=mkcol_body, headers=headers
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.debug(f"Created calendar: {calendar_name}")
|
||||||
|
return {
|
||||||
|
"name": calendar_name,
|
||||||
|
"display_name": display_name or calendar_name,
|
||||||
|
"description": description,
|
||||||
|
"color": color,
|
||||||
|
"status_code": response.status_code,
|
||||||
|
}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error creating calendar {calendar_name}: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
async def delete_calendar(self, calendar_name: str) -> Dict[str, Any]:
|
||||||
|
"""Delete a calendar."""
|
||||||
|
try:
|
||||||
|
calendar_path = f"{self._get_caldav_base_path()}/{calendar_name}/"
|
||||||
|
|
||||||
|
response = await self._make_request("DELETE", calendar_path)
|
||||||
|
|
||||||
|
logger.debug(f"Deleted calendar: {calendar_name}")
|
||||||
|
return {"status_code": response.status_code}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error deleting calendar {calendar_name}: {e}")
|
||||||
|
raise
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
"""Client for Nextcloud Notes app operations."""
|
"""Client for Nextcloud Notes app operations."""
|
||||||
|
|
||||||
from typing import Dict, List, Any, Optional
|
|
||||||
import logging
|
import logging
|
||||||
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
from .base import BaseNextcloudClient
|
from .base import BaseNextcloudClient
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"""Client for Nextcloud Tables app operations."""
|
"""Client for Nextcloud Tables app operations."""
|
||||||
|
|
||||||
from typing import Dict, List, Any, Optional
|
|
||||||
import logging
|
import logging
|
||||||
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
from .base import BaseNextcloudClient
|
from .base import BaseNextcloudClient
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
"""WebDAV client for Nextcloud file operations."""
|
"""WebDAV client for Nextcloud file operations."""
|
||||||
|
|
||||||
import mimetypes
|
|
||||||
from typing import Tuple, Dict, Any, Optional, List
|
|
||||||
import logging
|
import logging
|
||||||
from httpx import HTTPStatusError
|
import mimetypes
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
|
from typing import Any, Dict, List, Optional, Tuple
|
||||||
|
|
||||||
|
from httpx import HTTPStatusError
|
||||||
|
|
||||||
from .base import BaseNextcloudClient
|
from .base import BaseNextcloudClient
|
||||||
|
|
||||||
|
|||||||
@@ -21,12 +21,12 @@ LOGGING_CONFIG = {
|
|||||||
},
|
},
|
||||||
"httpx": {
|
"httpx": {
|
||||||
"handlers": ["default"],
|
"handlers": ["default"],
|
||||||
"level": "DEBUG",
|
"level": "INFO",
|
||||||
"propagate": False, # Prevent propagation to root logger
|
"propagate": False, # Prevent propagation to root logger
|
||||||
},
|
},
|
||||||
"httpcore": {
|
"httpcore": {
|
||||||
"handlers": ["default"],
|
"handlers": ["default"],
|
||||||
"level": "DEBUG",
|
"level": "INFO",
|
||||||
"propagate": False, # Prevent propagation to root logger
|
"propagate": False, # Prevent propagation to root logger
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"""Controller for notes search functionality."""
|
"""Controller for notes search functionality."""
|
||||||
|
|
||||||
from typing import List, Dict, Any
|
from typing import Any, Dict, List
|
||||||
|
|
||||||
|
|
||||||
class NotesSearchController:
|
class NotesSearchController:
|
||||||
|
|||||||
@@ -1,347 +0,0 @@
|
|||||||
# server.py
|
|
||||||
import logging
|
|
||||||
from nextcloud_mcp_server.config import setup_logging
|
|
||||||
from contextlib import asynccontextmanager
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from mcp.server.fastmcp import FastMCP, Context
|
|
||||||
from collections.abc import AsyncIterator
|
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
|
||||||
|
|
||||||
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()
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.resource("notes://settings")
|
|
||||||
async def notes_get_settings():
|
|
||||||
"""Get the Notes App settings"""
|
|
||||||
ctx: Context = (
|
|
||||||
mcp.get_context()
|
|
||||||
) # https://github.com/modelcontextprotocol/python-sdk/issues/244
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.notes.get_settings()
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_get_note(note_id: int, ctx: Context):
|
|
||||||
"""Get user note using note id"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.notes.get_note(note_id)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_notes_create_note(title: str, content: str, category: str, ctx: Context):
|
|
||||||
"""Create a new note"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.notes.create_note(
|
|
||||||
title=title,
|
|
||||||
content=content,
|
|
||||||
category=category,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_notes_update_note(
|
|
||||||
note_id: int,
|
|
||||||
etag: str,
|
|
||||||
title: str | None,
|
|
||||||
content: str | None,
|
|
||||||
category: str | None,
|
|
||||||
ctx: Context,
|
|
||||||
):
|
|
||||||
logger.info("Updating note %s", note_id)
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.notes.update(
|
|
||||||
note_id=note_id,
|
|
||||||
etag=etag,
|
|
||||||
title=title,
|
|
||||||
content=content,
|
|
||||||
category=category,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_notes_append_content(note_id: int, content: str, ctx: Context):
|
|
||||||
"""Append content to an existing note with a clear separator"""
|
|
||||||
logger.info("Appending content to note %s", note_id)
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.notes.append_content(note_id=note_id, content=content)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_notes_search_notes(query: str, ctx: Context):
|
|
||||||
"""Search notes by title or content, returning only id, title, and category."""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.notes_search_notes(query=query)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_notes_delete_note(note_id: int, ctx: Context):
|
|
||||||
logger.info("Deleting note %s", note_id)
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.notes.delete_note(note_id)
|
|
||||||
|
|
||||||
|
|
||||||
# Tables tools
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_tables_list_tables(ctx: Context):
|
|
||||||
"""List all tables available to the user"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.tables.list_tables()
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_tables_get_schema(table_id: int, ctx: Context):
|
|
||||||
"""Get the schema/structure of a specific table including columns and views"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.tables.get_table_schema(table_id)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_tables_read_table(
|
|
||||||
table_id: int,
|
|
||||||
ctx: Context,
|
|
||||||
limit: int | None = None,
|
|
||||||
offset: int | None = None,
|
|
||||||
):
|
|
||||||
"""Read rows from a table with optional pagination"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.tables.get_table_rows(table_id, limit, offset)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_tables_insert_row(table_id: int, data: dict, ctx: Context):
|
|
||||||
"""Insert a new row into a table.
|
|
||||||
|
|
||||||
Data should be a dictionary mapping column IDs to values, e.g. {1: "text", 2: 42}
|
|
||||||
"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.tables.create_row(table_id, data)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_tables_update_row(row_id: int, data: dict, ctx: Context):
|
|
||||||
"""Update an existing row in a table.
|
|
||||||
|
|
||||||
Data should be a dictionary mapping column IDs to new values, e.g. {1: "new text", 2: 99}
|
|
||||||
"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.tables.update_row(row_id, data)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_tables_delete_row(row_id: int, ctx: Context):
|
|
||||||
"""Delete a row from a table"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.tables.delete_row(row_id)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.resource("nc://Notes/{note_id}/attachments/{attachment_filename}")
|
|
||||||
async def nc_notes_get_attachment(note_id: int, attachment_filename: str):
|
|
||||||
"""Get a specific attachment from a note"""
|
|
||||||
ctx: Context = mcp.get_context()
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
# Assuming a method get_note_attachment exists in the client
|
|
||||||
# This method should return the raw content and determine the mime type
|
|
||||||
content, mime_type = await client.webdav.get_note_attachment(
|
|
||||||
note_id=note_id, filename=attachment_filename
|
|
||||||
)
|
|
||||||
return {
|
|
||||||
"contents": [
|
|
||||||
{
|
|
||||||
# Use uppercase 'Notes' to match the decorator
|
|
||||||
"uri": f"nc://Notes/{note_id}/attachments/{attachment_filename}",
|
|
||||||
"mimeType": mime_type, # Client needs to determine this
|
|
||||||
"data": content, # Return raw bytes/data
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# WebDAV file system tools
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_webdav_list_directory(ctx: Context, path: str = ""):
|
|
||||||
"""List files and directories in the specified NextCloud path.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
path: Directory path to list (empty string for root directory)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List of items with metadata including name, path, is_directory, size, content_type, last_modified
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
# List root directory
|
|
||||||
await nc_webdav_list_directory("")
|
|
||||||
|
|
||||||
# List a specific folder
|
|
||||||
await nc_webdav_list_directory("Documents/Projects")
|
|
||||||
"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.webdav.list_directory(path)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_webdav_read_file(path: str, ctx: Context):
|
|
||||||
"""Read the content of a file from NextCloud.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
path: Full path to the file to read
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Dict with path, content, content_type, size, and encoding (if binary)
|
|
||||||
Text files are decoded to UTF-8, binary files are base64 encoded
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
# Read a text file
|
|
||||||
result = await nc_webdav_read_file("Documents/readme.txt")
|
|
||||||
print(result['content']) # Decoded text content
|
|
||||||
|
|
||||||
# Read a binary file
|
|
||||||
result = await nc_webdav_read_file("Images/photo.jpg")
|
|
||||||
print(result['encoding']) # 'base64'
|
|
||||||
"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
content, content_type = await client.webdav.read_file(path)
|
|
||||||
|
|
||||||
# For text files, decode content for easier viewing
|
|
||||||
if content_type and content_type.startswith("text/"):
|
|
||||||
try:
|
|
||||||
decoded_content = content.decode("utf-8")
|
|
||||||
return {
|
|
||||||
"path": path,
|
|
||||||
"content": decoded_content,
|
|
||||||
"content_type": content_type,
|
|
||||||
"size": len(content),
|
|
||||||
}
|
|
||||||
except UnicodeDecodeError:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# For binary files, return metadata and base64 encoded content
|
|
||||||
import base64
|
|
||||||
|
|
||||||
return {
|
|
||||||
"path": path,
|
|
||||||
"content": base64.b64encode(content).decode("ascii"),
|
|
||||||
"content_type": content_type,
|
|
||||||
"size": len(content),
|
|
||||||
"encoding": "base64",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_webdav_write_file(
|
|
||||||
path: str, content: str, ctx: Context, content_type: str | None = None
|
|
||||||
):
|
|
||||||
"""Write content to a file in NextCloud.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
path: Full path where to write the file
|
|
||||||
content: File content (text or base64 for binary)
|
|
||||||
content_type: MIME type (auto-detected if not provided, use 'type;base64' for binary)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Dict with status_code indicating success
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
# Write a text file
|
|
||||||
await nc_webdav_write_file("Documents/notes.md", "# My Notes\nContent here...")
|
|
||||||
|
|
||||||
# Write binary data (base64 encoded)
|
|
||||||
await nc_webdav_write_file("files/data.bin", base64_content, "application/octet-stream;base64")
|
|
||||||
"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
|
|
||||||
# Handle base64 encoded content
|
|
||||||
if content_type and "base64" in content_type.lower():
|
|
||||||
import base64
|
|
||||||
|
|
||||||
content_bytes = base64.b64decode(content)
|
|
||||||
content_type = content_type.replace(";base64", "")
|
|
||||||
else:
|
|
||||||
content_bytes = content.encode("utf-8")
|
|
||||||
|
|
||||||
return await client.webdav.write_file(path, content_bytes, content_type)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_webdav_create_directory(path: str, ctx: Context):
|
|
||||||
"""Create a directory in NextCloud.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
path: Full path of the directory to create
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Dict with status_code (201 for created, 405 if already exists)
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
# Create a single directory
|
|
||||||
await nc_webdav_create_directory("NewProject")
|
|
||||||
|
|
||||||
# Create nested directories (parent must exist)
|
|
||||||
await nc_webdav_create_directory("Projects/MyApp/docs")
|
|
||||||
"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.webdav.create_directory(path)
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
async def nc_webdav_delete_resource(path: str, ctx: Context):
|
|
||||||
"""Delete a file or directory in NextCloud.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
path: Full path of the file or directory to delete
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Dict with status_code indicating result (404 if not found)
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
# Delete a file
|
|
||||||
await nc_webdav_delete_resource("old_document.txt")
|
|
||||||
|
|
||||||
# Delete a directory (will delete all contents)
|
|
||||||
await nc_webdav_delete_resource("temp_folder")
|
|
||||||
"""
|
|
||||||
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
|
||||||
return await client.webdav.delete_resource(path)
|
|
||||||
|
|
||||||
|
|
||||||
def run():
|
|
||||||
mcp.run()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
logger.info("Starting now")
|
|
||||||
mcp.run()
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
from .calendar import configure_calendar_tools
|
||||||
|
from .notes import configure_notes_tools
|
||||||
|
from .tables import configure_tables_tools
|
||||||
|
from .webdav import configure_webdav_tools
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"configure_calendar_tools",
|
||||||
|
"configure_notes_tools",
|
||||||
|
"configure_tables_tools",
|
||||||
|
"configure_webdav_tools",
|
||||||
|
]
|
||||||
@@ -0,0 +1,794 @@
|
|||||||
|
import datetime as dt
|
||||||
|
import logging
|
||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from mcp.server.fastmcp import Context, FastMCP
|
||||||
|
|
||||||
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_calendar_tools(mcp: FastMCP):
|
||||||
|
# Calendar tools
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_list_calendars(ctx: Context):
|
||||||
|
"""List all available calendars for the user"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.calendar.list_calendars()
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_create_event(
|
||||||
|
calendar_name: str,
|
||||||
|
title: str,
|
||||||
|
start_datetime: str,
|
||||||
|
ctx: Context,
|
||||||
|
end_datetime: str = "",
|
||||||
|
all_day: bool = False,
|
||||||
|
description: str = "",
|
||||||
|
location: str = "",
|
||||||
|
categories: str = "",
|
||||||
|
recurring: bool = False,
|
||||||
|
recurrence_rule: str = "",
|
||||||
|
recurrence_end_date: str = "",
|
||||||
|
reminder_minutes: int = 15,
|
||||||
|
reminder_email: bool = False,
|
||||||
|
status: str = "CONFIRMED",
|
||||||
|
priority: int = 5,
|
||||||
|
privacy: str = "PUBLIC",
|
||||||
|
attendees: str = "",
|
||||||
|
url: str = "",
|
||||||
|
color: str = "",
|
||||||
|
):
|
||||||
|
"""Create a comprehensive calendar event with full feature support
|
||||||
|
|
||||||
|
Args:
|
||||||
|
calendar_name: Name of the calendar to create the event in
|
||||||
|
title: Event title
|
||||||
|
start_datetime: ISO format: "2025-01-15T14:00:00" or "2025-01-15" for all-day
|
||||||
|
ctx: MCP context
|
||||||
|
end_datetime: ISO format end time, empty for all-day events
|
||||||
|
all_day: Whether this is an all-day event
|
||||||
|
description: Event description/details
|
||||||
|
location: Event location
|
||||||
|
categories: Comma-separated categories (e.g., "work,meeting")
|
||||||
|
recurring: Whether this is a recurring event
|
||||||
|
recurrence_rule: RFC5545 RRULE (e.g., "FREQ=WEEKLY;BYDAY=MO,WE,FR")
|
||||||
|
recurrence_end_date: When to stop recurring
|
||||||
|
reminder_minutes: Minutes before event to send reminder
|
||||||
|
reminder_email: Whether to send email notification
|
||||||
|
status: Event status: CONFIRMED, TENTATIVE, or CANCELLED
|
||||||
|
priority: Priority level 1-9 (1=highest, 9=lowest, 5=normal)
|
||||||
|
privacy: Privacy level: PUBLIC, PRIVATE, or CONFIDENTIAL
|
||||||
|
attendees: Comma-separated email addresses
|
||||||
|
url: Related URL for the event
|
||||||
|
color: Event color (hex or name)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with event creation result
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
event_data = {
|
||||||
|
"title": title,
|
||||||
|
"start_datetime": start_datetime,
|
||||||
|
"end_datetime": end_datetime,
|
||||||
|
"all_day": all_day,
|
||||||
|
"description": description,
|
||||||
|
"location": location,
|
||||||
|
"categories": categories,
|
||||||
|
"recurring": recurring,
|
||||||
|
"recurrence_rule": recurrence_rule,
|
||||||
|
"recurrence_end_date": recurrence_end_date,
|
||||||
|
"reminder_minutes": reminder_minutes,
|
||||||
|
"reminder_email": reminder_email,
|
||||||
|
"status": status,
|
||||||
|
"priority": priority,
|
||||||
|
"privacy": privacy,
|
||||||
|
"attendees": attendees,
|
||||||
|
"url": url,
|
||||||
|
"color": color,
|
||||||
|
}
|
||||||
|
|
||||||
|
return await client.calendar.create_event(calendar_name, event_data)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_list_events(
|
||||||
|
calendar_name: str,
|
||||||
|
ctx: Context,
|
||||||
|
start_date: str = "",
|
||||||
|
end_date: str = "",
|
||||||
|
limit: int = 50,
|
||||||
|
min_attendees: Optional[int] = None,
|
||||||
|
min_duration_minutes: Optional[int] = None,
|
||||||
|
categories: Optional[str] = None,
|
||||||
|
status: Optional[str] = None,
|
||||||
|
title_contains: Optional[str] = None,
|
||||||
|
location_contains: Optional[str] = None,
|
||||||
|
search_all_calendars: bool = False,
|
||||||
|
):
|
||||||
|
"""List events in a calendar (or all calendars) within date range with advanced filtering.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
calendar_name: Name of the calendar to search. Ignored if search_all_calendars=True.
|
||||||
|
ctx: MCP context
|
||||||
|
start_date: Start date for search (YYYY-MM-DD format, e.g., "2025-01-01")
|
||||||
|
end_date: End date for search (YYYY-MM-DD format, e.g., "2025-01-31")
|
||||||
|
limit: Maximum number of events to return
|
||||||
|
min_attendees: Filter events with at least this many attendees
|
||||||
|
min_duration_minutes: Filter events with at least this duration
|
||||||
|
categories: Filter events containing any of these categories (comma-separated, e.g., "work,meeting")
|
||||||
|
status: Filter events by status (CONFIRMED, TENTATIVE, or CANCELLED)
|
||||||
|
title_contains: Filter events where title contains this text
|
||||||
|
location_contains: Filter events where location contains this text
|
||||||
|
search_all_calendars: If True, search across all calendars instead of just one
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of events matching the filters
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
# Convert YYYY-MM-DD format dates to datetime objects
|
||||||
|
start_datetime = None
|
||||||
|
end_datetime = None
|
||||||
|
|
||||||
|
if start_date:
|
||||||
|
try:
|
||||||
|
start_datetime = dt.datetime.strptime(start_date, "%Y-%m-%d")
|
||||||
|
except ValueError:
|
||||||
|
# If parsing fails, try to parse as ISO format
|
||||||
|
try:
|
||||||
|
start_datetime = dt.datetime.fromisoformat(start_date)
|
||||||
|
except ValueError:
|
||||||
|
logger.warning(f"Invalid start_date format: {start_date}")
|
||||||
|
|
||||||
|
if end_date:
|
||||||
|
try:
|
||||||
|
# For end date, set to end of day (23:59:59)
|
||||||
|
end_datetime = dt.datetime.strptime(end_date, "%Y-%m-%d").replace(
|
||||||
|
hour=23, minute=59, second=59
|
||||||
|
)
|
||||||
|
except ValueError:
|
||||||
|
# If parsing fails, try to parse as ISO format
|
||||||
|
try:
|
||||||
|
end_datetime = dt.datetime.fromisoformat(end_date)
|
||||||
|
except ValueError:
|
||||||
|
logger.warning(f"Invalid end_date format: {end_date}")
|
||||||
|
|
||||||
|
# Build filters dictionary
|
||||||
|
filters = {}
|
||||||
|
if min_attendees is not None:
|
||||||
|
filters["min_attendees"] = min_attendees
|
||||||
|
if min_duration_minutes is not None:
|
||||||
|
filters["min_duration_minutes"] = min_duration_minutes
|
||||||
|
if categories is not None:
|
||||||
|
filters["categories"] = [cat.strip() for cat in categories.split(",")]
|
||||||
|
if status is not None:
|
||||||
|
filters["status"] = status
|
||||||
|
if title_contains is not None:
|
||||||
|
filters["title_contains"] = title_contains
|
||||||
|
if location_contains is not None:
|
||||||
|
filters["location_contains"] = location_contains
|
||||||
|
|
||||||
|
if search_all_calendars:
|
||||||
|
# Search across all calendars with filters
|
||||||
|
events = await client.calendar.search_events_across_calendars(
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
filters=filters if filters else None,
|
||||||
|
)
|
||||||
|
return events[:limit]
|
||||||
|
else:
|
||||||
|
# Search in specific calendar
|
||||||
|
events = await client.calendar.get_calendar_events(
|
||||||
|
calendar_name=calendar_name,
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
limit=limit,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Apply filters if provided
|
||||||
|
if filters:
|
||||||
|
events = client.calendar._apply_event_filters(events, filters)
|
||||||
|
|
||||||
|
return events
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_get_event(
|
||||||
|
calendar_name: str,
|
||||||
|
event_uid: str,
|
||||||
|
ctx: Context,
|
||||||
|
):
|
||||||
|
"""Get detailed information about a specific event"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
event_data, etag = await client.calendar.get_event(calendar_name, event_uid)
|
||||||
|
return event_data
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_update_event(
|
||||||
|
calendar_name: str,
|
||||||
|
event_uid: str,
|
||||||
|
ctx: Context,
|
||||||
|
# All the same parameters as create_event but optional
|
||||||
|
title: str | None = None,
|
||||||
|
start_datetime: str | None = None,
|
||||||
|
end_datetime: str | None = None,
|
||||||
|
all_day: bool | None = None,
|
||||||
|
description: str | None = None,
|
||||||
|
location: str | None = None,
|
||||||
|
categories: str | None = None,
|
||||||
|
# Recurrence updates
|
||||||
|
recurring: bool | None = None,
|
||||||
|
recurrence_rule: str | None = None,
|
||||||
|
# Notification updates
|
||||||
|
reminder_minutes: int | None = None,
|
||||||
|
reminder_email: bool | None = None,
|
||||||
|
# Event property updates
|
||||||
|
status: str | None = None,
|
||||||
|
priority: int | None = None,
|
||||||
|
privacy: str | None = None,
|
||||||
|
attendees: str | None = None,
|
||||||
|
url: str | None = None,
|
||||||
|
color: str | None = None,
|
||||||
|
etag: str = "",
|
||||||
|
):
|
||||||
|
"""Update any aspect of an existing event"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
# Build update data with only non-None values
|
||||||
|
event_data = {}
|
||||||
|
if title is not None:
|
||||||
|
event_data["title"] = title
|
||||||
|
if start_datetime is not None:
|
||||||
|
event_data["start_datetime"] = start_datetime
|
||||||
|
if end_datetime is not None:
|
||||||
|
event_data["end_datetime"] = end_datetime
|
||||||
|
if all_day is not None:
|
||||||
|
event_data["all_day"] = all_day
|
||||||
|
if description is not None:
|
||||||
|
event_data["description"] = description
|
||||||
|
if location is not None:
|
||||||
|
event_data["location"] = location
|
||||||
|
if categories is not None:
|
||||||
|
event_data["categories"] = categories
|
||||||
|
if recurring is not None:
|
||||||
|
event_data["recurring"] = recurring
|
||||||
|
if recurrence_rule is not None:
|
||||||
|
event_data["recurrence_rule"] = recurrence_rule
|
||||||
|
if reminder_minutes is not None:
|
||||||
|
event_data["reminder_minutes"] = reminder_minutes
|
||||||
|
if reminder_email is not None:
|
||||||
|
event_data["reminder_email"] = reminder_email
|
||||||
|
if status is not None:
|
||||||
|
event_data["status"] = status
|
||||||
|
if priority is not None:
|
||||||
|
event_data["priority"] = priority
|
||||||
|
if privacy is not None:
|
||||||
|
event_data["privacy"] = privacy
|
||||||
|
if attendees is not None:
|
||||||
|
event_data["attendees"] = attendees
|
||||||
|
if url is not None:
|
||||||
|
event_data["url"] = url
|
||||||
|
if color is not None:
|
||||||
|
event_data["color"] = color
|
||||||
|
|
||||||
|
return await client.calendar.update_event(
|
||||||
|
calendar_name, event_uid, event_data, etag
|
||||||
|
)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_delete_event(
|
||||||
|
calendar_name: str,
|
||||||
|
event_uid: str,
|
||||||
|
ctx: Context,
|
||||||
|
):
|
||||||
|
"""Delete a calendar event"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.calendar.delete_event(calendar_name, event_uid)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_create_meeting(
|
||||||
|
title: str,
|
||||||
|
date: str,
|
||||||
|
time: str,
|
||||||
|
ctx: Context,
|
||||||
|
duration_minutes: int = 60,
|
||||||
|
calendar_name: str = "personal",
|
||||||
|
attendees: str = "",
|
||||||
|
location: str = "",
|
||||||
|
description: str = "",
|
||||||
|
reminder_minutes: int = 15,
|
||||||
|
):
|
||||||
|
"""Quick meeting creation with smart defaults
|
||||||
|
|
||||||
|
This is a convenience function for creating events with common meeting defaults.
|
||||||
|
It automatically:
|
||||||
|
- Calculates end time based on duration
|
||||||
|
- Sets status to CONFIRMED
|
||||||
|
- Adds a reminder
|
||||||
|
- Uses simpler date/time inputs instead of full ISO format
|
||||||
|
|
||||||
|
For full control over all event properties, use nc_calendar_create_event instead.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
title: Meeting title
|
||||||
|
date: Meeting date (YYYY-MM-DD format, e.g., "2025-01-15")
|
||||||
|
time: Meeting start time (HH:MM format, e.g., "14:00")
|
||||||
|
ctx: MCP context
|
||||||
|
duration_minutes: Meeting duration in minutes (default: 60)
|
||||||
|
calendar_name: Calendar to create the meeting in (default: "personal")
|
||||||
|
attendees: Comma-separated email addresses of attendees
|
||||||
|
location: Meeting location
|
||||||
|
description: Meeting description/agenda
|
||||||
|
reminder_minutes: Minutes before meeting to send reminder (default: 15)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with meeting creation result
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
# Combine date and time for start_datetime
|
||||||
|
start_datetime = f"{date}T{time}:00"
|
||||||
|
|
||||||
|
# Calculate end_datetime
|
||||||
|
start_dt = dt.datetime.fromisoformat(start_datetime)
|
||||||
|
end_dt = start_dt + dt.timedelta(minutes=duration_minutes)
|
||||||
|
end_datetime = end_dt.isoformat()
|
||||||
|
|
||||||
|
event_data = {
|
||||||
|
"title": title,
|
||||||
|
"start_datetime": start_datetime,
|
||||||
|
"end_datetime": end_datetime,
|
||||||
|
"all_day": False,
|
||||||
|
"description": description,
|
||||||
|
"location": location,
|
||||||
|
"attendees": attendees,
|
||||||
|
"reminder_minutes": reminder_minutes,
|
||||||
|
"status": "CONFIRMED",
|
||||||
|
"priority": 5,
|
||||||
|
"privacy": "PUBLIC",
|
||||||
|
}
|
||||||
|
|
||||||
|
return await client.calendar.create_event(calendar_name, event_data)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_get_upcoming_events(
|
||||||
|
ctx: Context,
|
||||||
|
calendar_name: str = "", # Empty = all calendars
|
||||||
|
days_ahead: int = 7,
|
||||||
|
limit: int = 10,
|
||||||
|
):
|
||||||
|
"""Get upcoming events in next N days"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
now = dt.datetime.now()
|
||||||
|
end_datetime = now + dt.timedelta(days=days_ahead)
|
||||||
|
|
||||||
|
if calendar_name:
|
||||||
|
# Get events from specific calendar
|
||||||
|
return await client.calendar.get_calendar_events(
|
||||||
|
calendar_name=calendar_name,
|
||||||
|
start_datetime=now,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
limit=limit,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# Get events from all calendars
|
||||||
|
all_calendars = await client.calendar.list_calendars()
|
||||||
|
all_events = []
|
||||||
|
|
||||||
|
for calendar in all_calendars:
|
||||||
|
try:
|
||||||
|
events = await client.calendar.get_calendar_events(
|
||||||
|
calendar_name=calendar["name"],
|
||||||
|
start_datetime=now,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
limit=limit,
|
||||||
|
)
|
||||||
|
# Add calendar info to each event
|
||||||
|
for event in events:
|
||||||
|
event["calendar_name"] = calendar["name"]
|
||||||
|
event["calendar_display_name"] = calendar["display_name"]
|
||||||
|
all_events.extend(events)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(
|
||||||
|
f"Error getting events from calendar {calendar['name']}: {e}"
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Sort by start time and limit
|
||||||
|
all_events.sort(key=lambda x: x.get("start_datetime", ""))
|
||||||
|
return all_events[:limit]
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_find_availability(
|
||||||
|
duration_minutes: int,
|
||||||
|
ctx: Context,
|
||||||
|
attendees: str = "", # Comma-separated email list
|
||||||
|
date_range_start: str = "", # "2025-07-28"
|
||||||
|
date_range_end: str = "", # "2025-08-04"
|
||||||
|
business_hours_only: bool = True,
|
||||||
|
exclude_weekends: bool = True,
|
||||||
|
preferred_times: str = "", # Comma-separated time ranges like "09:00-12:00,14:00-17:00"
|
||||||
|
):
|
||||||
|
"""Find available time slots for scheduling meetings.
|
||||||
|
|
||||||
|
This tool intelligently analyzes existing calendar events to find free time slots
|
||||||
|
that work for all specified attendees within the given constraints.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
duration_minutes: Required duration for the meeting in minutes
|
||||||
|
attendees: Comma-separated list of attendee email addresses to check availability for
|
||||||
|
date_range_start: Start date for availability search (YYYY-MM-DD)
|
||||||
|
date_range_end: End date for availability search (YYYY-MM-DD)
|
||||||
|
business_hours_only: Only suggest slots during business hours (9 AM - 5 PM)
|
||||||
|
exclude_weekends: Skip weekends when finding availability
|
||||||
|
preferred_times: Preferred time ranges as "HH:MM-HH:MM" (comma-separated)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of available time slots with start/end times and duration
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
# Parse attendees
|
||||||
|
attendee_list = []
|
||||||
|
if attendees:
|
||||||
|
attendee_list = [
|
||||||
|
email.strip() for email in attendees.split(",") if email.strip()
|
||||||
|
]
|
||||||
|
|
||||||
|
# Parse preferred times
|
||||||
|
preferred_time_list = []
|
||||||
|
if preferred_times:
|
||||||
|
preferred_time_list = [
|
||||||
|
time_range.strip()
|
||||||
|
for time_range in preferred_times.split(",")
|
||||||
|
if time_range.strip()
|
||||||
|
]
|
||||||
|
|
||||||
|
# Convert date strings to datetime objects
|
||||||
|
start_datetime = None
|
||||||
|
end_datetime = None
|
||||||
|
|
||||||
|
if date_range_start:
|
||||||
|
try:
|
||||||
|
start_datetime = dt.datetime.strptime(date_range_start, "%Y-%m-%d")
|
||||||
|
except ValueError:
|
||||||
|
logger.warning(f"Invalid date_range_start format: {date_range_start}")
|
||||||
|
|
||||||
|
if date_range_end:
|
||||||
|
try:
|
||||||
|
end_datetime = dt.datetime.strptime(date_range_end, "%Y-%m-%d").replace(
|
||||||
|
hour=23, minute=59, second=59
|
||||||
|
)
|
||||||
|
except ValueError:
|
||||||
|
logger.warning(f"Invalid date_range_end format: {date_range_end}")
|
||||||
|
|
||||||
|
# Build constraints
|
||||||
|
constraints = {
|
||||||
|
"business_hours_only": business_hours_only,
|
||||||
|
"exclude_weekends": exclude_weekends,
|
||||||
|
"preferred_times": preferred_time_list,
|
||||||
|
}
|
||||||
|
|
||||||
|
return await client.calendar.find_availability(
|
||||||
|
duration_minutes=duration_minutes,
|
||||||
|
attendees=attendee_list,
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
constraints=constraints,
|
||||||
|
)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_bulk_operations(
|
||||||
|
operation: str, # "update", "delete", "move"
|
||||||
|
ctx: Context,
|
||||||
|
title_contains: Optional[str] = None,
|
||||||
|
categories: Optional[str] = None, # Comma-separated
|
||||||
|
calendar_name: Optional[str] = None,
|
||||||
|
start_date: str = "", # "2025-07-01"
|
||||||
|
end_date: str = "", # "2025-07-31"
|
||||||
|
status: Optional[str] = None,
|
||||||
|
location_contains: Optional[str] = None,
|
||||||
|
# Update operation parameters
|
||||||
|
new_title: Optional[str] = None,
|
||||||
|
new_description: Optional[str] = None,
|
||||||
|
new_location: Optional[str] = None,
|
||||||
|
new_categories: Optional[str] = None,
|
||||||
|
new_priority: Optional[int] = None,
|
||||||
|
new_reminder_minutes: Optional[int] = None,
|
||||||
|
# Move operation parameters
|
||||||
|
target_calendar: Optional[str] = None,
|
||||||
|
):
|
||||||
|
"""Perform bulk operations (update/delete) on events matching filter criteria.
|
||||||
|
|
||||||
|
This tool allows you to efficiently modify or delete multiple events at once
|
||||||
|
by applying filters to find matching events and then performing the specified operation.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
operation: Type of operation - "update" or "delete"
|
||||||
|
title_contains: Filter events where title contains this text
|
||||||
|
categories: Filter events containing any of these categories (comma-separated)
|
||||||
|
calendar_name: Filter events from this specific calendar
|
||||||
|
start_date: Filter events starting from this date (YYYY-MM-DD)
|
||||||
|
end_date: Filter events ending before this date (YYYY-MM-DD)
|
||||||
|
status: Filter events by status (CONFIRMED, TENTATIVE, CANCELLED)
|
||||||
|
location_contains: Filter events where location contains this text
|
||||||
|
|
||||||
|
# For update operations:
|
||||||
|
new_title: New title for matching events
|
||||||
|
new_description: New description for matching events
|
||||||
|
new_location: New location for matching events
|
||||||
|
new_categories: New categories for matching events (comma-separated)
|
||||||
|
new_priority: New priority for matching events (1-9, 5=normal)
|
||||||
|
new_reminder_minutes: New reminder time in minutes before event
|
||||||
|
|
||||||
|
# For move operations:
|
||||||
|
target_calendar: Calendar to move events to (requires operation="move")
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Summary of operation results including counts and details
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
if operation not in ["update", "delete", "move"]:
|
||||||
|
raise ValueError("Operation must be 'update', 'delete', or 'move'")
|
||||||
|
|
||||||
|
# Convert date strings to datetime objects
|
||||||
|
start_datetime = None
|
||||||
|
end_datetime = None
|
||||||
|
|
||||||
|
if start_date:
|
||||||
|
try:
|
||||||
|
start_datetime = dt.datetime.strptime(start_date, "%Y-%m-%d")
|
||||||
|
except ValueError:
|
||||||
|
logger.warning(f"Invalid start_date format: {start_date}")
|
||||||
|
|
||||||
|
if end_date:
|
||||||
|
try:
|
||||||
|
end_datetime = dt.datetime.strptime(end_date, "%Y-%m-%d").replace(
|
||||||
|
hour=23, minute=59, second=59
|
||||||
|
)
|
||||||
|
except ValueError:
|
||||||
|
logger.warning(f"Invalid end_date format: {end_date}")
|
||||||
|
|
||||||
|
# Build filter criteria
|
||||||
|
filter_criteria = {}
|
||||||
|
if title_contains is not None:
|
||||||
|
filter_criteria["title_contains"] = title_contains
|
||||||
|
if categories is not None:
|
||||||
|
filter_criteria["categories"] = [
|
||||||
|
cat.strip() for cat in categories.split(",")
|
||||||
|
]
|
||||||
|
if status is not None:
|
||||||
|
filter_criteria["status"] = status
|
||||||
|
if location_contains is not None:
|
||||||
|
filter_criteria["location_contains"] = location_contains
|
||||||
|
# Add datetime strings for client compatibility
|
||||||
|
if start_date:
|
||||||
|
filter_criteria["start_date"] = start_date
|
||||||
|
if end_date:
|
||||||
|
filter_criteria["end_date"] = end_date
|
||||||
|
|
||||||
|
if operation == "delete":
|
||||||
|
# Find matching events and delete them
|
||||||
|
if calendar_name:
|
||||||
|
events = await client.calendar.get_calendar_events(
|
||||||
|
calendar_name=calendar_name,
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
)
|
||||||
|
if filter_criteria:
|
||||||
|
events = client.calendar._apply_event_filters(
|
||||||
|
events, filter_criteria
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
events = await client.calendar.search_events_across_calendars(
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
filters=filter_criteria,
|
||||||
|
)
|
||||||
|
|
||||||
|
deleted_count = 0
|
||||||
|
failed_count = 0
|
||||||
|
results = []
|
||||||
|
|
||||||
|
for event in events:
|
||||||
|
try:
|
||||||
|
await client.calendar.delete_event(
|
||||||
|
event.get("calendar_name", calendar_name), event["uid"]
|
||||||
|
)
|
||||||
|
deleted_count += 1
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"uid": event["uid"],
|
||||||
|
"status": "deleted",
|
||||||
|
"title": event.get("title", ""),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
failed_count += 1
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"uid": event["uid"],
|
||||||
|
"status": "failed",
|
||||||
|
"error": str(e),
|
||||||
|
"title": event.get("title", ""),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"operation": "delete",
|
||||||
|
"total_found": len(events),
|
||||||
|
"deleted_count": deleted_count,
|
||||||
|
"failed_count": failed_count,
|
||||||
|
"results": results,
|
||||||
|
}
|
||||||
|
|
||||||
|
elif operation == "update":
|
||||||
|
# Build update data
|
||||||
|
update_data = {}
|
||||||
|
if new_title is not None:
|
||||||
|
update_data["title"] = new_title
|
||||||
|
if new_description is not None:
|
||||||
|
update_data["description"] = new_description
|
||||||
|
if new_location is not None:
|
||||||
|
update_data["location"] = new_location
|
||||||
|
if new_categories is not None:
|
||||||
|
update_data["categories"] = new_categories
|
||||||
|
if new_priority is not None:
|
||||||
|
update_data["priority"] = new_priority
|
||||||
|
if new_reminder_minutes is not None:
|
||||||
|
update_data["reminder_minutes"] = new_reminder_minutes
|
||||||
|
|
||||||
|
if not update_data:
|
||||||
|
raise ValueError("No update data provided for update operation")
|
||||||
|
|
||||||
|
return await client.calendar.bulk_update_events(
|
||||||
|
filter_criteria, update_data
|
||||||
|
)
|
||||||
|
|
||||||
|
elif operation == "move":
|
||||||
|
if not target_calendar:
|
||||||
|
raise ValueError("target_calendar is required for move operation")
|
||||||
|
|
||||||
|
# Find matching events
|
||||||
|
if calendar_name:
|
||||||
|
events = await client.calendar.get_calendar_events(
|
||||||
|
calendar_name=calendar_name,
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
)
|
||||||
|
if filter_criteria:
|
||||||
|
events = client.calendar._apply_event_filters(
|
||||||
|
events, filter_criteria
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
events = await client.calendar.search_events_across_calendars(
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
filters=filter_criteria,
|
||||||
|
)
|
||||||
|
|
||||||
|
moved_count = 0
|
||||||
|
failed_count = 0
|
||||||
|
results = []
|
||||||
|
|
||||||
|
for event in events:
|
||||||
|
try:
|
||||||
|
# Create event in target calendar
|
||||||
|
event_data = {
|
||||||
|
k: v
|
||||||
|
for k, v in event.items()
|
||||||
|
if k
|
||||||
|
not in [
|
||||||
|
"uid",
|
||||||
|
"href",
|
||||||
|
"etag",
|
||||||
|
"calendar_name",
|
||||||
|
"calendar_display_name",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
await client.calendar.create_event(target_calendar, event_data)
|
||||||
|
|
||||||
|
# Delete from source calendar
|
||||||
|
await client.calendar.delete_event(
|
||||||
|
event.get("calendar_name", calendar_name), event["uid"]
|
||||||
|
)
|
||||||
|
|
||||||
|
moved_count += 1
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"uid": event["uid"],
|
||||||
|
"status": "moved",
|
||||||
|
"title": event.get("title", ""),
|
||||||
|
"from_calendar": event.get("calendar_name", calendar_name),
|
||||||
|
"to_calendar": target_calendar,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
failed_count += 1
|
||||||
|
results.append(
|
||||||
|
{
|
||||||
|
"uid": event["uid"],
|
||||||
|
"status": "failed",
|
||||||
|
"error": str(e),
|
||||||
|
"title": event.get("title", ""),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"operation": "move",
|
||||||
|
"total_found": len(events),
|
||||||
|
"moved_count": moved_count,
|
||||||
|
"failed_count": failed_count,
|
||||||
|
"target_calendar": target_calendar,
|
||||||
|
"results": results,
|
||||||
|
}
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_calendar_manage_calendar(
|
||||||
|
action: str, # "create", "delete", "update", "list"
|
||||||
|
ctx: Context,
|
||||||
|
calendar_name: str = "",
|
||||||
|
display_name: str = "",
|
||||||
|
description: str = "",
|
||||||
|
color: str = "#1976D2", # Default blue color
|
||||||
|
):
|
||||||
|
"""Manage calendar creation, deletion, and properties.
|
||||||
|
|
||||||
|
This tool provides comprehensive calendar management functionality including
|
||||||
|
creating new calendars, deleting existing ones, and updating calendar properties.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
action: Action to perform - "create", "delete", "update", or "list"
|
||||||
|
calendar_name: Internal name for the calendar (required for create/delete/update)
|
||||||
|
display_name: Human-readable name for the calendar (used for create/update)
|
||||||
|
description: Description for the calendar (used for create/update)
|
||||||
|
color: Hex color code for the calendar (e.g., "#1976D2" for blue)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Result of the calendar management operation
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
if action == "list":
|
||||||
|
return await client.calendar.list_calendars()
|
||||||
|
|
||||||
|
elif action == "create":
|
||||||
|
if not calendar_name:
|
||||||
|
raise ValueError("calendar_name is required for create action")
|
||||||
|
|
||||||
|
return await client.calendar.create_calendar(
|
||||||
|
calendar_name=calendar_name,
|
||||||
|
display_name=display_name or calendar_name,
|
||||||
|
description=description,
|
||||||
|
color=color,
|
||||||
|
)
|
||||||
|
|
||||||
|
elif action == "delete":
|
||||||
|
if not calendar_name:
|
||||||
|
raise ValueError("calendar_name is required for delete action")
|
||||||
|
|
||||||
|
return await client.calendar.delete_calendar(calendar_name)
|
||||||
|
|
||||||
|
elif action == "update":
|
||||||
|
if not calendar_name:
|
||||||
|
raise ValueError("calendar_name is required for update action")
|
||||||
|
|
||||||
|
# Note: Calendar property updates require additional CalDAV PROPPATCH implementation
|
||||||
|
# For now, return an informative message
|
||||||
|
return {
|
||||||
|
"status": "not_implemented",
|
||||||
|
"message": "Calendar property updates require PROPPATCH implementation",
|
||||||
|
"calendar_name": calendar_name,
|
||||||
|
"requested_changes": {
|
||||||
|
"display_name": display_name,
|
||||||
|
"description": description,
|
||||||
|
"color": color,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise ValueError("Action must be 'create', 'delete', 'update', or 'list'")
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
import logging
|
||||||
|
|
||||||
|
from mcp.server.fastmcp import Context, FastMCP
|
||||||
|
|
||||||
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_notes_tools(mcp: FastMCP):
|
||||||
|
@mcp.resource("notes://settings")
|
||||||
|
async def notes_get_settings():
|
||||||
|
"""Get the Notes App settings"""
|
||||||
|
ctx: Context = (
|
||||||
|
mcp.get_context()
|
||||||
|
) # https://github.com/modelcontextprotocol/python-sdk/issues/244
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.notes.get_settings()
|
||||||
|
|
||||||
|
@mcp.resource("nc://Notes/{note_id}/attachments/{attachment_filename}")
|
||||||
|
async def nc_notes_get_attachment(note_id: int, attachment_filename: str):
|
||||||
|
"""Get a specific attachment from a note"""
|
||||||
|
ctx: Context = mcp.get_context()
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
# Assuming a method get_note_attachment exists in the client
|
||||||
|
# This method should return the raw content and determine the mime type
|
||||||
|
content, mime_type = await client.webdav.get_note_attachment(
|
||||||
|
note_id=note_id, filename=attachment_filename
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
"contents": [
|
||||||
|
{
|
||||||
|
# Use uppercase 'Notes' to match the decorator
|
||||||
|
"uri": f"nc://Notes/{note_id}/attachments/{attachment_filename}",
|
||||||
|
"mimeType": mime_type, # Client needs to determine this
|
||||||
|
"data": content, # Return raw bytes/data
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_get_note(note_id: int, ctx: Context):
|
||||||
|
"""Get user note using note id"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.notes.get_note(note_id)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_notes_create_note(
|
||||||
|
title: str, content: str, category: str, ctx: Context
|
||||||
|
):
|
||||||
|
"""Create a new note"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.notes.create_note(
|
||||||
|
title=title,
|
||||||
|
content=content,
|
||||||
|
category=category,
|
||||||
|
)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_notes_update_note(
|
||||||
|
note_id: int,
|
||||||
|
etag: str,
|
||||||
|
title: str | None,
|
||||||
|
content: str | None,
|
||||||
|
category: str | None,
|
||||||
|
ctx: Context,
|
||||||
|
):
|
||||||
|
logger.info("Updating note %s", note_id)
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.notes.update(
|
||||||
|
note_id=note_id,
|
||||||
|
etag=etag,
|
||||||
|
title=title,
|
||||||
|
content=content,
|
||||||
|
category=category,
|
||||||
|
)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_notes_append_content(note_id: int, content: str, ctx: Context):
|
||||||
|
"""Append content to an existing note with a clear separator"""
|
||||||
|
logger.info("Appending content to note %s", note_id)
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.notes.append_content(note_id=note_id, content=content)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_notes_search_notes(query: str, ctx: Context):
|
||||||
|
"""Search notes by title or content, returning only id, title, and category."""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.notes_search_notes(query=query)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_notes_delete_note(note_id: int, ctx: Context):
|
||||||
|
logger.info("Deleting note %s", note_id)
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.notes.delete_note(note_id)
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
import logging
|
||||||
|
|
||||||
|
from mcp.server.fastmcp import Context, FastMCP
|
||||||
|
|
||||||
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_tables_tools(mcp: FastMCP):
|
||||||
|
# Tables tools
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_tables_list_tables(ctx: Context):
|
||||||
|
"""List all tables available to the user"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.tables.list_tables()
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_tables_get_schema(table_id: int, ctx: Context):
|
||||||
|
"""Get the schema/structure of a specific table including columns and views"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.tables.get_table_schema(table_id)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_tables_read_table(
|
||||||
|
table_id: int,
|
||||||
|
ctx: Context,
|
||||||
|
limit: int | None = None,
|
||||||
|
offset: int | None = None,
|
||||||
|
):
|
||||||
|
"""Read rows from a table with optional pagination"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.tables.get_table_rows(table_id, limit, offset)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_tables_insert_row(table_id: int, data: dict, ctx: Context):
|
||||||
|
"""Insert a new row into a table.
|
||||||
|
|
||||||
|
Data should be a dictionary mapping column IDs to values, e.g. {1: "text", 2: 42}
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.tables.create_row(table_id, data)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_tables_update_row(row_id: int, data: dict, ctx: Context):
|
||||||
|
"""Update an existing row in a table.
|
||||||
|
|
||||||
|
Data should be a dictionary mapping column IDs to new values, e.g. {1: "new text", 2: 99}
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.tables.update_row(row_id, data)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_tables_delete_row(row_id: int, ctx: Context):
|
||||||
|
"""Delete a row from a table"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.tables.delete_row(row_id)
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
import logging
|
||||||
|
|
||||||
|
from mcp.server.fastmcp import Context, FastMCP
|
||||||
|
|
||||||
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def configure_webdav_tools(mcp: FastMCP):
|
||||||
|
# WebDAV file system tools
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_webdav_list_directory(ctx: Context, path: str = ""):
|
||||||
|
"""List files and directories in the specified NextCloud path.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
path: Directory path to list (empty string for root directory)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of items with metadata including name, path, is_directory, size, content_type, last_modified
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
# List root directory
|
||||||
|
await nc_webdav_list_directory("")
|
||||||
|
|
||||||
|
# List a specific folder
|
||||||
|
await nc_webdav_list_directory("Documents/Projects")
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.webdav.list_directory(path)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_webdav_read_file(path: str, ctx: Context):
|
||||||
|
"""Read the content of a file from NextCloud.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
path: Full path to the file to read
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with path, content, content_type, size, and encoding (if binary)
|
||||||
|
Text files are decoded to UTF-8, binary files are base64 encoded
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
# Read a text file
|
||||||
|
result = await nc_webdav_read_file("Documents/readme.txt")
|
||||||
|
print(result['content']) # Decoded text content
|
||||||
|
|
||||||
|
# Read a binary file
|
||||||
|
result = await nc_webdav_read_file("Images/photo.jpg")
|
||||||
|
print(result['encoding']) # 'base64'
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
content, content_type = await client.webdav.read_file(path)
|
||||||
|
|
||||||
|
# For text files, decode content for easier viewing
|
||||||
|
if content_type and content_type.startswith("text/"):
|
||||||
|
try:
|
||||||
|
decoded_content = content.decode("utf-8")
|
||||||
|
return {
|
||||||
|
"path": path,
|
||||||
|
"content": decoded_content,
|
||||||
|
"content_type": content_type,
|
||||||
|
"size": len(content),
|
||||||
|
}
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# For binary files, return metadata and base64 encoded content
|
||||||
|
import base64
|
||||||
|
|
||||||
|
return {
|
||||||
|
"path": path,
|
||||||
|
"content": base64.b64encode(content).decode("ascii"),
|
||||||
|
"content_type": content_type,
|
||||||
|
"size": len(content),
|
||||||
|
"encoding": "base64",
|
||||||
|
}
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_webdav_write_file(
|
||||||
|
path: str, content: str, ctx: Context, content_type: str | None = None
|
||||||
|
):
|
||||||
|
"""Write content to a file in NextCloud.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
path: Full path where to write the file
|
||||||
|
content: File content (text or base64 for binary)
|
||||||
|
content_type: MIME type (auto-detected if not provided, use 'type;base64' for binary)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with status_code indicating success
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
# Write a text file
|
||||||
|
await nc_webdav_write_file("Documents/notes.md", "# My Notes\nContent here...")
|
||||||
|
|
||||||
|
# Write binary data (base64 encoded)
|
||||||
|
await nc_webdav_write_file("files/data.bin", base64_content, "application/octet-stream;base64")
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
|
||||||
|
# Handle base64 encoded content
|
||||||
|
if content_type and "base64" in content_type.lower():
|
||||||
|
import base64
|
||||||
|
|
||||||
|
content_bytes = base64.b64decode(content)
|
||||||
|
content_type = content_type.replace(";base64", "")
|
||||||
|
else:
|
||||||
|
content_bytes = content.encode("utf-8")
|
||||||
|
|
||||||
|
return await client.webdav.write_file(path, content_bytes, content_type)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_webdav_create_directory(path: str, ctx: Context):
|
||||||
|
"""Create a directory in NextCloud.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
path: Full path of the directory to create
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with status_code (201 for created, 405 if already exists)
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
# Create a single directory
|
||||||
|
await nc_webdav_create_directory("NewProject")
|
||||||
|
|
||||||
|
# Create nested directories (parent must exist)
|
||||||
|
await nc_webdav_create_directory("Projects/MyApp/docs")
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.webdav.create_directory(path)
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
async def nc_webdav_delete_resource(path: str, ctx: Context):
|
||||||
|
"""Delete a file or directory in NextCloud.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
path: Full path of the file or directory to delete
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict with status_code indicating result (404 if not found)
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
# Delete a file
|
||||||
|
await nc_webdav_delete_resource("old_document.txt")
|
||||||
|
|
||||||
|
# Delete a directory (will delete all contents)
|
||||||
|
await nc_webdav_delete_resource("temp_folder")
|
||||||
|
"""
|
||||||
|
client: NextcloudClient = ctx.request_context.lifespan_context.client
|
||||||
|
return await client.webdav.delete_resource(path)
|
||||||
+5
-7
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "nextcloud-mcp-server"
|
name = "nextcloud-mcp-server"
|
||||||
version = "0.4.1"
|
version = "0.6.0"
|
||||||
description = ""
|
description = ""
|
||||||
authors = [
|
authors = [
|
||||||
{name = "Chris Coutinho",email = "chris@coutinho.io"}
|
{name = "Chris Coutinho",email = "chris@coutinho.io"}
|
||||||
@@ -10,19 +10,17 @@ requires-python = ">=3.11"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"mcp[cli] (>=1.10,<1.11)",
|
"mcp[cli] (>=1.10,<1.11)",
|
||||||
"httpx (>=0.28.1,<0.29.0)",
|
"httpx (>=0.28.1,<0.29.0)",
|
||||||
"pillow (>=11.2.1,<12.0.0)"
|
"pillow (>=11.2.1,<12.0.0)",
|
||||||
|
"icalendar (>=6.0.0,<7.0.0)"
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.scripts]
|
|
||||||
nc-mcp-server = "nextcloud_mcp_server.server:run"
|
|
||||||
|
|
||||||
[tool.pytest.ini_options]
|
[tool.pytest.ini_options]
|
||||||
asyncio_mode = "auto"
|
asyncio_mode = "auto"
|
||||||
asyncio_default_test_loop_scope = "session"
|
asyncio_default_test_loop_scope = "session"
|
||||||
asyncio_default_fixture_loop_scope = "session"
|
asyncio_default_fixture_loop_scope = "session"
|
||||||
log_cli = 1
|
log_cli = 1
|
||||||
log_cli_level = "WARN"
|
log_cli_level = "INFO"
|
||||||
log_level = "WARN"
|
log_level = "INFO"
|
||||||
markers = [
|
markers = [
|
||||||
"integration: marks tests as slow (deselect with '-m \"not slow\"')"
|
"integration: marks tests as slow (deselect with '-m \"not slow\"')"
|
||||||
]
|
]
|
||||||
|
|||||||
+54
-10
@@ -1,18 +1,20 @@
|
|||||||
import pytest
|
|
||||||
import os
|
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
import uuid
|
import uuid
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
from typing import Any, AsyncGenerator
|
||||||
|
|
||||||
|
import pytest
|
||||||
from httpx import HTTPStatusError
|
from httpx import HTTPStatusError
|
||||||
import asyncio
|
from mcp import ClientSession
|
||||||
|
from mcp.client.sse import sse_client
|
||||||
|
|
||||||
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
# pytestmark = pytest.mark.asyncio(loop_scope="package")
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
async def nc_client() -> NextcloudClient:
|
async def nc_client() -> AsyncGenerator[NextcloudClient, Any]:
|
||||||
"""
|
"""
|
||||||
Fixture to create a NextcloudClient instance for integration tests.
|
Fixture to create a NextcloudClient instance for integration tests.
|
||||||
Uses environment variables for configuration.
|
Uses environment variables for configuration.
|
||||||
@@ -29,10 +31,54 @@ async def nc_client() -> NextcloudClient:
|
|||||||
logger.info(
|
logger.info(
|
||||||
"NextcloudClient session fixture initialized and capabilities checked."
|
"NextcloudClient session fixture initialized and capabilities checked."
|
||||||
)
|
)
|
||||||
|
yield client
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to initialize NextcloudClient session fixture: {e}")
|
logger.error(f"Failed to initialize NextcloudClient session fixture: {e}")
|
||||||
pytest.fail(f"Failed to connect to Nextcloud or get capabilities: {e}")
|
pytest.fail(f"Failed to connect to Nextcloud or get capabilities: {e}")
|
||||||
return client
|
finally:
|
||||||
|
await client.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
async def nc_mcp_client() -> AsyncGenerator[ClientSession, Any]:
|
||||||
|
"""
|
||||||
|
Fixture to create an MCP client session for integration tests.
|
||||||
|
"""
|
||||||
|
logger.info("Creating SSE client")
|
||||||
|
sse_context = sse_client(url="http://127.0.0.1:8000/sse")
|
||||||
|
session_context = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
read, write = await sse_context.__aenter__()
|
||||||
|
session_context = ClientSession(read, write)
|
||||||
|
session = await session_context.__aenter__()
|
||||||
|
await session.initialize()
|
||||||
|
logger.info("MCP client session initialized successfully")
|
||||||
|
|
||||||
|
yield session
|
||||||
|
|
||||||
|
finally:
|
||||||
|
# Clean up in reverse order, ignoring task scope issues
|
||||||
|
if session_context is not None:
|
||||||
|
try:
|
||||||
|
await session_context.__aexit__(None, None, None)
|
||||||
|
except RuntimeError as e:
|
||||||
|
if "cancel scope" in str(e):
|
||||||
|
logger.debug(f"Ignoring cancel scope teardown issue: {e}")
|
||||||
|
else:
|
||||||
|
logger.warning(f"Error closing session: {e}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Error closing session: {e}")
|
||||||
|
|
||||||
|
try:
|
||||||
|
await sse_context.__aexit__(None, None, None)
|
||||||
|
except RuntimeError as e:
|
||||||
|
if "cancel scope" in str(e):
|
||||||
|
logger.debug(f"Ignoring cancel scope teardown issue: {e}")
|
||||||
|
else:
|
||||||
|
logger.warning(f"Error closing SSE client: {e}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Error closing SSE client: {e}")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
@@ -41,7 +87,6 @@ async def temporary_note(nc_client: NextcloudClient):
|
|||||||
Fixture to create a temporary note for a test and ensure its deletion afterward.
|
Fixture to create a temporary note for a test and ensure its deletion afterward.
|
||||||
Yields the created note dictionary.
|
Yields the created note dictionary.
|
||||||
"""
|
"""
|
||||||
asyncio.new_event_loop()
|
|
||||||
|
|
||||||
note_id = None
|
note_id = None
|
||||||
unique_suffix = uuid.uuid4().hex[:8]
|
unique_suffix = uuid.uuid4().hex[:8]
|
||||||
@@ -87,7 +132,6 @@ async def temporary_note_with_attachment(
|
|||||||
Yields a tuple: (note_data, attachment_filename, attachment_content).
|
Yields a tuple: (note_data, attachment_filename, attachment_content).
|
||||||
Depends on the temporary_note fixture.
|
Depends on the temporary_note fixture.
|
||||||
"""
|
"""
|
||||||
asyncio.new_event_loop()
|
|
||||||
|
|
||||||
note_data = temporary_note
|
note_data = temporary_note
|
||||||
note_id = note_data["id"]
|
note_id = note_data["id"]
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import pytest
|
|
||||||
import logging
|
import logging
|
||||||
import time
|
import time
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
import pytest
|
||||||
from httpx import HTTPStatusError
|
from httpx import HTTPStatusError
|
||||||
|
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|||||||
@@ -0,0 +1,462 @@
|
|||||||
|
"""Integration tests for Calendar CalDAV operations."""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from httpx import HTTPStatusError
|
||||||
|
|
||||||
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Mark all tests in this module as integration tests
|
||||||
|
pytestmark = pytest.mark.integration
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
async def calendar_test_client():
|
||||||
|
"""Create a new, isolated NextcloudClient for calendar tests."""
|
||||||
|
client = NextcloudClient.from_env()
|
||||||
|
try:
|
||||||
|
yield client
|
||||||
|
finally:
|
||||||
|
await client.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def test_calendar_name():
|
||||||
|
"""Unique calendar name for testing."""
|
||||||
|
return f"test_calendar_{uuid.uuid4().hex[:8]}"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
async def temporary_calendar(
|
||||||
|
calendar_test_client: NextcloudClient, test_calendar_name: str
|
||||||
|
):
|
||||||
|
"""Create a temporary calendar for testing and clean up afterward."""
|
||||||
|
calendar_name = test_calendar_name
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Create a test calendar
|
||||||
|
logger.info(f"Creating temporary calendar: {calendar_name}")
|
||||||
|
result = await calendar_test_client.calendar.create_calendar(
|
||||||
|
calendar_name=calendar_name,
|
||||||
|
display_name=f"Test Calendar {calendar_name}",
|
||||||
|
description="Temporary calendar for integration testing",
|
||||||
|
color="#FF5722",
|
||||||
|
)
|
||||||
|
|
||||||
|
if result["status_code"] not in [200, 201]:
|
||||||
|
pytest.skip(f"Failed to create temporary calendar: {result}")
|
||||||
|
|
||||||
|
logger.info(f"Created temporary calendar: {calendar_name}")
|
||||||
|
yield calendar_name
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error setting up temporary calendar: {e}")
|
||||||
|
pytest.skip(f"Calendar setup failed: {e}")
|
||||||
|
|
||||||
|
finally:
|
||||||
|
# Cleanup: Delete the temporary calendar
|
||||||
|
try:
|
||||||
|
logger.info(f"Cleaning up temporary calendar: {calendar_name}")
|
||||||
|
await calendar_test_client.calendar.delete_calendar(calendar_name)
|
||||||
|
logger.info(f"Successfully deleted temporary calendar: {calendar_name}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error deleting temporary calendar {calendar_name}: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
async def temporary_event(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Create a temporary event for testing and clean up afterward."""
|
||||||
|
event_uid = None
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
|
||||||
|
# Create a test event
|
||||||
|
tomorrow = datetime.now() + timedelta(days=1)
|
||||||
|
event_data = {
|
||||||
|
"title": f"Test Event {uuid.uuid4().hex[:8]}",
|
||||||
|
"start_datetime": tomorrow.strftime("%Y-%m-%dT14:00:00"),
|
||||||
|
"end_datetime": tomorrow.strftime("%Y-%m-%dT15:00:00"),
|
||||||
|
"description": "Test event created by integration tests",
|
||||||
|
"location": "Test Location",
|
||||||
|
"categories": "testing",
|
||||||
|
"status": "CONFIRMED",
|
||||||
|
"priority": 5,
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
logger.info(f"Creating temporary event in calendar: {calendar_name}")
|
||||||
|
result = await calendar_test_client.calendar.create_event(
|
||||||
|
calendar_name, event_data
|
||||||
|
)
|
||||||
|
event_uid = result.get("uid")
|
||||||
|
|
||||||
|
if not event_uid:
|
||||||
|
pytest.fail("Failed to create temporary event")
|
||||||
|
|
||||||
|
logger.info(f"Created temporary event with UID: {event_uid}")
|
||||||
|
yield {"uid": event_uid, "calendar_name": calendar_name, "data": event_data}
|
||||||
|
|
||||||
|
finally:
|
||||||
|
# Cleanup
|
||||||
|
if event_uid:
|
||||||
|
try:
|
||||||
|
logger.info(f"Cleaning up temporary event: {event_uid}")
|
||||||
|
await calendar_test_client.calendar.delete_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
logger.info(f"Successfully deleted temporary event: {event_uid}")
|
||||||
|
except HTTPStatusError as e:
|
||||||
|
if e.response.status_code != 404:
|
||||||
|
logger.error(f"Error deleting temporary event {event_uid}: {e}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(
|
||||||
|
f"Unexpected error deleting temporary event {event_uid}: {e}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def test_list_calendars(calendar_test_client: NextcloudClient):
|
||||||
|
"""Test listing available calendars."""
|
||||||
|
calendars = await calendar_test_client.calendar.list_calendars()
|
||||||
|
|
||||||
|
assert isinstance(calendars, list)
|
||||||
|
|
||||||
|
if not calendars:
|
||||||
|
pytest.skip("No calendars available - Calendar app may not be enabled")
|
||||||
|
|
||||||
|
logger.info(f"Found {len(calendars)} calendars")
|
||||||
|
|
||||||
|
# Check structure of calendars
|
||||||
|
for calendar in calendars:
|
||||||
|
assert "name" in calendar
|
||||||
|
assert "display_name" in calendar
|
||||||
|
assert "href" in calendar
|
||||||
|
# Optional fields
|
||||||
|
assert "description" in calendar
|
||||||
|
assert "color" in calendar
|
||||||
|
|
||||||
|
logger.info(f"Calendar: {calendar['name']} - {calendar['display_name']}")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_create_and_delete_event(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Test creating and deleting a basic event."""
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
|
||||||
|
# Create event
|
||||||
|
tomorrow = datetime.now() + timedelta(days=1)
|
||||||
|
event_data = {
|
||||||
|
"title": "Integration Test Event",
|
||||||
|
"start_datetime": tomorrow.strftime("%Y-%m-%dT10:00:00"),
|
||||||
|
"end_datetime": tomorrow.strftime("%Y-%m-%dT11:00:00"),
|
||||||
|
"description": "Test event for integration testing",
|
||||||
|
"location": "Test Room",
|
||||||
|
"categories": "testing,integration",
|
||||||
|
"status": "CONFIRMED",
|
||||||
|
"priority": 3,
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await calendar_test_client.calendar.create_event(
|
||||||
|
calendar_name, event_data
|
||||||
|
)
|
||||||
|
assert "uid" in result
|
||||||
|
assert result["status_code"] in [200, 201, 204]
|
||||||
|
|
||||||
|
event_uid = result["uid"]
|
||||||
|
logger.info(f"Created event with UID: {event_uid}")
|
||||||
|
|
||||||
|
# Verify event was created by retrieving it
|
||||||
|
retrieved_event, etag = await calendar_test_client.calendar.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert retrieved_event["uid"] == event_uid
|
||||||
|
assert retrieved_event["title"] == "Integration Test Event"
|
||||||
|
assert retrieved_event["location"] == "Test Room"
|
||||||
|
|
||||||
|
# Delete event
|
||||||
|
delete_result = await calendar_test_client.calendar.delete_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert delete_result["status_code"] in [200, 204, 404]
|
||||||
|
|
||||||
|
logger.info(f"Successfully deleted event: {event_uid}")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Test failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
async def test_create_all_day_event(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Test creating an all-day event."""
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
|
||||||
|
tomorrow = datetime.now() + timedelta(days=1)
|
||||||
|
event_data = {
|
||||||
|
"title": "All Day Test Event",
|
||||||
|
"start_datetime": tomorrow.strftime("%Y-%m-%d"),
|
||||||
|
"all_day": True,
|
||||||
|
"description": "Test all-day event",
|
||||||
|
"categories": "testing",
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await calendar_test_client.calendar.create_event(
|
||||||
|
calendar_name, event_data
|
||||||
|
)
|
||||||
|
event_uid = result["uid"]
|
||||||
|
logger.info(f"Created all-day event with UID: {event_uid}")
|
||||||
|
|
||||||
|
# Verify event
|
||||||
|
retrieved_event, _ = await calendar_test_client.calendar.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert retrieved_event["title"] == "All Day Test Event"
|
||||||
|
assert retrieved_event.get("all_day") is True
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
await calendar_test_client.calendar.delete_event(calendar_name, event_uid)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"All-day event test failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
async def test_create_recurring_event(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Test creating a recurring event."""
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
|
||||||
|
tomorrow = datetime.now() + timedelta(days=1)
|
||||||
|
event_data = {
|
||||||
|
"title": "Weekly Recurring Test",
|
||||||
|
"start_datetime": tomorrow.strftime("%Y-%m-%dT14:00:00"),
|
||||||
|
"end_datetime": tomorrow.strftime("%Y-%m-%dT15:00:00"),
|
||||||
|
"description": "Test recurring event",
|
||||||
|
"recurring": True,
|
||||||
|
"recurrence_rule": "FREQ=WEEKLY;BYDAY=MO,WE,FR",
|
||||||
|
"reminder_minutes": 30,
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await calendar_test_client.calendar.create_event(
|
||||||
|
calendar_name, event_data
|
||||||
|
)
|
||||||
|
event_uid = result["uid"]
|
||||||
|
logger.info(f"Created recurring event with UID: {event_uid}")
|
||||||
|
|
||||||
|
# Verify event
|
||||||
|
retrieved_event, _ = await calendar_test_client.calendar.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert retrieved_event["title"] == "Weekly Recurring Test"
|
||||||
|
assert retrieved_event.get("recurring") is True
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
await calendar_test_client.calendar.delete_event(calendar_name, event_uid)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Recurring event test failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
async def test_list_events_in_range(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_event: dict
|
||||||
|
):
|
||||||
|
"""Test listing events within a date range."""
|
||||||
|
calendar_name = temporary_event["calendar_name"]
|
||||||
|
|
||||||
|
# Get events for the next week
|
||||||
|
start_datetime = datetime.now()
|
||||||
|
end_datetime = datetime.now() + timedelta(days=7)
|
||||||
|
|
||||||
|
events = await calendar_test_client.calendar.get_calendar_events(
|
||||||
|
calendar_name=calendar_name,
|
||||||
|
start_datetime=start_datetime,
|
||||||
|
end_datetime=end_datetime,
|
||||||
|
limit=50,
|
||||||
|
)
|
||||||
|
|
||||||
|
assert isinstance(events, list)
|
||||||
|
logger.info(f"Found {len(events)} events in date range")
|
||||||
|
|
||||||
|
# Our temporary event should be in the list
|
||||||
|
event_uids = [event.get("uid") for event in events]
|
||||||
|
assert temporary_event["uid"] in event_uids
|
||||||
|
|
||||||
|
# Check event structure
|
||||||
|
for event in events:
|
||||||
|
assert "uid" in event
|
||||||
|
assert "title" in event
|
||||||
|
assert "start_datetime" in event
|
||||||
|
|
||||||
|
|
||||||
|
async def test_update_event(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_event: dict
|
||||||
|
):
|
||||||
|
"""Test updating an existing event."""
|
||||||
|
calendar_name = temporary_event["calendar_name"]
|
||||||
|
event_uid = temporary_event["uid"]
|
||||||
|
|
||||||
|
# Update event data
|
||||||
|
updated_data = {
|
||||||
|
"title": "Updated Test Event Title",
|
||||||
|
"description": "Updated description for test event",
|
||||||
|
"location": "Updated Location",
|
||||||
|
"priority": 1, # High priority
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await calendar_test_client.calendar.update_event(
|
||||||
|
calendar_name, event_uid, updated_data
|
||||||
|
)
|
||||||
|
assert result["uid"] == event_uid
|
||||||
|
|
||||||
|
# Verify updates
|
||||||
|
updated_event, _ = await calendar_test_client.calendar.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert updated_event["title"] == "Updated Test Event Title"
|
||||||
|
assert updated_event["description"] == "Updated description for test event"
|
||||||
|
assert updated_event["location"] == "Updated Location"
|
||||||
|
assert updated_event["priority"] == 1
|
||||||
|
|
||||||
|
logger.info(f"Successfully updated event: {event_uid}")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Event update test failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
async def test_create_event_with_attendees(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Test creating an event with attendees."""
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
|
||||||
|
tomorrow = datetime.now() + timedelta(days=1)
|
||||||
|
event_data = {
|
||||||
|
"title": "Meeting with Attendees",
|
||||||
|
"start_datetime": tomorrow.strftime("%Y-%m-%dT16:00:00"),
|
||||||
|
"end_datetime": tomorrow.strftime("%Y-%m-%dT17:00:00"),
|
||||||
|
"description": "Test meeting with multiple attendees",
|
||||||
|
"location": "Conference Room A",
|
||||||
|
"attendees": "test1@example.com,test2@example.com",
|
||||||
|
"reminder_minutes": 15,
|
||||||
|
"status": "TENTATIVE",
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await calendar_test_client.calendar.create_event(
|
||||||
|
calendar_name, event_data
|
||||||
|
)
|
||||||
|
event_uid = result["uid"]
|
||||||
|
logger.info(f"Created event with attendees, UID: {event_uid}")
|
||||||
|
|
||||||
|
# Verify event
|
||||||
|
retrieved_event, _ = await calendar_test_client.calendar.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert retrieved_event["title"] == "Meeting with Attendees"
|
||||||
|
assert "test1@example.com" in retrieved_event.get("attendees", "")
|
||||||
|
assert retrieved_event["status"] == "TENTATIVE"
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
await calendar_test_client.calendar.delete_event(calendar_name, event_uid)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Event with attendees test failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
async def test_get_nonexistent_event(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Test retrieving a non-existent event."""
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
fake_uid = f"nonexistent-{uuid.uuid4()}"
|
||||||
|
|
||||||
|
with pytest.raises(HTTPStatusError) as exc_info:
|
||||||
|
await calendar_test_client.calendar.get_event(calendar_name, fake_uid)
|
||||||
|
|
||||||
|
assert exc_info.value.response.status_code == 404
|
||||||
|
logger.info(f"Correctly got 404 for nonexistent event: {fake_uid}")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_delete_nonexistent_event(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Test deleting a non-existent event."""
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
fake_uid = f"nonexistent-{uuid.uuid4()}"
|
||||||
|
|
||||||
|
result = await calendar_test_client.calendar.delete_event(calendar_name, fake_uid)
|
||||||
|
assert result["status_code"] == 404
|
||||||
|
logger.info(f"Correctly got 404 for deleting nonexistent event: {fake_uid}")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_event_with_url_and_categories(
|
||||||
|
calendar_test_client: NextcloudClient, temporary_calendar: str
|
||||||
|
):
|
||||||
|
"""Test creating an event with URL and multiple categories."""
|
||||||
|
calendar_name = temporary_calendar
|
||||||
|
|
||||||
|
tomorrow = datetime.now() + timedelta(days=1)
|
||||||
|
event_data = {
|
||||||
|
"title": "Event with URL and Categories",
|
||||||
|
"start_datetime": tomorrow.strftime("%Y-%m-%dT09:00:00"),
|
||||||
|
"end_datetime": tomorrow.strftime("%Y-%m-%dT10:30:00"),
|
||||||
|
"description": "Test event with additional metadata",
|
||||||
|
"categories": "work,meeting,important,quarterly",
|
||||||
|
"url": "https://zoom.us/j/123456789",
|
||||||
|
"privacy": "PRIVATE",
|
||||||
|
"priority": 2,
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
result = await calendar_test_client.calendar.create_event(
|
||||||
|
calendar_name, event_data
|
||||||
|
)
|
||||||
|
event_uid = result["uid"]
|
||||||
|
logger.info(f"Created event with metadata, UID: {event_uid}")
|
||||||
|
|
||||||
|
# Verify event
|
||||||
|
retrieved_event, _ = await calendar_test_client.calendar.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert retrieved_event["title"] == "Event with URL and Categories"
|
||||||
|
assert "work" in retrieved_event.get("categories", "")
|
||||||
|
assert "important" in retrieved_event.get("categories", "")
|
||||||
|
assert retrieved_event.get("url") == "https://zoom.us/j/123456789"
|
||||||
|
assert retrieved_event.get("privacy") == "PRIVATE"
|
||||||
|
assert retrieved_event.get("priority") == 2
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
await calendar_test_client.calendar.delete_event(calendar_name, event_uid)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Event with metadata test failed: {e}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
async def test_calendar_operations_error_handling(
|
||||||
|
calendar_test_client: NextcloudClient,
|
||||||
|
):
|
||||||
|
"""Test error handling for calendar operations."""
|
||||||
|
|
||||||
|
# Test with non-existent calendar
|
||||||
|
fake_calendar = f"nonexistent_calendar_{uuid.uuid4().hex}"
|
||||||
|
|
||||||
|
with pytest.raises(HTTPStatusError):
|
||||||
|
await calendar_test_client.calendar.get_calendar_events(fake_calendar)
|
||||||
|
|
||||||
|
logger.info("Error handling tests completed successfully")
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
import pytest
|
import logging
|
||||||
import time
|
import time
|
||||||
import uuid
|
import uuid
|
||||||
import logging
|
|
||||||
from PIL import Image, ImageDraw
|
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
|
|
||||||
|
import pytest
|
||||||
from httpx import HTTPStatusError # Import if needed for specific error checks
|
from httpx import HTTPStatusError # Import if needed for specific error checks
|
||||||
|
from PIL import Image, ImageDraw
|
||||||
|
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,676 @@
|
|||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from mcp import ClientSession
|
||||||
|
|
||||||
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
pytestmark = pytest.mark.integration
|
||||||
|
|
||||||
|
|
||||||
|
async def test_mcp_connectivity(nc_mcp_client: ClientSession):
|
||||||
|
"""Test basic MCP server connectivity and list available tools/resources."""
|
||||||
|
|
||||||
|
# List available tools
|
||||||
|
tools = await nc_mcp_client.list_tools()
|
||||||
|
logger.info("Available MCP tools:")
|
||||||
|
tool_names = []
|
||||||
|
for tool in tools.tools:
|
||||||
|
logger.info(f" - {tool.name}: {tool.description}")
|
||||||
|
tool_names.append(tool.name)
|
||||||
|
|
||||||
|
# Verify expected tools are present
|
||||||
|
expected_tools = [
|
||||||
|
"nc_get_note",
|
||||||
|
"nc_notes_create_note",
|
||||||
|
"nc_notes_update_note",
|
||||||
|
"nc_notes_append_content",
|
||||||
|
"nc_notes_search_notes",
|
||||||
|
"nc_notes_delete_note",
|
||||||
|
"nc_tables_list_tables",
|
||||||
|
"nc_tables_get_schema",
|
||||||
|
"nc_tables_read_table",
|
||||||
|
"nc_tables_insert_row",
|
||||||
|
"nc_tables_update_row",
|
||||||
|
"nc_tables_delete_row",
|
||||||
|
"nc_webdav_list_directory",
|
||||||
|
"nc_webdav_read_file",
|
||||||
|
"nc_webdav_write_file",
|
||||||
|
"nc_webdav_create_directory",
|
||||||
|
"nc_webdav_delete_resource",
|
||||||
|
"nc_calendar_list_calendars",
|
||||||
|
"nc_calendar_create_event",
|
||||||
|
"nc_calendar_list_events",
|
||||||
|
"nc_calendar_get_event",
|
||||||
|
"nc_calendar_update_event",
|
||||||
|
"nc_calendar_delete_event",
|
||||||
|
"nc_calendar_create_meeting",
|
||||||
|
"nc_calendar_get_upcoming_events",
|
||||||
|
"nc_calendar_find_availability",
|
||||||
|
"nc_calendar_bulk_operations",
|
||||||
|
"nc_calendar_manage_calendar",
|
||||||
|
]
|
||||||
|
|
||||||
|
for expected_tool in expected_tools:
|
||||||
|
assert expected_tool in tool_names, (
|
||||||
|
f"Expected tool '{expected_tool}' not found in available tools"
|
||||||
|
)
|
||||||
|
|
||||||
|
# List available resource templates
|
||||||
|
templates = await nc_mcp_client.list_resource_templates()
|
||||||
|
logger.info("\nAvailable resource templates:")
|
||||||
|
template_uris = []
|
||||||
|
for template in templates.resourceTemplates:
|
||||||
|
logger.info(f" - {template.uriTemplate}")
|
||||||
|
template_uris.append(template.uriTemplate)
|
||||||
|
|
||||||
|
# Verify expected resource templates
|
||||||
|
expected_templates = ["nc://Notes/{note_id}/attachments/{attachment_filename}"]
|
||||||
|
|
||||||
|
for expected_template in expected_templates:
|
||||||
|
assert expected_template in template_uris, (
|
||||||
|
f"Expected template '{expected_template}' not found"
|
||||||
|
)
|
||||||
|
|
||||||
|
# List available resources
|
||||||
|
resources = await nc_mcp_client.list_resources()
|
||||||
|
logger.info("\nAvailable resources:")
|
||||||
|
resource_uris = []
|
||||||
|
for resource in resources.resources:
|
||||||
|
logger.info(f" - {resource.uri}: {resource.name}")
|
||||||
|
resource_uris.append(str(resource.uri)) # Convert to string for comparison
|
||||||
|
|
||||||
|
# Verify expected resources
|
||||||
|
expected_resources = ["nc://capabilities", "notes://settings"]
|
||||||
|
|
||||||
|
for expected_resource in expected_resources:
|
||||||
|
assert expected_resource in resource_uris, (
|
||||||
|
f"Expected resource '{expected_resource}' not found"
|
||||||
|
)
|
||||||
|
|
||||||
|
# List available prompts
|
||||||
|
prompts = await nc_mcp_client.list_prompts()
|
||||||
|
logger.info("\nAvailable prompts:")
|
||||||
|
for prompt in prompts.prompts:
|
||||||
|
logger.info(f" - {prompt.name}")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_mcp_notes_crud_workflow(
|
||||||
|
nc_mcp_client: ClientSession, nc_client: NextcloudClient
|
||||||
|
):
|
||||||
|
"""Test complete Notes CRUD workflow via MCP tools with verification via NextcloudClient."""
|
||||||
|
|
||||||
|
unique_suffix = uuid.uuid4().hex[:8]
|
||||||
|
test_title = f"MCP Test Note {unique_suffix}"
|
||||||
|
test_content = f"This is test content for note {unique_suffix}"
|
||||||
|
test_category = "MCPTesting"
|
||||||
|
|
||||||
|
created_note = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
# 1. Create note via MCP
|
||||||
|
logger.info(f"Creating note via MCP: {test_title}")
|
||||||
|
create_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_notes_create_note",
|
||||||
|
{"title": test_title, "content": test_content, "category": test_category},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert create_result.isError is False, (
|
||||||
|
f"MCP note creation failed: {create_result.content}"
|
||||||
|
)
|
||||||
|
created_note = create_result.content[0].text
|
||||||
|
note_data = json.loads(created_note) # Parse the returned JSON
|
||||||
|
note_id = note_data["id"]
|
||||||
|
|
||||||
|
logger.info(f"Note created via MCP with ID: {note_id}")
|
||||||
|
|
||||||
|
# 2. Verify creation via direct NextcloudClient
|
||||||
|
direct_note = await nc_client.notes.get_note(note_id)
|
||||||
|
assert direct_note["title"] == test_title, (
|
||||||
|
f"Title mismatch: {direct_note['title']} != {test_title}"
|
||||||
|
)
|
||||||
|
assert direct_note["content"] == test_content, "Content mismatch"
|
||||||
|
assert direct_note["category"] == test_category, "Category mismatch"
|
||||||
|
|
||||||
|
# 3. Read note via MCP
|
||||||
|
logger.info(f"Reading note via MCP: {note_id}")
|
||||||
|
read_result = await nc_mcp_client.call_tool("nc_get_note", {"note_id": note_id})
|
||||||
|
assert read_result.isError is False, (
|
||||||
|
f"MCP note read failed: {read_result.content}"
|
||||||
|
)
|
||||||
|
read_note_data = json.loads(read_result.content[0].text)
|
||||||
|
|
||||||
|
assert read_note_data["title"] == test_title
|
||||||
|
assert read_note_data["content"] == test_content
|
||||||
|
assert read_note_data["category"] == test_category
|
||||||
|
|
||||||
|
# 4. Update note via MCP
|
||||||
|
updated_title = f"Updated {test_title}"
|
||||||
|
updated_content = f"Updated content: {test_content}"
|
||||||
|
etag = read_note_data["etag"]
|
||||||
|
|
||||||
|
logger.info(f"Updating note via MCP: {note_id}")
|
||||||
|
update_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_notes_update_note",
|
||||||
|
{
|
||||||
|
"note_id": note_id,
|
||||||
|
"etag": etag,
|
||||||
|
"title": updated_title,
|
||||||
|
"content": updated_content,
|
||||||
|
"category": test_category,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert update_result.isError is False, (
|
||||||
|
f"MCP note update failed: {update_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 5. Verify update via direct NextcloudClient
|
||||||
|
updated_direct_note = await nc_client.notes.get_note(note_id)
|
||||||
|
assert updated_direct_note["title"] == updated_title
|
||||||
|
assert updated_direct_note["content"] == updated_content
|
||||||
|
|
||||||
|
# 6. Append content via MCP
|
||||||
|
append_content = "\n\nThis is appended content via MCP."
|
||||||
|
logger.info(f"Appending content to note via MCP: {note_id}")
|
||||||
|
append_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_notes_append_content", {"note_id": note_id, "content": append_content}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert append_result.isError is False, (
|
||||||
|
f"MCP note append failed: {append_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 7. Verify append via direct NextcloudClient
|
||||||
|
appended_direct_note = await nc_client.notes.get_note(note_id)
|
||||||
|
assert append_content in appended_direct_note["content"]
|
||||||
|
|
||||||
|
# 8. Search for note via MCP
|
||||||
|
logger.info(f"Searching for note via MCP with query: {unique_suffix}")
|
||||||
|
search_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_notes_search_notes", {"query": unique_suffix}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert search_result.isError is False, (
|
||||||
|
f"MCP note search failed: {search_result.content}"
|
||||||
|
)
|
||||||
|
search_notes_text = search_result.content[0].text
|
||||||
|
logger.info(f"Search result text: {search_notes_text}")
|
||||||
|
search_notes = json.loads(search_notes_text)
|
||||||
|
|
||||||
|
# Ensure search_notes is a list
|
||||||
|
if not isinstance(search_notes, list):
|
||||||
|
logger.warning(
|
||||||
|
f"Expected search results to be a list, got: {type(search_notes)}"
|
||||||
|
)
|
||||||
|
search_notes = [search_notes] if search_notes else []
|
||||||
|
|
||||||
|
# Find our note in search results
|
||||||
|
found_note = None
|
||||||
|
for note in search_notes:
|
||||||
|
if isinstance(note, dict) and note.get("id") == note_id:
|
||||||
|
found_note = note
|
||||||
|
break
|
||||||
|
|
||||||
|
assert found_note is not None, (
|
||||||
|
f"Created note not found in search results. Search returned: {search_notes}"
|
||||||
|
)
|
||||||
|
assert found_note["title"] == updated_title
|
||||||
|
|
||||||
|
# 9. Delete note via MCP
|
||||||
|
logger.info(f"Deleting note via MCP: {note_id}")
|
||||||
|
delete_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_notes_delete_note", {"note_id": note_id}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert delete_result.isError is False, (
|
||||||
|
f"MCP note deletion failed: {delete_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 10. Verify deletion via direct NextcloudClient
|
||||||
|
try:
|
||||||
|
await nc_client.notes.get_note(note_id)
|
||||||
|
pytest.fail("Note should have been deleted but was still found")
|
||||||
|
except Exception:
|
||||||
|
# Expected - note should be deleted
|
||||||
|
logger.info(f"Successfully verified note {note_id} was deleted")
|
||||||
|
created_note = None # Mark as cleaned up
|
||||||
|
|
||||||
|
finally:
|
||||||
|
# Cleanup in case of test failure
|
||||||
|
if created_note is not None:
|
||||||
|
try:
|
||||||
|
note_data = json.loads(created_note)
|
||||||
|
await nc_client.notes.delete_note(note_data["id"])
|
||||||
|
logger.info(f"Cleaned up note {note_data['id']} after test failure")
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Failed to cleanup note: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_mcp_webdav_workflow(
|
||||||
|
nc_mcp_client: ClientSession, nc_client: NextcloudClient
|
||||||
|
):
|
||||||
|
"""Test WebDAV file operations via MCP tools with verification via NextcloudClient."""
|
||||||
|
|
||||||
|
unique_suffix = uuid.uuid4().hex[:8]
|
||||||
|
test_dir = f"mcp_test_dir_{unique_suffix}"
|
||||||
|
test_file = f"mcp_test_file_{unique_suffix}.txt"
|
||||||
|
test_file_path = f"{test_dir}/{test_file}"
|
||||||
|
test_content = f"This is test content for MCP WebDAV testing {unique_suffix}"
|
||||||
|
|
||||||
|
try:
|
||||||
|
# 1. Create directory via MCP
|
||||||
|
logger.info(f"Creating directory via MCP: {test_dir}")
|
||||||
|
create_dir_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_webdav_create_directory", {"path": test_dir}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert create_dir_result.isError is False, (
|
||||||
|
f"MCP directory creation failed: {create_dir_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 2. Verify directory creation via direct WebDAV
|
||||||
|
dir_listing = await nc_client.webdav.list_directory("")
|
||||||
|
dir_names = [item["name"] for item in dir_listing if item["is_directory"]]
|
||||||
|
assert test_dir in dir_names, f"Directory {test_dir} not found in root listing"
|
||||||
|
|
||||||
|
# 3. Write file via MCP
|
||||||
|
logger.info(f"Writing file via MCP: {test_file_path}")
|
||||||
|
write_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_webdav_write_file",
|
||||||
|
{
|
||||||
|
"path": test_file_path,
|
||||||
|
"content": test_content,
|
||||||
|
"content_type": "text/plain",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert write_result.isError is False, (
|
||||||
|
f"MCP file write failed: {write_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 4. Verify file creation via direct WebDAV
|
||||||
|
file_listing = await nc_client.webdav.list_directory(test_dir)
|
||||||
|
file_names = [item["name"] for item in file_listing if not item["is_directory"]]
|
||||||
|
assert test_file in file_names, (
|
||||||
|
f"File {test_file} not found in directory listing"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 5. Read file via MCP
|
||||||
|
logger.info(f"Reading file via MCP: {test_file_path}")
|
||||||
|
read_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_webdav_read_file", {"path": test_file_path}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert read_result.isError is False, (
|
||||||
|
f"MCP file read failed: {read_result.content}"
|
||||||
|
)
|
||||||
|
read_data = json.loads(read_result.content[0].text)
|
||||||
|
|
||||||
|
assert read_data["content"] == test_content, "File content mismatch"
|
||||||
|
assert read_data["path"] == test_file_path
|
||||||
|
assert "text/plain" in read_data["content_type"]
|
||||||
|
|
||||||
|
# 6. Verify file content via direct WebDAV
|
||||||
|
direct_content, direct_content_type = await nc_client.webdav.read_file(
|
||||||
|
test_file_path
|
||||||
|
)
|
||||||
|
assert direct_content.decode("utf-8") == test_content
|
||||||
|
|
||||||
|
# 7. List directory via MCP
|
||||||
|
logger.info(f"Listing directory via MCP: {test_dir}")
|
||||||
|
list_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_webdav_list_directory", {"path": test_dir}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert list_result.isError is False, (
|
||||||
|
f"MCP directory listing failed: {list_result.content}"
|
||||||
|
)
|
||||||
|
listing_text = list_result.content[0].text
|
||||||
|
logger.info(f"Directory listing response: {listing_text}")
|
||||||
|
listing_data = json.loads(listing_text)
|
||||||
|
|
||||||
|
# Ensure listing_data is a list
|
||||||
|
if not isinstance(listing_data, list):
|
||||||
|
logger.warning(
|
||||||
|
f"Expected directory listing to be a list, got: {type(listing_data)}"
|
||||||
|
)
|
||||||
|
listing_data = [listing_data] if listing_data else []
|
||||||
|
|
||||||
|
# Find our file in the listing
|
||||||
|
found_file = None
|
||||||
|
for item in listing_data:
|
||||||
|
if isinstance(item, dict) and item.get("name") == test_file:
|
||||||
|
found_file = item
|
||||||
|
break
|
||||||
|
|
||||||
|
assert found_file is not None, (
|
||||||
|
f"File {test_file} not found in MCP directory listing"
|
||||||
|
)
|
||||||
|
assert found_file["is_directory"] is False
|
||||||
|
assert found_file["size"] == len(test_content.encode("utf-8"))
|
||||||
|
|
||||||
|
finally:
|
||||||
|
# Cleanup
|
||||||
|
try:
|
||||||
|
logger.info(f"Cleaning up test file: {test_file_path}")
|
||||||
|
await nc_mcp_client.call_tool(
|
||||||
|
"nc_webdav_delete_resource", {"path": test_file_path}
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(f"Cleaning up test directory: {test_dir}")
|
||||||
|
await nc_mcp_client.call_tool(
|
||||||
|
"nc_webdav_delete_resource", {"path": test_dir}
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Failed to cleanup WebDAV resources: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_mcp_resources_access(
|
||||||
|
nc_mcp_client: ClientSession, nc_client: NextcloudClient
|
||||||
|
):
|
||||||
|
"""Test accessing MCP resources and compare with direct API calls."""
|
||||||
|
|
||||||
|
# 1. Test capabilities resource
|
||||||
|
logger.info("Testing capabilities resource via MCP")
|
||||||
|
caps_result = await nc_mcp_client.read_resource("nc://capabilities")
|
||||||
|
assert len(caps_result.contents) == 1
|
||||||
|
mcp_capabilities = json.loads(caps_result.contents[0].text)
|
||||||
|
|
||||||
|
# Compare with direct API call
|
||||||
|
direct_capabilities = await nc_client.capabilities()
|
||||||
|
|
||||||
|
# Basic validation - both should have similar structure
|
||||||
|
# Both return full OCS response structure
|
||||||
|
assert "ocs" in mcp_capabilities
|
||||||
|
assert "data" in mcp_capabilities["ocs"]
|
||||||
|
assert "version" in mcp_capabilities["ocs"]["data"]
|
||||||
|
assert "ocs" in direct_capabilities
|
||||||
|
assert "data" in direct_capabilities["ocs"]
|
||||||
|
assert "version" in direct_capabilities["ocs"]["data"]
|
||||||
|
|
||||||
|
# 2. Test notes settings resource
|
||||||
|
logger.info("Testing notes settings resource via MCP")
|
||||||
|
settings_result = await nc_mcp_client.read_resource("notes://settings")
|
||||||
|
assert len(settings_result.contents) == 1
|
||||||
|
mcp_settings = json.loads(settings_result.contents[0].text)
|
||||||
|
|
||||||
|
# Compare with direct API call
|
||||||
|
direct_settings = await nc_client.notes.get_settings()
|
||||||
|
|
||||||
|
# Both should have settings data
|
||||||
|
assert isinstance(mcp_settings, dict)
|
||||||
|
assert isinstance(direct_settings, dict)
|
||||||
|
|
||||||
|
logger.info("Successfully verified MCP resources match direct API calls")
|
||||||
|
|
||||||
|
|
||||||
|
async def test_mcp_calendar_workflow(
|
||||||
|
nc_mcp_client: ClientSession, nc_client: NextcloudClient
|
||||||
|
):
|
||||||
|
"""Test complete Calendar workflow via MCP tools with verification via NextcloudClient."""
|
||||||
|
|
||||||
|
unique_suffix = uuid.uuid4().hex[:8]
|
||||||
|
test_event_title = f"MCP Test Event {unique_suffix}"
|
||||||
|
test_location = f"MCP Test Location {unique_suffix}"
|
||||||
|
|
||||||
|
created_event = None
|
||||||
|
calendar_name = None
|
||||||
|
|
||||||
|
try:
|
||||||
|
# 1. List calendars via MCP
|
||||||
|
logger.info("Listing calendars via MCP")
|
||||||
|
calendars_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_list_calendars", {}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert calendars_result.isError is False, (
|
||||||
|
f"MCP calendar listing failed: {calendars_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
calendars_data = json.loads(calendars_result.content[0].text)
|
||||||
|
|
||||||
|
# Debug output to understand the structure
|
||||||
|
logger.info(f"calendars_data type: {type(calendars_data)}")
|
||||||
|
logger.info(f"calendars_data content: {calendars_data}")
|
||||||
|
|
||||||
|
# Handle the case where MCP tool returns a single dict instead of a list
|
||||||
|
if isinstance(calendars_data, dict):
|
||||||
|
# Single calendar returned as dict instead of list
|
||||||
|
calendar_name = calendars_data["name"]
|
||||||
|
elif isinstance(calendars_data, list) and calendars_data:
|
||||||
|
# Normal case - list of calendars
|
||||||
|
calendar_name = calendars_data[0]["name"]
|
||||||
|
else:
|
||||||
|
pytest.skip("No calendars available for testing")
|
||||||
|
logger.info(f"Using calendar: {calendar_name}")
|
||||||
|
|
||||||
|
# 2. Create event via MCP
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
tomorrow = datetime.now() + timedelta(days=1)
|
||||||
|
start_datetime = tomorrow.strftime("%Y-%m-%dT14:00:00")
|
||||||
|
end_datetime = tomorrow.strftime("%Y-%m-%dT15:00:00")
|
||||||
|
|
||||||
|
event_data = {
|
||||||
|
"calendar_name": calendar_name,
|
||||||
|
"title": test_event_title,
|
||||||
|
"start_datetime": start_datetime,
|
||||||
|
"end_datetime": end_datetime,
|
||||||
|
"description": f"Test event created via MCP {unique_suffix}",
|
||||||
|
"location": test_location,
|
||||||
|
"categories": "testing,mcp",
|
||||||
|
"status": "CONFIRMED",
|
||||||
|
"priority": 5,
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info(f"Creating event via MCP: {test_event_title}")
|
||||||
|
create_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_create_event", event_data
|
||||||
|
)
|
||||||
|
|
||||||
|
assert create_result.isError is False, (
|
||||||
|
f"MCP event creation failed: {create_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
created_event_data = json.loads(create_result.content[0].text)
|
||||||
|
event_uid = created_event_data["uid"]
|
||||||
|
created_event = {"uid": event_uid, "calendar_name": calendar_name}
|
||||||
|
|
||||||
|
logger.info(f"Event created via MCP with UID: {event_uid}")
|
||||||
|
|
||||||
|
# 3. Verify creation via direct NextcloudClient
|
||||||
|
direct_event, _ = await nc_client.calendar.get_event(calendar_name, event_uid)
|
||||||
|
assert direct_event["title"] == test_event_title
|
||||||
|
assert direct_event["location"] == test_location
|
||||||
|
assert "testing" in direct_event.get("categories", "")
|
||||||
|
|
||||||
|
# 4. Get event via MCP
|
||||||
|
logger.info(f"Getting event via MCP: {event_uid}")
|
||||||
|
get_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_get_event",
|
||||||
|
{"calendar_name": calendar_name, "event_uid": event_uid},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert get_result.isError is False, (
|
||||||
|
f"MCP event get failed: {get_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
get_event_data = json.loads(get_result.content[0].text)
|
||||||
|
assert get_event_data["title"] == test_event_title
|
||||||
|
assert get_event_data["location"] == test_location
|
||||||
|
|
||||||
|
# 5. **TEST nc_calendar_list_events - This is the main tool we're testing**
|
||||||
|
logger.info("Testing nc_calendar_list_events via MCP")
|
||||||
|
|
||||||
|
# Get today and next week for date range
|
||||||
|
today = datetime.now()
|
||||||
|
next_week = today + timedelta(days=7)
|
||||||
|
start_date = today.strftime("%Y-%m-%d")
|
||||||
|
end_date = next_week.strftime("%Y-%m-%d")
|
||||||
|
|
||||||
|
list_events_data = {
|
||||||
|
"calendar_name": calendar_name,
|
||||||
|
"start_date": start_date,
|
||||||
|
"end_date": end_date,
|
||||||
|
"limit": 50,
|
||||||
|
"location_contains": "MCP Test",
|
||||||
|
"title_contains": unique_suffix,
|
||||||
|
}
|
||||||
|
|
||||||
|
list_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_list_events", list_events_data
|
||||||
|
)
|
||||||
|
|
||||||
|
assert list_result.isError is False, (
|
||||||
|
f"MCP list events failed: {list_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
events_data = json.loads(list_result.content[0].text)
|
||||||
|
|
||||||
|
# Debug output to understand what nc_calendar_list_events returns
|
||||||
|
logger.info(f"list_events result type: {type(events_data)}")
|
||||||
|
logger.info(f"list_events result content: {events_data}")
|
||||||
|
|
||||||
|
# Handle single event returned as dict instead of list (same fix as calendars)
|
||||||
|
if isinstance(events_data, dict):
|
||||||
|
# Single event returned as dict instead of list
|
||||||
|
events_data = [events_data]
|
||||||
|
|
||||||
|
assert isinstance(events_data, list), "Expected events list"
|
||||||
|
|
||||||
|
# Our created event should be in the list
|
||||||
|
found_event = None
|
||||||
|
for event in events_data:
|
||||||
|
if event.get("uid") == event_uid:
|
||||||
|
found_event = event
|
||||||
|
break
|
||||||
|
|
||||||
|
assert found_event is not None, (
|
||||||
|
f"Created event {event_uid} not found in events list"
|
||||||
|
)
|
||||||
|
assert found_event["title"] == test_event_title
|
||||||
|
|
||||||
|
# 6. Test list events across all calendars
|
||||||
|
logger.info("Testing nc_calendar_list_events across all calendars")
|
||||||
|
|
||||||
|
all_calendars_data = {
|
||||||
|
"calendar_name": "", # Will be ignored
|
||||||
|
"search_all_calendars": True,
|
||||||
|
"start_date": start_date,
|
||||||
|
"end_date": end_date,
|
||||||
|
"title_contains": unique_suffix,
|
||||||
|
}
|
||||||
|
|
||||||
|
all_list_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_list_events", all_calendars_data
|
||||||
|
)
|
||||||
|
|
||||||
|
assert all_list_result.isError is False, (
|
||||||
|
f"MCP list all events failed: {all_list_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
all_events_data = json.loads(all_list_result.content[0].text)
|
||||||
|
|
||||||
|
# Handle single event returned as dict instead of list (same fix as calendars)
|
||||||
|
if isinstance(all_events_data, dict):
|
||||||
|
# Single event returned as dict instead of list
|
||||||
|
all_events_data = [all_events_data]
|
||||||
|
|
||||||
|
assert isinstance(all_events_data, list), "Expected events list"
|
||||||
|
|
||||||
|
# Our event should still be found when searching all calendars
|
||||||
|
found_in_all = any(event.get("uid") == event_uid for event in all_events_data)
|
||||||
|
assert found_in_all, "Event not found when searching all calendars"
|
||||||
|
|
||||||
|
# 7. Update event via MCP
|
||||||
|
updated_title = f"Updated {test_event_title}"
|
||||||
|
updated_description = f"Updated description {unique_suffix}"
|
||||||
|
|
||||||
|
update_data = {
|
||||||
|
"calendar_name": calendar_name,
|
||||||
|
"event_uid": event_uid,
|
||||||
|
"title": updated_title,
|
||||||
|
"description": updated_description,
|
||||||
|
"priority": 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.info(f"Updating event via MCP: {event_uid}")
|
||||||
|
update_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_update_event", update_data
|
||||||
|
)
|
||||||
|
|
||||||
|
assert update_result.isError is False, (
|
||||||
|
f"MCP event update failed: {update_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 8. Verify update via direct NextcloudClient
|
||||||
|
updated_direct_event, _ = await nc_client.calendar.get_event(
|
||||||
|
calendar_name, event_uid
|
||||||
|
)
|
||||||
|
assert updated_direct_event["title"] == updated_title
|
||||||
|
assert updated_direct_event["description"] == updated_description
|
||||||
|
assert updated_direct_event["priority"] == 1
|
||||||
|
|
||||||
|
# 9. Test upcoming events via MCP
|
||||||
|
logger.info("Testing nc_calendar_get_upcoming_events via MCP")
|
||||||
|
upcoming_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_get_upcoming_events",
|
||||||
|
{"calendar_name": calendar_name, "days_ahead": 7, "limit": 10},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert upcoming_result.isError is False, (
|
||||||
|
f"MCP upcoming events failed: {upcoming_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
upcoming_events = json.loads(upcoming_result.content[0].text)
|
||||||
|
|
||||||
|
# Handle single event returned as dict instead of list (same fix as other tools)
|
||||||
|
if isinstance(upcoming_events, dict):
|
||||||
|
# Single event returned as dict instead of list
|
||||||
|
upcoming_events = [upcoming_events]
|
||||||
|
|
||||||
|
assert isinstance(upcoming_events, list), "Expected upcoming events list"
|
||||||
|
|
||||||
|
# 10. Delete event via MCP
|
||||||
|
logger.info(f"Deleting event via MCP: {event_uid}")
|
||||||
|
delete_result = await nc_mcp_client.call_tool(
|
||||||
|
"nc_calendar_delete_event",
|
||||||
|
{"calendar_name": calendar_name, "event_uid": event_uid},
|
||||||
|
)
|
||||||
|
|
||||||
|
assert delete_result.isError is False, (
|
||||||
|
f"MCP event deletion failed: {delete_result.content}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# 11. Verify deletion via direct NextcloudClient
|
||||||
|
try:
|
||||||
|
await nc_client.calendar.get_event(calendar_name, event_uid)
|
||||||
|
pytest.fail("Event should have been deleted but was still found")
|
||||||
|
except Exception:
|
||||||
|
# Expected - event should be deleted
|
||||||
|
logger.info(f"Successfully verified event {event_uid} was deleted")
|
||||||
|
created_event = None # Mark as cleaned up
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
if "Calendar app may not be enabled" in str(
|
||||||
|
e
|
||||||
|
) or "No calendars available" in str(e):
|
||||||
|
pytest.skip("Calendar functionality not available for testing")
|
||||||
|
raise
|
||||||
|
|
||||||
|
finally:
|
||||||
|
# Cleanup in case of test failure
|
||||||
|
if created_event is not None:
|
||||||
|
try:
|
||||||
|
await nc_client.calendar.delete_event(
|
||||||
|
created_event["calendar_name"], created_event["uid"]
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
f"Cleaned up event {created_event['uid']} after test failure"
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Failed to cleanup event: {e}")
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
import pytest
|
|
||||||
import logging
|
|
||||||
import asyncio
|
import asyncio
|
||||||
|
import logging
|
||||||
import uuid # Keep uuid if needed for generating unique data within tests
|
import uuid # Keep uuid if needed for generating unique data within tests
|
||||||
|
|
||||||
|
import pytest
|
||||||
from httpx import HTTPStatusError
|
from httpx import HTTPStatusError
|
||||||
|
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import pytest
|
|
||||||
import logging
|
|
||||||
import asyncio
|
import asyncio
|
||||||
|
import logging
|
||||||
import uuid
|
import uuid
|
||||||
|
from typing import Any, Dict
|
||||||
|
|
||||||
|
import pytest
|
||||||
from httpx import HTTPStatusError
|
from httpx import HTTPStatusError
|
||||||
from typing import Dict, Any
|
|
||||||
|
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import pytest
|
|
||||||
import logging
|
import logging
|
||||||
import time
|
import time
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
import pytest
|
||||||
from httpx import HTTPStatusError
|
from httpx import HTTPStatusError
|
||||||
|
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
"""Integration tests for WebDAV operations."""
|
"""Integration tests for WebDAV operations."""
|
||||||
|
|
||||||
import pytest
|
|
||||||
import logging
|
import logging
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
import pytest
|
||||||
from httpx import HTTPStatusError
|
from httpx import HTTPStatusError
|
||||||
|
|
||||||
from nextcloud_mcp_server.client import NextcloudClient
|
from nextcloud_mcp_server.client import NextcloudClient
|
||||||
|
|||||||
@@ -279,6 +279,19 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.4.0-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819, upload-time = "2023-12-22T08:01:19.89Z" },
|
{ url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.4.0-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819, upload-time = "2023-12-22T08:01:19.89Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "icalendar"
|
||||||
|
version = "6.3.1"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "python-dateutil" },
|
||||||
|
{ name = "tzdata" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/08/13/e5899c916dcf1343ea65823eb7278d3e1a1d679f383f6409380594b5f322/icalendar-6.3.1.tar.gz", hash = "sha256:a697ce7b678072941e519f2745704fc29d78ef92a2dc53d9108ba6a04aeba466", size = 177169, upload-time = "2025-05-20T07:42:50.683Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/6c/25/b5fc00e85d2dfaf5c806ac8b5f1de072fa11630c5b15b4ae5bbc228abd51/icalendar-6.3.1-py3-none-any.whl", hash = "sha256:7ea1d1b212df685353f74cdc6ec9646bf42fa557d1746ea645ce8779fdfbecdd", size = 242349, upload-time = "2025-05-20T07:42:48.589Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "idna"
|
name = "idna"
|
||||||
version = "3.10"
|
version = "3.10"
|
||||||
@@ -456,7 +469,7 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mcp"
|
name = "mcp"
|
||||||
version = "1.10.0"
|
version = "1.10.1"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "anyio" },
|
{ name = "anyio" },
|
||||||
@@ -470,9 +483,9 @@ dependencies = [
|
|||||||
{ name = "starlette" },
|
{ name = "starlette" },
|
||||||
{ name = "uvicorn", marker = "sys_platform != 'emscripten'" },
|
{ name = "uvicorn", marker = "sys_platform != 'emscripten'" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/c8/1a/d90e42be23a7e6dd35c03e35c7c63fe1036f082d3bb88114b66bd0f2467e/mcp-1.10.0.tar.gz", hash = "sha256:91fb1623c3faf14577623d14755d3213db837c5da5dae85069e1b59124cbe0e9", size = 392961, upload-time = "2025-06-26T13:51:19.025Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/7c/68/63045305f29ff680a9cd5be360c755270109e6b76f696ea6824547ddbc30/mcp-1.10.1.tar.gz", hash = "sha256:aaa0957d8307feeff180da2d9d359f2b801f35c0c67f1882136239055ef034c2", size = 392969, upload-time = "2025-06-27T12:03:08.982Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/0f/52/e1c43c4b5153465fd5d3b4b41bf2d4c7731475e9f668f38d68f848c25c9a/mcp-1.10.0-py3-none-any.whl", hash = "sha256:925c45482d75b1b6f11febddf9736d55edf7739c7ea39b583309f6651cbc9e5c", size = 150894, upload-time = "2025-06-26T13:51:17.342Z" },
|
{ url = "https://files.pythonhosted.org/packages/d7/3f/435a5b3d10ae242a9d6c2b33175551173c3c61fe637dc893be05c4ed0aaf/mcp-1.10.1-py3-none-any.whl", hash = "sha256:4d08301aefe906dce0fa482289db55ce1db831e3e67212e65b5e23ad8454b3c5", size = 150878, upload-time = "2025-06-27T12:03:07.328Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[package.optional-dependencies]
|
[package.optional-dependencies]
|
||||||
@@ -492,10 +505,11 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nextcloud-mcp-server"
|
name = "nextcloud-mcp-server"
|
||||||
version = "0.4.1"
|
version = "0.6.0"
|
||||||
source = { editable = "." }
|
source = { editable = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "httpx" },
|
{ name = "httpx" },
|
||||||
|
{ name = "icalendar" },
|
||||||
{ name = "mcp", extra = ["cli"] },
|
{ name = "mcp", extra = ["cli"] },
|
||||||
{ name = "pillow" },
|
{ name = "pillow" },
|
||||||
]
|
]
|
||||||
@@ -513,6 +527,7 @@ dev = [
|
|||||||
[package.metadata]
|
[package.metadata]
|
||||||
requires-dist = [
|
requires-dist = [
|
||||||
{ name = "httpx", specifier = ">=0.28.1,<0.29.0" },
|
{ name = "httpx", specifier = ">=0.28.1,<0.29.0" },
|
||||||
|
{ name = "icalendar", specifier = ">=6.0.0,<7.0.0" },
|
||||||
{ name = "mcp", extras = ["cli"], specifier = ">=1.10,<1.11" },
|
{ name = "mcp", extras = ["cli"], specifier = ">=1.10,<1.11" },
|
||||||
{ name = "pillow", specifier = ">=11.2.1,<12.0.0" },
|
{ name = "pillow", specifier = ">=11.2.1,<12.0.0" },
|
||||||
]
|
]
|
||||||
@@ -798,6 +813,18 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/28/d0/def53b4a790cfb21483016430ed828f64830dd981ebe1089971cd10cab25/pytest_cov-6.1.1-py3-none-any.whl", hash = "sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde", size = 23841, upload-time = "2025-04-05T14:07:49.641Z" },
|
{ url = "https://files.pythonhosted.org/packages/28/d0/def53b4a790cfb21483016430ed828f64830dd981ebe1089971cd10cab25/pytest_cov-6.1.1-py3-none-any.whl", hash = "sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde", size = 23841, upload-time = "2025-04-05T14:07:49.641Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "python-dateutil"
|
||||||
|
version = "2.9.0.post0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "six" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "python-dotenv"
|
name = "python-dotenv"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@@ -998,6 +1025,15 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755, upload-time = "2023-10-24T04:13:38.866Z" },
|
{ url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755, upload-time = "2023-10-24T04:13:38.866Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "six"
|
||||||
|
version = "1.17.0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sniffio"
|
name = "sniffio"
|
||||||
version = "1.3.1"
|
version = "1.3.1"
|
||||||
@@ -1114,7 +1150,7 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typer"
|
name = "typer"
|
||||||
version = "0.15.3"
|
version = "0.16.0"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "click" },
|
{ name = "click" },
|
||||||
@@ -1122,9 +1158,9 @@ dependencies = [
|
|||||||
{ name = "shellingham" },
|
{ name = "shellingham" },
|
||||||
{ name = "typing-extensions" },
|
{ name = "typing-extensions" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/98/1a/5f36851f439884bcfe8539f6a20ff7516e7b60f319bbaf69a90dc35cc2eb/typer-0.15.3.tar.gz", hash = "sha256:818873625d0569653438316567861899f7e9972f2e6e0c16dab608345ced713c", size = 101641, upload-time = "2025-04-28T21:40:59.204Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/c5/8c/7d682431efca5fd290017663ea4588bf6f2c6aad085c7f108c5dbc316e70/typer-0.16.0.tar.gz", hash = "sha256:af377ffaee1dbe37ae9440cb4e8f11686ea5ce4e9bae01b84ae7c63b87f1dd3b", size = 102625, upload-time = "2025-05-26T14:30:31.824Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/48/20/9d953de6f4367163d23ec823200eb3ecb0050a2609691e512c8b95827a9b/typer-0.15.3-py3-none-any.whl", hash = "sha256:c86a65ad77ca531f03de08d1b9cb67cd09ad02ddddf4b34745b5008f43b239bd", size = 45253, upload-time = "2025-04-28T21:40:56.269Z" },
|
{ url = "https://files.pythonhosted.org/packages/76/42/3efaf858001d2c2913de7f354563e3a3a2f0decae3efe98427125a8f441e/typer-0.16.0-py3-none-any.whl", hash = "sha256:1f79bed11d4d02d4310e3c1b7ba594183bcedb0ac73b27a9e5f28f6fb5b98855", size = 46317, upload-time = "2025-05-26T14:30:30.523Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1148,6 +1184,15 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.4.0-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125, upload-time = "2025-02-25T17:27:57.754Z" },
|
{ url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.4.0-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125, upload-time = "2025-02-25T17:27:57.754Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tzdata"
|
||||||
|
version = "2025.2"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/95/32/1a225d6164441be760d75c2c42e2780dc0873fe382da3e98a2e1e48361e5/tzdata-2025.2.tar.gz", hash = "sha256:b60a638fcc0daffadf82fe0f57e53d06bdec2f36c4df66280ae79bce6bd6f2b9", size = 196380, upload-time = "2025-03-23T13:54:43.652Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/5c/23/c7abc0ca0a1526a0774eca151daeb8de62ec457e77262b66b359c3c7679e/tzdata-2025.2-py2.py3-none-any.whl", hash = "sha256:1a403fada01ff9221ca8044d701868fa132215d84beb92242d9acd2147f667a8", size = 347839, upload-time = "2025-03-23T13:54:41.845Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uvicorn"
|
name = "uvicorn"
|
||||||
version = "0.34.2"
|
version = "0.34.2"
|
||||||
|
|||||||
Reference in New Issue
Block a user