publicWagsHome
/
amcrest2mqtt
mirror of https://github.com/dchesterton/amcrest2mqtt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: adjust server avty and states

Browse Source
pull/106/head
Jeff Culverhouse 3 months ago
parent 2929310d08
commit 06e6ce24bb
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
src/amcrest2mqtt/interface.py
Unescape Escape View File

@ -109,7 +109,7 @@ class AmcrestServiceProtocol(Protocol):
def publish_device_availability(self, device_id: str, online: bool = True) -> None: ... def publish_device_availability(self, device_id: str, online: bool = True) -> None: ...
def publish_device_discovery(self, device_id: str) -> None: ... def publish_device_discovery(self, device_id: str) -> None: ...
def publish_device_state(self, device_id: str) -> None: ... def publish_device_state(self, device_id: str) -> None: ...
def publish_service_availability(self, avail: str = "online") -> None: ... def publish_service_availability(self, status: str = "online") -> None: ...
def publish_service_discovery(self) -> None: ... def publish_service_discovery(self) -> None: ...
def publish_service_state(self) -> None: ... def publish_service_state(self) -> None: ...
def read_file(self, file_name: str) -> str: ... def read_file(self, file_name: str) -> str: ...

2
src/amcrest2mqtt/mixins/amcrest.py
Unescape Escape View File

@ -131,7 +131,7 @@ class AmcrestMixin:
"component_type": "sensor", "component_type": "sensor",
"name": "Recording time", "name": "Recording time",
"uniq_id": self.mqtt_helper.dev_unique_id(device_id, "recording_time"), "uniq_id": self.mqtt_helper.dev_unique_id(device_id, "recording_time"),
"stat_t": self.mqtt_helper.stat_t(device_id, "recording_time"), "stat_t": self.mqtt_helper.stat_t(device_id, "sensor", "recording_time"),
"avty_t": self.mqtt_helper.avty_t(device_id), "avty_t": self.mqtt_helper.avty_t(device_id),
"device_class": "timestamp", "device_class": "timestamp",
"icon": "mdi:clock", "icon": "mdi:clock",

2
src/amcrest2mqtt/mixins/mqtt.py
Unescape Escape View File

@ -52,7 +52,7 @@ class MqttMixin:
self.mqttc.on_log = self.mqtt_on_log self.mqttc.on_log = self.mqtt_on_log
# Define a "last will" message (LWT): # Define a "last will" message (LWT):
self.mqttc.will_set(self.mqtt_helper.svc_t("status"), "offline", qos=1, retain=True) self.mqttc.will_set(self.mqtt_helper.avty_t("service"), "offline", qos=1, retain=True)
try: try:
host = self.mqtt_config["host"] host = self.mqtt_config["host"]

49
src/amcrest2mqtt/mixins/publish.py
Unescape Escape View File

@ -1,4 +1,3 @@
from datetime import datetime
import json import json
from typing import TYPE_CHECKING, Any from typing import TYPE_CHECKING, Any
@ -25,7 +24,8 @@ class PublishMixin:
{ {
"name": self.service_name, "name": self.service_name,
"uniq_id": self.mqtt_helper.svc_unique_id("service"), "uniq_id": self.mqtt_helper.svc_unique_id("service"),
"stat_t": self.mqtt_helper.svc_t("service"), "stat_t": self.mqtt_helper.stat_t("service", "service"),
"avty_t": self.mqtt_helper.avty_t("service"),
"device_class": "connectivity", "device_class": "connectivity",
"icon": "mdi:server", "icon": "mdi:server",
"device": device_block, "device": device_block,
@ -46,8 +46,9 @@ class PublishMixin:
{ {
"name": f"{self.service_name} API Calls Today", "name": f"{self.service_name} API Calls Today",
"uniq_id": self.mqtt_helper.svc_unique_id("api_calls"), "uniq_id": self.mqtt_helper.svc_unique_id("api_calls"),
"stat_t": self.mqtt_helper.stat_t("service", "service", "api_calls"), "stat_t": self.mqtt_helper.stat_t("service", "service"),
"json_attr_t": self.mqtt_helper.attr_t("service", "service", "api_calls", "attributes"), "value_template": "{{ value_json.api_calls }}",
"avty_t": self.mqtt_helper.avty_t("service"),
"unit_of_measurement": "calls", "unit_of_measurement": "calls",
"icon": "mdi:api", "icon": "mdi:api",
"state_class": "total_increasing", "state_class": "total_increasing",
@ -63,8 +64,9 @@ class PublishMixin:
{ {
"name": f"{self.service_name} Rate Limited by Amcrest", "name": f"{self.service_name} Rate Limited by Amcrest",
"uniq_id": self.mqtt_helper.svc_unique_id("rate_limited"), "uniq_id": self.mqtt_helper.svc_unique_id("rate_limited"),
"stat_t": self.mqtt_helper.stat_t("service", "service", "rate_limited"), "stat_t": self.mqtt_helper.stat_t("service", "service"),
"json_attr_t": self.mqtt_helper.attr_t("service", "service", "rate_limited", "attributes"), "value_template": "{{ value_json.rate_limited }}",
"avty_t": self.mqtt_helper.avty_t("service"),
"payload_on": "YES", "payload_on": "YES",
"payload_off": "NO", "payload_off": "NO",
"device_class": "problem", "device_class": "problem",
@ -81,8 +83,9 @@ class PublishMixin:
{ {
"name": f"{self.service_name} Device Refresh Interval", "name": f"{self.service_name} Device Refresh Interval",
"uniq_id": self.mqtt_helper.svc_unique_id("storage_refresh"), "uniq_id": self.mqtt_helper.svc_unique_id("storage_refresh"),
"stat_t": self.mqtt_helper.stat_t("service", "service", "storage_refresh"), "stat_t": self.mqtt_helper.stat_t("service", "service"),
"json_attr_t": self.mqtt_helper.attr_t("service", "service", "storage_refresh", "attributes"), "value_template": "{{ value_json.storage_refresh }}",
"avty_t": self.mqtt_helper.avty_t("service"),
"cmd_t": self.mqtt_helper.cmd_t("service", "storage_refresh"), "cmd_t": self.mqtt_helper.cmd_t("service", "storage_refresh"),
"unit_of_measurement": "s", "unit_of_measurement": "s",
"min": 1, "min": 1,
@ -101,8 +104,9 @@ class PublishMixin:
{ {
"name": f"{self.service_name} Device List Refresh Interval", "name": f"{self.service_name} Device List Refresh Interval",
"uniq_id": self.mqtt_helper.svc_unique_id("device_list_refresh"), "uniq_id": self.mqtt_helper.svc_unique_id("device_list_refresh"),
"stat_t": self.mqtt_helper.stat_t("service", "service", "device_list_refresh"), "stat_t": self.mqtt_helper.stat_t("service", "service"),
"json_attr_t": self.mqtt_helper.attr_t("service", "service", "device_list_refresh", "attributes"), "value_template": "{{ value_json.device_list_refresh }}",
"avty_t": self.mqtt_helper.avty_t("service"),
"cmd_t": self.mqtt_helper.cmd_t("service", "device_list_refresh"), "cmd_t": self.mqtt_helper.cmd_t("service", "device_list_refresh"),
"unit_of_measurement": "s", "unit_of_measurement": "s",
"min": 1, "min": 1,
@ -121,8 +125,9 @@ class PublishMixin:
{ {
"name": f"{self.service_name} Snapshot Refresh Interval", "name": f"{self.service_name} Snapshot Refresh Interval",
"uniq_id": self.mqtt_helper.svc_unique_id("snapshot_refresh"), "uniq_id": self.mqtt_helper.svc_unique_id("snapshot_refresh"),
"stat_t": self.mqtt_helper.stat_t("service", "service", "snapshot_refresh"), "stat_t": self.mqtt_helper.stat_t("service", "service"),
"json_attr_t": self.mqtt_helper.attr_t("service", "service", "snapshot_refresh", "attributes"), "value_template": "{{ value_json.snapshot_refresh }}",
"avty_t": self.mqtt_helper.avty_t("service"),
"cmd_t": self.mqtt_helper.cmd_t("service", "snapshot_refresh"), "cmd_t": self.mqtt_helper.cmd_t("service", "snapshot_refresh"),
"unit_of_measurement": "m", "unit_of_measurement": "m",
"min": 1, "min": 1,
@ -152,16 +157,13 @@ class PublishMixin:
) )
self.logger.debug(f"[HA] Discovery published for {self.service} ({self.mqtt_helper.service_slug})") self.logger.debug(f"[HA] Discovery published for {self.service} ({self.mqtt_helper.service_slug})")
def publish_service_availability(self: Amcrest2Mqtt, avail: str = "online") -> None: def publish_service_availability(self: Amcrest2Mqtt, status: str = "online") -> None:
self.mqtt_safe_publish(self.mqtt_helper.svc_t("status"), avail, qos=self.qos, retain=True) self.mqtt_safe_publish(self.mqtt_helper.avty_t("service"), status, qos=self.qos, retain=True)
def publish_service_state(self: Amcrest2Mqtt) -> None: def publish_service_state(self: Amcrest2Mqtt) -> None:
service = { service = {
"state": "online", "api_calls": self.get_api_calls(),
"api_calls": { "last_api_call": self.get_last_call_date(),
"api_calls": self.get_api_calls(),
"last_api_call": self.get_last_call_date(),
},
"rate_limited": "YES" if self.is_rate_limited() else "NO", "rate_limited": "YES" if self.is_rate_limited() else "NO",
"storage_refresh": self.device_interval, "storage_refresh": self.device_interval,
"device_list_refresh": self.device_list_interval, "device_list_refresh": self.device_list_interval,
@ -170,13 +172,10 @@ class PublishMixin:
payload: Any payload: Any
for key, value in service.items(): for key, value in service.items():
if isinstance(value, dict): if not isinstance(value, dict):
payload = value.get(key)
if isinstance(payload, datetime):
payload = payload.isoformat()
payload = json.dumps(payload)
else:
payload = str(value) payload = str(value)
else:
payload = json.dumps(value)
self.mqtt_safe_publish( self.mqtt_safe_publish(
self.mqtt_helper.stat_t("service", "service", key), self.mqtt_helper.stat_t("service", "service", key),

Write Preview
Loading…
Cancel
Save