From 259171eda9ffad0417a0201faa9b6678c56ec4c9 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Benecke Date: Wed, 28 Feb 2024 10:51:04 +0100 Subject: [PATCH] Revert "Remove `@bind_hass` from `camera` functions" (#111703) Revert "Remove `@bind_hass` from `camera` functions (#111494)" This reverts commit c890c1aeee7342e8fb290d434c054b27aa998b7e. --- homeassistant/components/camera/__init__.py | 5 +++++ homeassistant/components/image_processing/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py index bf5cb2995e3..5ac981e9d93 100644 --- a/homeassistant/components/camera/__init__.py +++ b/homeassistant/components/camera/__init__.py @@ -64,6 +64,7 @@ from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.network import get_url from homeassistant.helpers.template import Template from homeassistant.helpers.typing import ConfigType +from homeassistant.loader import bind_hass from .const import ( # noqa: F401 _DEPRECATED_STREAM_TYPE_HLS, @@ -159,6 +160,7 @@ class Image: content: bytes = attr.ib() +@bind_hass async def async_request_stream(hass: HomeAssistant, entity_id: str, fmt: str) -> str: """Request a stream for a camera entity.""" camera = _get_camera_from_entity_id(hass, entity_id) @@ -207,6 +209,7 @@ async def _async_get_image( raise HomeAssistantError("Unable to get image") +@bind_hass async def async_get_image( hass: HomeAssistant, entity_id: str, @@ -237,12 +240,14 @@ async def _async_get_stream_image( return None +@bind_hass async def async_get_stream_source(hass: HomeAssistant, entity_id: str) -> str | None: """Fetch the stream source for a camera entity.""" camera = _get_camera_from_entity_id(hass, entity_id) return await camera.stream_source() +@bind_hass async def async_get_mjpeg_stream( hass: HomeAssistant, request: web.Request, entity_id: str ) -> web.StreamResponse | None: diff --git a/homeassistant/components/image_processing/__init__.py b/homeassistant/components/image_processing/__init__.py index 36d835447ab..178d40d1139 100644 --- a/homeassistant/components/image_processing/__init__.py +++ b/homeassistant/components/image_processing/__init__.py @@ -179,7 +179,7 @@ class ImageProcessingEntity(Entity): try: image: Image = await camera.async_get_image( - self.hass, self.camera_entity, timeout=self.timeout + self.camera_entity, timeout=self.timeout ) except HomeAssistantError as err: