Merge branch 'master' into fix/addon-stateless-http-and-runtime-python

Author: sergeykad

src/ha_mcp/errors.py

@@ -257,20 +257,22 @@ def create_connection_error(
     message: str,
     details: str | None = None,
     timeout: bool = False,
+    context: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Create a connection error response."""
     code = ErrorCode.CONNECTION_TIMEOUT if timeout else ErrorCode.CONNECTION_FAILED
-    return create_error_response(code, message, details)
+    return create_error_response(code, message, details, context=context)
 
 
 def create_auth_error(
     message: str,
     details: str | None = None,
     expired: bool = False,
+    context: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Create an authentication error response."""
     code = ErrorCode.AUTH_EXPIRED if expired else ErrorCode.AUTH_INVALID_TOKEN
-    return create_error_response(code, message, details)
+    return create_error_response(code, message, details, context=context)
 
 
 def create_entity_not_found_error(
@@ -350,13 +352,19 @@ def create_timeout_error(
     operation: str,
     timeout_seconds: float,
     details: str | None = None,
+    context: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Create a timeout error response."""
+    final_context: dict[str, Any] = {}
+    if context:
+        final_context.update(context)
+    final_context["operation"] = operation
+    final_context["timeout_seconds"] = timeout_seconds
     return create_error_response(
         ErrorCode.TIMEOUT_OPERATION,
         f"Operation '{operation}' timed out after {timeout_seconds}s",
         details=details,
-        context={"operation": operation, "timeout_seconds": timeout_seconds},
+        context=final_context,
     )
 
 

src/ha_mcp/tools/helpers.py

@@ -137,15 +137,15 @@ def exception_to_structured_error(
     # Handle specific exception types
     if isinstance(error, HomeAssistantConnectionError):
         if "timeout" in error_str:
-            error_response = create_connection_error(error_msg, timeout=True)
+            error_response = create_connection_error(error_msg, timeout=True, context=context)
         else:
-            error_response = create_connection_error(error_msg)
+            error_response = create_connection_error(error_msg, context=context)
 
     elif isinstance(error, HomeAssistantAuthError):
         if "expired" in error_str:
-            error_response = create_auth_error(error_msg, expired=True)
+            error_response = create_auth_error(error_msg, expired=True, context=context)
         else:
-            error_response = create_auth_error(error_msg)
+            error_response = create_auth_error(error_msg, context=context)
 
     elif isinstance(error, HomeAssistantAPIError):
         # Check for specific error patterns
@@ -162,7 +162,7 @@ def exception_to_structured_error(
                         context=context,
                     )
             case 401 | 403:
-                error_response = create_auth_error(error_msg)
+                error_response = create_auth_error(error_msg, context=context)
             case 400:
                 error_response = create_validation_error(error_msg, context=context)
             case _:
@@ -176,10 +176,10 @@ def exception_to_structured_error(
     elif isinstance(error, TimeoutError):
         operation = context.get("operation", "request") if context else "request"
         timeout_seconds = context.get("timeout_seconds", 30) if context else 30
-        error_response = create_timeout_error(operation, timeout_seconds, details=error_msg)
+        error_response = create_timeout_error(operation, timeout_seconds, details=error_msg, context=context)
 
     elif isinstance(error, ValueError):
-        error_response = create_validation_error(error_msg)
+        error_response = create_validation_error(error_msg, context=context)
 
     # Check for common error patterns in error message
     elif "not found" in error_str or "404" in error_str:
@@ -194,13 +194,13 @@ def exception_to_structured_error(
             )
 
     elif "timeout" in error_str:
-        error_response = create_timeout_error("operation", 30, details=error_msg)
+        error_response = create_timeout_error("operation", 30, details=error_msg, context=context)
 
     elif "connection" in error_str or "connect" in error_str:
-        error_response = create_connection_error(error_msg)
+        error_response = create_connection_error(error_msg, context=context)
 
     elif "auth" in error_str or "token" in error_str or "401" in error_str:
-        error_response = create_auth_error(error_msg)
+        error_response = create_auth_error(error_msg, context=context)
 
     else:
         # Default to internal error -- use generic message to avoid leaking internals

src/ha_mcp/tools/tools_areas.py

@@ -8,10 +8,11 @@
 import logging
 from typing import Annotated, Any
 
+from fastmcp.exceptions import ToolError
 from pydantic import Field
 
 from ..errors import ErrorCode, create_error_response
-from .helpers import log_tool_usage
+from .helpers import log_tool_usage, raise_tool_error
 from .util_helpers import parse_string_list_param
 
 logger = logging.getLogger(__name__)
@@ -121,10 +122,10 @@ async def ha_config_set_area(
             try:
                 parsed_aliases = parse_string_list_param(aliases, "aliases")
             except ValueError as e:
-                return create_error_response(
+                raise_tool_error(create_error_response(
                     ErrorCode.VALIDATION_INVALID_PARAMETER,
                     f"Invalid aliases parameter: {e}",
-                )
+                ))
 
             # Determine if this is a create or update operation
             if area_id:
@@ -193,6 +194,8 @@ async def ha_config_set_area(
                     error_response["name"] = name
                 return error_response
 
+        except ToolError:
+            raise
         except Exception as e:
             logger.error(f"Error in ha_config_set_area: {e}")
             error_response = {
@@ -352,10 +355,10 @@ async def ha_config_set_floor(
             try:
                 parsed_aliases = parse_string_list_param(aliases, "aliases")
             except ValueError as e:
-                return create_error_response(
+                raise_tool_error(create_error_response(
                     ErrorCode.VALIDATION_INVALID_PARAMETER,
                     f"Invalid aliases parameter: {e}",
-                )
+                ))
 
             # Determine if this is a create or update operation
             if floor_id:
@@ -420,6 +423,8 @@ async def ha_config_set_floor(
                     error_response["name"] = name
                 return error_response
 
+        except ToolError:
+            raise
         except Exception as e:
             logger.error(f"Error in ha_config_set_floor: {e}")
             error_response = {

src/ha_mcp/tools/tools_config_entry_flow.py

@@ -157,7 +157,7 @@ async def ha_create_config_entry_helper(
             context = {"helper_type": helper_type}
             if flow_id:
                 context["flow_id"] = flow_id
-            return exception_to_structured_error(e, context=context)
+            exception_to_structured_error(e, context=context, raise_error=True)
 
     @mcp.tool(
         annotations={
@@ -220,4 +220,4 @@ async def ha_get_helper_schema(
 
         except Exception as e:
             logger.error(f"Error getting helper schema: {e}")
-            return exception_to_structured_error(e, context={"helper_type": helper_type})
+            exception_to_structured_error(e, context={"helper_type": helper_type}, raise_error=True)

src/ha_mcp/tools/tools_config_helpers.py

@@ -10,10 +10,11 @@
 import logging
 from typing import Annotated, Any, Literal
 
+from fastmcp.exceptions import ToolError
 from pydantic import Field
 
 from ..errors import ErrorCode, create_error_response
-from .helpers import log_tool_usage
+from .helpers import log_tool_usage, raise_tool_error
 from .util_helpers import (
     coerce_bool_param,
     parse_string_list_param,
@@ -399,10 +400,10 @@ async def ha_config_set_helper(
                 labels = parse_string_list_param(labels, "labels")
                 options = parse_string_list_param(options, "options")
             except ValueError as e:
-                return create_error_response(
+                raise_tool_error(create_error_response(
                     ErrorCode.VALIDATION_INVALID_PARAMETER,
                     f"Invalid list parameter: {e}",
-                )
+                ))
 
             # Determine if this is a create or update based on helper_id
             action = "update" if helper_id else "create"
@@ -708,6 +709,8 @@ async def ha_config_set_helper(
                 "error": f"Unexpected action: {action}",
             }
 
+        except ToolError:
+            raise
         except Exception as e:
             return {
                 "success": False,

src/ha_mcp/tools/tools_entities.py

@@ -9,10 +9,11 @@
 import logging
 from typing import Annotated, Any, Literal
 
+from fastmcp.exceptions import ToolError
 from pydantic import Field
 
 from ..errors import ErrorCode, create_error_response
-from .helpers import exception_to_structured_error, log_tool_usage
+from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
 from .tools_voice_assistant import KNOWN_ASSISTANTS
 from .util_helpers import coerce_bool_param, parse_json_param, parse_string_list_param
 
@@ -445,65 +446,65 @@ async def ha_set_entity(
                 try:
                     parsed_aliases = parse_string_list_param(aliases, "aliases")
                 except ValueError as e:
-                    return create_error_response(
+                    raise_tool_error(create_error_response(
                         ErrorCode.VALIDATION_INVALID_PARAMETER,
                         f"Invalid aliases parameter: {e}",
-                    )
+                    ))
 
             parsed_labels = None
             if labels is not None:
                 try:
                     parsed_labels = parse_string_list_param(labels, "labels")
                 except ValueError as e:
-                    return create_error_response(
+                    raise_tool_error(create_error_response(
                         ErrorCode.VALIDATION_INVALID_PARAMETER,
                         f"Invalid labels parameter: {e}",
-                    )
+                    ))
 
             # Parse and validate expose_to parameter
             parsed_expose_to: dict[str, bool] | None = None
             if expose_to is not None:
                 try:
                     parsed = parse_json_param(expose_to, "expose_to")
                 except ValueError as e:
-                    return create_error_response(
+                    raise_tool_error(create_error_response(
                         ErrorCode.VALIDATION_INVALID_PARAMETER,
                         str(e),
-                    )
+                    ))
 
                 if not isinstance(parsed, dict):
-                    return create_error_response(
+                    raise_tool_error(create_error_response(
                         ErrorCode.VALIDATION_INVALID_PARAMETER,
                         "expose_to must be a dict mapping assistant IDs to booleans, "
                         'e.g. {"conversation": true, "cloud.alexa": false}',
-                    )
+                    ))
                 parsed_expose_to = parsed
 
                 # Validate assistant names
                 invalid_assistants = [
                     a for a in parsed_expose_to if a not in KNOWN_ASSISTANTS
                 ]
                 if invalid_assistants:
-                    return create_error_response(
+                    raise_tool_error(create_error_response(
                         ErrorCode.VALIDATION_INVALID_PARAMETER,
                         f"Invalid assistant(s) in expose_to: {invalid_assistants}. "
                         f"Valid: {KNOWN_ASSISTANTS}",
-                    )
+                    ))
 
                 # Coerce values to bool
                 for asst, val in parsed_expose_to.items():
                     try:
                         coerced = coerce_bool_param(val, f"expose_to[{asst}]")
                     except ValueError as e:
-                        return create_error_response(
+                        raise_tool_error(create_error_response(
                             ErrorCode.VALIDATION_INVALID_PARAMETER,
                             str(e),
-                        )
+                        ))
                     if coerced is None:
-                        return create_error_response(
+                        raise_tool_error(create_error_response(
                             ErrorCode.VALIDATION_INVALID_PARAMETER,
                             f"expose_to[{asst}] must be a boolean value",
-                        )
+                        ))
                     parsed_expose_to[asst] = coerced
 
             # Single entity case - use existing logic
@@ -579,10 +580,12 @@ async def ha_set_entity(
 
             return response
 
+        except ToolError:
+            raise
         except Exception as e:
             logger.error(f"Error updating entity: {e}")
             eid_context = entity_id if isinstance(entity_id, str) else entity_ids
-            return exception_to_structured_error(e, context={"entity_id": eid_context})
+            exception_to_structured_error(e, context={"entity_id": eid_context}, raise_error=True)
 
     @mcp.tool(
         annotations={
@@ -768,6 +771,7 @@ async def _fetch_entity(eid: str) -> dict[str, Any]:
 
         except Exception as e:
             logger.error(f"Error getting entity: {e}")
-            return exception_to_structured_error(
-                e, context={"entity_id": entity_id if isinstance(entity_id, str) else entity_ids}
+            exception_to_structured_error(
+                e, context={"entity_id": entity_id if isinstance(entity_id, str) else entity_ids},
+                raise_error=True,
             )

src/ha_mcp/tools/tools_filesystem.py

@@ -19,7 +19,7 @@
 
 from pydantic import Field
 
-from .helpers import exception_to_structured_error, log_tool_usage
+from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
 from .util_helpers import add_timezone_metadata, coerce_bool_param, coerce_int_param
 
 logger = logging.getLogger(__name__)
@@ -192,8 +192,10 @@ async def ha_list_files(
             error_response = exception_to_structured_error(
                 e,
                 context={"tool": "ha_list_files", "path": path, "pattern": pattern},
+                raise_error=False,
             )
-            return await add_timezone_metadata(client, error_response)
+            error_with_tz = await add_timezone_metadata(client, error_response)
+            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         annotations={
@@ -316,8 +318,10 @@ async def ha_read_file(
             error_response = exception_to_structured_error(
                 e,
                 context={"tool": "ha_read_file", "path": path},
+                raise_error=False,
             )
-            return await add_timezone_metadata(client, error_response)
+            error_with_tz = await add_timezone_metadata(client, error_response)
+            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         annotations={
@@ -458,8 +462,10 @@ async def ha_write_file(
             error_response = exception_to_structured_error(
                 e,
                 context={"tool": "ha_write_file", "path": path},
+                raise_error=False,
             )
-            return await add_timezone_metadata(client, error_response)
+            error_with_tz = await add_timezone_metadata(client, error_response)
+            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         annotations={
@@ -585,5 +591,7 @@ async def ha_delete_file(
             error_response = exception_to_structured_error(
                 e,
                 context={"tool": "ha_delete_file", "path": path},
+                raise_error=False,
             )
-            return await add_timezone_metadata(client, error_response)
+            error_with_tz = await add_timezone_metadata(client, error_response)
+            raise_tool_error(error_with_tz)