ha-mcp-dev 7.3.0.dev372__tar.gz → 7.3.0.dev374__tar.gz

{ha_mcp_dev-7.3.0.dev372/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.3.0.dev374}/PKG-INFO

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

{ha_mcp_dev-7.3.0.dev372 → ha_mcp_dev-7.3.0.dev374}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.3.0.dev372"
+version = "7.3.0.dev374"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -135,12 +135,6 @@ ignore = [
 "tests/**/*" = ["E501", "B011"]
 # C901 ignores for tools files with complex methods (see #925).
 # Remove lines as individual methods are simplified below threshold.
-"src/ha_mcp/tools/backup.py" = ["C901"]
-"src/ha_mcp/tools/best_practice_checker.py" = ["C901"]
-"src/ha_mcp/tools/device_control.py" = ["C901"]
-"src/ha_mcp/tools/helpers.py" = ["C901"]
-"src/ha_mcp/tools/registry.py" = ["C901"]
-"src/ha_mcp/tools/smart_search.py" = ["C901"]
 "src/ha_mcp/tools/tools_addons.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_dashboards.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_helpers.py" = ["C901"]
@@ -148,6 +142,7 @@ ignore = [
 "src/ha_mcp/tools/tools_registry.py" = ["C901"]
 "src/ha_mcp/tools/tools_search.py" = ["C901"]
 "src/ha_mcp/tools/tools_utility.py" = ["C901"]
+"src/ha_mcp/tools/smart_search.py" = ["C901"]
 "src/ha_mcp/tools/util_helpers.py" = ["C901"]
 
 [tool.pytest.ini_options]

{ha_mcp_dev-7.3.0.dev372 → ha_mcp_dev-7.3.0.dev374}/src/ha_mcp/tools/backup.py

@@ -27,6 +27,9 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
+_BACKUP_MAX_WAIT_S = 120
+_BACKUP_POLL_INTERVAL_S = 2
+
 
 def _get_backup_hint_text() -> str:
     """
@@ -85,6 +88,80 @@ async def _get_backup_password(
     return cast(str, default_password)
 
 
+async def _poll_backup_completion(
+    ws_client: HomeAssistantWebSocketClient,
+    name: str,
+    backup_job_id: str,
+    max_wait_seconds: int,
+    poll_interval: int,
+) -> dict[str, Any]:
+    """Poll backup/info until the named backup completes, fails, or times out.
+
+    Raises ToolError on backup failure or timeout.
+    """
+    waited = 0
+
+    while waited < max_wait_seconds:
+        await asyncio.sleep(poll_interval)
+        waited += poll_interval
+
+        info_result = await ws_client.send_command("backup/info")
+        if info_result.get("success"):
+            state = info_result.get("result", {}).get("state")
+            last_event = info_result.get("result", {}).get("last_action_event", {})
+            event_state = last_event.get("state")
+
+            logger.debug(
+                f"Backup state: {state}, event_state: {event_state}, waited: {waited}s"
+            )
+
+            if state == "idle" and event_state == "completed":
+                backups = info_result.get("result", {}).get("backups", [])
+                created_backup = None
+                for backup in backups:
+                    if backup.get("name") == name:
+                        created_backup = backup
+                        break
+
+                if created_backup:
+                    logger.info(
+                        f"Backup completed successfully: {created_backup.get('backup_id')}"
+                    )
+                    return {
+                        "success": True,
+                        "backup_id": created_backup.get("backup_id"),
+                        "backup_job_id": backup_job_id,
+                        "name": name,
+                        "date": created_backup.get("date"),
+                        "size_bytes": created_backup.get("agents", {})
+                        .get("hassio.local", {})
+                        .get("size"),
+                        "status": "Backup completed successfully",
+                        "duration_seconds": waited,
+                        "note": "Backup uses your Home Assistant's default backup password",
+                    }
+                else:
+                    logger.warning(
+                        "Backup completed but not found in backup list yet, waiting..."
+                    )
+                    continue
+
+            elif event_state == "failed":
+                raise_tool_error(create_error_response(
+                    ErrorCode.SERVICE_CALL_FAILED,
+                    "Backup creation failed",
+                    context={"backup_job_id": backup_job_id},
+                ))
+
+    logger.warning(f"Backup did not complete within {max_wait_seconds} seconds")
+    raise_tool_error(create_error_response(
+        ErrorCode.TIMEOUT_OPERATION,
+        f"Backup creation timed out after {max_wait_seconds} seconds",
+        context={"backup_job_id": backup_job_id, "name": name},
+        suggestions=["Backup may still be in progress. Check Home Assistant backup status."],
+    ))
+
+
 async def create_backup(
     client: HomeAssistantClient, name: str | None = None
 ) -> dict[str, Any]:
@@ -140,76 +217,13 @@ async def create_backup(
         backup_job_id = result.get("result", {}).get("backup_job_id")
         logger.info(f"Backup job started: {backup_job_id}, waiting for completion...")
 
-        # Wait for backup to complete by polling backup/info
-        max_wait_seconds = 120  # 2 minutes max wait
-        poll_interval = 2  # Check every 2 seconds
-        waited = 0
-
-        while waited < max_wait_seconds:
-            await asyncio.sleep(poll_interval)
-            waited += poll_interval
-
-            # Check backup status
-            info_result = await ws_client.send_command("backup/info")
-            if info_result.get("success"):
-                state = info_result.get("result", {}).get("state")
-                last_event = info_result.get("result", {}).get("last_action_event", {})
-                event_state = last_event.get("state")
-
-                logger.debug(
-                    f"Backup state: {state}, event_state: {event_state}, waited: {waited}s"
-                )
-
-                # Check if backup is complete
-                if state == "idle" and event_state == "completed":
-                    # Find the backup that was just created
-                    backups = info_result.get("result", {}).get("backups", [])
-                    created_backup = None
-                    for backup in backups:
-                        if backup.get("name") == name:
-                            created_backup = backup
-                            break
-
-                    if created_backup:
-                        logger.info(
-                            f"Backup completed successfully: {created_backup.get('backup_id')}"
-                        )
-                        return {
-                            "success": True,
-                            "backup_id": created_backup.get("backup_id"),
-                            "backup_job_id": backup_job_id,
-                            "name": name,
-                            "date": created_backup.get("date"),
-                            "size_bytes": created_backup.get("agents", {})
-                            .get("hassio.local", {})
-                            .get("size"),
-                            "status": "Backup completed successfully",
-                            "duration_seconds": waited,
-                            "note": "Backup uses your Home Assistant's default backup password",
-                        }
-                    else:
-                        # Backup completed but not found in list yet
-                        logger.warning(
-                            "Backup completed but not found in backup list yet, waiting..."
-                        )
-                        continue
-
-                # Check if backup failed
-                elif event_state == "failed":
-                    raise_tool_error(create_error_response(
-                        ErrorCode.SERVICE_CALL_FAILED,
-                        "Backup creation failed",
-                        context={"backup_job_id": backup_job_id},
-                    ))
-
-        # Timeout waiting for backup
-        logger.warning(f"Backup did not complete within {max_wait_seconds} seconds")
-        raise_tool_error(create_error_response(
-            ErrorCode.TIMEOUT_OPERATION,
-            f"Backup creation timed out after {max_wait_seconds} seconds",
-            context={"backup_job_id": backup_job_id, "name": name},
-            suggestions=["Backup may still be in progress. Check Home Assistant backup status."],
-        ))
+        return await _poll_backup_completion(
+            ws_client,
+            name,
+            backup_job_id,
+            max_wait_seconds=_BACKUP_MAX_WAIT_S,
+            poll_interval=_BACKUP_POLL_INTERVAL_S,
+        )
 
     except ToolError:
         raise
@@ -229,6 +243,43 @@ async def create_backup(
                 pass  # Ignore errors during cleanup
 
 
+async def _create_safety_backup(
+    ws_client: HomeAssistantWebSocketClient,
+    password: str | None,
+) -> str | None:
+    """Create a pre-restore safety backup.
+
+    Returns the safety backup ID, or None when password is None (backup intentionally
+    skipped). Raises ToolError if backup creation fails.
+    """
+    if password is None:
+        return None
+
+    now = datetime.now()
+    safety_backup_name = f"PreRestore_Safety_{now.strftime('%Y-%m-%d_%H:%M:%S')}"
+
+    safety_backup = await ws_client.send_command(
+        "backup/generate",
+        name=safety_backup_name,
+        password=password,
+        agent_ids=["hassio.local"],
+        include_homeassistant=True,
+        include_database=True,
+        include_all_addons=True,
+    )
+
+    if not safety_backup.get("success"):
+        raise_tool_error(create_error_response(
+            ErrorCode.SERVICE_CALL_FAILED,
+            safety_backup.get("error", "Failed to create safety backup before restore"),
+            suggestions=["Cannot proceed with restore without safety backup"],
+        ))
+
+    safety_backup_id = safety_backup.get("result", {}).get("backup_job_id")
+    logger.info(f"Safety backup created: {safety_backup_id}")
+    return cast(str, safety_backup_id)
+
+
 async def restore_backup(
     client: HomeAssistantClient, backup_id: str, restore_database: bool = False
 ) -> dict[str, Any]:
@@ -277,38 +328,14 @@ async def restore_backup(
 
         # Create safety backup BEFORE restoring
         logger.info("Creating safety backup before restore...")
-        now = datetime.now()
-        safety_backup_name = f"PreRestore_Safety_{now.strftime('%Y-%m-%d_%H:%M:%S')}"
-
-        # Get backup password
         try:
             password = await _get_backup_password(ws_client)
         except ToolError:
             # Password error - log warning but continue (restore might still work)
             logger.warning("No default password - proceeding without safety backup")
             password = None
-            safety_backup_id = None
-
-        if password is not None:
-            safety_backup = await ws_client.send_command(
-                "backup/generate",
-                name=safety_backup_name,
-                password=password,
-                agent_ids=["hassio.local"],
-                include_homeassistant=True,
-                include_database=True,  # Full backup for safety
-                include_all_addons=True,
-            )
-
-            if not safety_backup.get("success"):
-                raise_tool_error(create_error_response(
-                    ErrorCode.SERVICE_CALL_FAILED,
-                    safety_backup.get("error", "Failed to create safety backup before restore"),
-                    suggestions=["Cannot proceed with restore without safety backup"],
-                ))
 
-            safety_backup_id = safety_backup.get("result", {}).get("backup_job_id")
-            logger.info(f"Safety backup created: {safety_backup_id}")
+        safety_backup_id = await _create_safety_backup(ws_client, password)
 
         # Perform restore
         restore_params = {

{ha_mcp_dev-7.3.0.dev372 → ha_mcp_dev-7.3.0.dev374}/src/ha_mcp/tools/best_practice_checker.py

@@ -216,6 +216,27 @@ def _check_template_string(
 # ---------------------------------------------------------------------------
 
 
+def _check_choose_actions(
+    choose: Any, warnings: list[str], skill_prefix: str | None
+) -> None:
+    for option in _as_list(choose):
+        if isinstance(option, dict):
+            _check_condition_templates(
+                option.get("conditions", []), warnings, skill_prefix
+            )
+            _check_action_tree(
+                option.get("sequence", []), warnings, skill_prefix
+            )
+
+
+def _check_repeat_actions(
+    repeat: dict, warnings: list[str], skill_prefix: str | None
+) -> None:
+    _check_condition_templates(repeat.get("while", []), warnings, skill_prefix)
+    _check_condition_templates(repeat.get("until", []), warnings, skill_prefix)
+    _check_action_tree(repeat.get("sequence", []), warnings, skill_prefix)
+
+
 def _check_action_tree(
     actions: Any, warnings: list[str], skill_prefix: str | None
 ) -> None:
@@ -235,14 +256,7 @@ def _check_action_tree(
 
         # Nested conditions in choose/if/repeat
         if "choose" in action:
-            for option in _as_list(action["choose"]):
-                if isinstance(option, dict):
-                    _check_condition_templates(
-                        option.get("conditions", []), warnings, skill_prefix
-                    )
-                    _check_action_tree(
-                        option.get("sequence", []), warnings, skill_prefix
-                    )
+            _check_choose_actions(action["choose"], warnings, skill_prefix)
 
         if "if" in action:
             _check_condition_templates(action["if"], warnings, skill_prefix)
@@ -253,16 +267,7 @@ def _check_action_tree(
                 _check_action_tree(nested, warnings, skill_prefix)
 
         if "repeat" in action and isinstance(action["repeat"], dict):
-            repeat = action["repeat"]
-            _check_condition_templates(
-                repeat.get("while", []), warnings, skill_prefix
-            )
-            _check_condition_templates(
-                repeat.get("until", []), warnings, skill_prefix
-            )
-            _check_action_tree(
-                repeat.get("sequence", []), warnings, skill_prefix
-            )
+            _check_repeat_actions(action["repeat"], warnings, skill_prefix)
 
 
 # ---------------------------------------------------------------------------
@@ -347,6 +352,20 @@ def _check_mode_motion(
         )
 
 
+def _has_delay_or_wait_in_nested(action: dict) -> bool:
+    for key in ("then", "else", "default", "sequence"):
+        if key in action and _has_delay_or_wait(action[key]):
+            return True
+    if "choose" in action:
+        for opt in _as_list(action["choose"]):
+            if isinstance(opt, dict) and _has_delay_or_wait(opt.get("sequence", [])):
+                return True
+    if "repeat" in action and isinstance(action["repeat"], dict):
+        if _has_delay_or_wait(action["repeat"].get("sequence", [])):
+            return True
+    return False
+
+
 def _has_delay_or_wait(actions: Any) -> bool:
     """Recursively check if any action uses delay or wait."""
     for action in _as_list(actions):
@@ -354,18 +373,8 @@ def _has_delay_or_wait(actions: Any) -> bool:
             continue
         if any(k in action for k in ("delay", "wait_for_trigger", "wait_template")):
             return True
-        for key in ("then", "else", "default", "sequence"):
-            if key in action and _has_delay_or_wait(action[key]):
-                return True
-        if "choose" in action:
-            for opt in _as_list(action["choose"]):
-                if isinstance(opt, dict) and _has_delay_or_wait(
-                    opt.get("sequence", [])
-                ):
-                    return True
-        if "repeat" in action and isinstance(action["repeat"], dict):
-            if _has_delay_or_wait(action["repeat"].get("sequence", [])):
-                return True
+        if _has_delay_or_wait_in_nested(action):
+            return True
     return False