Skip to content

Home Information - Your home, your data, organized.

Python

Added alert banner display and alert acknowledgement. WIP

Anthony Cassandra6b71adc478d3
diff --git a/src/hi/apps/alert/alert.py b/src/hi/apps/alert/alert.py
index 958220b7..e0c69937 100644
--- a/src/hi/apps/alert/alert.py
+++ b/src/hi/apps/alert/alert.py
@@ -1,10 +1,13 @@
from collections import deque
from datetime import datetime, timedelta
+from typing import List
import uuid
import hi.apps.common.datetimeproxy as datetimeproxy
+from hi.apps.config.enums import AudioSignal
from .alarm import Alarm
+from .enums import AlarmLevel, AlarmSource
class Alert:
@@ -14,8 +17,8 @@ class Alert:
def __init__( self, first_alarm : Alarm ):
self._id = uuid.uuid4().hex
- self._start_datetime = datetimeproxy.now()
- self._end_datetime = self.startEpochSecs + timedelta( seconds = first_alarm.alarm_lifetime_secs )
+ self._start_datetime = first_alarm.timestamp
+ self._end_datetime = self._start_datetime + timedelta( seconds = first_alarm.alarm_lifetime_secs )
# Prevent unbounded growth and kept in reverse order of arrival, so
# most recent alarm is on the left side of list (popleft)
@@ -27,8 +30,12 @@ class Alert:
return
@property
- def id(self):
+ def id(self) -> str:
return self._id
+
+ @property
+ def alarm_list(self) -> List[ Alarm ]:
+ return list( self._latest_alarms )
@property
def start_datetime(self) -> datetime:
@@ -37,6 +44,30 @@ class Alert:
@property
def end_datetime(self) -> datetime:
return self._end_datetime
+
+ @property
+ def audio_signal(self) -> AudioSignal:
+ return self._first_alarm.audio_signal
+
+ @property
+ def alarm_level(self) -> AlarmLevel:
+ return self._first_alarm.alarm_level
+
+ @property
+ def alarm_source(self) -> AlarmSource:
+ return self._first_alarm.alarm_source
+
+ @property
+ def alarm_type(self) -> AlarmSource:
+ return self._first_alarm.alarm_type
+
+ @property
+ def alarm_count(self) -> int:
+ return len( self._latest_alarms )
+
+ @property
+ def title(self) -> str:
+ return self._first_alarm.title
@property
def first_alarm(self) -> Alarm:
@@ -46,6 +77,11 @@ class Alert:
def is_acknowledged(self) -> bool:
return self._is_acknowledged
+ @is_acknowledged.setter
+ def is_acknowledged( self, value : bool ):
+ self._is_acknowledged = value
+ return
+
def is_matching_alarm( self, alarm : Alarm ) -> bool:
return self._first_alarm.sSignature == alarm.signature
@@ -64,3 +100,4 @@ class Alert:
if len(self._latest_alarms) > 0:
return self._latest_alarms[0]
return None
+
diff --git a/src/hi/apps/alert/alert_helpers.py b/src/hi/apps/alert/alert_helpers.py
new file mode 100644
index 00000000..583ae419
--- /dev/null
+++ b/src/hi/apps/alert/alert_helpers.py
@@ -0,0 +1,20 @@
+from typing import List
+
+from django.http import HttpRequest
+from django.template.loader import get_template
+
+from .alert import Alert
+
+
+class AlertHelpers:
+
+ ALERT_LIST_BANNER_TEMPLATE_NAME = 'alert/panes/alert_list_banner.html'
+
+ @classmethod
+ def alert_list_to_html_str( cls,
+ request : HttpRequest,
+ alert_list : List[ Alert ] ) -> str:
+ context = { 'alert_list': alert_list }
+ template = get_template( cls.ALERT_LIST_BANNER_TEMPLATE_NAME )
+ content = template.render( context, request = request )
+ return content
diff --git a/src/hi/apps/alert/alert_manager.py b/src/hi/apps/alert/alert_manager.py
index 6a74de69..c1a651d0 100644
--- a/src/hi/apps/alert/alert_manager.py
+++ b/src/hi/apps/alert/alert_manager.py
@@ -3,7 +3,7 @@ import logging
from hi.apps.common.singleton import Singleton
-from .alert_collection import AlertCollection
+from .alert_queue import AlertQueue
from .alarm import Alarm
from .alert_status import AlertStatusData
@@ -13,11 +13,15 @@ logger = logging.getLogger(__name__)
class AlertManager(Singleton):
def __init_singleton__(self):
- self._alert_collection = AlertCollection()
+ self._alert_queue = AlertQueue()
return
- def get_alert_status_data( self, last_alert_status_datetime : datetime ) -> AlertStatusData:
+ @property
+ def unacknowledged_alert_list(self):
+ return self._alert_queue.unacknowledged_alert_list
+ def get_alert_status_data( self, last_alert_status_datetime : datetime ) -> AlertStatusData:
+
# Things to check on alert status:
#
# 1) Has the alert list changed in any way? If so, return new HTML
@@ -36,13 +40,13 @@ class AlertManager(Singleton):
# in the view. Also, we return it if it has changed, which include
# it having become empty.
- new_alert = self._alert_collection.get_most_important_alert(
+ new_alert = self._alert_queue.get_most_important_alert(
since_datetime = last_alert_status_datetime,
)
if new_alert:
max_alert = new_alert.audio_signal_name if new_alert else None
else:
- max_alert = self._alert_collection.get_most_important_alert()
+ max_alert = self._alert_queue.get_most_important_alert()
# TODO: Use this latest new alarm for providing auto-switching to
# show something related to the latest event, e.g., camera feed.
@@ -50,12 +54,12 @@ class AlertManager(Singleton):
# whether to show it based on the console settings and user
# interaction context.
#
- latest_new_alarm = self._alert_collection.get_most_recent_alarm(
+ latest_new_alarm = self._alert_queue.get_most_recent_alarm(
since_datetime = last_alert_status_datetime,
)
return AlertStatusData(
- alert_list = None,
+ alert_list = self._alert_queue.unacknowledged_alert_list,
max_audio_signal = max_alert.audio_signal if max_alert else None,
new_audio_signal = new_alert.audio_signal if new_alert else None,
)
@@ -63,7 +67,22 @@ class AlertManager(Singleton):
async def add_alarm( self, alarm : Alarm ):
logging.debug( f'Adding Alarm: {alarm}' )
try:
- self._alert_collection.add_alarm()
+ self._alert_queue.add_alarm()
except ValueError as ve:
logging.info( str(ve) )
return
+
+ def acknowledge_alert( self, alert_id : str ):
+ self._alert_queue.acknowledge_alert( alert_id = alert_id )
+ return
+
+ def do_periodic_maintenance(self):
+ self._alert_queue.remove_expired_or_acknowledged_alerts()
+ self.check_email_queues()
+ return
+
+ def check_email_queues(self):
+
+ # TODO: Implement this method after adding email sending.
+
+ return
diff --git a/src/hi/apps/alert/alert_monitor.py b/src/hi/apps/alert/alert_monitor.py
new file mode 100644
index 00000000..a09cc2d3
--- /dev/null
+++ b/src/hi/apps/alert/alert_monitor.py
@@ -0,0 +1,25 @@
+import logging
+
+from hi.apps.monitor.periodic_monitor import PeriodicMonitor
+
+from .alert_manager import AlertManager
+
+logger = logging.getLogger(__name__)
+
+
+class AlertMonitor( PeriodicMonitor ):
+
+ ALERT_POLLING_INTERVAL_SECS = 10
+
+ def __init__( self ):
+ super().__init__(
+ id = 'alert-monitor',
+ interval_secs = self.ALERT_POLLING_INTERVAL_SECS,
+ )
+ self._alert_manager = AlertManager()
+ return
+
+ async def do_work(self):
+ logger.debug( 'Checking for alert maintenance work.' )
+ self._alert_manager.do_periodic_maintenance()
+ return
diff --git a/src/hi/apps/alert/alert_collection.py b/src/hi/apps/alert/alert_queue.py
similarity index 62%
rename from src/hi/apps/alert/alert_collection.py
rename to src/hi/apps/alert/alert_queue.py
index 01f7d6e6..a2d8a12e 100644
--- a/src/hi/apps/alert/alert_collection.py
+++ b/src/hi/apps/alert/alert_queue.py
@@ -11,12 +11,34 @@ from .enums import AlarmLevel
logger = logging.getLogger(__name__)
-class AlertCollection:
+class AlertQueue:
MAX_ALERT_LIST_SIZE = 50
def __init__(self):
self._alert_list = list()
+
+
+
+
+
+ """
+ from hi.apps.alert.tests.synthetic_data import AlertSyntheticData
+ self._alert_list = AlertSyntheticData.create_random_alert_list(
+ reference_datetime = datetimeproxy.iso_naive_to_datetime_utc('2024-12-08T18:01:54'),
+ alarm_lifetime_secs = 999999,
+ # seed = 23456789, # Alerts = 1, Alarms = 1W
+ # seed = 23456780, # Alerts = 4, Alarms = 4C, 1C, 2C, 3W
+ seed = 23456781, # Alerts = 2, Alarms = 1I, 2C
+ )
+ print( f'\n\nSET SYNTHETIC ALERT LIST: size={len(self._alert_list)}\n' )
+ """
+
+
+
+
+
+
self._active_alerts_lock = threading.Lock()
self._last_changed_datetime = datetimeproxy.now()
return
@@ -26,6 +48,10 @@ class AlertCollection:
def __len__(self):
return len( self._alert_list )
+
+ @property
+ def unacknowledged_alert_list(self):
+ return [ x for x in self._alert_list if not x.is_acknowledged ]
def get_most_important_alert( self, since_datetime : datetime = None ):
"""
@@ -46,6 +72,8 @@ class AlertCollection:
max_alert = None
for alert in self._alert_list:
+ if alert.is_acknowledged:
+ continue
if alert.start_datetime <= since_datetime:
continue
if max_alert is None:
@@ -76,6 +104,8 @@ class AlertCollection:
latest_alarm = None
latest_alarm_datetime = datetimeproxy.min()
for alert in self._alert_list:
+ if alert.is_acknowledged:
+ continue
alarm = alert.get_latest_alarm()
if not alarm:
continue
@@ -114,3 +144,47 @@ class AlertCollection:
finally:
self._active_alerts_lock.release()
return
+
+ def acknowledge_alert( self, alert_id : str ):
+ try:
+ self._active_alerts_lock.acquire()
+
+ for alert in self._alert_list:
+ if alert.id != alert_id:
+ continue
+ alert.is_acknowledged = True
+ self._last_changed_datetime = datetimeproxy.now()
+ return True
+
+ raise KeyError( f'Alert not found for {alert_id}' )
+ finally:
+ self._active_alerts_lock.release()
+
+ def remove_expired_or_acknowledged_alerts(self):
+ try:
+ self._active_alerts_lock.acquire()
+
+ logger.debug( f'Alert Check: List size = {len(self._alert_list)}')
+ if len( self._alert_list ) < 1:
+ return
+
+ now_datetime = datetimeproxy.now()
+ new_list = list()
+ for alert in self._alert_list:
+ if alert.end_datetime <= now_datetime:
+ continue
+ if alert.is_acknowledged:
+ continue
+ new_list.append( alert )
+
+ removed_count = len(self._alert_list) - len(new_list)
+ logger.debug( f'Removed "{removed_count}" alerts.' )
+ if removed_count > 0:
+ self._alert_list = new_list
+ self._last_changed_datetime = datetimeproxy.now()
+
+ finally:
+ self._active_alerts_lock.release()
+ return
+
+
diff --git a/src/hi/apps/alert/alert_status.py b/src/hi/apps/alert/alert_status.py
index 01c347ab..0a9f12fd 100644
--- a/src/hi/apps/alert/alert_status.py
+++ b/src/hi/apps/alert/alert_status.py
@@ -1,14 +1,19 @@
from dataclasses import dataclass
from typing import ClassVar, List
+from django.http import HttpRequest
+
from hi.apps.config.enums import AudioSignal
from .alert import Alert
+from .alert_helpers import AlertHelpers
@dataclass
class AlertStatusData:
+ ALERT_LIST_BANNER_TEMPLATE_NAME = 'alert/panes/alert_list_banner.html'
+
alert_list : List[ Alert ]
max_audio_signal : AudioSignal
new_audio_signal : AudioSignal # Not seen before (for immediate audio notification)
@@ -17,19 +22,17 @@ class AlertStatusData:
MaxAudioSignalNameAttr : ClassVar = 'maxAudioSignaName'
AlarmMessageHtmlAttr : ClassVar = 'alarmMessageHtml'
- def to_dict(self):
-
-
-
- # TODO: alarm_list to HTML via new template
-
-
+ def to_dict(self, request : HttpRequest ):
+ alert_list_html_str = AlertHelpers.alert_list_to_html_str(
+ request = request,
+ alert_list = self.alert_list,
+ )
response_dict = dict()
if self.max_audio_signal:
response_dict[self.MaxAudioSignalNameAttr] = str(self.max_audio_signal)
if self.new_audio_signal:
response_dict[self.NewAudioSignalNameAttr] = str(self.new_audio_signal)
if self.alert_list:
- response_dict[self.AlarmMessageHtmlAttr] = zzz
+ response_dict[self.AlarmMessageHtmlAttr] = alert_list_html_str
return response_dict
diff --git a/src/hi/apps/alert/apps.py b/src/hi/apps/alert/apps.py
index 3c5b5b56..cad085a2 100644
--- a/src/hi/apps/alert/apps.py
+++ b/src/hi/apps/alert/apps.py
@@ -1,6 +1,17 @@
+import os
from django.apps import AppConfig
class AlertConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "hi.apps.alert"
+
+ def ready(self):
+ if os.getenv( "RUN_MAIN", None ) != "true":
+ # Avoid double initialization when using the reloader in development
+ return
+ from hi.apps.monitor.monitor_manager import MonitorManager
+ from hi.apps.alert.alert_monitor import AlertMonitor
+ alert_monitor = AlertMonitor()
+ MonitorManager().register( alert_monitor )
+ return
diff --git a/src/hi/apps/alert/templates/alert/panes/alert_list_banner.html b/src/hi/apps/alert/templates/alert/panes/alert_list_banner.html
new file mode 100644
index 00000000..50607b06
--- /dev/null
+++ b/src/hi/apps/alert/templates/alert/panes/alert_list_banner.html
@@ -0,0 +1,28 @@
+{% load humanize %}
+<div class="hi-alert-banner">
+ {% for alert in alert_list %}
+ <div class="hi-alert hi-alarm-level-{{ alert.alarm_level }} row">
+ <div class="col-1">
+ <a href="{% url 'alert_details' alert_id=alert.id %}"
+ class="btn btn-info" data-async="modal">DETAILS</a>
+ </div>
+ <div class="col-1">{{ alert.alarm_level.label }}</div>
+ <div class="col-6">{{ alert.alarm_type }}: {{ alert.title }}</div>
+ <div class="col-3">
+ Since {{ alert.start_datetime|naturaltime }}
+ {% if alert.alarm_count > 1 %}
+ ({{ alert.alarm_count }} Alarms)
+ {% endif %}
+ </div>
+ <div class="col-1">
+ <form action="{% url 'alert_acknowledge' alert_id=alert.id %}" method="post"
+ data-async="true">
+ {% csrf_token %}
+ <input type="submit" class="btn btn-danger" name="action" value="Dismiss">
+ </form>
+ </div>
+ </div>
+ {% empty %}
+ <div class="alert alert-warning">No alerts.</div>
+ {% endfor %}
+</div>
diff --git a/src/hi/apps/alert/tests/synthetic_data.py b/src/hi/apps/alert/tests/synthetic_data.py
new file mode 100644
index 00000000..bc8ff334
--- /dev/null
+++ b/src/hi/apps/alert/tests/synthetic_data.py
@@ -0,0 +1,108 @@
+from datetime import datetime, timedelta
+import random
+from typing import List
+
+from hi.apps.alert.alarm import Alarm
+from hi.apps.alert.alert import Alert
+from hi.apps.alert.alert_status import AlertStatusData
+from hi.apps.alert.enums import AlarmLevel, AlarmSource, SecurityPosture
+import hi.apps.common.datetimeproxy as datetimeproxy
+
+
+class AlertSyntheticData:
+
+ @classmethod
+ def create_random_alert_status_data( cls,
+ reference_datetime : datetime = None,
+ seed : int = None ) -> AlertStatusData:
+ alert_list = cls.create_random_alert_list(
+ reference_datetime = reference_datetime,
+ seed = seed,
+ )
+ max_priority_alert = alert_list[0]
+ max_recent_alarm = alert_list[0].alarm_list[0]
+ for alert in alert_list:
+ if alert.alert_priority > max_priority_alert.alert_priority:
+ max_priority_alert = alert
+ for alarm in alert.alarm_list:
+ if alarm.timestamp > max_recent_alarm.timestamp:
+ max_recent_alarm = alarm
+ continue
+ continue
+
+ return AlertStatusData(
+ alert_list = alert_list,
+ max_audio_signal = max_priority_alert.audio_signal,
+ new_audio_signal = max_recent_alarm.audio_signal,
+ )
+
+ @classmethod
+ def create_random_alert_list( cls,
+ reference_datetime : datetime = None,
+ alarm_lifetime_secs : int = None,
+ seed : int = None ) -> List[ Alert ]:
+ random_impl = random.Random( seed ) if seed else random
+
+ if not reference_datetime:
+ reference_datetime = datetimeproxy.now()
+ if not alarm_lifetime_secs:
+ alarm_lifetime_secs = random_impl.randint( 300, 600 )
+
+ num_alerts = random_impl.randint( 1, 4 )
+ alert_list = list()
+ for alert_idx in range( num_alerts ):
+ alarm_count = random_impl.randint( 1, 4 )
+ alarm_time_offsets = cls.generate_time_offsets( length = num_alerts,
+ max_seconds = 120,
+ random_impl = random_impl )
+ alarm_source = random_impl.choice( list( AlarmSource ))
+ alarm_type = f'Alarm Type {num_alerts}'
+ alarm_level = random_impl.choice([ AlarmLevel.INFO,
+ AlarmLevel.WARNING,
+ AlarmLevel.CRITICAL ])
+ security_posture = random_impl.choice( list( SecurityPosture ))
+ alarm_idx = 0
+ alarm_title = f'Alarm-{alert_idx}-{alarm_idx}'
+ alarm_timestamp = reference_datetime - timedelta( seconds = alarm_time_offsets[alarm_idx] )
+ first_alarm = Alarm(
+ alarm_source = alarm_source,
+ alarm_type = alarm_type,
+ alarm_level= alarm_level,
+ title = alarm_title,
+ details = f'Details for {alarm_title}. Seed = {seed} ',
+ security_posture = security_posture,
+ alarm_lifetime_secs = alarm_lifetime_secs,
+ timestamp = alarm_timestamp,
+ )
+ alert = Alert(
+ first_alarm = first_alarm,
+ )
+ for extra_idx in range( alarm_count - 1 ):
+ alarm_idx = extra_idx + 1
+ alarm_title = f'Alarm-{alert_idx}-{alarm_idx}'
+ alarm_timestamp = reference_datetime - timedelta( seconds = alarm_time_offsets[alarm_idx] )
+ alarm = Alarm(
+ alarm_source = alarm_source,
+ alarm_type = alarm_type,
+ alarm_level= alarm_level,
+ title = alarm_title,
+ details = f'Details for {alarm_title}. Seed = {seed} ',
+ security_posture = security_posture,
+ alarm_lifetime_secs = alarm_lifetime_secs,
+ timestamp = alarm_timestamp,
+ )
+ alert.add_alarm( alarm )
+ continue
+ alert_list.append( alert )
+ continue
+
+ return alert_list
+
+ @classmethod
+ def generate_time_offsets( cls,
+ length : int,
+ max_seconds : int,
+ random_impl : random.Random ) -> List[ int ]:
+ random_impl = random_impl or random
+ return sorted( random_impl.randint( 0, max_seconds ) for _ in range(length) )
+
diff --git a/src/hi/apps/alert/urls.py b/src/hi/apps/alert/urls.py
new file mode 100644
index 00000000..c7c712de
--- /dev/null
+++ b/src/hi/apps/alert/urls.py
@@ -0,0 +1,15 @@
+from django.urls import re_path
+
+from . import views
+
+
+urlpatterns = [
+
+ re_path( r'^acknowledge/(?P<alert_id>.+)$',
+ views.AlertAcknowledgeView.as_view(),
+ name='alert_acknowledge'),
+
+ re_path( r'^details/(?P<alert_id>.+)$',
+ views.AlertDetailsView.as_view(),
+ name='alert_details'),
+]
diff --git a/src/hi/apps/alert/views.py b/src/hi/apps/alert/views.py
index 91ea44a2..240192e5 100644
--- a/src/hi/apps/alert/views.py
+++ b/src/hi/apps/alert/views.py
@@ -1,3 +1,36 @@
-from django.shortcuts import render
+from django.http import Http404
+from django.views.generic import View
+
+import hi.apps.common.antinode as antinode
+
+from hi.constants import DIVID
+from hi.hi_async_view import HiModalView
+
+from .alert_helpers import AlertHelpers
+from .alert_manager import AlertManager
+
+
+class AlertAcknowledgeView( View ):
+
+ def post( self, request, *args, **kwargs ):
+ alert_id = kwargs.get( 'alert_id' )
+ alert_manager = AlertManager()
+ try:
+ alert_manager.acknowledge_alert( alert_id = alert_id )
+ except KeyError:
+ raise Http404( 'Unknown alert.' )
+
+ alert_list_html_str = AlertHelpers.alert_list_to_html_str(
+ request = request,
+ alert_list = alert_manager.unacknowledged_alert_list,
+ )
+ return antinode.response(
+ insert_map = {
+ DIVID['ALERT_BANNER_CONTAINER']: alert_list_html_str
+ },
+ )
+
+
+class AlertDetailsView( HiModalView ):
+ pass
-# Create your views here.
diff --git a/src/hi/apps/api/views.py b/src/hi/apps/api/views.py
index 031ce8ee..868b32f2 100644
--- a/src/hi/apps/api/views.py
+++ b/src/hi/apps/api/views.py
@@ -57,7 +57,7 @@ class StatusView( View ):
data = {
self.ServerStartTimestampAttr: server_start_datetime.isoformat(),
self.ServerTimestampAttr: server_datetime.isoformat(),
- self.AlertStatusDataAttr: alert_status_data.to_dict(),
+ self.AlertStatusDataAttr: alert_status_data.to_dict( request = request ),
self.CssClassUpdateMapAttr: css_class_update_map,
}
return HttpResponse(
diff --git a/src/hi/apps/common/antinode.py b/src/hi/apps/common/antinode.py
index b07b4a5b..2cbf8fab 100644
--- a/src/hi/apps/common/antinode.py
+++ b/src/hi/apps/common/antinode.py
@@ -41,8 +41,8 @@ def modal_from_template( request, template_name, context={}, status=200 ):
the target content. The template should be set up to contain the necessary
modal structure (modulo the main wrapper modal div).
"""
- template = get_template(template_name)
- content = template.render(context, request=request)
+ template = get_template( template_name )
+ content = template.render( context, request = request )
return modal_from_content( request, content, status = status )
diff --git a/src/hi/apps/common/datetimeproxy.py b/src/hi/apps/common/datetimeproxy.py
index d4f4d25c..76c2197f 100644
--- a/src/hi/apps/common/datetimeproxy.py
+++ b/src/hi/apps/common/datetimeproxy.py
@@ -371,3 +371,22 @@ def iso_naive_to_datetime_utc( iso_str : str, tzname : str = 'UTC' ):
def change_timezone( original_datetime : datetime, new_tzname : str ):
new_tz = pytz.timezone( new_tzname )
return original_datetime.astimezone( new_tz )
+
+
+def get_since_time_humanized( reference_datetime : datetime ):
+ current_datetime = now()
+ elapsed_timedelta = current_datetime - reference_datetime
+ elapsed_seconds = elapsed_timedelta.total_seconds()
+ if elapsed_seconds < 55:
+ return f'{round(elapsed_seconds)} seconds ago'
+
+ elapsed_minutes = elapsed_seconds / 60
+
+ if elapsed_minutes <= 90:
+ return f'{round(elapsed_minutes)} minutes ago'
+
+ elapsed_hours = elapsed_minutes / 60
+ if elapsed_hours <= 24:
+ return f'over {round(elapsed_hours)} hours ago'
+
+ return reference_datetime.strftime('%A, %B %d at %I:%M %p')
diff --git a/src/hi/apps/event/event_manager.py b/src/hi/apps/event/event_manager.py
index 1b4b678f..26773e8a 100644
--- a/src/hi/apps/event/event_manager.py
+++ b/src/hi/apps/event/event_manager.py
@@ -87,7 +87,7 @@ class EventManager(Singleton):
if not recent_event:
return False
recent_event_timedelta = datetimeproxy.now() - recent_event.timestamp
- return bool( recent_event_timedelta.seconds <= event_definition.dedupe_window_secs )
+ return bool( recent_event_timedelta.total_seconds() <= event_definition.dedupe_window_secs )
def _create_event_if_detected( self, event_definition : EventDefinition ) -> bool:
if not event_definition.event_clauses.exists():
@@ -104,7 +104,7 @@ class EventManager(Singleton):
if transition.latest_sensor_response.value != event_clause.value:
continue
transition_timedelta = current_timestamp - transition.timestamp
- if transition_timedelta.seconds > event_definition.event_window_secs:
+ if transition_timedelta.total_seconds() > event_definition.event_window_secs:
continue
matches = True
sensor_response_list.append( transition.latest_sensor_response )
diff --git a/src/hi/apps/event/transient_models.py b/src/hi/apps/event/transient_models.py
index c1b89ca0..ef2915e4 100644
--- a/src/hi/apps/event/transient_models.py
+++ b/src/hi/apps/event/transient_models.py
@@ -42,7 +42,7 @@ class Event:
def to_alarm( self, alarm_action : AlarmAction ) -> Alarm:
return Alarm(
alarm_source = AlarmSource.EVENT,
- alarm_type = str(self.event_definition.event_type),
+ alarm_type = self.event_definition.event_type.label,
alarm_level = alarm_action.alarm_level,
title = self.event_definition.name,
details = ', '.join([ x.sensor.name for x in self.sensor_response_list ]),
diff --git a/src/hi/apps/monitor/monitor_manager.py b/src/hi/apps/monitor/monitor_manager.py
index 761cfcd6..5b6a1154 100644
--- a/src/hi/apps/monitor/monitor_manager.py
+++ b/src/hi/apps/monitor/monitor_manager.py
@@ -56,7 +56,7 @@ class MonitorManager( Singleton ):
# In case any registrations happened before initialize is called.
for monitor_id, monitor in self._monitor_map.items():
- if not monitor.is_running():
+ if not monitor.is_running:
logger.debug(f"Starting monitor: {monitor_id}")
asyncio.run_coroutine_threadsafe( monitor.start(), self._event_loop )
continue
diff --git a/src/hi/apps/monitor/status_display_data.py b/src/hi/apps/monitor/status_display_data.py
index 11bf599e..2d7b7aeb 100644
--- a/src/hi/apps/monitor/status_display_data.py
+++ b/src/hi/apps/monitor/status_display_data.py
@@ -220,10 +220,10 @@ class StatusDisplayData:
if self.penultimate_sensor_value == str(EntityStateValue.ACTIVE):
movement_timedelta = datetimeproxy.now() - self.penultimate_sensor_timestamp
- if movement_timedelta.seconds < 30:
+ if movement_timedelta.total_seconds() < 30:
return StatusStyle.MovementRecent
- elif movement_timedelta.seconds < 60:
+ elif movement_timedelta.total_seconds() < 60:
return StatusStyle.MovementPast
return StatusStyle.MovementIdle
@@ -235,10 +235,10 @@ class StatusDisplayData:
if self.penultimate_sensor_value == str(EntityStateValue.ACTIVE):
presence_timedelta = datetimeproxy.now() - self.penultimate_sensor_timestamp
- if presence_timedelta.seconds < 30:
+ if presence_timedelta.total_seconds() < 30:
return StatusStyle.MovementRecent
- elif presence_timedelta.seconds < 60:
+ elif presence_timedelta.total_seconds() < 60:
return StatusStyle.MovementPast
return StatusStyle.MovementIdle
diff --git a/src/hi/constants.py b/src/hi/constants.py
index 2afe8b28..b323d234 100644
--- a/src/hi/constants.py
+++ b/src/hi/constants.py
@@ -45,4 +45,6 @@ DIVID = {
'COLLECTION_POSITION_EDIT_PANE': 'hi-collection-position-edit',
'ATTRIBUTE_CONTAINER_CLASS': 'hi-attribute',
+
+ 'ALERT_BANNER_CONTAINER': 'hi-alert-banner-container',
}
diff --git a/src/hi/integrations/zoneminder/zm_monitor.py b/src/hi/integrations/zoneminder/zm_monitor.py
index b3145f05..0e482127 100644
--- a/src/hi/integrations/zoneminder/zm_monitor.py
+++ b/src/hi/integrations/zoneminder/zm_monitor.py
@@ -78,7 +78,7 @@ class ZoneMinderMonitor( PeriodicMonitor ):
}
events = self._zm_manager.get_zm_events( options = options )
if self.TRACE:
- logger.debug( f"Found {len(events)} new ZM events" )
+ logger.debug( f'Found {len(events)} new ZM events' )
# Sensor readings and state value transitions are points in time,
# but ZoneMinder events are intervals. Thus, one ZoneMinder event
diff --git a/src/hi/static/css/main.css b/src/hi/static/css/main.css
index b4d9bd57..c3e5d9d2 100644
--- a/src/hi/static/css/main.css
+++ b/src/hi/static/css/main.css
@@ -350,3 +350,20 @@ div[status="low"] {
.switch input:checked + .slider:before {
transform: translateX(26px);
}
+
+#hi-alert-banner-container {
+}
+.hi-alarm-level-info {
+ color: var(--on-success-color);
+ background-color: var(--success-color);
+}
+
+.hi-alarm-level-warning {
+ color: var(--on-warning-color);
+ background-color: var(--warning-color);
+}
+
+.hi-alarm-level-critical {
+ color: var(--on-error-color);
+ background-color: var(--error-color);
+}
diff --git a/src/hi/static/js/status.js b/src/hi/static/js/status.js
index 5b0951a4..3d96dfcf 100644
--- a/src/hi/static/js/status.js
+++ b/src/hi/static/js/status.js
@@ -31,7 +31,7 @@
const CssClassUpdateMapAttr = 'cssClassUpdateMap';
const AlertStatusDataAttr = 'alertData';
- const AlertMessageSelector = '#hi-alert-message';
+ const AlertBannerContainerSelector = '#hi-alert-banner-container';
const MaxAudioSignalNameAttr = 'maxAudioSignaName';
const NewAudioSignalNameAttr = 'newAudioSignalName';
const AlarmMessageHtmlAttr = 'alarmMessageHtml';
@@ -157,9 +157,9 @@
if (( AlarmMessageHtmlAttr in alertStatusData )
&& alertStatusData[AlarmMessageHtmlAttr] ) {
- $(AlertMessageSelector).html( alertStatusData[AlarmMessageHtmlAttr] ).show();
+ $(AlertBannerContainerSelector).html( alertStatusData[AlarmMessageHtmlAttr] ).show();
} else {
- $(AlertMessageSelector).empty().hide();
+ $(AlertBannerContainerSelector).empty().hide();
}
}
diff --git a/src/hi/templates/pages/base.html b/src/hi/templates/pages/base.html
index 1900a19f..5a8b524b 100644
--- a/src/hi/templates/pages/base.html
+++ b/src/hi/templates/pages/base.html
@@ -24,8 +24,7 @@
</script>
{% javascript 'js_before_content' %}
- <div id="hi-alert-message"
- class="fixed-top bg-danger text-white text-center py-2"
+ <div id="{{ DIVID.ALERT_BANNER_CONTAINER }}" class="fixed-top"
style="z-index: 5000; display: none;"></div>
{% block content %}{% endblock %}
diff --git a/src/hi/urls.py b/src/hi/urls.py
index 71442b19..72b2d637 100644
--- a/src/hi/urls.py
+++ b/src/hi/urls.py
@@ -37,6 +37,7 @@ urlpatterns = [
re_path( r'^sense/', include('hi.apps.sense.urls' )),
re_path( r'^control/', include('hi.apps.control.urls' )),
re_path( r'^event/', include('hi.apps.event.urls' )),
+ re_path( r'^alert/', include('hi.apps.alert.urls' )),
# Custom error pages
re_path( r'^400.html$', views.bad_request_response, name='bad_request' ),