greenpick 0.4.0__tar.gz → 0.4.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenpick
-Version: 0.4.0
+Version: 0.4.1
 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
@@ -60,11 +60,12 @@ seconds. (It responds when you ask; auto-nudging on infra-code changes is on the
 > this month's average for each grid, from a year of real data.
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/bithug01/greenpick/master/docs/img/region-carbon-30x.svg" alt="Same H100 training run, ~30× the carbon depending only on region (Stockholm vs Sydney)" width="560" />
+  <img src="https://raw.githubusercontent.com/bithug01/greenpick/master/docs/img/region-carbon-30x.svg" alt="Same H100 training run, ~28× the carbon depending only on region (Stockholm vs Sydney)" width="560" />
 </p>
 
-*The same 40-GPU-hour training run emits ~0.7 kg CO₂ in Stockholm vs ~19 kg in Sydney — a ~30×
-difference from region choice alone. Ask GreenPick and it surfaces that (with the cost and latency
+*The same 40-GPU-hour training run emits ~0.6 kg CO₂ in Stockholm vs ~17.5 kg in Sydney — a ~28×
+difference from region choice alone (typical October grids; Sydney on Ember's 2025 national figure,
+a lower bound for its coal-heavier state grid). Ask GreenPick and it surfaces that (with the cost and latency
 tradeoff) while you're still in the editor, before you commit.*
 
 **▶ [See the 5-minute demo](docs/demo.md)** — three scenarios with real tool output (training placement, the egress backfire, the forecast).
@@ -195,12 +196,12 @@ See `docs/user-questions-backlog.md`.
   intensity and average hour-of-day profile (UTC), computed from 12 months of real hourly EIA-930 /
   ENTSO-E data (`data/typical.json`, refreshed by `scripts/refresh_typical.py`). Labelled
   `quality: "typical"` — a realistic norm, never presented as a current reading.
-- **Annual** — for Singapore, Tokyo and Mumbai/Pune, where no free hourly data exists: the country's
+- **Annual** — for Singapore, Tokyo, Mumbai/Pune and Sydney, where no free hourly data exists: the country's
   yearly lifecycle grid intensity from [Ember](https://ember-energy.org/) (via Our World in Data,
   CC BY 4.0), with source and year (`data/annual.json`). Labelled `quality: "annual_average"`; fine for
   comparing regions, but carries no timing signal.
-- **Mock** — a hand-set illustrative value, labelled `quality: "mock"`, used only where nothing else
-  exists (currently Sydney).
+- **Mock** — a hand-set illustrative value, labelled `quality: "mock"`, kept only as a last resort if
+  every other source is missing. No catalog region relies on it.
 - Cost: a **dated static pricing table** (`data/pricing.json`), refreshed from live Vantage
   pricing via `scripts/refresh_pricing.py` using one matched method across all three clouds.
 - Instance-family efficiency: directional perf-per-watt multipliers (`data/instance_families.json`).
@@ -318,7 +319,7 @@ carbon, set two free keys (`EIA_API_KEY` for US, `ENTSOE_TOKEN` for EU) and
 `GREENPICK_CARBON_SOURCE=auto` — see [Turn on live data](#turn-on-live-data).
 
 **Why "directional" and not audited numbers?** Because it's for a *design-time decision*, not a
-compliance report. "Stockholm is ~30× cleaner than Sydney" is what you need to pick a region in
+compliance report. "Stockholm is ~28× cleaner than Sydney" is what you need to pick a region in
 seconds — a certified figure is a different job for a different tool (Electricity Maps, WattTime).
 GreenPick is for *decisions*, not *disclosures*, and says so in every tool's limitations.
 

{greenpick-0.4.0 → greenpick-0.4.1}/README.md

@@ -30,11 +30,12 @@ seconds. (It responds when you ask; auto-nudging on infra-code changes is on the
 > this month's average for each grid, from a year of real data.
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/bithug01/greenpick/master/docs/img/region-carbon-30x.svg" alt="Same H100 training run, ~30× the carbon depending only on region (Stockholm vs Sydney)" width="560" />
+  <img src="https://raw.githubusercontent.com/bithug01/greenpick/master/docs/img/region-carbon-30x.svg" alt="Same H100 training run, ~28× the carbon depending only on region (Stockholm vs Sydney)" width="560" />
 </p>
 
-*The same 40-GPU-hour training run emits ~0.7 kg CO₂ in Stockholm vs ~19 kg in Sydney — a ~30×
-difference from region choice alone. Ask GreenPick and it surfaces that (with the cost and latency
+*The same 40-GPU-hour training run emits ~0.6 kg CO₂ in Stockholm vs ~17.5 kg in Sydney — a ~28×
+difference from region choice alone (typical October grids; Sydney on Ember's 2025 national figure,
+a lower bound for its coal-heavier state grid). Ask GreenPick and it surfaces that (with the cost and latency
 tradeoff) while you're still in the editor, before you commit.*
 
 **▶ [See the 5-minute demo](docs/demo.md)** — three scenarios with real tool output (training placement, the egress backfire, the forecast).
@@ -165,12 +166,12 @@ See `docs/user-questions-backlog.md`.
   intensity and average hour-of-day profile (UTC), computed from 12 months of real hourly EIA-930 /
   ENTSO-E data (`data/typical.json`, refreshed by `scripts/refresh_typical.py`). Labelled
   `quality: "typical"` — a realistic norm, never presented as a current reading.
-- **Annual** — for Singapore, Tokyo and Mumbai/Pune, where no free hourly data exists: the country's
+- **Annual** — for Singapore, Tokyo, Mumbai/Pune and Sydney, where no free hourly data exists: the country's
   yearly lifecycle grid intensity from [Ember](https://ember-energy.org/) (via Our World in Data,
   CC BY 4.0), with source and year (`data/annual.json`). Labelled `quality: "annual_average"`; fine for
   comparing regions, but carries no timing signal.
-- **Mock** — a hand-set illustrative value, labelled `quality: "mock"`, used only where nothing else
-  exists (currently Sydney).
+- **Mock** — a hand-set illustrative value, labelled `quality: "mock"`, kept only as a last resort if
+  every other source is missing. No catalog region relies on it.
 - Cost: a **dated static pricing table** (`data/pricing.json`), refreshed from live Vantage
   pricing via `scripts/refresh_pricing.py` using one matched method across all three clouds.
 - Instance-family efficiency: directional perf-per-watt multipliers (`data/instance_families.json`).
@@ -288,7 +289,7 @@ carbon, set two free keys (`EIA_API_KEY` for US, `ENTSOE_TOKEN` for EU) and
 `GREENPICK_CARBON_SOURCE=auto` — see [Turn on live data](#turn-on-live-data).
 
 **Why "directional" and not audited numbers?** Because it's for a *design-time decision*, not a
-compliance report. "Stockholm is ~30× cleaner than Sydney" is what you need to pick a region in
+compliance report. "Stockholm is ~28× cleaner than Sydney" is what you need to pick a region in
 seconds — a certified figure is a different job for a different tool (Electricity Maps, WattTime).
 GreenPick is for *decisions*, not *disclosures*, and says so in every tool's limitations.
 

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

@@ -1,6 +1,6 @@
 [project]
 name = "greenpick"
-version = "0.4.0"
+version = "0.4.1"
 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"

{greenpick-0.4.0 → greenpick-0.4.1}/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.0"
+__version__ = "0.4.1"
 
 # 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.0 → greenpick-0.4.1}/src/greenpick/data/annual.json

@@ -8,6 +8,8 @@
   "JP": { "country": "Japan", "g_co2_per_kwh": 477.3, "year": 2025,
           "note": "National average; the Tokyo (TEPCO) area mix differs somewhat and varies by hour." },
   "IN": { "country": "India", "g_co2_per_kwh": 670.1, "year": 2025,
-          "note": "National average; Maharashtra (Mumbai, Pune) runs about 6% above it on Ember's state-level data." }
+          "note": "National average; Maharashtra (Mumbai, Pune) runs about 6% above it on Ember's state-level data." },
+  "AU": { "country": "Australia", "g_co2_per_kwh": 525.2, "year": 2025,
+          "note": "National average; New South Wales (Sydney) is more coal-heavy and runs higher, so treat this as a lower bound for Sydney." }
  }
 }

{greenpick-0.4.0 → greenpick-0.4.1}/src/greenpick/data/regions.json

@@ -6,7 +6,7 @@
     "us-west-2":      { "name": "Oregon",        "lat": 45.87, "lon": -119.69, "zone": "US-NW-PACW", "eia_ba": "BPAT", "jurisdiction": "US" },
     "eu-west-1":      { "name": "Ireland",       "lat": 53.41, "lon": -8.24,  "zone": "IE", "entsoe_eic": "10Y1001A1001A59C", "jurisdiction": "EEA" },
     "eu-north-1":     { "name": "Stockholm",     "lat": 59.33, "lon": 18.07,  "zone": "SE", "entsoe_eic": "10YSE-1--------K", "jurisdiction": "EEA" },
-    "ap-southeast-2": { "name": "Sydney",        "lat": -33.87, "lon": 151.21, "zone": "AU-NSW", "jurisdiction": "AU" },
+    "ap-southeast-2": { "name": "Sydney",        "lat": -33.87, "lon": 151.21, "zone": "AU-NSW", "annual_zone": "AU", "jurisdiction": "AU" },
     "ca-central-1":   { "name": "Montreal",      "lat": 45.50, "lon": -73.57, "zone": "CA-QC", "ca_source": "hq", "jurisdiction": "CA" },
     "ap-southeast-1": { "name": "Singapore",     "lat": 1.29,  "lon": 103.85, "zone": "SG", "annual_zone": "SG", "jurisdiction": "SG" },
     "ap-northeast-1": { "name": "Tokyo",         "lat": 35.68, "lon": 139.69, "zone": "JP-TK", "annual_zone": "JP", "jurisdiction": "JP" },

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

@@ -381,6 +381,6 @@ def explain_methodology_and_limits() -> dict:
         "forecast": "Day-ahead forecast is RELATIVE: upcoming hours ranked by forecast wind+solar output (ENTSO-E A69), not an absolute gCO2/kWh forecast. EU only; US/uncovered zones degrade to the recent historical pattern (labelled 'historical').",
         "data_residency": "GreenPick flags when a recommended move CROSSES a jurisdiction (esp. leaving the EEA) as a geographic heads-up only. It does NOT assess legal/GDPR compliance, does not encode adequacy decisions, and is not legal advice — confirm with your own data governance.",
         "ignored": "Embodied/hardware carbon and provider renewable-energy certificates.",
-        "fallback_data": "Used when live data isn't available (no key, the source didn't respond, or GreenPick isn't set to live). 'typical' = this calendar month's average intensity and average hour-of-day profile (UTC) for the region, computed from 12 months of real hourly EIA-930 / ENTSO-E data with GreenPick's own emission factors (bundled typical.json, refreshed by scripts/refresh_typical.py) — a realistic norm, not a current reading. 'annual_average' = the country's yearly lifecycle grid intensity from Ember (via Our World in Data; bundled annual.json with source and year), for regions with no free hourly data (Singapore, Tokyo, Mumbai/Pune) — sound for comparing regions, no timing signal (no hourly profile). 'mock' = a hand-set illustrative value with a synthetic hourly pattern, used only where nothing else exists (Sydney); timing advice on mock isn't meaningful. Both carry a live_data_hint saying why the result isn't live and how to turn live data on.",
+        "fallback_data": "Used when live data isn't available (no key, the source didn't respond, or GreenPick isn't set to live). 'typical' = this calendar month's average intensity and average hour-of-day profile (UTC) for the region, computed from 12 months of real hourly EIA-930 / ENTSO-E data with GreenPick's own emission factors (bundled typical.json, refreshed by scripts/refresh_typical.py) — a realistic norm, not a current reading. 'annual_average' = the country's yearly lifecycle grid intensity from Ember (via Our World in Data; bundled annual.json with source and year), for regions with no free hourly data (Singapore, Tokyo, Mumbai/Pune, Sydney — national figures, so Sydney's is a lower bound for its coal-heavier state) — sound for comparing regions, no timing signal (no hourly profile). 'mock' = a hand-set illustrative value with a synthetic hourly pattern, a last resort no catalog region relies on; timing advice on mock isn't meaningful. Both carry a live_data_hint saying why the result isn't live and how to turn live data on.",
         "data_sources": "GREENPICK_CARBON_SOURCE=auto routes US regions to EIA-930 and EU regions to ENTSO-E (both free, key needed), and Canadian regions to Hydro-Québec (Québec) and IESO (Ontario) open data (free, no key). All mixes are weighted with the same per-fuel factors. Without live data a region uses its clearly-labelled typical value (or mock where no free source exists). Electricity Maps is available when selected explicitly (GREENPICK_CARBON_SOURCE=electricitymaps).",
     }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenpick
-Version: 0.4.0
+Version: 0.4.1
 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
@@ -60,11 +60,12 @@ seconds. (It responds when you ask; auto-nudging on infra-code changes is on the
 > this month's average for each grid, from a year of real data.
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/bithug01/greenpick/master/docs/img/region-carbon-30x.svg" alt="Same H100 training run, ~30× the carbon depending only on region (Stockholm vs Sydney)" width="560" />
+  <img src="https://raw.githubusercontent.com/bithug01/greenpick/master/docs/img/region-carbon-30x.svg" alt="Same H100 training run, ~28× the carbon depending only on region (Stockholm vs Sydney)" width="560" />
 </p>
 
-*The same 40-GPU-hour training run emits ~0.7 kg CO₂ in Stockholm vs ~19 kg in Sydney — a ~30×
-difference from region choice alone. Ask GreenPick and it surfaces that (with the cost and latency
+*The same 40-GPU-hour training run emits ~0.6 kg CO₂ in Stockholm vs ~17.5 kg in Sydney — a ~28×
+difference from region choice alone (typical October grids; Sydney on Ember's 2025 national figure,
+a lower bound for its coal-heavier state grid). Ask GreenPick and it surfaces that (with the cost and latency
 tradeoff) while you're still in the editor, before you commit.*
 
 **▶ [See the 5-minute demo](docs/demo.md)** — three scenarios with real tool output (training placement, the egress backfire, the forecast).
@@ -195,12 +196,12 @@ See `docs/user-questions-backlog.md`.
   intensity and average hour-of-day profile (UTC), computed from 12 months of real hourly EIA-930 /
   ENTSO-E data (`data/typical.json`, refreshed by `scripts/refresh_typical.py`). Labelled
   `quality: "typical"` — a realistic norm, never presented as a current reading.
-- **Annual** — for Singapore, Tokyo and Mumbai/Pune, where no free hourly data exists: the country's
+- **Annual** — for Singapore, Tokyo, Mumbai/Pune and Sydney, where no free hourly data exists: the country's
   yearly lifecycle grid intensity from [Ember](https://ember-energy.org/) (via Our World in Data,
   CC BY 4.0), with source and year (`data/annual.json`). Labelled `quality: "annual_average"`; fine for
   comparing regions, but carries no timing signal.
-- **Mock** — a hand-set illustrative value, labelled `quality: "mock"`, used only where nothing else
-  exists (currently Sydney).
+- **Mock** — a hand-set illustrative value, labelled `quality: "mock"`, kept only as a last resort if
+  every other source is missing. No catalog region relies on it.
 - Cost: a **dated static pricing table** (`data/pricing.json`), refreshed from live Vantage
   pricing via `scripts/refresh_pricing.py` using one matched method across all three clouds.
 - Instance-family efficiency: directional perf-per-watt multipliers (`data/instance_families.json`).
@@ -318,7 +319,7 @@ carbon, set two free keys (`EIA_API_KEY` for US, `ENTSOE_TOKEN` for EU) and
 `GREENPICK_CARBON_SOURCE=auto` — see [Turn on live data](#turn-on-live-data).
 
 **Why "directional" and not audited numbers?** Because it's for a *design-time decision*, not a
-compliance report. "Stockholm is ~30× cleaner than Sydney" is what you need to pick a region in
+compliance report. "Stockholm is ~28× cleaner than Sydney" is what you need to pick a region in
 seconds — a certified figure is a different job for a different tool (Electricity Maps, WattTime).
 GreenPick is for *decisions*, not *disclosures*, and says so in every tool's limitations.
 

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

@@ -348,10 +348,10 @@ async def test_auto_router_picks_source_by_region(monkeypatch):
     repo = AutoRepository(eia_key="k", entsoe_token="t")
     us = await repo.carbon_now("aws", "us-east-1")      # -> EIA
     eu = await repo.carbon_now("aws", "eu-north-1")     # -> ENTSO-E
-    syd = await repo.carbon_now("aws", "ap-southeast-2")  # -> mock
+    syd = await repo.carbon_now("aws", "ap-southeast-2")  # -> no live source: sourced yearly figure
     assert us.source == "eia"
     assert eu.source == "entsoe"
-    assert syd.quality == "mock"
+    assert syd.quality == "annual_average"
 
 
 @pytest.mark.asyncio
@@ -1494,14 +1494,26 @@ async def test_typical_reading_is_this_months_real_average():
 
 
 @pytest.mark.asyncio
-async def test_uncovered_region_still_falls_back_to_mock():
+async def test_mock_is_only_the_last_resort(monkeypatch):
+    from greenpick.data import typical_repository as tr
     repo = TypicalCarbonRepository()
+    # Sydney has no typical data but a sourced yearly figure -> annual, not mock.
     r = await repo.carbon_now("aws", "ap-southeast-2")
-    assert r.quality == "mock"
+    assert r.quality == "annual_average" and r.g_co2_per_kwh == 525.2
+    # With no yearly figure either, mock still answers (labelled) rather than failing.
+    monkeypatch.setattr(tr, "annual_entry", lambda p, reg: None)
+    m = await repo.carbon_now("aws", "ap-southeast-2")
+    assert m.quality == "mock"
     hist = await repo.carbon_history("aws", "ap-southeast-2")
     assert hist and hist[0].period.startswith("H") and not hist[0].period.endswith("Z")
 
 
+def test_no_catalog_region_relies_on_mock():
+    from greenpick.data.static_data import iter_regions
+    for prov, reg, meta in iter_regions():
+        assert typical_entry(prov, reg) or annual_entry(prov, reg), f"{prov}/{reg} would be mock"
+
+
 @pytest.mark.asyncio
 async def test_typical_history_is_the_months_real_profile_in_utc():
     from greenpick.services import scheduling_service as ss