Merge pull request #120 from Minims/dev

Dev
Minims · Sep 11, 2023 · 69befef · 69befef
2 parents 12b3255 + 3275943
commit 69befef
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 24 deletions.
diff --git a/somfyProtect2Mqtt/Dockerfile b/somfyProtect2Mqtt/Dockerfile
@@ -15,9 +15,8 @@ COPY requirements.txt .
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
-    build-essential zlib1g-dev libjpeg62-turbo-dev ffmpeg \
-    && python -m pip install -r requirements.txt \
-    && apt-get autoremove --yes build-essential zlib1g-dev libjpeg62-turbo-dev \
+    python3-opencv ffmpeg \
+    && python -m pip install -r requirements_addons.txt \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

diff --git a/somfyProtect2Mqtt/business/mqtt.py b/somfyProtect2Mqtt/business/mqtt.py
@@ -51,18 +51,14 @@ def update_site(api, mqtt_client, mqtt_config, site_id):
         mqtt_publish(
             mqtt_client=mqtt_client,
             topic=f"{mqtt_config.get('topic_prefix', 'somfyProtect2mqtt')}/{site_id}/state",
-            payload={
-                "security_level": ALARM_STATUS.get(site.security_level, "disarmed")
-            },
+            payload={"security_level": ALARM_STATUS.get(site.security_level, "disarmed")},
             retain=True,
         )
     except Exception as exp:
         LOGGER.warning(f"Error while refreshing site {site_id}: {exp}")
 
 
-def consume_mqtt_message(
-    msg, mqtt_config: dict, api: SomfyProtectApi, mqtt_client: client
-):
+def consume_mqtt_message(msg, mqtt_config: dict, api: SomfyProtectApi, mqtt_client: client):
     """Compute MQTT received message"""
     try:
         text_payload = msg.payload.decode("UTF-8")
@@ -134,9 +130,7 @@ def consume_mqtt_message(
             site_id = msg.topic.split("/")[1]
             device_id = msg.topic.split("/")[2]
             if device_id:
-                LOGGER.info(
-                    f"Message received for Site ID: {site_id}, Device ID: {device_id}, Action: {text_payload}"
-                )
+                LOGGER.info(f"Message received for Site ID: {site_id}, Device ID: {device_id}, Action: {text_payload}")
                 action_device = api.action_device(
                     site_id=site_id,
                     device_id=device_id,
@@ -153,9 +147,7 @@ def consume_mqtt_message(
                     device_id=device_id,
                 )
             else:
-                LOGGER.info(
-                    f"Message received for Site ID: {site_id}, Action: {text_payload}"
-                )
+                LOGGER.info(f"Message received for Site ID: {site_id}, Action: {text_payload}")
 
         # Manage Manual Snapshot
         elif msg.topic.split("/")[3] == "snapshot":
@@ -193,9 +185,7 @@ def consume_mqtt_message(
             if setting == "stream":
                 return
             device = api.get_device(site_id=site_id, device_id=device_id)
-            LOGGER.info(
-                f"Message received for Site ID: {site_id}, Device ID: {device_id}, Setting: {setting}"
-            )
+            LOGGER.info(f"Message received for Site ID: {site_id}, Device ID: {device_id}, Setting: {setting}")
             settings = device.settings
             settings["global"][setting] = text_payload
             api.update_device(
@@ -215,6 +205,4 @@ def consume_mqtt_message(
             )
 
     except Exception as exp:
-        LOGGER.error(
-            f"Error when processing message: {exp}: {msg.topic} => {msg.payload}"
-        )
+        LOGGER.error(f"Error when processing message: {exp}: {msg.topic} => {msg.payload}")
diff --git a/somfyProtect2Mqtt/docker-compose.yml b/somfyProtect2Mqtt/docker-compose.yml
@@ -1,7 +1,7 @@
-version: "3"
+version: '3'
 services:
   somfyprotect2mqtt:
     build: .
-    image: somfyprotect2mqtt:v2023.9.1
+    image: somfyprotect2mqtt:v2023.9.2
     volumes:
       - ./config:/config
diff --git a/somfyProtect2Mqtt/homeassistant/ha_discovery.py b/somfyProtect2Mqtt/homeassistant/ha_discovery.py
@@ -618,6 +618,7 @@ def ha_discovery_alarm(site: Site, mqtt_config: dict, homeassistant_config: dict
         "payload_arm_night": "partial",
         "payload_disarm": "disarmed",
         "value_template": "{{ value_json.security_level }}",
+        "supported_features": ["arm_night", "arm_away", "trigger"],
         "device": site_info,
     }
     if code and (isinstance(code, int)):

diff --git a/somfyProtect2Mqtt/main.py b/somfyProtect2Mqtt/main.py
@@ -16,7 +16,7 @@
 from somfy_protect.api import SomfyProtectApi
 from somfy_protect.websocket import SomfyProtectWebsocket
 
-VERSION = "2023.9.1"
+VERSION = "2023.9.2"
 
 
 def somfy_protect_loop(config, mqtt_client, api):