ng-postcode-mcp 0.4.1__tar.gz → 0.4.2__tar.gz

{ng_postcode_mcp-0.4.1 → ng_postcode_mcp-0.4.2}/.gitignore

@@ -7,3 +7,4 @@ dist/
 .ruff_cache/
 .pytest_cache/
 *.mcpb
+node_modules/

{ng_postcode_mcp-0.4.1 → ng_postcode_mcp-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ng-postcode-mcp
-Version: 0.4.1
+Version: 0.4.2
 Summary: MCP server for Nigeria's NIPOST digital postcode (NDAPS): validate, look up, reverse-geocode and resolve addresses to postcodes.
 Project-URL: Repository, https://github.com/Adeniyikayodee/ng-postcode
 Project-URL: Issues, https://github.com/Adeniyikayodee/ng-postcode/issues

{ng_postcode_mcp-0.4.1 → ng_postcode_mcp-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ng-postcode-mcp"
-version = "0.4.1"
+version = "0.4.2"
 description = "MCP server for Nigeria's NIPOST digital postcode (NDAPS): validate, look up, reverse-geocode and resolve addresses to postcodes."
 readme = "README.md"
 requires-python = ">=3.10"

{ng_postcode_mcp-0.4.1 → ng_postcode_mcp-0.4.2}/server.json

@@ -3,7 +3,7 @@
   "name": "io.github.Adeniyikayodee/ng-postcode",
   "title": "Nigeria Postcode",
   "description": "Validate, look up and resolve addresses to Nigeria's NIPOST digital postcodes (NDAPS).",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "repository": {
     "url": "https://github.com/Adeniyikayodee/ng-postcode",
     "source": "github",
@@ -13,7 +13,7 @@
     {
       "registryType": "pypi",
       "identifier": "ng-postcode-mcp",
-      "version": "0.4.1",
+      "version": "0.4.2",
       "runtimeHint": "uvx",
       "transport": {
         "type": "stdio"
@@ -55,6 +55,35 @@
           ]
         }
       ]
+    },
+    {
+      "registryType": "npm",
+      "identifier": "ng-postcode-mcp",
+      "version": "0.1.0",
+      "runtimeHint": "npx",
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": [
+        {
+          "name": "NG_POSTCODE_API_KEY",
+          "description": "NIPOST Postcode API key from dashboard.postcode.gov.ng. Validation works without it.",
+          "isRequired": false,
+          "isSecret": true
+        },
+        {
+          "name": "NG_POSTCODE_MAX_LEVEL",
+          "description": "Highest lookup level tools may request. Levels 2 and up consume NIPOST credits.",
+          "default": "1",
+          "choices": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5"
+          ]
+        }
+      ]
     }
   ]
 }

{ng_postcode_mcp-0.4.1 → ng_postcode_mcp-0.4.2}/src/ng_postcode_mcp/server.py

@@ -10,10 +10,11 @@ header; without one it uses the server's key, if the server has one.
 
 from __future__ import annotations
 
+import inspect
 import logging
 import os
 import sys
-from collections.abc import AsyncIterator, Mapping
+from collections.abc import AsyncIterator, Callable, Mapping
 from contextlib import asynccontextmanager
 from dataclasses import dataclass
 from importlib.metadata import version
@@ -39,6 +40,7 @@ from ng_postcode.client import TIMEOUT, AsyncClient, TransportError
 from pydantic import BaseModel, ConfigDict, Field
 
 T = TypeVar("T")
+F = TypeVar("F", bound=Callable[..., Any])
 
 KEY_URL = "https://dashboard.postcode.gov.ng"
 KEY_HEADER = "x-nipost-api-key"
@@ -251,6 +253,7 @@ def create_server(
         annotations=READ_ONLY_OFFLINE,
         structured_output=True,
     )
+    @tidy
     def validate_postcode(
         postcode: Annotated[str, Field(description="Code in any style, e.g. 'ek 01 a03 fk 01'.")],
     ) -> Validation:
@@ -266,6 +269,7 @@ def create_server(
         annotations=READ_ONLY_ONLINE,
         structured_output=True,
     )
+    @tidy
     async def lookup_postcode(
         postcode: Annotated[str, Field(description="Code in any style, e.g. EK-01-A03-FK-01.")],
         ctx: Context[State, Any],
@@ -293,6 +297,7 @@ def create_server(
         annotations=READ_ONLY_ONLINE,
         structured_output=True,
     )
+    @tidy
     async def autocomplete_postcode(
         partial: Annotated[
             str, Field(min_length=1, description="The start of a code, e.g. 'EK 01 A'.")
@@ -310,6 +315,7 @@ def create_server(
         annotations=READ_ONLY_ONLINE,
         structured_output=True,
     )
+    @tidy
     async def find_postcode_at_location(
         latitude: Annotated[
             float, Field(ge=-90, le=90, description="Latitude in decimal degrees, e.g. 7.6211.")
@@ -337,6 +343,7 @@ def create_server(
         annotations=READ_ONLY_ONLINE,
         structured_output=True,
     )
+    @tidy
     async def resolve_address(
         address: Annotated[str, Field(description="The address exactly as the user gave it.")],
         ctx: Context[State, Any],
@@ -388,6 +395,13 @@ def create_server(
     return server
 
 
+def tidy(tool: F) -> F:
+    """Give the tool the same description on every Python: before 3.13 a docstring keeps
+    its indentation."""
+    tool.__doc__ = inspect.cleandoc(tool.__doc__ or "")
+    return tool
+
+
 def reading(landmarks: list[Landmark] | None, queries: list[str] | None) -> ParsedAddress | None:
     """The host model's reading of the address, in the resolver's terms."""
     if not landmarks and not queries:

{ng_postcode_mcp-0.4.1 → ng_postcode_mcp-0.4.2}/tests/test_metadata.py

@@ -7,9 +7,20 @@ from importlib.metadata import version
 from pathlib import Path
 from typing import Any
 
+import pytest
+from mcp import Client
+
+from ng_postcode_mcp import Settings, create_server
+from ng_postcode_mcp.server import INSTRUCTIONS
+
 ROOT = Path(__file__).resolve().parents[1]
 
 
+@pytest.fixture
+def anyio_backend() -> str:
+    return "asyncio"
+
+
 def server_json() -> dict[str, Any]:
     data: dict[str, Any] = json.loads((ROOT / "server.json").read_text(encoding="utf-8"))
     return data
@@ -21,6 +32,15 @@ def test_versions_and_names_agree() -> None:
     assert package["identifier"] == "ng-postcode-mcp"
     assert server["version"] == package["version"] == version("ng-postcode-mcp")
 
+    manifest = ROOT.parent / "js/packages/ng-postcode-mcp/package.json"
+    if not manifest.exists():  # the Node package lives in the repository, not the sdist
+        return
+    node = json.loads(manifest.read_text(encoding="utf-8"))
+    listed = server["packages"][1]
+    assert (listed["registryType"], listed["identifier"]) == ("npm", node["name"])
+    assert listed["version"] == node["version"]
+    assert node["mcpName"] == server["name"]
+
 
 def test_readme_proves_registry_ownership() -> None:
     marker = f"<!-- mcp-name: {server_json()['name']} -->"
@@ -49,3 +69,15 @@ def test_the_python_bundle_pins_this_version() -> None:
     manifest: dict[str, Any] = json.loads((bundle / "manifest.json").read_text(encoding="utf-8"))
     assert manifest["version"] == released
     assert f'"ng-postcode-mcp=={released}"' in (bundle / "server" / "main.py").read_text()
+
+
+@pytest.mark.anyio
+async def test_the_shared_contract_matches_this_server() -> None:
+    shared = ROOT.parent / "spec" / "mcp.json"
+    if not shared.exists():  # the contract lives in the repository, not the sdist
+        return
+    async with Client(create_server(Settings(api_key=None))) as client:
+        tools = (await client.list_tools()).tools
+    live = [t.model_dump(mode="json", by_alias=True, exclude_none=True) for t in tools]
+    recorded: dict[str, Any] = json.loads(shared.read_text(encoding="utf-8"))
+    assert recorded == {"instructions": INSTRUCTIONS, "tools": live}, "run scripts/mcp_spec.py"