ha-mcp-dev 7.8.0.dev705__tar.gz → 7.8.0.dev706__tar.gz

{ha_mcp_dev-7.8.0.dev705/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.8.0.dev706}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.8.0.dev705
+Version: 7.8.0.dev706
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -26,6 +26,7 @@ Requires-Dist: truststore==0.10.4
 Requires-Dist: websockets==16.0
 Requires-Dist: cryptography==49.0.0
 Requires-Dist: pydantic-monty==0.0.18
+Requires-Dist: tzdata>=2024.1
 Dynamic: license-file
 
 > **Breaking change (v7.3.0):** `ha_config_set_yaml` has been moved to [beta](docs/beta.md).

{ha_mcp_dev-7.8.0.dev705 → ha_mcp_dev-7.8.0.dev706}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.8.0.dev705"
+version = "7.8.0.dev706"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -32,6 +32,7 @@ dependencies = [
     "websockets==16.0",
     "cryptography==49.0.0",
     "pydantic-monty==0.0.18",
+    "tzdata>=2024.1",
 ]
 
 [project.urls]

{ha_mcp_dev-7.8.0.dev705 → ha_mcp_dev-7.8.0.dev706}/src/ha_mcp/tools/util_helpers.py

@@ -10,7 +10,10 @@ import logging
 import re
 import time
 from collections.abc import Awaitable, Callable
+from datetime import UTC, datetime
+from datetime import tzinfo as _TZInfo
 from typing import Any
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 from fastmcp.exceptions import ToolError
 from pydantic import BeforeValidator, ValidationError
@@ -596,26 +599,30 @@ async def get_logger_levels(client: Any) -> dict[str, dict[str, Any]]:
 async def add_timezone_metadata(
     client: Any, data: dict[str, Any], include_metadata: bool = True
 ) -> dict[str, Any]:
-    """Add Home Assistant timezone to tool responses for local time context.
+    """Add Home Assistant timezone to tool responses and convert timestamps to local time.
 
-    Wraps *data* in ``{"data": ..., "metadata": {...}}``.  Pass
-    ``include_metadata=False`` to return *data* unchanged — the ``metadata``
-    wrapper is then omitted entirely.
+    Fetches ``time_zone`` from ``/api/config``, converts every
+    ``last_changed``, ``last_updated``, ``last_reported``, ``when``, and
+    ``last_triggered`` field found anywhere in *data* from UTC to that local
+    timezone, then wraps the result in ``{"data": ..., "metadata": {...}}``.
+
+    Pass ``include_metadata=False`` to return *data* unchanged — the
+    ``metadata`` wrapper is then omitted entirely.
+
+    Conversion notes:
+    - Offset-aware strings (``+00:00``) are converted directly.
+    - Naive strings (no offset) are assumed to be UTC before conversion.
+    - ``ZoneInfoNotFoundError`` (tzdata not installed) falls back to UTC.
+    - Any config-fetch failure also falls back to UTC without conversion.
     """
     if not include_metadata:
         return data
+
+    ha_timezone = "UTC"
+    fetch_failed = False
     try:
         config = await client.get_config()
         ha_timezone = config.get("time_zone", "UTC")
-
-        return {
-            "data": data,
-            "metadata": {
-                "home_assistant_timezone": ha_timezone,
-                "timestamp_format": "ISO 8601 (UTC)",
-                "note": f"All timestamps are in UTC. Home Assistant timezone is {ha_timezone}.",
-            },
-        }
     except (
         HomeAssistantConnectionError,
         HomeAssistantAPIError,
@@ -623,21 +630,73 @@ async def add_timezone_metadata(
         TimeoutError,
         OSError,
     ) as _tz_exc:
+        fetch_failed = True
         logger.warning(
             "add_timezone_metadata: failed to fetch HA timezone config — "
-            "falling back to 'Unknown': %s",
+            "falling back to UTC: %s",
             _tz_exc,
             exc_info=True,
         )
+
+    if fetch_failed:
         return {
             "data": data,
             "metadata": {
-                "home_assistant_timezone": "Unknown",
+                "home_assistant_timezone": "UTC",
                 "timestamp_format": "ISO 8601 (UTC)",
-                "note": "All timestamps are in UTC. Could not fetch Home Assistant timezone.",
+                "note": "Could not fetch Home Assistant timezone — timestamps are in UTC.",
             },
         }
 
+    try:
+        local_tz: _TZInfo = ZoneInfo(ha_timezone)
+    except ZoneInfoNotFoundError:
+        logger.warning(
+            "add_timezone_metadata: ZoneInfo(%r) not found "
+            "(tzdata package missing?) — falling back to UTC",
+            ha_timezone,
+        )
+        local_tz = UTC
+        ha_timezone = "UTC"
+
+    _TS_FIELDS = {
+        "last_changed",
+        "last_updated",
+        "last_reported",
+        "when",
+        "last_triggered",
+    }
+
+    def _convert(obj: Any) -> Any:
+        if isinstance(obj, list):
+            return [_convert(i) for i in obj]
+        if isinstance(obj, dict):
+            out = {}
+            for k, v in obj.items():
+                if k in _TS_FIELDS and isinstance(v, str) and v:
+                    try:
+                        parsed = datetime.fromisoformat(v)
+                        if parsed.tzinfo is None:
+                            parsed = parsed.replace(tzinfo=UTC)
+                        out[k] = parsed.astimezone(local_tz).isoformat()
+                    except (ValueError, TypeError):
+                        out[k] = v
+                else:
+                    out[k] = _convert(v)
+            return out
+        return obj
+
+    converted_data = _convert(data)
+
+    return {
+        "data": converted_data,
+        "metadata": {
+            "home_assistant_timezone": ha_timezone,
+            "timestamp_format": f"ISO 8601 ({ha_timezone})",
+            "note": f"Per-record timestamp fields (last_changed, last_updated, last_reported, when, last_triggered) have been converted to {ha_timezone} local time. Query-window boundary fields (period, start_time, end_time) remain in UTC.",
+        },
+    }
+
 
 # --- WS-event-driven wait helpers (#1152) -----------------------------------
 #

{ha_mcp_dev-7.8.0.dev705 → ha_mcp_dev-7.8.0.dev706/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.8.0.dev705
+Version: 7.8.0.dev706
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -26,6 +26,7 @@ Requires-Dist: truststore==0.10.4
 Requires-Dist: websockets==16.0
 Requires-Dist: cryptography==49.0.0
 Requires-Dist: pydantic-monty==0.0.18
+Requires-Dist: tzdata>=2024.1
 Dynamic: license-file
 
 > **Breaking change (v7.3.0):** `ha_config_set_yaml` has been moved to [beta](docs/beta.md).

{ha_mcp_dev-7.8.0.dev705 → ha_mcp_dev-7.8.0.dev706}/src/ha_mcp_dev.egg-info/requires.txt

@@ -6,3 +6,4 @@ truststore==0.10.4
 websockets==16.0
 cryptography==49.0.0
 pydantic-monty==0.0.18
+tzdata>=2024.1