ha-mcp-dev 6.7.2.dev255__tar.gz → 6.7.2.dev256__tar.gz

{ha_mcp_dev-6.7.2.dev255/src/ha_mcp_dev.egg-info → ha_mcp_dev-6.7.2.dev256}/PKG-INFO

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

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "6.7.2.dev255"
+version = "6.7.2.dev256"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -56,7 +56,8 @@ packages = { find = { where = ["src", "."], include = ["ha_mcp*", "tests"] } }
 ha_mcp = ["py.typed", "_pypi_marker", "resources/*.md", "resources/*.json", "resources/skills-vendor/**/*"]
 
 [tool.mypy]
-python_version = "3.11"
+python_version = "3.13"
+mypy_path = "src"
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true
@@ -72,6 +73,7 @@ explicit_package_bases = true
 [[tool.mypy.overrides]]
 module = [
     "fastmcp.*",
+    "jq",
 ]
 ignore_missing_imports = true
 

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/__main__.py

@@ -13,7 +13,16 @@ import signal  # noqa: E402
 import stat  # noqa: E402
 import sys  # noqa: E402
 import threading  # noqa: E402
-from typing import Any  # noqa: E402
+from collections.abc import Coroutine  # noqa: E402
+from typing import TYPE_CHECKING, Any  # noqa: E402
+
+if TYPE_CHECKING:
+    from fastmcp import FastMCP
+
+    from ha_mcp.auth.provider import HomeAssistantOAuthProvider
+    from ha_mcp.client.rest_client import HomeAssistantClient
+    from ha_mcp.config import Settings
+    from ha_mcp.server import HomeAssistantSmartMCPServer
 
 logger = logging.getLogger(__name__)
 
@@ -25,12 +34,12 @@ class OAuthProxyClient:
     The proxy allows us to inject different credentials per-request based on OAuth token claims.
     """
 
-    def __init__(self, auth_provider):
+    def __init__(self, auth_provider: "HomeAssistantOAuthProvider") -> None:
         self._auth_provider = auth_provider
-        self._oauth_clients = {}
+        self._oauth_clients: dict[str, HomeAssistantClient] = {}
         self._lock = threading.Lock()
 
-    def _get_oauth_client(self):
+    def _get_oauth_client(self) -> "HomeAssistantClient":
         """Get the OAuth client for the current request context."""
         from fastmcp.server.dependencies import get_access_token
 
@@ -74,7 +83,7 @@ class OAuthProxyClient:
         for client in clients:
             await client.close()
 
-    def __getattr__(self, name):
+    def __getattr__(self, name: str) -> Any:
         """Forward all attribute access to the OAuth client."""
         client = self._get_oauth_client()
         return getattr(client, name)
@@ -217,7 +226,7 @@ For setup instructions, see:
     sys.exit(1)
 
 
-def _validate_standard_credentials(settings) -> None:
+def _validate_standard_credentials(settings: "Settings") -> None:
     """Exit with error if HA credentials are OAuth sentinels in standard (non-OAuth) mode."""
     from ha_mcp.config import OAUTH_MODE_TOKEN, OAUTH_MODE_URL
 
@@ -264,14 +273,12 @@ def _http_run_kwargs(transport: str, port: int, path: str) -> dict:
     }
 
 
-def _create_server():
+def _create_server() -> "HomeAssistantSmartMCPServer":
     """Create server instance (deferred to avoid import during smoke test)."""
     from pydantic import ValidationError
 
     try:
-        from ha_mcp.server import (
-            HomeAssistantSmartMCPServer,  # type: ignore[import-not-found]
-        )
+        from ha_mcp.server import HomeAssistantSmartMCPServer
 
         return HomeAssistantSmartMCPServer()
     except ValidationError as e:
@@ -280,10 +287,10 @@ def _create_server():
 
 
 # Lazy server creation - only create when needed
-_server = None
+_server: "HomeAssistantSmartMCPServer | None" = None
 
 
-def _get_mcp():
+def _get_mcp() -> "FastMCP":
     """Get the MCP instance, creating server if needed."""
     global _server
     if _server is None:
@@ -291,7 +298,7 @@ def _get_mcp():
     return _server.mcp
 
 
-def _get_server():
+def _get_server() -> "HomeAssistantSmartMCPServer":
     """Get the server instance, creating if needed."""
     global _server
     if _server is None:
@@ -390,7 +397,7 @@ async def _cancel_tasks(*tasks: asyncio.Task) -> None:
                 pass
 
 
-async def _run_with_shutdown(server_coro) -> None:
+async def _run_with_shutdown(server_coro: Coroutine[Any, Any, Any]) -> None:
     """Run a server coroutine with graceful shutdown support.
 
     Handles signal-based shutdown, resource cleanup, and task cancellation.
@@ -431,7 +438,7 @@ async def _run_with_shutdown(server_coro) -> None:
         await _cancel_tasks(server_task, shutdown_task)
 
 
-def _run_entrypoint(coro, label: str) -> None:
+def _run_entrypoint(coro: Coroutine[Any, Any, Any], label: str) -> None:
     """Run an async entrypoint with standard exception handling."""
     _setup_signal_handlers()
 
@@ -659,7 +666,9 @@ async def _run_oauth_server(base_url: str, port: int, path: str) -> None:
     proxy_client = OAuthProxyClient(auth_provider)
 
     global _server
-    _server = HomeAssistantSmartMCPServer(client=proxy_client)
+    _server = HomeAssistantSmartMCPServer(
+        client=proxy_client,  # type: ignore[arg-type]  # OAuthProxyClient forwards all HomeAssistantClient attrs via __getattr__
+    )
     mcp = _server.mcp
     mcp.auth = auth_provider
 

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/auth/provider.py

@@ -338,7 +338,7 @@ class HomeAssistantOAuthProvider(OAuthProvider):
         """
         if client.client_id is None:
             raise AuthorizeError(
-                error="invalid_client",
+                error="invalid_request",
                 error_description="Client ID is required",
             )
 
@@ -507,7 +507,7 @@ class HomeAssistantOAuthProvider(OAuthProvider):
             ),
             scopes=scopes_list,
             expires_at=expires_at,
-            code_challenge=pending.get("code_challenge"),
+            code_challenge=pending.get("code_challenge"),  # type: ignore[arg-type]  # None is valid per PKCE spec (RFC 7636 §4.3); empty string would break validation
         )
         self.auth_codes[auth_code_value] = auth_code
 
@@ -617,7 +617,7 @@ class HomeAssistantOAuthProvider(OAuthProvider):
         ha_credentials = self.ha_credentials.get(client.client_id)
         if not ha_credentials:
             raise TokenError(
-                "server_error",
+                "invalid_client",
                 f"No Home Assistant credentials found for client {client.client_id}",
             )
 

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/client/rest_client.py

@@ -618,7 +618,7 @@ class HomeAssistantClient:
         Raises:
             HomeAssistantAPIError: If flow start fails
         """
-        payload = {"handler": handler}
+        payload: dict[str, Any] = {"handler": handler}
         if context:
             payload["context"] = context
 
@@ -740,6 +740,8 @@ class HomeAssistantClient:
                 logger.error(f"WebSocket message failed: {e}")
                 return {"success": False, "error": str(e)}
 
+        return {"success": False, "error": "WebSocket request failed"}
+
     async def _handle_render_template(
         self, ws_client: Any, message: dict[str, Any]
     ) -> dict[str, Any]:

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/client/websocket_client.py

@@ -688,7 +688,7 @@ class WebSocketManager:
 
             # Evict least-recently-used connection if over limit
             if len(self._clients) > MAX_POOL_SIZE:
-                oldest_key = min(self._last_used, key=self._last_used.get)
+                oldest_key = min(self._last_used, key=lambda k: self._last_used[k])
                 stale = self._clients.pop(oldest_key, None)
                 self._last_used.pop(oldest_key, None)
                 if stale:

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/server.py

@@ -11,9 +11,9 @@ from __future__ import annotations
 
 import logging
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
 
-import yaml
+import yaml  # type: ignore[import-untyped]
 from fastmcp import FastMCP
 from mcp.types import Icon
 
@@ -314,9 +314,9 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
         self, query: str, domain_filter: str | None = None, limit: int = 10
     ) -> dict[str, Any]:
         """Bridge method to existing smart search implementation."""
-        return await self.smart_tools.smart_entity_search(
+        return cast(dict[str, Any], await self.smart_tools.smart_entity_search(
             query=query, limit=limit, include_attributes=False
-        )
+        ))
 
     async def get_entity_state(self, entity_id: str) -> dict[str, Any]:
         """Bridge method to existing entity state implementation."""
@@ -328,7 +328,7 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
         service: str,
         entity_id: str | None = None,
         data: dict | None = None,
-    ) -> list[dict[str, Any]]:
+    ) -> list[dict[str, Any]] | dict[str, Any]:
         """Bridge method to existing service call implementation."""
         service_data = data or {}
         if entity_id:
@@ -337,9 +337,9 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
 
     async def get_entities_by_area(self, area_name: str) -> dict[str, Any]:
         """Bridge method to existing area functionality."""
-        return await self.smart_tools.get_entities_by_area(
+        return cast(dict[str, Any], await self.smart_tools.get_entities_by_area(
             area_query=area_name, group_by_domain=True
-        )
+        ))
 
     async def start(self) -> None:
         """Start the Smart MCP server with async compatibility."""

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/backup.py

@@ -7,7 +7,7 @@ Provides backup creation and restoration capabilities with safety mechanisms.
 import asyncio
 import logging
 from datetime import datetime
-from typing import TYPE_CHECKING, Annotated, Any
+from typing import TYPE_CHECKING, Annotated, Any, cast
 
 from fastmcp.exceptions import ToolError
 from pydantic import Field
@@ -105,6 +105,7 @@ async def create_backup(
                 ErrorCode.CONNECTION_FAILED,
                 "Failed to connect to Home Assistant WebSocket for backup",
             ))
+        ws_client = cast(HomeAssistantWebSocketClient, ws_client)
 
         # Get backup password
         password, error = await _get_backup_password(ws_client)
@@ -256,6 +257,7 @@ async def restore_backup(
                 ErrorCode.CONNECTION_FAILED,
                 "Failed to connect to Home Assistant WebSocket for restore",
             ))
+        ws_client = cast(HomeAssistantWebSocketClient, ws_client)
 
         # Verify backup exists
         backup_info = await ws_client.send_command("backup/info")
@@ -354,7 +356,7 @@ async def restore_backup(
                 pass  # Ignore errors during cleanup
 
 
-def register_backup_tools(mcp: "FastMCP", client: HomeAssistantClient, **kwargs) -> None:
+def register_backup_tools(mcp: "FastMCP", client: HomeAssistantClient, **kwargs: Any) -> None:
     """
     Register backup and restore tools with the MCP server.
 

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/tools_addons.py

@@ -257,7 +257,7 @@ async def list_available_addons(
                 pass
 
 
-def register_addon_tools(mcp: Any, client: HomeAssistantClient, **kwargs) -> None:
+def register_addon_tools(mcp: Any, client: HomeAssistantClient, **kwargs: Any) -> None:
     """
     Register add-on management tools with the MCP server.
 

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/tools_areas.py

@@ -156,7 +156,7 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         suggestions=["Provide a name for the new area"],
                     ))
 
-                message: dict[str, Any] = {
+                message = {
                     "type": "config/area_registry/create",
                     "name": name,
                 }
@@ -380,7 +380,7 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         suggestions=["Provide a name for the new floor"],
                     ))
 
-                message: dict[str, Any] = {
+                message = {
                     "type": "config/floor_registry/create",
                     "name": name,
                 }

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/tools_config_automations.py

@@ -169,7 +169,7 @@ def _normalize_config_for_roundtrip(config: dict[str, Any]) -> dict[str, Any]:
     if "trigger" in normalized and isinstance(normalized["trigger"], list):
         normalized["trigger"] = _normalize_trigger_keys(normalized["trigger"])
 
-    return normalized
+    return cast(dict[str, Any], normalized)
 
 
 def _strip_empty_automation_fields(config: dict[str, Any]) -> dict[str, Any]:

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/tools_config_dashboards.py

@@ -30,7 +30,7 @@ logger = logging.getLogger(__name__)
 
 # Try to import jq - it's not available on Windows ARM64
 try:
-    import jq  # noqa: F401 - Used to check availability, re-imported in function
+    import jq  # noqa: F401
 
     JQ_AVAILABLE = True
 except ImportError:
@@ -68,9 +68,9 @@ def _get_resources_dir() -> Path:
 
         # For Python 3.9+
         if hasattr(pkg_resources, "files"):
-            resources_dir = pkg_resources.files("ha_mcp") / "resources"
-            if hasattr(resources_dir, "__fspath__"):
-                return Path(str(resources_dir))
+            pkg_resources_dir = pkg_resources.files("ha_mcp") / "resources"
+            if hasattr(pkg_resources_dir, "__fspath__"):
+                return Path(str(pkg_resources_dir))
     except (ImportError, AttributeError):
         # If importlib.resources or its attributes are unavailable, fall back to relative path
         pass
@@ -380,7 +380,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
             # Calculate config size for progressive disclosure hint
             config_size = len(json.dumps(config)) if isinstance(config, dict) else 0
 
-            result: dict[str, Any] = {
+            result = {
                 "success": True,
                 "action": "get",
                 "url_path": url_path,
@@ -397,7 +397,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
                     "instead of full config replacement."
                 )
 
-            return result
+            return cast(dict[str, Any], result)
         except ToolError:
             raise
         except Exception as e:
@@ -798,7 +798,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
                     ))
 
                 # Fetch current dashboard config
-                get_data: dict[str, Any] = {"type": "lovelace/config", "force": True}
+                get_data = {"type": "lovelace/config", "force": True}
                 if url_path:
                     get_data["url_path"] = url_path
 
@@ -847,7 +847,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
                     ))
 
                 # Apply jq transformation
-                transformed_config, error = _apply_jq_transform(
+                jq_result, error = _apply_jq_transform(
                     current_config, jq_transform
                 )
                 if error:
@@ -861,9 +861,10 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
                         ],
                         context={"action": "jq_transform", "url_path": url_path},
                     ))
+                transformed_config = cast(dict[str, Any], jq_result)
 
                 # Save transformed config
-                save_data: dict[str, Any] = {
+                save_data = {
                     "type": "lovelace/config/save",
                     "config": transformed_config,
                 }
@@ -890,9 +891,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
 
                 # Compute new hash for potential chaining
                 # transformed_config is guaranteed to be a dict here (validated above)
-                new_config_hash = _compute_config_hash(
-                    cast(dict[str, Any], transformed_config)
-                )
+                new_config_hash = _compute_config_hash(transformed_config)
 
                 return {
                     "success": True,
@@ -1034,7 +1033,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
                 # For existing dashboards, optionally validate config_hash and warn on large replacement
                 if dashboard_exists:
                     # Fetch current config for validation/comparison
-                    get_data: dict[str, Any] = {
+                    get_data = {
                         "type": "lovelace/config",
                         "force": True,
                     }

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/tools_mcp_component.py

@@ -37,7 +37,7 @@ MCP_TOOLS_REPO = "julienld/ha-mcp-test-custom-component"
 MCP_TOOLS_DOMAIN = "ha_mcp_tools"
 
 
-def register_mcp_component_tools(mcp, client, **kwargs):
+def register_mcp_component_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
     """Register MCP component installation tools.
 
     This function only registers tools if the feature flag is enabled.
@@ -236,7 +236,7 @@ def register_mcp_component_tools(mcp, client, **kwargs):
                     ],
                 ))
 
-            result = {
+            result: dict[str, Any] = {
                 "success": True,
                 "installed": True,
                 "repository": MCP_TOOLS_REPO,

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/tools_service.py

@@ -50,7 +50,7 @@ def _build_service_suggestions(domain: str, service: str, entity_id: str | None)
     ]
 
 
-def register_service_tools(mcp, client, **kwargs):
+def register_service_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
     """Register service call and operation monitoring tools with the MCP server."""
     device_tools = kwargs.get("device_tools")
     if not device_tools:

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256}/src/ha_mcp/tools/tools_traces.py

@@ -230,7 +230,7 @@ async def _resolve_trace_item_id(
                 logger.debug(
                     f"Resolved {entity_id} to unique_id: {unique_id}"
                 )
-                return unique_id
+                return str(unique_id)
 
         # Fallback to object_id if no unique_id found
         logger.debug(
@@ -449,7 +449,7 @@ def _format_detailed_trace(
                 actions.append(step_info)
 
     # Sort by timestamp (if available) or path to maintain execution order
-    def sort_key(item):
+    def sort_key(item: dict[str, Any]) -> tuple[str, str]:
         return (item.get("timestamp", ""), item.get("path", ""))
 
     triggers.sort(key=sort_key)

{ha_mcp_dev-6.7.2.dev255 → ha_mcp_dev-6.7.2.dev256/src/ha_mcp_dev.egg-info}/PKG-INFO

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