msgraph-mcp-server 0.5.1__tar.gz → 0.5.2__tar.gz

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
-      - uses: astral-sh/setup-uv@v10.0.1
+      - uses: astral-sh/setup-uv@v10.1.0
         with:
           enable-cache: true
 
@@ -31,7 +31,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
-      - uses: astral-sh/setup-uv@v10.0.1
+      - uses: astral-sh/setup-uv@v10.1.0
         with:
           enable-cache: true
 
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
-      - uses: astral-sh/setup-uv@v10.0.1
+      - uses: astral-sh/setup-uv@v10.1.0
         with:
           enable-cache: true
 

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
 
-      - uses: astral-sh/setup-uv@v10.0.1
+      - uses: astral-sh/setup-uv@v10.1.0
         with:
           enable-cache: true
 
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v7
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v10.0.1
+        uses: astral-sh/setup-uv@v10.1.0
 
       - name: Build sdist and wheel
         run: uv build

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: msgraph-mcp-server
-Version: 0.5.1
+Version: 0.5.2
 Summary: MCP server for Microsoft Graph: Outlook mail and calendar, plus read-only Microsoft Teams
 Project-URL: Homepage, https://github.com/timfurlong/msgraph-mcp
 Project-URL: Repository, https://github.com/timfurlong/msgraph-mcp

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "msgraph-mcp-server"
-version = "0.5.1"
+version = "0.5.2"
 description = "MCP server for Microsoft Graph: Outlook mail and calendar, plus read-only Microsoft Teams"
 readme = "README.md"
 license = "MIT"

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/server.json

@@ -7,12 +7,12 @@
     "url": "https://github.com/timfurlong/msgraph-mcp",
     "source": "github"
   },
-  "version": "0.5.1",
+  "version": "0.5.2",
   "packages": [
     {
       "registryType": "pypi",
       "identifier": "msgraph-mcp-server",
-      "version": "0.5.1",
+      "version": "0.5.2",
       "runtimeHint": "uvx",
       "transport": {
         "type": "stdio"

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/src/msgraph_mcp/auth/token.py

@@ -6,12 +6,17 @@ get_access_token raises NotAuthenticatedError pointing at the login CLI.
 
 from __future__ import annotations
 
+from mcp.server.mcpserver.exceptions import ToolError
+
 from msgraph_mcp import config
 from msgraph_mcp.auth.msal_app import build_app, persist_cache
 
 
-class NotAuthenticatedError(RuntimeError):
-    """Raised when no valid token is available and silent refresh failed."""
+class NotAuthenticatedError(ToolError, RuntimeError):
+    """Raised when no valid token is available and silent refresh failed.
+
+    A ToolError so MCPServer passes the login hint through to the caller.
+    """
 
 
 _LOGIN_HINT = "Not authenticated. Run `msgraph-mcp-login` in a terminal to sign in."

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/src/msgraph_mcp/graph/batch.py

@@ -203,6 +203,10 @@ class GraphBatchTransport:
         from kiota_abstractions.request_information import (
             RequestInformation,  # type: ignore[import-untyped]
         )
+        from msgraph.generated.models.o_data_errors.o_data_error import ODataError
+
+        from msgraph_mcp.auth.token import NotAuthenticatedError
+        from msgraph_mcp.graph.errors import map_kiota_error
 
         ri = RequestInformation()
         ri.url = self.GRAPH_BATCH_URL
@@ -210,7 +214,14 @@ class GraphBatchTransport:
         ri.headers.try_add("Content-Type", "application/json")
         ri.content = json.dumps(payload).encode("utf-8")
 
-        raw = await self._graph.raw.request_adapter.send_primitive_async(
-            ri, "bytes", {}
-        )
+        # The error map lets kiota parse Graph's error body (code and message)
+        # when the $batch request as a whole fails.
+        try:
+            raw = await self._graph.raw.request_adapter.send_primitive_async(
+                ri, "bytes", {"XXX": ODataError}
+            )
+        except NotAuthenticatedError:
+            raise
+        except Exception as exc:
+            raise map_kiota_error(exc) from exc
         return json.loads(raw)

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/src/msgraph_mcp/graph/client.py

@@ -15,8 +15,9 @@ from msgraph_mcp.graph.auth_provider import MsalTokenCredential
 
 
 class GraphClient:
-    def __init__(self) -> None:
-        self._sdk = GraphServiceClient(
+    def __init__(self, sdk: GraphServiceClient | None = None) -> None:
+        # `sdk` lets tests supply a client wired to a mock transport.
+        self._sdk = sdk or GraphServiceClient(
             credentials=MsalTokenCredential(),
             scopes=config.SCOPES,
         )

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/src/msgraph_mcp/graph/errors.py

@@ -3,18 +3,25 @@
 Kiota / msgraph-sdk raises a variety of exception shapes for HTTP errors.
 We normalize them into a single GraphAPIError class that the tool layer
 can catch and turn into a clean MCP tool error.
+
+Both error classes subclass MCPServer's ToolError. MCPServer reports any other
+exception as a bare "Error executing tool <name>" and keeps its text on the
+server, so without that the caller would never see the Graph status, code and
+message.
 """
 
 from __future__ import annotations
 
 from typing import Any
 
+from mcp.server.mcpserver.exceptions import ToolError
+
 
-class GraphValidationError(RuntimeError):
+class GraphValidationError(ToolError, RuntimeError):
     """Raised when tool params fail validation before the Graph call."""
 
 
-class GraphAPIError(RuntimeError):
+class GraphAPIError(ToolError, RuntimeError):
     """Raised when Graph returns a non-success response."""
 
     def __init__(self, *, status: int, code: str, message: str) -> None:

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/src/msgraph_mcp/tools/mail_read.py

@@ -42,13 +42,21 @@ def _list_messages_query(*, limit: int, filter_expr: str | None = None):
     ](query_parameters=qp)
 
 
+# Graph refuses a $filter combined with $orderby unless the filter names the
+# sort property first (400 InefficientFilter, "The restriction or sort order is
+# too complex for this operation"). Leading every filter with this always-true
+# clause satisfies that rule, so filtered results keep the server-side
+# newest-first order and stay newest first across pages.
+_SORT_CLAUSE = "receivedDateTime ge 1900-01-01T00:00:00Z"
+
+
 def _build_list_filter(*, unread_only: bool, filter: str | None) -> str | None:
     parts: list[str] = []
     if unread_only:
         parts.append("isRead eq false")
     if filter:
         parts.append(f"({filter})")
-    return " and ".join(parts) if parts else None
+    return " and ".join([_SORT_CLAUSE, *parts]) if parts else None
 
 
 def _search_query(*, limit: int, query: str):
@@ -74,6 +82,12 @@ async def list_messages(
 ) -> dict:
     """List messages from a mail folder, newest first.
 
+    Filtered results are newest first too. When `filter` or `unread_only` is
+    given, the server-side $filter starts with
+    `receivedDateTime ge 1900-01-01T00:00:00Z and`, because Graph only sorts a
+    filtered query by receivedDateTime when the filter names it first. That
+    clause matches every message, so it doesn't narrow the results.
+
     Args:
         folder_id: Folder id, or a well-known name (inbox, sentitems, drafts,
             deleteditems, archive, junkemail). Default: inbox.

msgraph_mcp_server-0.5.2/tests/sdk_graph.py

@@ -0,0 +1,38 @@
+"""A GraphClient backed by the real msgraph SDK over a mock HTTP transport.
+
+Tools built on it send real requests through the SDK's middleware, so tests
+can check the exact URL a tool sends and answer with real Graph response
+bodies, including error bodies. No auth is involved.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+
+import httpx
+from kiota_abstractions.authentication import AnonymousAuthenticationProvider
+from msgraph.graph_request_adapter import GraphRequestAdapter, options
+from msgraph.graph_service_client import GraphServiceClient
+from msgraph_core import GraphClientFactory
+
+from msgraph_mcp.graph.client import GraphClient
+
+Handler = Callable[[httpx.Request], httpx.Response]
+
+
+def sdk_graph(handler: Handler) -> GraphClient:
+    http = GraphClientFactory.create_with_default_middleware(
+        options=options,
+        client=httpx.AsyncClient(transport=httpx.MockTransport(handler)),
+    )
+    sdk = GraphServiceClient(
+        request_adapter=GraphRequestAdapter(
+            AnonymousAuthenticationProvider(), client=http
+        )
+    )
+    return GraphClient(sdk=sdk)
+
+
+def graph_error(status: int, code: str, message: str) -> httpx.Response:
+    """A Graph error response, shaped the way Graph returns one."""
+    return httpx.Response(status, json={"error": {"code": code, "message": message}})

msgraph_mcp_server-0.5.2/tests/test_tool_errors.py

@@ -0,0 +1,131 @@
+"""Tool failures reach the MCP caller with their details.
+
+MCPServer reports any exception that isn't a ToolError as a bare
+"Error executing tool <name>" and keeps its text on the server. These tests
+call tools through a real in-process MCP client, so they check exactly what
+the caller sees.
+"""
+
+from unittest.mock import MagicMock, patch
+
+import httpx
+import pytest
+from mcp import Client
+from mcp.server.mcpserver.exceptions import ToolError
+from mcp.types import CallToolResult, TextContent
+
+from msgraph_mcp import server
+from msgraph_mcp.auth.token import NotAuthenticatedError
+from msgraph_mcp.graph.batch import GraphBatchTransport
+from msgraph_mcp.graph.errors import GraphAPIError, GraphValidationError
+from tests.sdk_graph import graph_error, sdk_graph
+
+
+@pytest.fixture
+def fake_env(monkeypatch):
+    monkeypatch.setenv("MSGRAPH_MCP_CLIENT_ID", "fake-client-id")
+    monkeypatch.setenv("MSGRAPH_MCP_TENANT_ID", "fake-tenant-id")
+
+
+async def _call(graph, tool: str, arguments: dict) -> CallToolResult:
+    with patch("msgraph_mcp.server.GraphClient", return_value=graph):
+        mcp = server.build_server()
+    async with Client(mcp) as client:
+        return await client.call_tool(tool, arguments)
+
+
+def _text(result: CallToolResult) -> str:
+    return " ".join(c.text for c in result.content if isinstance(c, TextContent))
+
+
+@pytest.mark.parametrize(
+    "error_class", [GraphAPIError, GraphValidationError, NotAuthenticatedError]
+)
+def test_anticipated_errors_are_tool_errors(error_class):
+    assert issubclass(error_class, ToolError)
+
+
+@pytest.mark.parametrize(
+    ("tool", "arguments"),
+    [
+        (
+            "list_messages",
+            {"folder_id": "sentitems", "filter": "contains(subject,'x')"},
+        ),
+        ("search_messages", {"query": "report"}),
+        ("get_message", {"message_id": "m1"}),
+        ("list_folders", {}),
+        ("list_rules", {}),
+        (
+            "list_events",
+            {
+                "calendar_id": "c1",
+                "start_datetime": "2026-11-01T00:00:00Z",
+                "end_datetime": "2026-11-08T00:00:00Z",
+            },
+        ),
+        ("list_chats", {}),
+        ("whoami", {}),
+        ("batch_mark_read", {"message_ids": ["m1", "m2"]}),
+    ],
+)
+async def test_graph_error_reaches_caller(fake_env, tool, arguments):
+    graph = sdk_graph(
+        lambda request: graph_error(
+            400,
+            "InefficientFilter",
+            "The restriction or sort order is too complex for this operation.",
+        )
+    )
+
+    result = await _call(graph, tool, arguments)
+
+    assert result.is_error
+    text = _text(result)
+    assert "400" in text
+    assert "InefficientFilter" in text
+    assert "The restriction or sort order is too complex" in text
+
+
+async def test_validation_error_reaches_caller(fake_env):
+    result = await _call(MagicMock(), "list_messages", {"limit": 200})
+
+    assert result.is_error
+    assert "limit must be an integer in 1..100" in _text(result)
+
+
+async def test_login_hint_reaches_caller(fake_env):
+    graph = MagicMock()
+    graph.mailbox.return_value.get.side_effect = NotAuthenticatedError(
+        "Not authenticated. Run `msgraph-mcp-login` in a terminal to sign in."
+    )
+
+    result = await _call(graph, "whoami", {})
+
+    assert result.is_error
+    assert "msgraph-mcp-login" in _text(result)
+
+
+async def test_batch_transport_maps_graph_errors():
+    graph = sdk_graph(
+        lambda request: graph_error(
+            401, "InvalidAuthenticationToken", "Access token has expired."
+        )
+    )
+
+    with pytest.raises(GraphAPIError) as excinfo:
+        await GraphBatchTransport(graph).post_batch({"requests": []})
+
+    assert excinfo.value.status == 401
+    assert excinfo.value.code == "InvalidAuthenticationToken"
+    assert excinfo.value.message == "Access token has expired."
+
+
+async def test_batch_transport_passes_through_success():
+    graph = sdk_graph(
+        lambda request: httpx.Response(200, json={"responses": [{"id": "1"}]})
+    )
+
+    out = await GraphBatchTransport(graph).post_batch({"requests": []})
+
+    assert out == {"responses": [{"id": "1"}]}

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/tests/test_tools_mail_read.py

@@ -1,10 +1,17 @@
 from types import SimpleNamespace
 from unittest.mock import AsyncMock, MagicMock
 
+import httpx
 import pytest
 
 from msgraph_mcp.graph.errors import GraphValidationError
 from msgraph_mcp.tools import mail_read
+from tests.sdk_graph import graph_error, sdk_graph
+
+# Graph only sorts a filtered message query by receivedDateTime when the
+# filter names receivedDateTime first, so list_messages leads every filter
+# with this always-true clause.
+SORT_CLAUSE = "receivedDateTime ge 1900-01-01T00:00:00Z"
 
 
 def _fake_message(*, id_="m1", subject="Hi"):
@@ -110,7 +117,7 @@ async def test_list_messages_default_passes_no_filter():
 async def test_list_messages_unread_only_sets_isread_filter():
     graph, folder = _list_messages_mock_setup()
     await mail_read.list_messages(graph=graph, unread_only=True)
-    assert _captured_filter(folder) == "isRead eq false"
+    assert _captured_filter(folder) == f"{SORT_CLAUSE} and isRead eq false"
 
 
 @pytest.mark.asyncio
@@ -119,7 +126,10 @@ async def test_list_messages_raw_filter_passes_through():
     await mail_read.list_messages(
         graph=graph, filter="from/emailAddress/address eq 'a@x.com'"
     )
-    assert _captured_filter(folder) == "(from/emailAddress/address eq 'a@x.com')"
+    assert (
+        _captured_filter(folder)
+        == f"{SORT_CLAUSE} and (from/emailAddress/address eq 'a@x.com')"
+    )
 
 
 @pytest.mark.asyncio
@@ -128,11 +138,89 @@ async def test_list_messages_combines_unread_and_filter_with_and():
     await mail_read.list_messages(
         graph=graph, unread_only=True, filter="contains(subject,'report')"
     )
-    assert (
-        _captured_filter(folder) == "isRead eq false and (contains(subject,'report'))"
+    assert _captured_filter(folder) == (
+        f"{SORT_CLAUSE} and isRead eq false and (contains(subject,'report'))"
     )
 
 
+def _graph_with_sort_rule(seen: list[httpx.URL]):
+    """Real SDK over a transport that applies Graph's $filter/$orderby rule.
+
+    Graph answers 400 InefficientFilter when a $filter is combined with an
+    $orderby whose property the filter doesn't name first.
+    """
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        seen.append(request.url)
+        filter_expr = request.url.params.get("$filter")
+        orderby = request.url.params.get("$orderby")
+        if filter_expr and orderby:
+            sort_property = orderby.split()[0]
+            if not filter_expr.lstrip("(").startswith(sort_property):
+                return graph_error(
+                    400,
+                    "InefficientFilter",
+                    "The restriction or sort order is too complex for this operation.",
+                )
+        return httpx.Response(200, json={"value": [{"id": "m1", "subject": "Hi"}]})
+
+    return sdk_graph(handler)
+
+
+async def test_list_messages_filtered_request_sorts_newest_first():
+    seen: list[httpx.URL] = []
+    graph = _graph_with_sort_rule(seen)
+
+    result = await mail_read.list_messages(
+        graph=graph,
+        folder_id="sentitems",
+        filter="contains(subject,'Quarterly report')",
+        limit=5,
+    )
+
+    assert [item["id"] for item in result["items"]] == ["m1"]
+    (url,) = seen
+    assert url.path == "/v1.0/me/mailFolders/sentitems/messages"
+    assert url.params["$filter"] == (
+        f"{SORT_CLAUSE} and (contains(subject,'Quarterly report'))"
+    )
+    assert url.params["$orderby"] == "receivedDateTime DESC"
+    assert url.params["$top"] == "5"
+
+
+@pytest.mark.parametrize(
+    ("unread_only", "filter_expr"),
+    [
+        (False, "contains(subject,'report')"),
+        (False, "hasAttachments eq false"),
+        (False, "from/emailAddress/address eq 'a@example.com'"),
+        (False, "receivedDateTime ge 2026-05-01T00:00:00Z"),
+        (True, None),
+        (True, "contains(body/content,'invoice')"),
+    ],
+)
+async def test_list_messages_filters_satisfy_graph_sort_rule(unread_only, filter_expr):
+    seen: list[httpx.URL] = []
+    graph = _graph_with_sort_rule(seen)
+
+    result = await mail_read.list_messages(
+        graph=graph, unread_only=unread_only, filter=filter_expr
+    )
+
+    assert [item["id"] for item in result["items"]] == ["m1"]
+    assert seen[0].params["$orderby"] == "receivedDateTime DESC"
+
+
+async def test_list_messages_unfiltered_request_has_no_filter():
+    seen: list[httpx.URL] = []
+    graph = _graph_with_sort_rule(seen)
+
+    await mail_read.list_messages(graph=graph)
+
+    assert "$filter" not in seen[0].params
+    assert seen[0].params["$orderby"] == "receivedDateTime DESC"
+
+
 @pytest.mark.asyncio
 async def test_search_messages_calls_root_messages_with_search_param():
     graph = MagicMock()

{msgraph_mcp_server-0.5.1 → msgraph_mcp_server-0.5.2}/uv.lock

@@ -971,7 +971,7 @@ wheels = [
 
 [[package]]
 name = "msgraph-mcp-server"
-version = "0.5.1"
+version = "0.5.2"
 source = { editable = "." }
 dependencies = [
     { name = "mcp" },