Home Information - Your home, your data, organized.
Python
Refactoring of StatusDataHelper. WIP
Anthony Cassandra55d0bdefe4d9
diff --git a/src/hi/apps/api/views.py b/src/hi/apps/api/views.pyindex 1ddf47a1..6d43cfcb 100644--- a/src/hi/apps/api/views.py+++ b/src/hi/apps/api/views.py@@ -4,7 +4,8 @@ import loggingfrom django.http import HttpResponsefrom django.views.generic import View-from hi.apps.monitor.status_display_helpers import StatusDisplayStatusViewHelper+from hi.apps.monitor.status_data_helpers import StatusDataHelper+from hi.apps.monitor.status_display_data import StatusDisplayDatalogger = logging.getLogger(__name__)@@ -15,7 +16,9 @@ class StatusView( View ):CssClassUpdateMap = 'cssClassUpdateMap'def get( self, *args, **kwargs ):- status_display_data_list = StatusDisplayStatusViewHelper().get_status_display_data()++ entity_state_status_data_list = StatusDataHelper().get_entity_state_status_data_list()+ status_display_data_list = [ StatusDisplayData(x) for x in entity_state_status_data_list ]css_class_update_map = dict()for status_display_data in status_display_data_list:diff --git a/src/hi/apps/collection/collection_manager.py b/src/hi/apps/collection/collection_manager.pyindex 27097b1e..4d033787 100644--- a/src/hi/apps/collection/collection_manager.py+++ b/src/hi/apps/collection/collection_manager.py@@ -9,7 +9,7 @@ from hi.apps.common.singleton import Singletonfrom hi.apps.entity.models import Entityfrom hi.apps.location.models import Location, LocationViewfrom hi.apps.location.svg_item_factory import SvgItemFactory-from hi.apps.monitor.status_display_helpers import StatusDisplayEntityHelper+from hi.apps.monitor.status_data_helpers import StatusDataHelperfrom .models import (Collection,@@ -61,16 +61,12 @@ class CollectionManager(Singleton):def get_collection_data( self,collection : Collection,is_editing : bool ):-- entity_status_data_list = list()- for collection_entity in collection.entities.all().order_by('order_id'):- entity_status_data = StatusDisplayEntityHelper().get_entity_status_data(- entity = collection_entity.entity,- is_editing = is_editing,- )- entity_status_data_list.append( entity_status_data )- continue+ collection_entity_list = list( collection.entities.all().order_by('order_id') )+ entity_list = [ x.entity for x in collection_entity_list ]+ entity_status_data_list = StatusDataHelper().get_entity_status_data_list(+ entities = entity_list,+ )return CollectionData(collection = collection,entity_status_data_list = entity_status_data_list,diff --git a/src/hi/apps/control/controller_manager.py b/src/hi/apps/control/controller_manager.pyindex 1e9b437f..f8aa39ae 100644--- a/src/hi/apps/control/controller_manager.py+++ b/src/hi/apps/control/controller_manager.py@@ -2,7 +2,7 @@ import loggingfrom typing import Listfrom hi.apps.common.singleton import Singleton-from hi.apps.monitor.status_display_helpers import StatusDisplayControllerHelper+from hi.apps.monitor.status_data_helpers import StatusDataHelperfrom .models import Controllerfrom .transient_models import ControllerData@@ -17,8 +17,8 @@ class ControllerManager( Singleton ):def get_controller_data( self, controller : Controller, error_list : List[ str ] = None ):- latest_sensor_response = StatusDisplayControllerHelper().get_latest_sensor_response(- controller = controller,+ latest_sensor_response = StatusDataHelper().get_latest_sensor_response(+ entity_state = controller.entity_state,)return ControllerData(controller = controller,diff --git a/src/hi/apps/entity/views.py b/src/hi/apps/entity/views.pyindex 59425f52..c70cfa6f 100644--- a/src/hi/apps/entity/views.py+++ b/src/hi/apps/entity/views.py@@ -4,7 +4,7 @@ from django.db import transactionfrom django.views.generic import Viewfrom hi.apps.location.location_manager import LocationManager-from hi.apps.monitor.status_display_helpers import StatusDisplayEntityHelper+from hi.apps.monitor.status_data_helpers import StatusDataHelperfrom hi.apps.sense.sensor_history_manager import SensorHistoryManagerfrom hi.hi_async_view import HiModalView, HiSideView@@ -101,10 +101,7 @@ class EntityStatusView( HiModalView, EntityViewMixin ):def get( self, request, *args, **kwargs ):entity = self.get_entity( request, *args, **kwargs )- entity_status_data = StatusDisplayEntityHelper().get_entity_status_data(- entity = entity,- is_editing = request.is_editing,- )+ entity_status_data = StatusDataHelper().get_entity_status_data( entity = entity )if not entity_status_data.entity_state_status_data_list:return EntityEditView().get( request, *args, **kwargs )diff --git a/src/hi/apps/location/location_manager.py b/src/hi/apps/location/location_manager.pyindex f2e6ec59..bed2f16c 100644--- a/src/hi/apps/location/location_manager.py+++ b/src/hi/apps/location/location_manager.py@@ -8,7 +8,7 @@ from django.http import HttpRequestfrom hi.apps.common.singleton import Singletonfrom hi.apps.common.svg_models import SvgViewBox-from hi.apps.monitor.status_display_helpers import StatusDisplayLocationHelper+from hi.apps.monitor.status_data_helpers import StatusDataHelperfrom .enums import LocationViewTypefrom .location_view_data import LocationViewData@@ -208,12 +208,13 @@ class LocationManager(Singleton):unpositioned_collections.sort( key = lambda item : item.order_id )if include_status_display_data:- status_display_helper = StatusDisplayLocationHelper( location_view = location_view )- status_entity_states_map = status_display_helper.get_status_entity_states_map(+ helper = StatusDataHelper()+ entity_to_entity_state_status_data_list = helper.get_entity_to_entity_state_status_data_list(+ location_view = location_view,entities = displayed_entities,)else:- status_entity_states_map = dict()+ entity_to_entity_state_status_data_list = dict()return LocationViewData(location_view = location_view,@@ -223,7 +224,7 @@ class LocationManager(Singleton):collection_paths = collection_paths,unpositioned_collections = unpositioned_collections,orphan_entities = orphan_entities,- status_entity_states_map = status_entity_states_map,+ entity_to_entity_state_status_data_list = entity_to_entity_state_status_data_list,)def set_location_view_order( self, location_view_id_list : List[int] ):diff --git a/src/hi/apps/location/location_view_data.py b/src/hi/apps/location/location_view_data.pyindex 89d733f2..9d65b1ef 100644--- a/src/hi/apps/location/location_view_data.py+++ b/src/hi/apps/location/location_view_data.py@@ -5,6 +5,7 @@ from hi.apps.collection.models import Collection, CollectionPath, CollectionPosifrom hi.apps.common.svg_models import SvgIconItem, SvgPathItemfrom hi.apps.entity.models import Entity, EntityPosition, EntityPath, EntityStatefrom hi.apps.location.svg_item_factory import SvgItemFactory+from hi.apps.monitor.transient_models import EntityStateStatusDatafrom .models import LocationView@@ -15,23 +16,28 @@ class LocationViewData:Encapsulates all the data needed to render overlaying a Location's SVGfor a given LocationView."""- location_view : LocationView- entity_positions : List[ EntityPosition ]- entity_paths : List[ EntityPath ]- collection_positions : List[ CollectionPosition ]- collection_paths : List[ CollectionPath ]- unpositioned_collections : List[ Collection ]- orphan_entities : Set[ Entity ]- status_entity_states_map : Dict[ Entity, List[ EntityState ]]-+ location_view : LocationView+ entity_positions : List[ EntityPosition ]+ entity_paths : List[ EntityPath ]+ collection_positions : List[ CollectionPosition ]+ collection_paths : List[ CollectionPath ]+ unpositioned_collections : List[ Collection ]+ orphan_entities : Set[ Entity ]+ entity_to_entity_state_status_data_list : Dict[ Entity, List[ EntityStateStatusData ]]+def __post_init__(self):self._svg_item_factory = SvgItemFactory()returndef svg_icon_items(self) -> Generator[ SvgIconItem, None, None ]:- for entity_position in self.entity_positions:- entity_states = self.status_entity_states_map.get( entity_position.entity )+ for entity_position in self.entity_positions:+ entity_state_status_data_list = self.entity_to_entity_state_status_data_list.get(+ entity_position.entity,+ )+ if entity_state_status_data_list is None:+ entity_state_status_data_list = list()+ entity_states = [ x.entity_state for x in entity_state_status_data_list ]if entity_states:css_class = ' '.join([ x.css_class for x in entity_states ])else:@@ -56,7 +62,12 @@ class LocationViewData:def svg_path_items(self) -> Generator[ SvgPathItem, None, None ]:for entity_path in self.entity_paths:- entity_states = self.status_entity_states_map.get( entity_path.entity )+ entity_state_status_data_list = self.entity_to_entity_state_status_data_list.get(+ entity_path.entity,+ )+ if entity_state_status_data_list is None:+ entity_state_status_data_list = list()+ entity_states = [ x.entity_state for x in entity_state_status_data_list ]if entity_states:css_class = ' '.join([ x.css_class for x in entity_states ])else:diff --git a/src/hi/apps/monitor/status_data_helpers.py b/src/hi/apps/monitor/status_data_helpers.pynew file mode 100644index 00000000..f16b4379--- /dev/null+++ b/src/hi/apps/monitor/status_data_helpers.py@@ -0,0 +1,315 @@+from typing import Dict, List, Set, Sequence++from hi.apps.control.transient_models import ControllerData+from hi.apps.entity.enums import EntityStateType+from hi.apps.entity.models import Entity, EntityState+from hi.apps.location.enums import LocationViewType+from hi.apps.location.models import LocationView+from hi.apps.sense.sensor_response_manager import SensorResponseManager+from hi.apps.sense.transient_models import SensorResponse++from .transient_models import EntityStatusData, EntityStateStatusData+++class StatusDataHelper:++ def get_entity_status_data( self, entity : Entity ) -> EntityStatusData:++ entity_state_set = set( entity.states.all() )++ for entity_state_delegation in entity.entity_state_delegations.all():+ entity_state_set.add( entity_state_delegation.entity_state )+ continue++ entity_state_to_status_data = self.get_entity_state_to_entity_state_status_data(+ entity_states = entity_state_set,+ )+ return EntityStatusData(+ entity = entity,+ entity_state_status_data_list = list( entity_state_to_status_data.values() ),+ )++ def get_entity_status_data_list(+ self,+ entities : Sequence[ Entity ] ) -> List[ EntityStatusData ]:++ entity_to_entity_status_data = self.get_entity_to_entity_status_data(+ entities = entities,+ )+ entity_status_data_list = list()+ for entity in entities:+ entity_status_data = entity_to_entity_status_data.get( entity )+ if not entity_status_data:+ entity_status_data = EntityStatusData(+ entity = entity,+ entity_state_status_data_list = list()+ )+ entity_status_data_list.append( entity_status_data )+ continue+ return entity_status_data_list++ def get_entity_to_entity_status_data(+ self,+ entities : Sequence[ Entity ] ) -> Dict[ Entity, EntityStatusData ]:++ # Gather all EntityState of interest.+ entity_to_entity_state_set = { x: set( x.states.all() ) for x in entities }+ all_entity_states = set()+ for entity, entity_state_set in entity_to_entity_state_set.items():+ all_entity_states.update( entity_state_set )+ for entity_state_delegation in entity.entity_state_delegations.all():+ entity_state_set.add( entity_state_delegation.entity_state )+ all_entity_states.add( entity_state_delegation.entity_state )+ continue+ continue++ # Single fetch for getting all latest sensor data.+ entity_state_to_status_data = self.get_entity_state_to_entity_state_status_data(+ entity_states = all_entity_states,+ )++ # Collate EntityStateStatusData by Entity+ entity_to_entity_status_data = dict()+ for entity_state, entity_state_status_data in entity_state_to_status_data.items():+ entity = entity_state.entity+ if entity not in entity_to_entity_status_data:+ entity_status_data = EntityStatusData(+ entity = entity,+ entity_state_status_data_list = list()+ )+ entity_to_entity_status_data[entity] = entity_status_data+ entity_to_entity_status_data[entity].entity_state_status_data_list.append(+ entity_state_status_data+ )+ continue++ return entity_to_entity_status_data++ def get_entity_state_to_entity_state_status_data(+ self,+ entity_states : Sequence[ EntityState ] ) -> Dict[ EntityState, EntityStateStatusData ]:++ entity_state_to_sensor_list = dict()+ all_sensor_list = list()+ for entity_state in entity_states:+ entity_state_sensor_list = list( entity_state.sensors.all() )+ entity_state_to_sensor_list[entity_state] = entity_state_sensor_list+ all_sensor_list.extend( entity_state_sensor_list )+ continue++ sensor_response_list_map = SensorResponseManager().get_latest_sensor_responses(+ sensor_list = all_sensor_list,+ )++ entity_state_to_entity_state_status_data_map = dict()+ for entity_state in entity_states:+ entity_state_sensor_response_list = list()+ for sensor in entity_state_to_sensor_list.get( entity_state ):+ sensor_response_list = sensor_response_list_map.get( sensor )+ if sensor_response_list:+ entity_state_sensor_response_list.extend( sensor_response_list )+ continue+ entity_state_sensor_response_list.sort( key = lambda item: item.timestamp, reverse = True )++ if entity_state_sensor_response_list:+ latest_sensor_response = entity_state_sensor_response_list[0]+ else:+ latest_sensor_response = None++ controller_data_list = list()+ for controller in entity_state.controllers.all():+ controller_data = ControllerData(+ controller = controller,+ latest_sensor_response = latest_sensor_response,+ )+ controller_data_list.append( controller_data )+ continue++ entity_state_status_data = EntityStateStatusData(+ entity_state = entity_state,+ sensor_response_list = entity_state_sensor_response_list,+ controller_data_list = controller_data_list,+ )+ entity_state_to_entity_state_status_data_map[entity_state] = entity_state_status_data+ continue++ return entity_state_to_entity_state_status_data_map++ def get_entity_to_entity_state_status_data_list(+ self,+ location_view : LocationView,+ entities : Set[ Entity ] ) -> Dict[ Entity, List[ EntityStateStatusData ] ]:+ """+ A map from Entity to EntityStateStatusData for the single EntityState+ that is the highest display priority for the given LocationView.+ """+ location_view_type = location_view.location_view_type+ if location_view_type == LocationViewType.SUPPRESS:+ return dict()++ entity_to_entity_state_list = self.get_entity_to_entity_state_list(+ location_view = location_view,+ entities = entities,+ )+ all_entity_states = set()+ for entity_state_list in entity_to_entity_state_list.values():+ all_entity_states.update( entity_state_list )+ continue++ entity_state_to_status_data = self.get_entity_state_to_entity_state_status_data(+ entity_states = all_entity_states,+ )++ entity_to_entity_state_status_data_list = dict()+ for entity, entity_state_list in entity_to_entity_state_list.items():+ if entity not in entity_to_entity_state_status_data_list:+ entity_to_entity_state_status_data_list[entity] = list()+ for entity_state in entity_state_list:+ entity_state_status_data = entity_state_to_status_data.get( entity_state )+ if entity_state_status_data:+ entity_to_entity_state_status_data_list[entity].append( entity_state_status_data )+ continue+ continue++ return entity_to_entity_state_status_data_list++ def get_entity_to_entity_state_list(+ self,+ location_view : LocationView,+ entities : Set[ Entity ] ) -> Dict[ Entity, List[ EntityState ] ]:+ """+ A map from Entity to EntityState for the list of EntityState with+ EntityStateTyoe that is the highest display priority for the given+ LocationView.+ """+ location_view_type = location_view.location_view_type+ if location_view_type == LocationViewType.SUPPRESS:+ return dict()++ entity_state_type_priority_list = location_view_type.entity_state_type_priority_list++ entity_to_entity_state_list = dict()+ for entity in entities:+ entity_state_list = self.get_status_entity_states(+ entity = entity,+ entity_state_type_priority_list = entity_state_type_priority_list,+ )+ if entity_state_list:+ entity_to_entity_state_list[entity] = entity_state_list+ continue++ return entity_to_entity_state_list++ def get_status_entity_states(+ self,+ entity : Entity,+ entity_state_type_priority_list : List[ EntityStateType ] ) -> List[ EntityState ]:+ """+ Finds all EntityState for the highest priority EntityStateType.+ """++ # Delegate entities include will include all their principal entity+ # states, though any direct state will take precendence++ delegations_queryset = entity.entity_state_delegations.select_related('entity_state').all()+ all_entity_states = [ x.entity_state for x in delegations_queryset ]+ all_entity_states.extend( entity.states.all() )++ # Gather all possible EntityStateType for the Entity and its pricipals.+ entity_state_list_map = dict()+ for entity_state in all_entity_states:+ if entity_state.entity_state_type not in entity_state_list_map:+ entity_state_list_map[entity_state.entity_state_type] = list()+ entity_state_list_map[entity_state.entity_state_type].append( entity_state )+ continue++ if not entity_state_list_map:+ return None++ entity_state_type_for_status = self._get_entity_state_type_for_status(+ entity_state_types = entity_state_list_map.keys(),+ entity_state_type_priority_list = entity_state_type_priority_list,+ )+ entity_state_list = entity_state_list_map.get( entity_state_type_for_status )++ return entity_state_list++ def _get_entity_state_type_for_status(+ self,+ entity_state_types : Sequence[ EntityStateType ],+ entity_state_type_priority_list : List[ EntityStateType ] ) -> EntityStateType:+ """+ Determines the single EntityStateType that is the highest display priority+ from the given priority list.+ """++ for priority_entity_state_type in entity_state_type_priority_list:+ if priority_entity_state_type in entity_state_types:+ return priority_entity_state_type+ continue++ # If no prioritizes state type matches, then fallback to an+ # arbitrary, but deterministic choice by using all defined values.+ #+ for default_entity_state_type in EntityStateType:+ if default_entity_state_type in entity_state_types:+ return default_entity_state_type+ continue++ # This code should not really be reachable. Should always match one in fallback case.+ return None++ def get_latest_sensor_response( self, entity_state : EntityState ) -> SensorResponse:+ sensor_list = list( entity_state.sensors.all() )++ sensor_response_list_map = SensorResponseManager().get_latest_sensor_responses(+ sensor_list = sensor_list,+ )+ entity_state_sensor_response_list = list()+ for sensor in sensor_list:+ sensor_response_list = sensor_response_list_map.get( sensor )+ if sensor_response_list:+ entity_state_sensor_response_list.extend( sensor_response_list )+ continue+ entity_state_sensor_response_list.sort( key = lambda item: item.timestamp, reverse = True )++ if entity_state_sensor_response_list:+ return entity_state_sensor_response_list[0]++ return None++ def get_entity_state_status_data_list( self ) -> List[ EntityStateStatusData ]:++ sensor_to_sensor_response_list = SensorResponseManager().get_all_latest_sensor_responses()++ # Since a given EntityState can have zero or more sensors, for each+ # EntityState, we need to collate all the sensor values to find the+ # latest status.++ entity_state_to_sensor_response_list = dict()+ for sensor, sensor_response_list in sensor_to_sensor_response_list.items():+ if sensor.entity_state not in entity_state_to_sensor_response_list:+ entity_state_to_sensor_response_list[sensor.entity_state] = list()+ entity_state_to_sensor_response_list[sensor.entity_state].extend( sensor_response_list )+ continue++ entity_state_status_data_list = list()+ for entity_state, sensor_response_list in entity_state_to_sensor_response_list.items():+ sensor_response_list.sort( key = lambda item: item.timestamp, reverse = True )+ latest_sensor_response = sensor_response_list[0]+ controller_data_list = [+ ControllerData(+ controller = controller,+ latest_sensor_response = latest_sensor_response,+ )+ for controller in entity_state.controllers.all()+ ]+ entity_state_status_data = EntityStateStatusData(+ entity_state = entity_state,+ sensor_response_list = sensor_response_list,+ controller_data_list = controller_data_list,+ )+ entity_state_status_data_list.append( entity_state_status_data )+ continue++ return entity_state_status_data_listdiff --git a/src/hi/apps/monitor/status_display_data.py b/src/hi/apps/monitor/status_display_data.pyindex 81cb95e9..4e7bf331 100644--- a/src/hi/apps/monitor/status_display_data.py+++ b/src/hi/apps/monitor/status_display_data.py@@ -1,11 +1,10 @@import hi.apps.common.datetimeproxy as datetimeproxyfrom dataclasses import dataclass-from typing import Listfrom hi.apps.entity.enums import EntityStateType-from hi.apps.entity.models import EntityStatefrom hi.apps.sense.enums import SensorValue-from hi.apps.sense.transient_models import SensorResponse++from .transient_models import EntityStateStatusData@dataclass@@ -115,15 +114,28 @@ class StatusStyle:)-@dataclassclass StatusDisplayData:- entity_state : EntityState- sensor_response_list : List[ SensorResponse ]++ def __init__( self, entity_state_status_data : EntityStateStatusData ):+ self._entity_state = entity_state_status_data.entity_state+ self._sensor_response_list = entity_state_status_data.sensor_response_list+ self._controller_data_list = entity_state_status_data.controller_data_list- def __post_init__(self):self._svg_status_style = self._get_svg_status_style()return+ @property+ def entity_state(self):+ return self._entity_state++ @property+ def sensor_response_list(self):+ return self._sensor_response_list++ @property+ def controller_data_list(self):+ return self._controller_data_list+@propertydef should_skip(self):return bool( self._svg_status_style is None )diff --git a/src/hi/apps/monitor/status_display_helpers.py b/src/hi/apps/monitor/status_display_helpers.pydeleted file mode 100644index bc127b78..00000000--- a/src/hi/apps/monitor/status_display_helpers.py+++ /dev/null@@ -1,199 +0,0 @@-from typing import Dict, List, Set, Sequence--from hi.apps.control.models import Controller-from hi.apps.control.transient_models import ControllerData-from hi.apps.entity.enums import EntityStateType-from hi.apps.entity.models import Entity, EntityState-from hi.apps.location.enums import LocationViewType-from hi.apps.location.models import LocationView-from hi.apps.sense.sensor_response_manager import SensorResponseManager--from .status_display_data import StatusDisplayData-from .transient_models import EntityStatusData, EntityStateStatusData---class StatusDisplayLocationHelper:-- def __init__( self, location_view : LocationView ):- self._location_view_type = location_view.location_view_type- self._entity_state_type_priority_list = self._location_view_type.entity_state_type_priority_list- return-- def get_status_entity_states_map( self, entities : Set[ Entity ] ) -> Dict[ Entity, EntityState ]:- if self._location_view_type == LocationViewType.SUPPRESS:- return dict()-- entity_to_entity_states_data = dict()- for entity in entities:- entity_states = self.get_status_entity_states( entity = entity )- if entity_states:- entity_to_entity_states_data[entity] = entity_states- continue-- return entity_to_entity_states_data-- def get_status_entity_states( self, entity : Entity ) -> List[ EntityState ]:-- # Delegate entities include will include all their principal entity- # states, though any direct state will take precendence-- delegations_queryset = entity.entity_state_delegations.select_related('entity_state').all()- all_entity_states = [ x.entity_state for x in delegations_queryset ]- all_entity_states.extend( entity.states.all() )-- entity_state_list_map = dict()- for entity_state in all_entity_states:- if entity_state.entity_state_type not in entity_state_list_map:- entity_state_list_map[entity_state.entity_state_type] = list()- entity_state_list_map[entity_state.entity_state_type].append( entity_state )- continue-- if not entity_state_list_map:- return None-- entity_state_type_for_status = self._get_entity_state_type_for_status(- entity_state_types = entity_state_list_map.keys(),- )- entity_state_list = entity_state_list_map.get( entity_state_type_for_status )-- return entity_state_list-- def _get_entity_state_type_for_status(- self,- entity_state_types : Sequence[ EntityStateType ] ) -> EntityStateType:-- for priority_entity_state_type in self._entity_state_type_priority_list:- if priority_entity_state_type in entity_state_types:- return priority_entity_state_type- continue-- # If no prioritizes state type matches, then fallback to an- # arbitrary, but deterministic choice by using all defined values.- #- for default_entity_state_type in EntityStateType:- if default_entity_state_type in entity_state_types:- return default_entity_state_type- continue-- # This code should not really be reachable. Should always match one in fallback case.- return None---class StatusDisplayStatusViewHelper:-- def get_status_display_data( self ) -> List[ StatusDisplayData ]:-- sensor_to_sensor_response_list = SensorResponseManager().get_all_latest_sensor_responses()-- # Since a given EntityState can have zero or more sensors, for each- # EntityState, we need to collate all the sensor values to find the- # latest status.-- entity_state_to_sensor_response_list = dict()- for sensor, sensor_response_list in sensor_to_sensor_response_list.items():- if sensor.entity_state not in entity_state_to_sensor_response_list:- entity_state_to_sensor_response_list[sensor.entity_state] = list()- entity_state_to_sensor_response_list[sensor.entity_state].extend( sensor_response_list )- continue-- status_display_data_list = list()- for entity_state, sensor_response_list in entity_state_to_sensor_response_list.items():- sensor_response_list.sort( key = lambda item: item.timestamp, reverse = True )- status_display_data = StatusDisplayData(- entity_state = entity_state,- sensor_response_list = sensor_response_list,- )- status_display_data_list.append( status_display_data )- continue-- return status_display_data_list---class StatusDisplayEntityHelper:-- def get_entity_status_data( self,- entity : Entity,- is_editing : bool ) -> EntityStatusData:-- entity_state_set = set( entity.states.all() )-- for entity_state_delegation in entity.entity_state_delegations.all():- entity_state_set.add( entity_state_delegation.entity_state )- continue-- entity_state_to_sensor_list = dict()-- sensor_list = list()- for entity_state in entity_state_set:- entity_state_sensor_list = list( entity_state.sensors.all() )- entity_state_to_sensor_list[entity_state] = entity_state_sensor_list- sensor_list.extend( entity_state_sensor_list )- continue-- if not is_editing:- sensor_response_list_map = SensorResponseManager().get_latest_sensor_responses(- sensor_list = sensor_list,- )- else:- sensor_response_list_map = dict()-- entity_state_status_data_list = list()- for entity_state in entity_state_set:- entity_state_sensor_response_list = list()- for sensor in entity_state_to_sensor_list.get( entity_state ):- sensor_response_list = sensor_response_list_map.get( sensor )- if sensor_response_list:- entity_state_sensor_response_list.extend( sensor_response_list )- continue- entity_state_sensor_response_list.sort( key = lambda item: item.timestamp, reverse = True )-- if entity_state_sensor_response_list:- latest_sensor_response = entity_state_sensor_response_list[0]- else:- latest_sensor_response = None-- controller_data_list = list()- for controller in entity_state.controllers.all():- controller_data = ControllerData(- controller = controller,- latest_sensor_response = latest_sensor_response,- )- controller_data_list.append( controller_data )- continue-- entity_state_status_data = EntityStateStatusData(- entity_state = entity_state,- sensor_response_list = entity_state_sensor_response_list,- controller_data_list = controller_data_list,- )- entity_state_status_data_list.append( entity_state_status_data )- continue-- return EntityStatusData(- entity = entity,- entity_state_status_data_list = entity_state_status_data_list,- )---class StatusDisplayControllerHelper:-- def get_latest_sensor_response( self, controller : Controller ):- entity_state = controller.entity_state- sensor_list = list( entity_state.sensors.all() )-- sensor_response_list_map = SensorResponseManager().get_latest_sensor_responses(- sensor_list = sensor_list,- )- entity_state_sensor_response_list = list()- for sensor in sensor_list:- sensor_response_list = sensor_response_list_map.get( sensor )- if sensor_response_list:- entity_state_sensor_response_list.extend( sensor_response_list )- continue- entity_state_sensor_response_list.sort( key = lambda item: item.timestamp, reverse = True )-- if entity_state_sensor_response_list:- return entity_state_sensor_response_list[0]-- return None-diff --git a/src/hi/apps/monitor/transient_models.py b/src/hi/apps/monitor/transient_models.pyindex 533ff020..5592d44b 100644--- a/src/hi/apps/monitor/transient_models.py+++ b/src/hi/apps/monitor/transient_models.py@@ -9,7 +9,7 @@ from hi.apps.sense.transient_models import SensorResponse@dataclassclass EntityStateStatusData:entity_state : EntityState- sensor_response_list : List[ SensorResponse ]+ sensor_response_list : List[ SensorResponse ] # Not grouped by sensor, but ordered by response timecontroller_data_list : List[ ControllerData ]@propertydiff --git a/src/hi/integrations/zoneminder/zm_models.py b/src/hi/integrations/zoneminder/zm_models.pyindex 08330a64..0e2340da 100644--- a/src/hi/integrations/zoneminder/zm_models.py+++ b/src/hi/integrations/zoneminder/zm_models.py@@ -16,8 +16,14 @@ class ZmEvent:self._end_datetime = self._to_datetime( zm_api_event.get()['EndTime'], zm_tzname )self._cause = zm_api_event.cause()self._duration_secs = zm_api_event.duration()- self._total_frame_count = zm_api_event.total_frames()- self._alarmed_frame_count = zm_api_event.alarmed_frames()+ try:+ self._total_frame_count = zm_api_event.total_frames()+ except (TypeError, ValueError):+ self._total_frame_count = 0+ try:+ self._alarmed_frame_count = zm_api_event.alarmed_frames()+ except (TypeError, ValueError):+ self._alarmed_frame_count = 0self._score = zm_api_event.score()self._notes = zm_api_event.notes()self._max_score_frame_id = zm_api_event.get()['MaxScoreFrameId']