Skip to content

Commit

Permalink
Fixing None values screen dur
Browse files Browse the repository at this point in the history
  • Loading branch information
carlan1 committed Sep 26, 2023
1 parent 0cef85a commit 67c8088
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions cortex/secondary/screen_duration.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import numpy as np
from ..feature_types import secondary_feature
from ..primary.screen_active import screen_active
from ..raw.device_state import device_state

MS_IN_A_DAY = 86400000
@secondary_feature(
Expand Down Expand Up @@ -32,9 +33,17 @@ def screen_duration(**kwargs):
value (float): The time (in ms) spent with the device screen on.
"""
_screen_active = screen_active(**kwargs)
_screen_duration = np.sum([active_bout['duration'] for active_bout in _screen_active['data']])

_device_state = device_state(id=kwargs['id'],
start=kwargs['start'],
end=kwargs['end'],
_limit=1)['data']

# screen duration should be None if there is no data
if _screen_active['has_raw_data'] == 0:
if len(_device_state) == 0:
_screen_duration = None
return {'timestamp':kwargs['start'], 'value': _screen_duration}
else:
_screen_active = screen_active(**kwargs)
_screen_duration = np.sum([active_bout['duration'] for active_bout in _screen_active['data']])

return {'timestamp': kwargs['start'], 'value': _screen_duration}

0 comments on commit 67c8088

Please sign in to comment.