keep-mcp 2.2.0__tar.gz → 2.2.2__tar.gz

{keep_mcp-2.2.0 → keep_mcp-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: keep-mcp
-Version: 2.2.0
+Version: 2.2.2
 Summary: MCP Server for Google Keep
 Project-URL: Homepage, https://github.com/feuerdev/keep-mcp
 Project-URL: Repository, https://github.com/feuerdev/keep-mcp
@@ -36,7 +36,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Requires-Dist: gkeepapi>=0.16.0
-Requires-Dist: mcp[cli]<3,>=1.2
+Requires-Dist: mcp[cli]<3,>=2.0
 Requires-Dist: python-dotenv>=1.0
 Requires-Dist: requests>=2.28
 Description-Content-Type: text/markdown

{keep_mcp-2.2.0 → keep_mcp-2.2.2}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "keep-mcp"
-version = "2.2.0"
+version = "2.2.2"
 description = "MCP Server for Google Keep"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "gkeepapi>=0.16.0",
-    "mcp[cli]>=1.2,<3",
+    "mcp[cli]>=2.0,<3",
     "python-dotenv>=1.0",
     "requests>=2.28",
 ]

{keep_mcp-2.2.0 → keep_mcp-2.2.2}/src/server/cli.py

@@ -12,11 +12,8 @@ from itertools import islice
 from typing import Any
 
 import gkeepapi
-
-try:
-    from mcp.server import MCPServer
-except ImportError:  # MCP SDK 1.x: FastMCP became MCPServer in 2.0
-    from mcp.server.fastmcp import FastMCP as MCPServer
+from mcp.server import MCPServer
+from mcp.server.mcpserver.exceptions import ToolError
 
 from .keep_api import (
     KEEP_MCP_LABEL,
@@ -38,13 +35,13 @@ def _get_note_or_raise(note_id: str):
     keep = get_client()
     note = keep.get(note_id)
     if not note:
-        raise ValueError(f"Note with ID {note_id} not found")
+        raise ToolError(f"Note with ID {note_id} not found")
     return keep, note
 
 
 def _ensure_modifiable(note):
     if not can_modify_note(note):
-        raise ValueError(
+        raise ToolError(
             f"Note with ID {note.id} cannot be modified "
             "(missing keep-mcp label and UNSAFE_MODE is not enabled)"
         )
@@ -59,7 +56,7 @@ def _normalize_colors(colors: list[str] | None):
         try:
             normalized_colors.append(gkeepapi.node.ColorValue(color))
         except ValueError as exc:
-            raise ValueError(f"Invalid color '{color}'") from exc
+            raise ToolError(f"Invalid color '{color}'") from exc
 
     return normalized_colors
 
@@ -70,7 +67,7 @@ def _parse_utc(value: str | None, param: str) -> datetime | None:
     try:
         parsed = datetime.fromisoformat(value.replace("Z", "+00:00"))
     except ValueError as exc:
-        raise ValueError(
+        raise ToolError(
             f"Invalid {param} '{value}': expected ISO 8601, "
             "e.g. 2026-07-29 or 2026-07-29T12:00:00Z"
         ) from exc
@@ -203,7 +200,7 @@ def create_list(title: str | None = None, items: list[dict[str, Any]] | None = N
     if items:
         for item in items:
             if not isinstance(item.get("checked", False), bool):
-                raise TypeError("Each item's checked field must be a boolean")
+                raise ToolError("Each item's checked field must be a boolean")
         formatted_items = [
             (item.get("text", ""), item.get("checked", False)) for item in items
         ]
@@ -227,7 +224,7 @@ def add_list_item(note_id: str, text: str, checked: bool = False) -> str:
     _ensure_modifiable(note)
 
     if not isinstance(note, gkeepapi.node.List):
-        raise TypeError(f"Note with ID {note_id} is not a list")
+        raise ToolError(f"Note with ID {note_id} is not a list")
 
     item = note.add(text=text, checked=checked)
     keep.sync()
@@ -242,11 +239,11 @@ def update_list_item(note_id: str, item_id: str, text: str | None = None, checke
     _ensure_modifiable(note)
 
     if not isinstance(note, gkeepapi.node.List):
-        raise TypeError(f"Note with ID {note_id} is not a list")
+        raise ToolError(f"Note with ID {note_id} is not a list")
 
     item = note.get(item_id)
     if not item:
-        raise ValueError(f"List item with ID {item_id} not found")
+        raise ToolError(f"List item with ID {item_id} not found")
 
     if text is not None:
         item.text = text
@@ -265,11 +262,11 @@ def delete_list_item(note_id: str, item_id: str) -> str:
     _ensure_modifiable(note)
 
     if not isinstance(note, gkeepapi.node.List):
-        raise TypeError(f"Note with ID {note_id} is not a list")
+        raise ToolError(f"Note with ID {note_id} is not a list")
 
     item = note.get(item_id)
     if not item:
-        raise ValueError(f"List item with ID {item_id} not found")
+        raise ToolError(f"List item with ID {item_id} not found")
 
     item.delete()
     keep.sync()
@@ -284,7 +281,7 @@ def update_note(note_id: str, title: str | None = None, text: str | None = None)
     _ensure_modifiable(note)
 
     if text is not None and isinstance(note, gkeepapi.node.List):
-        raise ValueError("Cannot replace checklist text: use the checklist item tools")
+        raise ToolError("Cannot replace checklist text: use the checklist item tools")
 
     if title is not None:
         note.title = title
@@ -305,7 +302,7 @@ def set_note_color(note_id: str, color: str) -> str:
     try:
         note.color = gkeepapi.node.ColorValue(color)
     except ValueError as exc:
-        raise ValueError(f"Invalid color '{color}'") from exc
+        raise ToolError(f"Invalid color '{color}'") from exc
 
     keep.sync()
     return json.dumps(serialize_note(note))
@@ -397,10 +394,10 @@ def delete_label(label_id: str) -> str:
     keep = get_client()
     label = keep.getLabel(label_id)
     if not label:
-        raise ValueError(f"Label with ID {label_id} not found")
+        raise ToolError(f"Label with ID {label_id} not found")
     if not is_unsafe_mode():
         if label.name == KEEP_MCP_LABEL:
-            raise ValueError(
+            raise ToolError(
                 f"Cannot delete the '{KEEP_MCP_LABEL}' label in safe mode: all notes managed "
                 "by this server would become permanently unmodifiable. Set UNSAFE_MODE=true to override."
             )
@@ -409,7 +406,7 @@ def delete_label(label_id: str) -> str:
             if any(lb.id == label_id for lb in n.labels.all()) and not has_keep_mcp_label(n)
         ]
         if unmanaged:
-            raise ValueError(
+            raise ToolError(
                 f"Cannot delete label '{label.name}' in safe mode: it is attached to "
                 f"{len(unmanaged)} unmanaged note(s). Deleting it would silently modify "
                 "those notes. Set UNSAFE_MODE=true to override."
@@ -428,7 +425,7 @@ def add_label_to_note(note_id: str, label_id: str) -> str:
 
     label = keep.getLabel(label_id)
     if not label:
-        raise ValueError(f"Label with ID {label_id} not found")
+        raise ToolError(f"Label with ID {label_id} not found")
 
     note.labels.add(label)
     keep.sync()
@@ -444,9 +441,9 @@ def remove_label_from_note(note_id: str, label_id: str) -> str:
 
     label = keep.getLabel(label_id)
     if not label:
-        raise ValueError(f"Label with ID {label_id} not found")
+        raise ToolError(f"Label with ID {label_id} not found")
     if label.name == KEEP_MCP_LABEL and not is_unsafe_mode():
-        raise ValueError(
+        raise ToolError(
             f"Cannot remove the '{KEEP_MCP_LABEL}' label in safe mode: the note would "
             "become permanently unmodifiable. Set UNSAFE_MODE=true to override."
         )
@@ -523,7 +520,7 @@ def download_media(note_id: str, dest_dir: str, blob_id: str | None = None) -> s
 
     blobs = [blob for blob in note.blobs if blob_id is None or blob.id == blob_id]
     if blob_id is not None and not blobs:
-        raise ValueError(f"Blob with ID {blob_id} not found on note {note_id}")
+        raise ToolError(f"Blob with ID {blob_id} not found on note {note_id}")
 
     os.makedirs(dest_dir, exist_ok=True)
 

{keep_mcp-2.2.0 → keep_mcp-2.2.2}/src/server/keep_api.py

@@ -5,6 +5,7 @@ from threading import RLock
 import gkeepapi
 import requests
 from dotenv import load_dotenv
+from mcp.server.mcpserver.exceptions import ToolError
 
 KEEP_MCP_LABEL = "keep-mcp"
 
@@ -20,6 +21,8 @@ def keep_operation(func):
         with _client_lock:
             try:
                 return func(*args, **kwargs)
+            except ToolError:
+                raise
             except Exception:
                 # A failed operation can leave unsaved or prematurely cleaned
                 # mutations in memory. Reload remote state on the next call.
@@ -51,7 +54,7 @@ def get_client():
     master_token = os.getenv('GOOGLE_MASTER_TOKEN')
     
     if not email or not master_token:
-        raise ValueError("Missing Google Keep credentials. Please set GOOGLE_EMAIL and GOOGLE_MASTER_TOKEN environment variables.")
+        raise ToolError("Missing Google Keep credentials. Please set GOOGLE_EMAIL and GOOGLE_MASTER_TOKEN environment variables.")
     
     # Initialize the Keep API
     keep = gkeepapi.Keep()
@@ -60,7 +63,7 @@ def get_client():
     try:
         keep.authenticate(email, master_token)
     except requests.exceptions.JSONDecodeError as exc:
-        raise RuntimeError(
+        raise ToolError(
             "Google Keep API returned a non-JSON response during authentication. "
             "This usually means the unofficial Keep API (notes/v1) is inaccessible "
             "from this environment (HTTP 403/4xx). "
@@ -68,7 +71,7 @@ def get_client():
             "is reachable from this network."
         ) from exc
     except gkeepapi.exception.LoginException as exc:
-        raise RuntimeError(
+        raise ToolError(
             f"Google Keep login failed: {exc}. "
             "Verify that GOOGLE_EMAIL and GOOGLE_MASTER_TOKEN are correct."
         ) from exc

{keep_mcp-2.2.0 → keep_mcp-2.2.2}/tests/test_checklist_validation.py

@@ -5,6 +5,7 @@ from unittest.mock import Mock
 
 import gkeepapi
 import pytest
+from mcp.server.mcpserver.exceptions import ToolError
 
 from server import cli
 
@@ -20,7 +21,7 @@ def offline_keep(monkeypatch):
 
 @pytest.mark.parametrize("checked", ["false", "true", 0, 1, None])
 def test_create_list_rejects_non_boolean_checked_without_creating_note(offline_keep, checked):
-    with pytest.raises(TypeError, match="checked.*boolean"):
+    with pytest.raises(ToolError, match="checked.*boolean"):
         cli.create_list("Tasks", [{"text": "Buy milk", "checked": checked}])
     assert list(offline_keep.all()) == []
     offline_keep.sync.assert_not_called()
@@ -40,7 +41,7 @@ def test_create_list_preserves_boolean_checked_and_default(offline_keep):
 def test_update_list_text_does_not_partially_change_title(offline_keep):
     note = offline_keep.createList("Original", [("Buy milk", False)])
     note.labels.add(offline_keep.createLabel("keep-mcp"))
-    with pytest.raises(ValueError, match="checklist.*item"):
+    with pytest.raises(ToolError, match="checklist.*item"):
         cli.update_note(note.id, title="Changed", text="Replacement")
     assert note.title == "Original"
     assert [item.text for item in note.items] == ["Buy milk"]

{keep_mcp-2.2.0 → keep_mcp-2.2.2}/tests/test_cli.py

@@ -3,7 +3,9 @@ import re
 from datetime import datetime, timezone
 from types import SimpleNamespace
 
+import anyio
 import pytest
+from mcp.server.mcpserver.exceptions import ToolError
 
 from server import cli
 
@@ -253,7 +255,7 @@ def test_find_date_filter_func(keep):
 
 
 def test_find_invalid_date_raises(keep):
-    with pytest.raises(ValueError, match="created_after"):
+    with pytest.raises(ToolError, match="created_after"):
         cli.find(created_after="not-a-date")
 
 
@@ -268,7 +270,7 @@ def test_find_invalid_color_raises(keep, monkeypatch):
         raise ValueError("bad")
 
     monkeypatch.setattr(cli.gkeepapi.node, "ColorValue", bad_color)
-    with pytest.raises(ValueError, match="Invalid color 'invalid'"):
+    with pytest.raises(ToolError, match="Invalid color 'invalid'"):
         cli.find(colors=["invalid"])
 
 
@@ -310,8 +312,13 @@ def test_update_note_updates_fields(keep):
     assert data["text"] == "changed"
 
 
+def test_anticipated_errors_reach_the_client(keep):
+    with pytest.raises(ToolError, match="Note with ID missing not found"):
+        anyio.run(cli.mcp.call_tool, "get_note", {"note_id": "missing"})
+
+
 def test_update_note_not_found_raises(keep):
-    with pytest.raises(ValueError, match="not found"):
+    with pytest.raises(ToolError, match="not found"):
         cli.update_note("missing", title="x")
 
 
@@ -325,12 +332,12 @@ def test_list_item_roundtrip(keep):
 
 
 def test_update_list_item_missing_item_raises(keep):
-    with pytest.raises(ValueError, match="not found"):
+    with pytest.raises(ToolError, match="not found"):
         cli.update_list_item("list1", "missing", text="x")
 
 
 def test_delete_list_item_paths(keep):
-    with pytest.raises(ValueError, match="not found"):
+    with pytest.raises(ToolError, match="not found"):
         cli.delete_list_item("list1", "missing")
 
     new_item_id = json.loads(cli.add_list_item("list1", "task"))["item_id"]
@@ -339,11 +346,11 @@ def test_delete_list_item_paths(keep):
 
 
 def test_list_item_requires_list_type(keep):
-    with pytest.raises(TypeError, match="not a list"):
+    with pytest.raises(ToolError, match="not a list"):
         cli.add_list_item("n1", "x")
-    with pytest.raises(TypeError, match="not a list"):
+    with pytest.raises(ToolError, match="not a list"):
         cli.update_list_item("n1", "i1", text="x")
-    with pytest.raises(TypeError, match="not a list"):
+    with pytest.raises(ToolError, match="not a list"):
         cli.delete_list_item("n1", "i1")
 
 
@@ -352,7 +359,7 @@ def test_set_note_color_validates(keep, monkeypatch):
         raise ValueError("bad")
 
     monkeypatch.setattr(cli.gkeepapi.node, "ColorValue", bad_color)
-    with pytest.raises(ValueError, match="Invalid color"):
+    with pytest.raises(ToolError, match="Invalid color"):
         cli.set_note_color("n1", "invalid")
 
 
@@ -378,17 +385,17 @@ def test_label_crud_and_missing_label_errors(keep):
     message = json.loads(cli.delete_label(created["id"]))
     assert "marked for deletion" in message["message"]
 
-    with pytest.raises(ValueError, match="Label with ID bad not found"):
+    with pytest.raises(ToolError, match="Label with ID bad not found"):
         cli.delete_label("bad")
-    with pytest.raises(ValueError, match="Label with ID bad not found"):
+    with pytest.raises(ToolError, match="Label with ID bad not found"):
         cli.add_label_to_note("n1", "bad")
-    with pytest.raises(ValueError, match="Label with ID bad not found"):
+    with pytest.raises(ToolError, match="Label with ID bad not found"):
         cli.remove_label_from_note("n1", "bad")
 
 
 def test_delete_label_safe_mode_guards(keep, monkeypatch):
     # Deleting the keep-mcp label is blocked in safe mode.
-    with pytest.raises(ValueError, match="keep-mcp"):
+    with pytest.raises(ToolError, match="keep-mcp"):
         cli.delete_label("l1")
 
     # Deleting a label that is on an unmanaged note is also blocked in safe mode.
@@ -397,7 +404,7 @@ def test_delete_label_safe_mode_guards(keep, monkeypatch):
     keep._labels["shared"] = shared
     unmanaged.labels.add(shared)
     keep.notes["unmanaged"] = unmanaged
-    with pytest.raises(ValueError, match="unmanaged"):
+    with pytest.raises(ToolError, match="unmanaged"):
         cli.delete_label("shared")
 
     # UNSAFE_MODE bypasses both guards.
@@ -441,14 +448,14 @@ def test_download_media_writes_files(keep, monkeypatch, tmp_path):
 
 
 def test_download_media_unknown_blob(keep, tmp_path):
-    with pytest.raises(ValueError, match="Blob with ID nope not found"):
+    with pytest.raises(ToolError, match="Blob with ID nope not found"):
         cli.download_media("n1", str(tmp_path), blob_id="nope")
 
 
 def test_modification_guard_blocks_when_unlabeled(keep, monkeypatch):
     keep.notes["n1"].labels = DummyLabels()
     monkeypatch.setattr(cli, "can_modify_note", lambda _: False)
-    with pytest.raises(ValueError, match="cannot be modified"):
+    with pytest.raises(ToolError, match="cannot be modified"):
         cli.update_note("n1", title="x")
 
 

{keep_mcp-2.2.0 → keep_mcp-2.2.2}/tests/test_keep_client.py

@@ -1,4 +1,5 @@
 import pytest
+from mcp.server.mcpserver.exceptions import ToolError
 
 from server import keep_api
 
@@ -38,12 +39,21 @@ def test_get_client_raises_when_missing_credentials(monkeypatch):
     monkeypatch.setattr(keep_api, "load_dotenv", lambda: None)
     monkeypatch.setattr(keep_api.os, "getenv", lambda _key: None)
 
-    try:
+    with pytest.raises(ToolError, match="Missing Google Keep credentials"):
         keep_api.get_client()
-    except ValueError as exc:
-        assert "Missing Google Keep credentials" in str(exc)
-    else:
-        raise AssertionError("Expected ValueError for missing credentials")
+
+
+def test_tool_error_keeps_the_client(monkeypatch):
+    client = object()
+    monkeypatch.setattr(keep_api, "_keep_client", client)
+
+    @keep_api.keep_operation
+    def reject():
+        raise ToolError("rejected")
+
+    with pytest.raises(ToolError):
+        reject()
+    assert keep_api._keep_client is client
 
 
 def test_cached_client_refreshes_external_changes(monkeypatch):