Improve vol.Invalid handling (#120480)

Author: cdce8p

homeassistant/components/blueprint/errors.py

@@ -47,7 +47,7 @@ def __init__(
         domain: str | None,
         blueprint_name: str | None,
         blueprint_data: Any,
-        msg_or_exc: vol.Invalid,
+        msg_or_exc: str | vol.Invalid,
     ) -> None:
         """Initialize an invalid blueprint error."""
         if isinstance(msg_or_exc, vol.Invalid):

homeassistant/components/logbook/rest_api.py

@@ -70,11 +70,11 @@ async def get(
         if entity_ids_str := request.query.get("entity"):
             try:
                 entity_ids = cv.entity_ids(entity_ids_str)
-            except vol.Invalid:
+            except vol.Invalid as ex:
                 raise InvalidEntityFormatError(
                     f"Invalid entity id(s) encountered: {entity_ids_str}. "
                     "Format should be <domain>.<object_id>"
-                ) from vol.Invalid
+                ) from ex
         else:
             entity_ids = None
 

homeassistant/components/mqtt/mixins.py

@@ -157,7 +157,7 @@ async def __call__(
 
 @callback
 def async_handle_schema_error(
-    discovery_payload: MQTTDiscoveryPayload, err: vol.MultipleInvalid
+    discovery_payload: MQTTDiscoveryPayload, err: vol.Invalid
 ) -> None:
     """Help handling schema errors on MQTT discovery messages."""
     discovery_topic: str = discovery_payload.discovery_data[ATTR_DISCOVERY_TOPIC]