greenpick 0.4.1__tar.gz → 0.4.2__tar.gz

{greenpick-0.4.1/src/greenpick.egg-info → greenpick-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenpick
-Version: 0.4.1
+Version: 0.4.2
 Summary: Design-time sustainability co-pilot (MCP server): greener, cheaper cloud infrastructure decisions with carbon + cost + latency tradeoffs.
 Author-email: "Data Science Advisers, LLC" <info@datascienceadvisers.com>
 License-Expression: MIT
@@ -19,7 +19,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp<2,>=1.2
+Requires-Dist: mcp<2,>=1.7
 Requires-Dist: pydantic>=2.0
 Requires-Dist: httpx>=0.27
 Provides-Extra: dev

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

@@ -1,6 +1,6 @@
 [project]
 name = "greenpick"
-version = "0.4.1"
+version = "0.4.2"
 description = "Design-time sustainability co-pilot (MCP server): greener, cheaper cloud infrastructure decisions with carbon + cost + latency tradeoffs."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -19,7 +19,7 @@ classifiers = [
     "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-    "mcp>=1.2,<2",       # Model Context Protocol SDK (FastMCP lives here). Pinned <2: mcp 2.x
+    "mcp>=1.7,<2",       # Model Context Protocol SDK (FastMCP lives here). >=1.7: tool annotations. Pinned <2: mcp 2.x
                          # renamed FastMCP -> MCPServer and changed APIs; this code targets the 1.x API.
     "pydantic>=2.0",
     "httpx>=0.27",       # async HTTP for live data sources

{greenpick-0.4.1 → greenpick-0.4.2}/src/greenpick/__init__.py

@@ -4,7 +4,7 @@ Greener cloud-region choices with honest carbon + cost + latency tradeoffs,
 delivered inside the vibe-coding loop. Directional guidance, not audited accounting.
 """
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 
 # httpx logs every request URL at INFO, and our live sources pass their API key / token as a URL
 # query parameter — so at the default log level the secret would land in the MCP client's logs.

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

@@ -8,6 +8,17 @@ from __future__ import annotations
 from typing import Optional
 
 from mcp.server.fastmcp import FastMCP
+from mcp.types import ToolAnnotations
+
+# Tool annotations let MCP hosts decide whether to ask the user before a call (and some
+# directories require them). Every GreenPick tool only reads and computes: nothing is created,
+# changed or deleted, so repeating a call has no extra effect. Most fetch live grid data from
+# outside services (EIA, ENTSO-E, Hydro-Québec, IESO) -> openWorldHint; the methodology tool
+# returns fixed text only.
+LIVE_DATA_TOOL = ToolAnnotations(readOnlyHint=True, destructiveHint=False,
+                                 idempotentHint=True, openWorldHint=True)
+LOCAL_TOOL = ToolAnnotations(readOnlyHint=True, destructiveHint=False,
+                             idempotentHint=True, openWorldHint=False)
 
 from .models import Workload, GeoPoint, Provider
 from .data import get_repository
@@ -48,7 +59,7 @@ mcp = FastMCP("greenpick", instructions=INSTRUCTIONS)
 _repo = get_repository()
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def compare_regions_tri_axis(
     user_lat: float,
     user_lon: float,
@@ -80,7 +91,7 @@ async def compare_regions_tri_axis(
     return with_hint(rec.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def greener_alternative_to(
     current_region: str,
     user_lat: float,
@@ -110,7 +121,7 @@ async def greener_alternative_to(
     return with_hint(rec.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def estimate_workload_carbon(
     provider: str,
     region: str,
@@ -134,7 +145,7 @@ async def estimate_workload_carbon(
     })
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def region_carbon_now(provider: str, region: str) -> dict:
     """Current grid carbon intensity for a region, with source, timestamp, and data freshness.
     When the reading is live, also says how it compares with what's typical for that hour this month
@@ -149,7 +160,7 @@ async def region_carbon_now(provider: str, region: str) -> dict:
     return with_hint(out)
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def cleanest_hours_to_run(
     provider: str, region: str, top_n: int = 3, window_hours: Optional[int] = None,
 ) -> dict:
@@ -164,7 +175,7 @@ async def cleanest_hours_to_run(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def greener_instance_family(
     provider: str,
     region: str,
@@ -192,7 +203,7 @@ async def greener_instance_family(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def estimate_inference_carbon(
     size_class: str,
     monthly_requests: float,
@@ -214,7 +225,7 @@ async def estimate_inference_carbon(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def rightsizing_check(
     provider: str,
     region: str,
@@ -237,7 +248,7 @@ async def rightsizing_check(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def carbon_metric_scaffold(
     language: str = "python",
     region: Optional[str] = None,
@@ -260,7 +271,7 @@ async def carbon_metric_scaffold(
     return with_hint(scaffold.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def serving_pattern_advice(
     hubs: list[dict],
     vcpu: float = 1,
@@ -290,7 +301,7 @@ async def serving_pattern_advice(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def data_locality_egress_check(
     compute_provider: str,
     compute_region: str,
@@ -312,7 +323,7 @@ async def data_locality_egress_check(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def carbon_forecast(
     provider: str, region: str, hours_ahead: int = 24, top_n: int = 5,
 ) -> dict:
@@ -327,7 +338,7 @@ async def carbon_forecast(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def cleanest_time_of_day(provider: str, region: str) -> dict:
     """For a RECURRING job (e.g. a nightly batch you run every day), find the region's cleanest
     time of day — each hour-of-day averaged across the recent days of data. Returns the cleanest/
@@ -337,7 +348,7 @@ async def cleanest_time_of_day(provider: str, region: str) -> dict:
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LIVE_DATA_TOOL)
 async def estimate_training_carbon(
     gpu: str,
     gpu_count: int,
@@ -364,7 +375,7 @@ async def estimate_training_carbon(
     return with_hint(advice.model_dump())
 
 
-@mcp.tool()
+@mcp.tool(annotations=LOCAL_TOOL)
 def explain_methodology_and_limits() -> dict:
     """GreenPick's assumptions and what it explicitly does NOT claim. Read this before trusting a number."""
     return {

{greenpick-0.4.1 → greenpick-0.4.2/src/greenpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenpick
-Version: 0.4.1
+Version: 0.4.2
 Summary: Design-time sustainability co-pilot (MCP server): greener, cheaper cloud infrastructure decisions with carbon + cost + latency tradeoffs.
 Author-email: "Data Science Advisers, LLC" <info@datascienceadvisers.com>
 License-Expression: MIT
@@ -19,7 +19,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp<2,>=1.2
+Requires-Dist: mcp<2,>=1.7
 Requires-Dist: pydantic>=2.0
 Requires-Dist: httpx>=0.27
 Provides-Extra: dev

{greenpick-0.4.1 → greenpick-0.4.2}/src/greenpick.egg-info/requires.txt

@@ -1,4 +1,4 @@
-mcp<2,>=1.2
+mcp<2,>=1.7
 pydantic>=2.0
 httpx>=0.27
 

{greenpick-0.4.1 → greenpick-0.4.2}/tests/test_services.py

@@ -1792,3 +1792,55 @@ async def test_asian_users_are_now_served_from_asia():
     adv = await serving_service.serving_pattern(TypicalCarbonRepository(), hubs, Workload(vcpu=1, ram_gb=2))
     assert adv.single_region.region in ("ap-southeast-1", "asia-southeast1", "southeastasia")
     assert adv.single_region.weighted_latency_ms < 40                  # was ~199 ms from Sydney
+
+
+# --- 0.4.2: tool annotations on every tool; every tool tested by name ---
+
+def test_every_tool_declares_all_four_annotation_hints():
+    import asyncio
+    from greenpick import server
+    tools = asyncio.run(server.mcp.list_tools())
+    assert len(tools) == 15
+    for t in tools:
+        a = t.annotations
+        assert a is not None, t.name
+        for hint in (a.readOnlyHint, a.destructiveHint, a.idempotentHint, a.openWorldHint):
+            assert isinstance(hint, bool), t.name           # explicit booleans, none missing
+        assert a.readOnlyHint and not a.destructiveHint and a.idempotentHint, t.name
+    local = {t.name for t in tools if not t.annotations.openWorldHint}
+    assert local == {"explain_methodology_and_limits"}   # the only tool that fetches nothing
+
+
+def _tool(name):
+    from greenpick import server
+    f = getattr(server, name)
+    return getattr(f, "fn", f)
+
+
+@pytest.mark.asyncio
+async def test_tool_greener_alternative_to(monkeypatch):
+    from greenpick import server
+    monkeypatch.setattr(server, "_repo", MockCarbonRepository())
+    r = await _tool("greener_alternative_to")(current_region="us-east-1", user_lat=40.71, user_lon=-74.01,
+                                               vcpu=4, ram_gb=16, max_added_latency_ms=50)
+    assert r["recommended_region"] in ("aws/ca-central-1", "gcp/northamerica-northeast1", "azure/canadaeast")
+    picked = next(c for c in r["candidates"]
+                  if f"{c['provider']}/{c['region']}" == r["recommended_region"])
+    assert picked["added_latency_ms"] <= 50 + 15
+
+
+@pytest.mark.asyncio
+async def test_tool_cleanest_hours_to_run(monkeypatch):
+    from greenpick import server
+    monkeypatch.setattr(server, "_repo", TypicalCarbonRepository())
+    r = await _tool("cleanest_hours_to_run")(provider="aws", region="us-west-2", window_hours=4)
+    assert r["quality"] == "typical" and r["cleanest"]
+    assert r["window"]["window_hours"] == 4 and r["window"]["start_hour_of_day"] is not None
+    assert "live_data_hint" in r
+
+
+def test_tool_explain_methodology_and_limits():
+    r = _tool("explain_methodology_and_limits")()
+    for key in ("what_it_is", "what_it_is_not", "carbon", "cost", "fallback_data", "data_sources"):
+        assert r.get(key), key
+    assert "annual_average" in r["fallback_data"] and "Hydro-Québec" in r["data_sources"]