ha-mcp-dev 8.6.0.dev2811__tar.gz → 8.6.0.dev2815__tar.gz

{ha_mcp_dev-8.6.0.dev2811/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.6.0.dev2815}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.6.0.dev2811
+Version: 8.6.0.dev2815
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-8.6.0.dev2811 → ha_mcp_dev-8.6.0.dev2815}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.6.0.dev2811"
+version = "8.6.0.dev2815"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's

{ha_mcp_dev-8.6.0.dev2811 → ha_mcp_dev-8.6.0.dev2815}/src/ha_mcp/_version.py

@@ -12,6 +12,9 @@ import os
 
 logger = logging.getLogger(__name__)
 
+# The two distributions ha-mcp ships as (stable and dev channel).
+_CHANNEL_DISTS = ("ha-mcp", "ha-mcp-dev")
+
 
 def get_version() -> str:
     """Return the installed ha-mcp version.
@@ -36,13 +39,12 @@ def get_version() -> str:
     # fixed name order then reports the leftover dist's version instead of the
     # one whose files are really installed.
     try:
-        owners = importlib.metadata.packages_distributions().get("ha_mcp", [])
-        unique = sorted(set(owners))
-        if len(unique) == 1:
-            return importlib.metadata.version(unique[0])
+        owners = [name for name in _CHANNEL_DISTS if _owns_ha_mcp(name)]
+        if len(owners) == 1:
+            return importlib.metadata.version(owners[0])
     except Exception as exc:
-        logger.debug("packages_distributions probe failed: %s", exc)
-    for pkg_name in ("ha-mcp", "ha-mcp-dev"):
+        logger.debug("distribution ownership probe failed: %s", exc)
+    for pkg_name in _CHANNEL_DISTS:
         try:
             return importlib.metadata.version(pkg_name)
         except importlib.metadata.PackageNotFoundError:
@@ -55,6 +57,26 @@ def get_version() -> str:
     return "unknown"
 
 
+def _owns_ha_mcp(dist_name: str) -> bool:
+    """Whether the installed ``dist_name`` distribution provides ``ha_mcp``.
+
+    Reads only that distribution's metadata. ``packages_distributions()``
+    would answer the same question, but reads the metadata of every
+    installed package, which costs seconds where many packages are
+    installed or file access is slow. This runs at every ``ha_mcp`` import.
+    A declared ``top_level.txt`` wins, as it does there; otherwise the
+    file list decides.
+    """
+    try:
+        dist = importlib.metadata.distribution(dist_name)
+    except importlib.metadata.PackageNotFoundError:
+        return False
+    declared = (dist.read_text("top_level.txt") or "").split()
+    if declared:
+        return "ha_mcp" in declared
+    return any(path.parts[:1] == ("ha_mcp",) for path in dist.files or ())
+
+
 def is_dev_version(version: str) -> bool:
     """Return True when the version string contains a PEP 440 ``.dev`` suffix."""
     return ".dev" in version

{ha_mcp_dev-8.6.0.dev2811 → ha_mcp_dev-8.6.0.dev2815}/src/ha_mcp/settings_ui/_handlers_server.py

@@ -359,9 +359,8 @@ async def _settings_info(
     # (the value flips across processes).
     addon = False if is_sidecar else is_running_in_addon()
     try:
-        # Executor: get_version's distribution-ownership scan reads
-        # metadata for every installed package — too heavy for the
-        # event loop on an endpoint the restart cycle polls.
+        # Executor: get_version reads package metadata from disk, and the
+        # restart cycle polls this endpoint.
         version = await asyncio.to_thread(get_version)
     except Exception:  # pragma: no cover — defensive only
         logger.warning("get_version() raised; omitting version from info")

{ha_mcp_dev-8.6.0.dev2811 → ha_mcp_dev-8.6.0.dev2815}/src/ha_mcp/tools/radio/thread.py

@@ -4,10 +4,10 @@ Thread is network-scoped, not per-device: operations target the Thread network
 and its border router rather than an individual node. Border-router writes use
 the ``otbr/*`` WebSocket API and take an OTBR ``extended_address`` — resolved
 from ``otbr/info`` when the caller omits it, which covers the common
-single-OTBR setup. Dataset listing and router discovery use the
+single-OTBR setup. Dataset management and router discovery use the
 integration-wide ``thread/*`` API. When no OTBR is configured the read-only
-``network_status`` degrades to an ``available: False`` payload; the write
-actions raise instead so an unconfigured integration is not a silent no-op.
+``network_status`` degrades to an ``available: False`` payload; border-router
+writes raise instead so an unconfigured integration is not a silent no-op.
 """
 
 from __future__ import annotations
@@ -31,6 +31,17 @@ SUPPORTED: dict[str, ActionSpec] = {
     "list_datasets": ActionSpec(
         "List stored Thread operational datasets (the preferred network + others)."
     ),
+    "set_preferred_dataset": ActionSpec(
+        "Make a stored dataset preferred in Home Assistant. Does not change the "
+        "OTBR's active network; use set_network for that.",
+        required=("dataset_id",),
+    ),
+    "delete_dataset": ActionSpec(
+        "Delete a stored Thread dataset. To delete the preferred dataset, "
+        "make another dataset preferred first.",
+        destructive=True,
+        required=("dataset_id",),
+    ),
     "discover_routers": ActionSpec(
         "Start mDNS discovery of Thread border routers. Results arrive as an "
         "out-of-band event stream; this kicks off the scan.",
@@ -114,9 +125,19 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
         )
         return ok("thread", "add_dataset", result=result)
 
-    # Remaining actions (create_network / set_network / set_channel) are writes
-    # targeting a specific OTBR border router; an absent OTBR must error, not
-    # degrade to a no-op success.
+    if action in ("set_preferred_dataset", "delete_dataset"):
+        result = await ws_call(
+            client, f"thread/{action}", dataset_id=args.get("dataset_id")
+        )
+        return ok("thread", action, result=result)
+
+    return await _handle_otbr(client, action, args)
+
+
+async def _handle_otbr(
+    client: Any, action: str, args: dict[str, Any]
+) -> dict[str, Any]:
+    """Execute a border-router write, requiring a configured OTBR."""
     extended_address = await _resolve_extended_address(client, args)
     if not extended_address:
         integration_required("thread", "otbr")

{ha_mcp_dev-8.6.0.dev2811 → ha_mcp_dev-8.6.0.dev2815}/src/ha_mcp/tools/tools_integrations.py

@@ -72,6 +72,9 @@ from .util_helpers import (
 
 logger = logging.getLogger(__name__)
 
+# First wait between helper registry lookups; each later retry doubles it.
+_REGISTRY_RETRY_BASE_DELAY = 0.5
+
 
 async def _resolve_config_entry_backup_domain(
     client: Any, kwargs: dict[str, Any], domain: str, entry_id: str
@@ -2970,7 +2973,7 @@ class IntegrationTools:
                         logger.info(f"Found unique_id: {unique_id} for {entity_id}")
                         break
                 if attempt < max_retries - 1:
-                    wait_time = 0.5 * (2**attempt)
+                    wait_time = _REGISTRY_RETRY_BASE_DELAY * (2**attempt)
                     logger.debug(
                         f"Registry lookup failed for {entity_id}, "
                         f"waiting {wait_time}s before retry..."
@@ -2982,7 +2985,7 @@ class IntegrationTools:
                 # re-reported as ENTITY_NOT_FOUND in the fallback below.
                 logger.warning(f"Registry lookup attempt {attempt + 1} failed: {e}")
                 if attempt < max_retries - 1:
-                    wait_time = 0.5 * (2**attempt)
+                    wait_time = _REGISTRY_RETRY_BASE_DELAY * (2**attempt)
                     await asyncio.sleep(wait_time)
         return unique_id, registry_result
 

{ha_mcp_dev-8.6.0.dev2811 → ha_mcp_dev-8.6.0.dev2815/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.6.0.dev2811
+Version: 8.6.0.dev2815
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT