ldraney-notion-mcp 0.1.3__tar.gz → 0.1.5__tar.gz

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ldraney-notion-mcp
-Version: 0.1.3
+Version: 0.1.5
 Summary: MCP server wrapping the Notion Python SDK (v2025-09-03)
 License: MIT
 Requires-Python: >=3.10

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ldraney-notion-mcp"
-version = "0.1.3"
+version = "0.1.5"
 description = "MCP server wrapping the Notion Python SDK (v2025-09-03)"
 readme = "README.md"
 requires-python = ">=3.10"

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/src/ldraney_notion_mcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ldraney-notion-mcp
-Version: 0.1.3
+Version: 0.1.5
 Summary: MCP server wrapping the Notion Python SDK (v2025-09-03)
 License: MIT
 Requires-Python: >=3.10

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/src/notion_mcp/tools/blocks.py

@@ -3,13 +3,17 @@
 from __future__ import annotations
 
 import json
-from typing import Any
+from typing import Annotated, Any
+
+from pydantic import Field
 
 from ..server import mcp, get_client, _parse_json, _error_response
 
 
 @mcp.tool()
-def get_block(block_id: str) -> str:
+def get_block(
+    block_id: Annotated[str, Field(description="The UUID of the block to retrieve")],
+) -> str:
     """Retrieve a Notion block by its ID.
 
     Args:
@@ -24,9 +28,9 @@ def get_block(block_id: str) -> str:
 
 @mcp.tool()
 def get_block_children(
-    block_id: str,
-    start_cursor: str | None = None,
-    page_size: int | None = None,
+    block_id: Annotated[str, Field(description="The UUID of the parent block")],
+    start_cursor: Annotated[str | None, Field(description="Cursor for pagination")] = None,
+    page_size: Annotated[int | None, Field(description="Number of results per page")] = None,
 ) -> str:
     """List child blocks of a Notion block.
 
@@ -47,14 +51,15 @@ def get_block_children(
 
 
 @mcp.tool()
-def append_block_children(block_id: str, children: str) -> str:
+def append_block_children(
+    block_id: Annotated[str, Field(description="The UUID of the parent block to append children to")],
+    children: Annotated[str | list, Field(description="JSON string or array for a list of block objects to append")],
+) -> str:
     """Append child blocks to a Notion block.
 
-    IMPORTANT: The children parameter must be passed as a JSON-encoded string, NOT as an object.
-
     Args:
         block_id: The UUID of the parent block to append children to.
-        children: JSON string for a list of block objects to append.
+        children: JSON string or array for a list of block objects to append.
     """
     try:
         result = get_client().append_block_children(
@@ -68,17 +73,15 @@ def append_block_children(block_id: str, children: str) -> str:
 
 @mcp.tool()
 def update_block(
-    block_id: str,
-    content: str | None = None,
+    block_id: Annotated[str, Field(description="The UUID of the block to update")],
+    content: Annotated[str | dict | None, Field(description="JSON string or object of block properties to update. The keys depend on the block type, e.g. {\"paragraph\": {\"rich_text\": [...]}}")] = None,
 ) -> str:
     """Update a Notion block.
 
-    IMPORTANT: The content parameter must be passed as a JSON-encoded string, NOT as an object.
-
     Args:
         block_id: The UUID of the block to update.
-        content: JSON string of block properties to update. The keys depend
-            on the block type (e.g. '{"paragraph": {"rich_text": [...]}}').
+        content: JSON string or object of block properties to update. The keys depend
+            on the block type (e.g. {"paragraph": {"rich_text": [...]}}).
     """
     try:
         kwargs: dict[str, Any] = {}
@@ -91,7 +94,9 @@ def update_block(
 
 
 @mcp.tool()
-def delete_block(block_id: str) -> str:
+def delete_block(
+    block_id: Annotated[str, Field(description="The UUID of the block to delete")],
+) -> str:
     """Delete (archive) a Notion block.
 
     Args:

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/src/notion_mcp/tools/comments.py

@@ -3,25 +3,26 @@
 from __future__ import annotations
 
 import json
+from typing import Annotated
+
+from pydantic import Field
 
 from ..server import mcp, get_client, _parse_json, _error_response
 
 
 @mcp.tool()
 def create_comment(
-    parent: str,
-    rich_text: str,
-    discussion_id: str | None = None,
+    parent: Annotated[str | dict, Field(description="JSON string or object for the parent, e.g. {\"page_id\": \"...\"}")],
+    rich_text: Annotated[str | list, Field(description="JSON string or array for the rich-text content, e.g. [{\"type\": \"text\", \"text\": {\"content\": \"Hello!\"}}]")],
+    discussion_id: Annotated[str | None, Field(description="UUID of an existing discussion thread to reply to. Omit to start a new top-level comment.")] = None,
 ) -> str:
     """Create a comment on a Notion page or block.
 
-    IMPORTANT: parent and rich_text must be passed as JSON-encoded strings, NOT as objects.
-
     Args:
-        parent: JSON string for the parent object,
-            e.g. '{"page_id": "..."}'.
-        rich_text: JSON string for the rich-text content array,
-            e.g. '[{"type": "text", "text": {"content": "Hello!"}}]'.
+        parent: JSON string or object for the parent,
+            e.g. {"page_id": "..."}.
+        rich_text: JSON string or array for the rich-text content,
+            e.g. [{"type": "text", "text": {"content": "Hello!"}}].
         discussion_id: Optional UUID of an existing discussion thread
             to reply to. Omit to start a new top-level comment.
     """
@@ -41,9 +42,9 @@ def create_comment(
 
 @mcp.tool()
 def get_comments(
-    block_id: str,
-    start_cursor: str | None = None,
-    page_size: int | None = None,
+    block_id: Annotated[str, Field(description="The UUID of the block or page to list comments for")],
+    start_cursor: Annotated[str | None, Field(description="Cursor for pagination")] = None,
+    page_size: Annotated[int | None, Field(description="Number of results per page")] = None,
 ) -> str:
     """List comments on a Notion block or page.
 

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/src/notion_mcp/tools/databases.py

@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 import json
-from typing import Any
+from typing import Annotated, Any
+
+from pydantic import Field
 
 from ..server import mcp, get_client, _parse_json, _error_response
 
@@ -15,22 +17,20 @@ from ..server import mcp, get_client, _parse_json, _error_response
 
 @mcp.tool()
 def create_database(
-    parent: str,
-    title: str,
-    initial_data_source: str | None = None,
+    parent: Annotated[str | dict, Field(description="JSON string or object for the parent, e.g. {\"type\": \"page_id\", \"page_id\": \"...\"}")],
+    title: Annotated[str | list, Field(description="JSON string or array for the title rich-text array, e.g. [{\"type\": \"text\", \"text\": {\"content\": \"My DB\"}}]")],
+    initial_data_source: Annotated[str | dict | None, Field(description="JSON string or object for the initial data source configuration including properties")] = None,
 ) -> str:
     """Create a new Notion database.
 
     In Notion API v2025-09-03, database properties live on data sources.
     Pass properties inside initial_data_source.properties.
 
-    IMPORTANT: All structured parameters must be passed as JSON-encoded strings, NOT as objects.
-
     Args:
-        parent: JSON string for the parent object, e.g. '{"type": "page_id", "page_id": "..."}'.
-        title: JSON string for the title rich-text array,
-            e.g. '[{"type": "text", "text": {"content": "My DB"}}]'.
-        initial_data_source: Optional JSON string for the initial data source
+        parent: JSON string or object for the parent, e.g. {"type": "page_id", "page_id": "..."}.
+        title: JSON string or array for the title rich-text array,
+            e.g. [{"type": "text", "text": {"content": "My DB"}}].
+        initial_data_source: Optional JSON string or object for the initial data source
             configuration including properties.
     """
     try:
@@ -45,7 +45,9 @@ def create_database(
 
 
 @mcp.tool()
-def get_database(database_id: str) -> str:
+def get_database(
+    database_id: Annotated[str, Field(description="The UUID of the database to retrieve")],
+) -> str:
     """Retrieve a Notion database by its ID.
 
     Note: In v2025-09-03 the response contains data_sources but NOT
@@ -63,22 +65,20 @@ def get_database(database_id: str) -> str:
 
 @mcp.tool()
 def update_database(
-    database_id: str,
-    title: str | None = None,
-    description: str | None = None,
-    icon: str | None = None,
-    cover: str | None = None,
+    database_id: Annotated[str, Field(description="The UUID of the database to update")],
+    title: Annotated[str | list | None, Field(description="JSON string or array for the new title rich-text array")] = None,
+    description: Annotated[str | list | None, Field(description="JSON string or array for the description rich-text array")] = None,
+    icon: Annotated[str | dict | None, Field(description="JSON string or object for the database icon, e.g. {\"type\": \"emoji\", \"emoji\": \"...\"}")] = None,
+    cover: Annotated[str | dict | None, Field(description="JSON string or object for the database cover, e.g. {\"type\": \"external\", \"external\": {\"url\": \"https://...\"}}")] = None,
 ) -> str:
     """Update a Notion database.
 
-    IMPORTANT: All structured parameters must be passed as JSON-encoded strings, NOT as objects.
-
     Args:
         database_id: The UUID of the database to update.
-        title: Optional JSON string for the new title rich-text array.
-        description: Optional JSON string for the description rich-text array.
-        icon: Optional JSON string for the database icon.
-        cover: Optional JSON string for the database cover.
+        title: Optional JSON string or array for the new title rich-text array.
+        description: Optional JSON string or array for the description rich-text array.
+        icon: Optional JSON string or object for the database icon.
+        cover: Optional JSON string or object for the database cover.
     """
     try:
         kwargs: dict[str, Any] = {}
@@ -97,7 +97,9 @@ def update_database(
 
 
 @mcp.tool()
-def archive_database(database_id: str) -> str:
+def archive_database(
+    database_id: Annotated[str, Field(description="The UUID of the database to archive")],
+) -> str:
     """Archive a Notion database.
 
     Args:
@@ -112,23 +114,21 @@ def archive_database(database_id: str) -> str:
 
 @mcp.tool()
 def query_database(
-    database_id: str,
-    filter: str | None = None,
-    sorts: str | None = None,
-    start_cursor: str | None = None,
-    page_size: int | None = None,
+    database_id: Annotated[str, Field(description="The UUID of the database to query")],
+    filter: Annotated[str | dict | None, Field(description="JSON string or object for a filter, e.g. {\"property\": \"Status\", \"select\": {\"equals\": \"Done\"}}")] = None,
+    sorts: Annotated[str | list | None, Field(description="JSON string or array for a list of sort objects, e.g. [{\"property\": \"Created\", \"direction\": \"descending\"}]")] = None,
+    start_cursor: Annotated[str | None, Field(description="Cursor for pagination")] = None,
+    page_size: Annotated[int | None, Field(description="Number of results per page")] = None,
 ) -> str:
     """Query a Notion database for pages/rows.
 
     Automatically resolves the first data source and queries it.
     If you already know the data source ID, use query_data_source instead.
 
-    IMPORTANT: filter and sorts must be passed as JSON-encoded strings, NOT as objects.
-
     Args:
         database_id: The UUID of the database to query.
-        filter: Optional JSON string for a filter object.
-        sorts: Optional JSON string for a list of sort objects.
+        filter: Optional JSON string or object for a filter.
+        sorts: Optional JSON string or array for a list of sort objects.
         start_cursor: Optional cursor for pagination.
         page_size: Optional number of results per page.
     """
@@ -151,7 +151,9 @@ def query_database(
 
 
 @mcp.tool()
-def get_data_source(data_source_id: str) -> str:
+def get_data_source(
+    data_source_id: Annotated[str, Field(description="The UUID of the data source to retrieve")],
+) -> str:
     """Retrieve a Notion data source (includes properties).
 
     Args:
@@ -166,16 +168,14 @@ def get_data_source(data_source_id: str) -> str:
 
 @mcp.tool()
 def update_data_source(
-    data_source_id: str,
-    properties: str | None = None,
+    data_source_id: Annotated[str, Field(description="The UUID of the data source to update")],
+    properties: Annotated[str | dict | None, Field(description="JSON string or object for properties to update")] = None,
 ) -> str:
     """Update a Notion data source.
 
-    IMPORTANT: The properties parameter must be passed as a JSON-encoded string, NOT as an object.
-
     Args:
         data_source_id: The UUID of the data source to update.
-        properties: Optional JSON string for properties to update.
+        properties: Optional JSON string or object for properties to update.
     """
     try:
         kwargs: dict[str, Any] = {}
@@ -189,20 +189,18 @@ def update_data_source(
 
 @mcp.tool()
 def query_data_source(
-    data_source_id: str,
-    filter: str | None = None,
-    sorts: str | None = None,
-    start_cursor: str | None = None,
-    page_size: int | None = None,
+    data_source_id: Annotated[str, Field(description="The UUID of the data source to query")],
+    filter: Annotated[str | dict | None, Field(description="JSON string or object for a filter, e.g. {\"property\": \"Status\", \"select\": {\"equals\": \"Done\"}}")] = None,
+    sorts: Annotated[str | list | None, Field(description="JSON string or array for a list of sort objects, e.g. [{\"property\": \"Created\", \"direction\": \"descending\"}]")] = None,
+    start_cursor: Annotated[str | None, Field(description="Cursor for pagination")] = None,
+    page_size: Annotated[int | None, Field(description="Number of results per page")] = None,
 ) -> str:
     """Query rows in a Notion data source.
 
-    IMPORTANT: filter and sorts must be passed as JSON-encoded strings, NOT as objects.
-
     Args:
         data_source_id: The UUID of the data source to query.
-        filter: Optional JSON string for a filter object.
-        sorts: Optional JSON string for a list of sort objects.
+        filter: Optional JSON string or object for a filter.
+        sorts: Optional JSON string or array for a list of sort objects.
         start_cursor: Optional cursor for pagination.
         page_size: Optional number of results per page.
     """
@@ -221,10 +219,10 @@ def query_data_source(
 
 @mcp.tool()
 def list_data_source_templates(
-    data_source_id: str,
-    name: str | None = None,
-    start_cursor: str | None = None,
-    page_size: int | None = None,
+    data_source_id: Annotated[str, Field(description="The UUID of the data source")],
+    name: Annotated[str | None, Field(description="Name filter for templates")] = None,
+    start_cursor: Annotated[str | None, Field(description="Cursor for pagination")] = None,
+    page_size: Annotated[int | None, Field(description="Number of results per page")] = None,
 ) -> str:
     """List templates for a Notion data source.
 

ldraney_notion_mcp-0.1.5/src/notion_mcp/tools/pages.py

@@ -0,0 +1,130 @@
+"""Page tools — wraps PagesMixin methods."""
+
+from __future__ import annotations
+
+import json
+from typing import Annotated, Any
+
+from pydantic import Field
+
+from ..server import mcp, get_client, _parse_json, _error_response
+
+
+@mcp.tool()
+def create_page(
+    parent: Annotated[str | dict, Field(description="JSON string or object for the parent, e.g. {\"type\": \"page_id\", \"page_id\": \"...\"}")],
+    properties: Annotated[str | dict, Field(description="JSON string or object for the page properties mapping")],
+    children: Annotated[str | list | None, Field(description="JSON string or array for a list of block children to append. Cannot be used together with template.")] = None,
+    template: Annotated[str | dict | None, Field(description="JSON string or object for a data-source template, e.g. {\"type\": \"none\"}, {\"type\": \"default\"}, or {\"type\": \"template_id\", \"template_id\": \"<uuid>\"}")] = None,
+) -> str:
+    """Create a new Notion page.
+
+    Args:
+        parent: JSON string or object for the parent object, e.g. {"type": "page_id", "page_id": "..."}.
+        properties: JSON string or object for the page properties mapping.
+        children: Optional JSON string or array for a list of block children to append.
+            Cannot be used together with template.
+        template: Optional JSON string or object for a data-source template, e.g.
+            {"type": "none"}, {"type": "default"}, or
+            {"type": "template_id", "template_id": "<uuid>"}.
+    """
+    try:
+        result = get_client().create_page(
+            parent=_parse_json(parent, "parent"),
+            properties=_parse_json(properties, "properties"),
+            children=_parse_json(children, "children"),
+            template=_parse_json(template, "template"),
+        )
+        return json.dumps(result, indent=2)
+    except Exception as exc:
+        return _error_response(exc)
+
+
+@mcp.tool()
+def get_page(
+    page_id: Annotated[str, Field(description="The UUID of the page to retrieve")],
+) -> str:
+    """Retrieve a Notion page by its ID.
+
+    Args:
+        page_id: The UUID of the page to retrieve.
+    """
+    try:
+        result = get_client().get_page(page_id)
+        return json.dumps(result, indent=2)
+    except Exception as exc:
+        return _error_response(exc)
+
+
+@mcp.tool()
+def update_page(
+    page_id: Annotated[str, Field(description="The UUID of the page to update")],
+    properties: Annotated[str | dict | None, Field(description="JSON string or object of properties to update")] = None,
+    erase_content: Annotated[bool | None, Field(description="If true, clears ALL block content from the page. WARNING: This is destructive and irreversible.")] = None,
+    icon: Annotated[str | dict | None, Field(description="JSON string or object for the page icon, e.g. {\"type\": \"emoji\", \"emoji\": \"...\"}")] = None,
+    cover: Annotated[str | dict | None, Field(description="JSON string or object for the page cover, e.g. {\"type\": \"external\", \"external\": {\"url\": \"https://...\"}}")] = None,
+) -> str:
+    """Update a Notion page's properties, icon, or cover.
+
+    Args:
+        page_id: The UUID of the page to update.
+        properties: Optional JSON string or object of properties to update.
+        erase_content: If true, clears ALL block content from the page.
+            WARNING: This is destructive and irreversible.
+        icon: Optional JSON string or object for the page icon.
+        cover: Optional JSON string or object for the page cover.
+    """
+    try:
+        kwargs: dict[str, Any] = {}
+        if properties is not None:
+            kwargs["properties"] = _parse_json(properties, "properties")
+        if icon is not None:
+            kwargs["icon"] = _parse_json(icon, "icon")
+        if cover is not None:
+            kwargs["cover"] = _parse_json(cover, "cover")
+        result = get_client().update_page(
+            page_id,
+            erase_content=erase_content,
+            **kwargs,
+        )
+        return json.dumps(result, indent=2)
+    except Exception as exc:
+        return _error_response(exc)
+
+
+@mcp.tool()
+def archive_page(
+    page_id: Annotated[str, Field(description="The UUID of the page to archive")],
+) -> str:
+    """Archive (soft-delete) a Notion page.
+
+    Args:
+        page_id: The UUID of the page to archive.
+    """
+    try:
+        result = get_client().archive_page(page_id)
+        return json.dumps(result, indent=2)
+    except Exception as exc:
+        return _error_response(exc)
+
+
+@mcp.tool()
+def move_page(
+    page_id: Annotated[str, Field(description="The UUID of the page to move")],
+    parent: Annotated[str | dict, Field(description="JSON string or object for the new parent, e.g. {\"type\": \"page_id\", \"page_id\": \"...\"}")],
+) -> str:
+    """Move a Notion page to a new parent.
+
+    Args:
+        page_id: The UUID of the page to move.
+        parent: JSON string or object for the new parent object,
+            e.g. {"type": "page_id", "page_id": "..."}.
+    """
+    try:
+        result = get_client().move_page(
+            page_id,
+            parent=_parse_json(parent, "parent"),
+        )
+        return json.dumps(result, indent=2)
+    except Exception as exc:
+        return _error_response(exc)

ldraney_notion_mcp-0.1.5/src/notion_mcp/tools/search.py

@@ -0,0 +1,42 @@
+"""Search tool — wraps SearchMixin method."""
+
+from __future__ import annotations
+
+import json
+from typing import Annotated
+
+from pydantic import Field
+
+from ..server import mcp, get_client, _parse_json, _error_response
+
+
+@mcp.tool()
+def search(
+    query: Annotated[str | None, Field(description="Text query to search for")] = None,
+    filter: Annotated[str | dict | None, Field(description="JSON string or object for a filter, e.g. {\"value\": \"page\", \"property\": \"object\"}")] = None,
+    sort: Annotated[str | dict | None, Field(description="JSON string or object for a sort, e.g. {\"direction\": \"ascending\", \"timestamp\": \"last_edited_time\"}")] = None,
+    start_cursor: Annotated[str | None, Field(description="Cursor for pagination")] = None,
+    page_size: Annotated[int | None, Field(description="Number of results per page")] = None,
+) -> str:
+    """Search Notion pages and databases.
+
+    Args:
+        query: Optional text query to search for.
+        filter: Optional JSON string or object for a filter,
+            e.g. {"value": "page", "property": "object"}.
+        sort: Optional JSON string or object for a sort,
+            e.g. {"direction": "ascending", "timestamp": "last_edited_time"}.
+        start_cursor: Optional cursor for pagination.
+        page_size: Optional number of results per page.
+    """
+    try:
+        result = get_client().search(
+            query=query,
+            filter=_parse_json(filter, "filter"),
+            sort=_parse_json(sort, "sort"),
+            start_cursor=start_cursor,
+            page_size=page_size,
+        )
+        return json.dumps(result, indent=2)
+    except Exception as exc:
+        return _error_response(exc)

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/src/notion_mcp/tools/users.py

@@ -3,14 +3,17 @@
 from __future__ import annotations
 
 import json
+from typing import Annotated
+
+from pydantic import Field
 
 from ..server import mcp, get_client, _error_response
 
 
 @mcp.tool()
 def get_users(
-    start_cursor: str | None = None,
-    page_size: int | None = None,
+    start_cursor: Annotated[str | None, Field(description="Cursor for pagination")] = None,
+    page_size: Annotated[int | None, Field(description="Number of results per page")] = None,
 ) -> str:
     """List all users in the Notion workspace.
 

{ldraney_notion_mcp-0.1.3 → ldraney_notion_mcp-0.1.5}/tests/test_tools.py

@@ -499,6 +499,225 @@ class TestErrorHandling:
         assert parsed["details"]["code"] == "rate_limited"
 
 
+# ---------------------------------------------------------------------------
+# Raw dict/list parameter tests (no JSON string encoding)
+# ---------------------------------------------------------------------------
+
+
+class TestRawDictParams:
+    """Verify that passing native dicts/lists (not JSON strings) works.
+
+    LLMs often send raw objects instead of JSON-encoded strings.  The widened
+    type annotations (str | dict, str | list, etc.) let pydantic accept them,
+    and _parse_json already passes them through unchanged.
+    """
+
+    def test_create_page_raw_dict(self, mock_client):
+        from notion_mcp.tools.pages import create_page
+
+        mock_client.create_page.return_value = {"id": "page-raw"}
+        result = create_page(
+            parent={"type": "page_id", "page_id": "abc"},
+            properties={"title": [{"text": {"content": "Raw"}}]},
+        )
+        parsed = json.loads(result)
+        assert parsed["id"] == "page-raw"
+        mock_client.create_page.assert_called_once_with(
+            parent={"type": "page_id", "page_id": "abc"},
+            properties={"title": [{"text": {"content": "Raw"}}]},
+            children=None,
+            template=None,
+        )
+
+    def test_create_page_raw_children_list(self, mock_client):
+        from notion_mcp.tools.pages import create_page
+
+        mock_client.create_page.return_value = {"id": "page-ch"}
+        children = [{"object": "block", "type": "paragraph"}]
+        result = create_page(
+            parent={"type": "page_id", "page_id": "abc"},
+            properties={"title": []},
+            children=children,
+        )
+        parsed = json.loads(result)
+        assert parsed["id"] == "page-ch"
+        call_kwargs = mock_client.create_page.call_args.kwargs
+        assert call_kwargs["children"] == children
+
+    def test_create_page_raw_template_dict(self, mock_client):
+        from notion_mcp.tools.pages import create_page
+
+        mock_client.create_page.return_value = {"id": "page-tmpl"}
+        template = {"type": "template_id", "template_id": "tmpl-abc"}
+        result = create_page(
+            parent={"type": "page_id", "page_id": "abc"},
+            properties={"title": []},
+            template=template,
+        )
+        parsed = json.loads(result)
+        assert parsed["id"] == "page-tmpl"
+        mock_client.create_page.assert_called_once_with(
+            parent={"type": "page_id", "page_id": "abc"},
+            properties={"title": []},
+            children=None,
+            template=template,
+        )
+
+    def test_update_page_raw_dicts(self, mock_client):
+        from notion_mcp.tools.pages import update_page
+
+        mock_client.update_page.return_value = {"id": "page-1"}
+        result = update_page(
+            page_id="page-1",
+            properties={"title": [{"text": {"content": "New"}}]},
+            icon={"type": "emoji", "emoji": "X"},
+            cover={"type": "external", "external": {"url": "https://example.com"}},
+        )
+        parsed = json.loads(result)
+        assert parsed["id"] == "page-1"
+        mock_client.update_page.assert_called_once_with(
+            "page-1",
+            erase_content=None,
+            properties={"title": [{"text": {"content": "New"}}]},
+            icon={"type": "emoji", "emoji": "X"},
+            cover={"type": "external", "external": {"url": "https://example.com"}},
+        )
+
+    def test_move_page_raw_dict(self, mock_client):
+        from notion_mcp.tools.pages import move_page
+
+        mock_client.move_page.return_value = {"id": "page-1"}
+        parent = {"type": "page_id", "page_id": "new-parent"}
+        result = move_page(page_id="page-1", parent=parent)
+        parsed = json.loads(result)
+        assert parsed["id"] == "page-1"
+        mock_client.move_page.assert_called_once_with("page-1", parent=parent)
+
+    def test_create_database_raw(self, mock_client):
+        from notion_mcp.tools.databases import create_database
+
+        mock_client.create_database.return_value = {"id": "db-raw"}
+        result = create_database(
+            parent={"type": "page_id", "page_id": "abc"},
+            title=[{"type": "text", "text": {"content": "My DB"}}],
+            initial_data_source={"properties": {"Name": {"title": {}}}},
+        )
+        parsed = json.loads(result)
+        assert parsed["id"] == "db-raw"
+        mock_client.create_database.assert_called_once_with(
+            parent={"type": "page_id", "page_id": "abc"},
+            title=[{"type": "text", "text": {"content": "My DB"}}],
+            initial_data_source={"properties": {"Name": {"title": {}}}},
+        )
+
+    def test_update_database_raw(self, mock_client):
+        from notion_mcp.tools.databases import update_database
+
+        mock_client.update_database.return_value = {"id": "db-1"}
+        result = update_database(
+            database_id="db-1",
+            title=[{"type": "text", "text": {"content": "Renamed"}}],
+            description=[{"type": "text", "text": {"content": "Desc"}}],
+            icon={"type": "emoji", "emoji": "X"},
+            cover={"type": "external", "external": {"url": "https://x.com"}},
+        )
+        parsed = json.loads(result)
+        assert parsed["id"] == "db-1"
+
+    def test_query_database_raw(self, mock_client):
+        from notion_mcp.tools.databases import query_database
+
+        mock_client.query_database.return_value = {"results": [], "has_more": False}
+        filter_obj = {"property": "Status", "select": {"equals": "Done"}}
+        sorts_obj = [{"property": "Created", "direction": "descending"}]
+        result = query_database("db-1", filter=filter_obj, sorts=sorts_obj)
+        parsed = json.loads(result)
+        assert parsed["has_more"] is False
+        mock_client.query_database.assert_called_once_with(
+            "db-1",
+            filter=filter_obj,
+            sorts=sorts_obj,
+            start_cursor=None,
+            page_size=None,
+        )
+
+    def test_update_data_source_raw(self, mock_client):
+        from notion_mcp.tools.databases import update_data_source
+
+        mock_client.update_data_source.return_value = {"id": "ds-1"}
+        props = {"Name": {"title": {}}}
+        result = update_data_source("ds-1", properties=props)
+        parsed = json.loads(result)
+        assert parsed["id"] == "ds-1"
+
+    def test_query_data_source_raw(self, mock_client):
+        from notion_mcp.tools.databases import query_data_source
+
+        mock_client.query_data_source.return_value = {"results": []}
+        filter_obj = {"property": "Done", "checkbox": {"equals": True}}
+        sorts_obj = [{"property": "Name", "direction": "ascending"}]
+        result = query_data_source("ds-1", filter=filter_obj, sorts=sorts_obj)
+        parsed = json.loads(result)
+        assert "results" in parsed
+
+    def test_append_block_children_raw(self, mock_client):
+        from notion_mcp.tools.blocks import append_block_children
+
+        mock_client.append_block_children.return_value = {"results": [{"id": "b1"}]}
+        children = [{"object": "block", "type": "paragraph", "paragraph": {"rich_text": []}}]
+        result = append_block_children("block-1", children=children)
+        parsed = json.loads(result)
+        assert len(parsed["results"]) == 1
+        mock_client.append_block_children.assert_called_once_with(
+            "block-1", children=children,
+        )
+
+    def test_update_block_raw(self, mock_client):
+        from notion_mcp.tools.blocks import update_block
+
+        mock_client.update_block.return_value = {"id": "block-1"}
+        content = {"paragraph": {"rich_text": [{"text": {"content": "updated"}}]}}
+        result = update_block("block-1", content=content)
+        parsed = json.loads(result)
+        assert parsed["id"] == "block-1"
+        mock_client.update_block.assert_called_once_with(
+            "block-1",
+            paragraph={"rich_text": [{"text": {"content": "updated"}}]},
+        )
+
+    def test_create_comment_raw(self, mock_client):
+        from notion_mcp.tools.comments import create_comment
+
+        mock_client.create_comment.return_value = {"id": "comment-raw"}
+        result = create_comment(
+            parent={"page_id": "page-1"},
+            rich_text=[{"type": "text", "text": {"content": "Nice!"}}],
+        )
+        parsed = json.loads(result)
+        assert parsed["id"] == "comment-raw"
+        mock_client.create_comment.assert_called_once_with(
+            parent={"page_id": "page-1"},
+            rich_text=[{"type": "text", "text": {"content": "Nice!"}}],
+        )
+
+    def test_search_raw(self, mock_client):
+        from notion_mcp.tools.search import search
+
+        mock_client.search.return_value = {"results": [], "has_more": False}
+        filter_obj = {"value": "page", "property": "object"}
+        sort_obj = {"direction": "ascending", "timestamp": "last_edited_time"}
+        result = search(query="test", filter=filter_obj, sort=sort_obj)
+        parsed = json.loads(result)
+        assert parsed["has_more"] is False
+        mock_client.search.assert_called_once_with(
+            query="test",
+            filter=filter_obj,
+            sort=sort_obj,
+            start_cursor=None,
+            page_size=None,
+        )
+
+
 # ---------------------------------------------------------------------------
 # Helper tests
 # ---------------------------------------------------------------------------

ldraney_notion_mcp-0.1.3/src/notion_mcp/tools/pages.py

@@ -1,127 +0,0 @@
-"""Page tools — wraps PagesMixin methods."""
-
-from __future__ import annotations
-
-import json
-from typing import Any
-
-from ..server import mcp, get_client, _parse_json, _error_response
-
-
-@mcp.tool()
-def create_page(
-    parent: str,
-    properties: str,
-    children: str | None = None,
-    template: str | None = None,
-) -> str:
-    """Create a new Notion page.
-
-    IMPORTANT: All structured parameters must be passed as JSON-encoded strings, NOT as objects.
-
-    Args:
-        parent: JSON string for the parent object, e.g. '{"type": "page_id", "page_id": "..."}'.
-        properties: JSON string for the page properties mapping.
-        children: Optional JSON string for a list of block children to append.
-            Cannot be used together with template.
-        template: Optional JSON string for a data-source template, e.g.
-            '{"type": "none"}', '{"type": "default"}', or
-            '{"type": "template_id", "template_id": "<uuid>"}'.
-    """
-    try:
-        result = get_client().create_page(
-            parent=_parse_json(parent, "parent"),
-            properties=_parse_json(properties, "properties"),
-            children=_parse_json(children, "children"),
-            template=_parse_json(template, "template"),
-        )
-        return json.dumps(result, indent=2)
-    except Exception as exc:
-        return _error_response(exc)
-
-
-@mcp.tool()
-def get_page(page_id: str) -> str:
-    """Retrieve a Notion page by its ID.
-
-    Args:
-        page_id: The UUID of the page to retrieve.
-    """
-    try:
-        result = get_client().get_page(page_id)
-        return json.dumps(result, indent=2)
-    except Exception as exc:
-        return _error_response(exc)
-
-
-@mcp.tool()
-def update_page(
-    page_id: str,
-    properties: str | None = None,
-    erase_content: bool | None = None,
-    icon: str | None = None,
-    cover: str | None = None,
-) -> str:
-    """Update a Notion page's properties, icon, or cover.
-
-    IMPORTANT: All structured parameters must be passed as JSON-encoded strings, NOT as objects.
-
-    Args:
-        page_id: The UUID of the page to update.
-        properties: Optional JSON string of properties to update.
-        erase_content: If true, clears ALL block content from the page.
-            WARNING: This is destructive and irreversible.
-        icon: Optional JSON string for the page icon.
-        cover: Optional JSON string for the page cover.
-    """
-    try:
-        kwargs: dict[str, Any] = {}
-        if properties is not None:
-            kwargs["properties"] = _parse_json(properties, "properties")
-        if icon is not None:
-            kwargs["icon"] = _parse_json(icon, "icon")
-        if cover is not None:
-            kwargs["cover"] = _parse_json(cover, "cover")
-        result = get_client().update_page(
-            page_id,
-            erase_content=erase_content,
-            **kwargs,
-        )
-        return json.dumps(result, indent=2)
-    except Exception as exc:
-        return _error_response(exc)
-
-
-@mcp.tool()
-def archive_page(page_id: str) -> str:
-    """Archive (soft-delete) a Notion page.
-
-    Args:
-        page_id: The UUID of the page to archive.
-    """
-    try:
-        result = get_client().archive_page(page_id)
-        return json.dumps(result, indent=2)
-    except Exception as exc:
-        return _error_response(exc)
-
-
-@mcp.tool()
-def move_page(page_id: str, parent: str) -> str:
-    """Move a Notion page to a new parent.
-
-    IMPORTANT: The parent parameter must be passed as a JSON-encoded string, NOT as an object.
-
-    Args:
-        page_id: The UUID of the page to move.
-        parent: JSON string for the new parent object,
-            e.g. '{"type": "page_id", "page_id": "..."}'.
-    """
-    try:
-        result = get_client().move_page(
-            page_id,
-            parent=_parse_json(parent, "parent"),
-        )
-        return json.dumps(result, indent=2)
-    except Exception as exc:
-        return _error_response(exc)

ldraney_notion_mcp-0.1.3/src/notion_mcp/tools/search.py

@@ -1,41 +0,0 @@
-"""Search tool — wraps SearchMixin method."""
-
-from __future__ import annotations
-
-import json
-
-from ..server import mcp, get_client, _parse_json, _error_response
-
-
-@mcp.tool()
-def search(
-    query: str | None = None,
-    filter: str | None = None,
-    sort: str | None = None,
-    start_cursor: str | None = None,
-    page_size: int | None = None,
-) -> str:
-    """Search Notion pages and databases.
-
-    IMPORTANT: filter and sort must be passed as JSON-encoded strings, NOT as objects.
-
-    Args:
-        query: Optional text query to search for.
-        filter: Optional JSON string for a filter object,
-            e.g. '{"value": "page", "property": "object"}'.
-        sort: Optional JSON string for a sort object,
-            e.g. '{"direction": "ascending", "timestamp": "last_edited_time"}'.
-        start_cursor: Optional cursor for pagination.
-        page_size: Optional number of results per page.
-    """
-    try:
-        result = get_client().search(
-            query=query,
-            filter=_parse_json(filter, "filter"),
-            sort=_parse_json(sort, "sort"),
-            start_cursor=start_cursor,
-            page_size=page_size,
-        )
-        return json.dumps(result, indent=2)
-    except Exception as exc:
-        return _error_response(exc)