Add camera support #336

anishsane · 2025-01-15T13:07:27Z

It uses the mjpeg stream over the http server to access the camara feed.
The stream implementation is based on the mjpeg integration in home assistant.

It uses the mjpeg stream over the http server to access the camara feed. This stream implementation is based on the mjpeg integration.

anishsane · 2025-01-15T13:08:13Z

This needs an update in the tasmota integration of the home assistant to work end-to-end.

emontnemery

Looks good, just questions about configurability

hatasmota/camera.py

emontnemery · 2025-01-20T08:54:39Z

Please fix the lint errors 👍

emontnemery · 2025-02-15T09:56:22Z

There are still lint errors.
I'd recommend to install and run the linters locally, let me know if you need guidance for that.

I had defined them to support the flip/resolution/brightness change operations. However, it is easier to support these operations via automation/blueprints, since these are just commands over mqtt. Dropping them from the code to avoid the linter warnings.

emontnemery · 2025-02-17T08:10:33Z

You need to add aiohttp to requirements.txt. We don't want to pin, so maybe set it to aiohttp>=3.0.0 (just the major version used by HA Core) or to aiohttp>=3.11.12 (the version currently used by HA Core)

anishsane · 2025-02-17T13:24:50Z

My bad.
I tested in HA directly which already had it installed.
Fixed.

anishsane · 2025-02-18T13:30:56Z

I had originally added the additional constants to support resolution/brightness/contrast configuration.
I was under the assumption that camera core integration has built-in support for such config knobs.

I implemented it via home assistant blueprints instead: tasmota/blueprints#4

emontnemery · 2025-02-21T07:25:27Z

I had originally added the additional constants to support resolution/brightness/contrast configuration. I was under the assumption that camera core integration has built-in support for such config knobs.

I implemented it via home assistant blueprints instead: tasmota/blueprints#4

Hmm, I'm not sure what you mean now. Can you elaborate a bit?

emontnemery · 2025-02-21T07:31:05Z

Linters are still failing..

I'll explain how to set up the linters locally then.
First time, set up a local development environment for hatasmota:

cd hatasmota
python3 -m venv .venv
source .venv/bin/activate
pip3 install -r requirements.txt
pip3 install -r requirements-test.txt

After that, activate the local development environment for hatasmota:

cd hatasmota
source .venv/bin/activate

Run the linters:

flake8 hatasmota
pylint hatasmota
mypy hatasmota
black hatasmota
isort hatasmota --combine-as --force-sort-within-sections --profile black

Note that flake8 will complain about f-strings in existing code if run on Python 3.12 or newer, please ignore that

emontnemery · 2025-02-21T08:00:55Z

The mypy error is genuine, websession.get returns an async context manager, not a StreamResponse.

I think it would make sense to modify the code like this:

diff --git a/hatasmota/camera.py b/hatasmota/camera.py
index 25fa14b..2cb4840 100644
--- a/hatasmota/camera.py
+++ b/hatasmota/camera.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 import logging
 from typing import Any
-from aiohttp import ClientSession, web
+from aiohttp import ClientResponse, ClientSession

 from .const import (
     CONF_IP,
@@ -122,12 +122,12 @@ class TasmotaCamera(TasmotaAvailability, TasmotaEntity):
         """Unsubscribe to all MQTT topics."""
         self._sub_state = await self._mqtt_client.unsubscribe(self._sub_state)

-    def get_still_image_stream(self, websession: ClientSession) -> web.StreamResponse | None:
+    async def get_still_image_stream(self, websession: ClientSession) -> ClientResponse:
         """Get the io stream to read the static image."""
         still_image_url = f"http://{self._cfg.ip_address}/snapshot.jpg"
-        return websession.get(still_image_url)
+        return await websession.get(still_image_url)

-    def get_mjpeg_stream(self, websession: ClientSession) -> web.StreamResponse | None:
+    async def get_mjpeg_stream(self, websession: ClientSession) -> ClientResponse:
         """Get the io stream to read the mjpeg stream."""
         mjpeg_url = f"http://{self._cfg.ip_address}:81/cam.mjpeg"
-        return websession.get(mjpeg_url)
+        return await websession.get(mjpeg_url)

You could also skip the await, and type the return values as Awaitable[ClientResponse]:

diff --git a/hatasmota/camera.py b/hatasmota/camera.py
index 25fa14b..a78a571 100644
--- a/hatasmota/camera.py
+++ b/hatasmota/camera.py
@@ -2,10 +2,11 @@

 from __future__ import annotations

+from collections.abc import Awaitable
 from dataclasses import dataclass
 import logging
 from typing import Any
-from aiohttp import ClientSession, web
+from aiohttp import ClientResponse, ClientSession

 from .const import (
     CONF_IP,
@@ -122,12 +123,12 @@ class TasmotaCamera(TasmotaAvailability, TasmotaEntity):
         """Unsubscribe to all MQTT topics."""
         self._sub_state = await self._mqtt_client.unsubscribe(self._sub_state)

-    def get_still_image_stream(self, websession: ClientSession) -> web.StreamResponse | None:
+    def get_still_image_stream(self, websession: ClientSession) -> Awaitable[ClientResponse]:
         """Get the io stream to read the static image."""
         still_image_url = f"http://{self._cfg.ip_address}/snapshot.jpg"
         return websession.get(still_image_url)

-    def get_mjpeg_stream(self, websession: ClientSession) -> web.StreamResponse | None:
+    def get_mjpeg_stream(self, websession: ClientSession) -> Awaitable[ClientResponse]:
         """Get the io stream to read the mjpeg stream."""
         mjpeg_url = f"http://{self._cfg.ip_address}:81/cam.mjpeg"
         return websession.get(mjpeg_url)

This commit also rearranges the code as per the linter suggestions.

anishsane · 2025-02-21T09:14:50Z

Oh.. I had only used the pylint linter locally.
The other linters from your comment suggested changes.
Updated the PR.

About my blueprint-related comment:
My initial commit had some extra string constants added and imported. They were for configuring the camera settings like resolution. I had added them but I was not able to use them. I removed them from hatasmota and was able get that functionality using a home-assistant blueprint.

emontnemery · 2025-02-21T10:51:53Z

hatasmota/discovery.py

+def get_camera_entities(
+    discovery_msg: dict,
+) -> list[tuple[TasmotaCameraConfig | None, DiscoveryHashType]]:
+    """Generate camera configuration."""
+    camera_entities: list[tuple[TasmotaCameraConfig | None, DiscoveryHashType]] = []
+
+    entity = None
+    discovery_hash = (discovery_msg[CONF_MAC], "cam", "cam", 0)
+    if CONF_CAM in discovery_msg and discovery_msg[CONF_CAM]:
+        entity = TasmotaCameraConfig.from_discovery_message(discovery_msg, "camera")
+    camera_entities.append((entity, discovery_hash))
+
+    return camera_entities
+
+


Please move this to before get_cover_entities to keep the functions mostly sorted alphabetically

emontnemery · 2025-02-21T10:52:27Z

hatasmota/discovery.py

+    elif platform == "camera":
+        entities.extend(get_camera_entities(discovery_msg))


Please move this before cover to keep the alphabetical sorting

emontnemery · 2025-02-21T10:52:34Z

hatasmota/discovery.py

+    if platform == "camera":
+        return TasmotaCamera(config=config, mqtt_client=mqtt_client)


Please move this before cover to keep the alphabetical sorting

emontnemery · 2025-02-21T10:57:53Z

hatasmota/camera.py

+class TasmotaCameraConfig(TasmotaAvailabilityConfig, TasmotaEntityConfig):
+    """Tasmota camera configuation."""
+
+    idx: int


Does tasmota support more than a single camera? If not, can we skip this, it seems to be hardcoded to 0 below?

emontnemery · 2025-02-21T10:58:17Z

hatasmota/camera.py

+
+    idx: int
+
+    command_topic: str


This doesn't seem to be used

It was added earlier to support the configuring the camera parameters. But since it is not used, I have removed it.
The configuration is done easily via the blueprint mentioned earlier.

emontnemery · 2025-02-21T11:00:19Z

hatasmota/camera.py

+    async def subscribe_topics(self) -> None:
+        """Subscribe to topics."""
+
+        def state_message_received(msg: ReceiveMessage) -> None:


What is this used for? The core PR doesn't seem to use it?

It was part of the original version of the core PR. It was removed during the review.
I have updated this PR to reflect that.

Earlier the sensors like fps and failures were used to set the camera state. But this logic was removed from the tasmota component of the home-assistant. Removing it from the hatasmota module as well. Remove related now-unused imports from camera.py. Minor changes: It also rearranges the functions in discovery.py so that they are alphabetical.

Added camera support to hatasmota.

2478cca

It uses the mjpeg stream over the http server to access the camara feed. This stream implementation is based on the mjpeg integration.

anishsane mentioned this pull request Jan 15, 2025

Add support for Tasmota camera home-assistant/core#135706

Draft

19 tasks

emontnemery changed the title ~~Added camera support to hatasmota.~~ Add camera support Jan 20, 2025

emontnemery reviewed Jan 20, 2025

View reviewed changes

hatasmota/camera.py Show resolved Hide resolved

hatasmota/camera.py Show resolved Hide resolved

Fix the linter errors for the hatasmota camera

eda0c33

Add the missing dependencies in requirements.txt

d780d71

Correct the return types of the camera image and stream functions.

4898eca

This commit also rearranges the code as per the linter suggestions.

emontnemery reviewed Feb 21, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add camera support #336

Add camera support #336

anishsane commented Jan 15, 2025

anishsane commented Jan 15, 2025

emontnemery left a comment

emontnemery commented Jan 20, 2025

emontnemery commented Feb 15, 2025

emontnemery commented Feb 17, 2025 •

edited

Loading

anishsane commented Feb 17, 2025

anishsane commented Feb 18, 2025

emontnemery commented Feb 21, 2025

emontnemery commented Feb 21, 2025 •

edited

Loading

emontnemery commented Feb 21, 2025 •

edited

Loading

anishsane commented Feb 21, 2025

emontnemery Feb 21, 2025 •

edited

Loading

anishsane Feb 23, 2025

emontnemery Feb 21, 2025

anishsane Feb 23, 2025

emontnemery Feb 21, 2025

anishsane Feb 23, 2025

emontnemery Feb 21, 2025 •

edited

Loading

anishsane Feb 23, 2025

emontnemery Feb 21, 2025

anishsane Feb 23, 2025

emontnemery Feb 21, 2025

anishsane Feb 23, 2025

		elif platform == "camera":
		entities.extend(get_camera_entities(discovery_msg))

		if platform == "camera":
		return TasmotaCamera(config=config, mqtt_client=mqtt_client)

Add camera support #336

Are you sure you want to change the base?

Add camera support #336

Conversation

anishsane commented Jan 15, 2025

anishsane commented Jan 15, 2025

emontnemery left a comment

Choose a reason for hiding this comment

emontnemery commented Jan 20, 2025

emontnemery commented Feb 15, 2025

emontnemery commented Feb 17, 2025 • edited Loading

anishsane commented Feb 17, 2025

anishsane commented Feb 18, 2025

emontnemery commented Feb 21, 2025

emontnemery commented Feb 21, 2025 • edited Loading

emontnemery commented Feb 21, 2025 • edited Loading

anishsane commented Feb 21, 2025

emontnemery Feb 21, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emontnemery Feb 21, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emontnemery commented Feb 17, 2025 •

edited

Loading

emontnemery commented Feb 21, 2025 •

edited

Loading

emontnemery commented Feb 21, 2025 •

edited

Loading

emontnemery Feb 21, 2025 •

edited

Loading

emontnemery Feb 21, 2025 •

edited

Loading