workspaces-euc-mcp-server 0.1.3__tar.gz → 0.1.4__tar.gz

{workspaces_euc_mcp_server-0.1.3 → workspaces_euc_mcp_server-0.1.4}/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project are documented here. The format is based on
 
 ## [Unreleased]
 
+## [0.1.4] - 2026-06-02
+
+### Added
+- `get_euc_cost_summary` now returns `by_period` — a per-bucket time series (one entry per day for
+  `DAILY`, per month for `MONTHLY`), each with its own per-service split. Previously the tool
+  collapsed all periods into per-service totals, so a `DAILY` request lost the daily breakdown and
+  clients had to query each day individually to chart trends.
+
 ## [0.1.3] - 2026-06-02
 
 ### Fixed

{workspaces_euc_mcp_server-0.1.3 → workspaces_euc_mcp_server-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workspaces-euc-mcp-server
-Version: 0.1.3
+Version: 0.1.4
 Summary: MCP server for administering the Amazon WorkSpaces family of End User Computing services (Personal, Pools, Applications, Secure Browser, Core).
 Project-URL: Homepage, https://github.com/bengroeneveldsg/aws-workspaces-euc-mcp
 Project-URL: Repository, https://github.com/bengroeneveldsg/aws-workspaces-euc-mcp

{workspaces_euc_mcp_server-0.1.3 → workspaces_euc_mcp_server-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "workspaces-euc-mcp-server"
-version = "0.1.3"
+version = "0.1.4"
 description = "MCP server for administering the Amazon WorkSpaces family of End User Computing services (Personal, Pools, Applications, Secure Browser, Core)."
 readme = "README.md"
 requires-python = ">=3.11"

{workspaces_euc_mcp_server-0.1.3 → workspaces_euc_mcp_server-0.1.4}/tests/test_cost.py

@@ -172,6 +172,49 @@ def test_cost_summary_keyword_matches_variants_and_excludes_noneuc():
     assert summary.total == 1701.82
 
 
+def test_cost_summary_daily_returns_per_period_time_series():
+    # DAILY granularity must preserve the per-day breakdown in by_period (for charts), not just
+    # collapse everything into by_service totals.
+    ce = types.SimpleNamespace(
+        get_cost_and_usage=lambda **_: {
+            "ResultsByTime": [
+                {
+                    "TimePeriod": {"Start": "2026-05-01", "End": "2026-05-02"},
+                    "Groups": [
+                        {
+                            "Keys": ["Amazon WorkSpaces Applications"],
+                            "Metrics": {"UnblendedCost": {"Amount": "30.00", "Unit": "USD"}},
+                        }
+                    ],
+                },
+                {
+                    "TimePeriod": {"Start": "2026-05-02", "End": "2026-05-03"},
+                    "Groups": [
+                        {
+                            "Keys": ["Amazon WorkSpaces Applications"],
+                            "Metrics": {"UnblendedCost": {"Amount": "45.00", "Unit": "USD"}},
+                        }
+                    ],
+                },
+            ]
+        }
+    )
+    factory = FakeFactory({consts.COST_EXPLORER_API: ce})
+
+    summary = cost.get_euc_cost_summary_core(
+        factory, granularity="DAILY", start_date="2026-05-01", end_date="2026-05-03"
+    )
+
+    # Aggregate total preserved...
+    assert summary.total == 75.0
+    # ...and the daily series is available, ordered by date.
+    assert [(p.start, p.total) for p in summary.by_period] == [
+        ("2026-05-01", 30.0),
+        ("2026-05-02", 45.0),
+    ]
+    assert summary.by_period[0].by_service[0].service == "Amazon WorkSpaces Applications"
+
+
 def test_cost_summary_explicit_date_range_overrides_lookback():
     captured: dict = {}
 

{workspaces_euc_mcp_server-0.1.3 → workspaces_euc_mcp_server-0.1.4}/workspaces_euc_mcp_server/__init__.py

@@ -3,4 +3,4 @@
 # A copy of the License is located at http://www.apache.org/licenses/LICENSE-2.0
 """MCP server for administering the Amazon WorkSpaces End User Computing portfolio."""
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"

{workspaces_euc_mcp_server-0.1.3 → workspaces_euc_mcp_server-0.1.4}/workspaces_euc_mcp_server/models.py

@@ -231,6 +231,15 @@ class CostLineItem(BaseModel):
     amount: float
 
 
+class CostPeriod(BaseModel):
+    """One time bucket (a day or a month, per the requested granularity)."""
+
+    start: str
+    end: str
+    total: float
+    by_service: list[CostLineItem] = Field(default_factory=list)
+
+
 class CostSummary(BaseModel):
     """Cost rollup for the EUC portfolio over a time window (account-wide)."""
 
@@ -244,6 +253,13 @@ class CostSummary(BaseModel):
     currency: str = "USD"
     total: float
     by_service: list[CostLineItem] = Field(default_factory=list)
+    by_period: list[CostPeriod] = Field(
+        default_factory=list,
+        description=(
+            "Per-bucket time series (one entry per day for DAILY, per month for MONTHLY). "
+            "Use this for charts / trend analysis."
+        ),
+    )
     errors: list[ServiceError] = Field(default_factory=list)
     notes: list[str] = Field(default_factory=list)
 

{workspaces_euc_mcp_server-0.1.3 → workspaces_euc_mcp_server-0.1.4}/workspaces_euc_mcp_server/tools/cost.py

@@ -20,6 +20,7 @@ from .. import consts
 from ..clients import ClientFactory
 from ..models import (
     CostLineItem,
+    CostPeriod,
     CostSummary,
     Recommendation,
     RecommendationReport,
@@ -227,8 +228,10 @@ def get_euc_cost_summary_core(
 
     # Group by SERVICE across ALL spend and select EUC services in code (see _is_euc_service).
     # A server-side exact-name SERVICE filter would silently drop any naming variant — the very
-    # bug that hid AppStream / WorkSpaces Applications spend. Page through all results.
+    # bug that hid AppStream / WorkSpaces Applications spend. Page through all results, keeping both
+    # the overall per-service totals and the per-period (daily/monthly) breakdown for charts.
     totals_by_service: dict[str, float] = {}
+    per_period: dict[tuple[str, str], dict[str, float]] = {}
     currency = "USD"
     next_token: str | None = None
     while True:
@@ -250,6 +253,8 @@ def get_euc_cost_summary_core(
         if not response:
             break
         for period in response.get("ResultsByTime", []):
+            tp = period.get("TimePeriod", {})
+            bucket = per_period.setdefault((tp.get("Start", ""), tp.get("End", "")), {})
             for group in period.get("Groups", []):
                 service = (group.get("Keys") or ["Unknown"])[0]
                 if not _is_euc_service(service):
@@ -258,6 +263,7 @@ def get_euc_cost_summary_core(
                 amount = float(metric.get("Amount", 0.0))
                 currency = metric.get("Unit", currency)
                 totals_by_service[service] = totals_by_service.get(service, 0.0) + amount
+                bucket[service] = bucket.get(service, 0.0) + amount
         next_token = response.get("NextPageToken")
         if not next_token:
             break
@@ -267,6 +273,18 @@ def get_euc_cost_summary_core(
         for s, a in sorted(totals_by_service.items(), key=lambda kv: kv[1], reverse=True)
     ]
     total = round(sum(item.amount for item in by_service), 2)
+    by_period = [
+        CostPeriod(
+            start=p_start,
+            end=p_end,
+            total=round(sum(svc.values()), 2),
+            by_service=[
+                CostLineItem(service=s, amount=round(a, 2))
+                for s, a in sorted(svc.items(), key=lambda kv: kv[1], reverse=True)
+            ],
+        )
+        for (p_start, p_end), svc in sorted(per_period.items())
+    ]
 
     return CostSummary(
         start=start,
@@ -275,12 +293,15 @@ def get_euc_cost_summary_core(
         currency=currency,
         total=total,
         by_service=by_service,
+        by_period=by_period,
         errors=errors,
         notes=[
             "EUC services are selected by matching the Cost Explorer SERVICE name against the EUC "
             "keyword set (workspaces / appstream), so naming variants are not dropped.",
             "Cost Explorer bills WorkSpaces Personal, Pools, and Core together under the single "
             "'Amazon WorkSpaces' service; they cannot be separated via the SERVICE dimension.",
+            "by_period gives the per-bucket time series (per day for DAILY, per month for MONTHLY) "
+            "for charts/trends; by_service is the total across the whole window.",
         ],
     )
 
@@ -335,6 +356,11 @@ def register(mcp: Any, factory: ClientFactory) -> None:
         variants are never dropped. Cost Explorer is not region-scoped, so figures are account-wide.
         Read-only.
 
+        Returns both `by_service` (totals across the whole window) and `by_period` (a per-bucket
+        time series — one entry per day for DAILY, per month for MONTHLY — each with its own
+        per-service split). Use `by_period` with granularity="DAILY" to chart daily trends in a
+        single call.
+
         For a specific calendar month, pass start_date/end_date instead of lookback_days — Cost
         Explorer's end is EXCLUSIVE, so for May 2026 use start_date="2026-05-01",
         end_date="2026-06-01".