Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

database: adding customizable time_precision #974

Merged
merged 4 commits into from
Nov 21, 2024
Merged

database: adding customizable time_precision #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a99dbf9
Added time_precision in plugin.yaml
AAPohl Nov 14, 2024
0d8519a
added _time_precision_query
AAPohl Nov 14, 2024
35c53d5
applied _time_precision_query
AAPohl Nov 14, 2024
d79f427
typo fix
AAPohl Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions database/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def __init__(self, sh, *args, **kwargs):
if self._removeold_cycle == self._dump_cycle:
self._removeold_cycle += 2
self._precision = self.get_parameter_value('precision')
self._time_precision = self.get_parameter_value('time_precision')
self.count_logentries = self.get_parameter_value('count_logentries')
self.max_delete_logentries = self.get_parameter_value('max_delete_logentries')
self.max_reassign_logentries = self.get_parameter_value('max_reassign_logentries')
Expand Down Expand Up @@ -1115,21 +1116,21 @@ def _series(self, func, start, end='now', count=100, ratio=1, update=False, step
sid = item + '|' + func + '|' + str(start) + '|' + str(end) + '|' + str(count)
func, expression = self._expression(func)
queries = {
'avg': 'MIN(time), ' + self._precision_query('AVG(val_num * duration) / AVG(duration)'),
'avg': self._time_precision_query('MIN(time)') + ', ' + self._precision_query('AVG(val_num * duration) / AVG(duration)'),
'avg.order': 'ORDER BY time ASC',
'integrate': 'MIN(time), SUM(val_num * duration)',
'diff': 'MIN(time), (val_num - LAG(val_num,1) OVER (ORDER BY val_num))',
'duration': 'MIN(time), duration',
'integrate': self._time_precision_query('MIN(time)') + ', SUM(val_num * duration)',
'diff': self._time_precision_query('MIN(time)') + ', (val_num - LAG(val_num,1) OVER (ORDER BY val_num))',
'duration': self._time_precision_query('MIN(time)') + ', duration',
# differentiate (d/dt) is scaled to match the conversion from d/dt (kWh) = kWh: time is in ms, val_num in kWh, therefore scale by 1000ms and 3600s/h to obtain the result in kW:
'differentiate': 'MIN(time), (val_num - LAG(val_num,1) OVER (ORDER BY val_num)) / ( (time - LAG(time,1) OVER (ORDER BY val_num)) / (3600 * 1000) )',
'count': 'MIN(time), SUM(CASE WHEN val_num{op}{value} THEN 1 ELSE 0 END)'.format(**expression['params']),
'countall': 'MIN(time), COUNT(*)',
'min': 'MIN(time), MIN(val_num)',
'max': 'MIN(time), MAX(val_num)',
'on': 'MIN(time), ' + self._precision_query('SUM(val_bool * duration) / SUM(duration)'),
'differentiate': self._time_precision_query('MIN(time)') + ', (val_num - LAG(val_num,1) OVER (ORDER BY val_num)) / ( (time - LAG(time,1) OVER (ORDER BY val_num)) / (3600 * 1000) )',
'count': self._time_precision_query('MIN(time)') + ', SUM(CASE WHEN val_num{op}{value} THEN 1 ELSE 0 END)'.format(**expression['params']),
'countall': self._time_precision_query('MIN(time)') + ', COUNT(*)',
'min': self._time_precision_query('MIN(time)') + ', MIN(val_num)',
'max': self._time_precision_query('MIN(time)') + ', MAX(val_num)',
'on': self._time_precision_query('MIN(time)') + ', ' + self._precision_query('SUM(val_bool * duration) / SUM(duration)'),
'on.order': 'ORDER BY time ASC',
'sum': 'MIN(time), SUM(val_num)',
'raw': 'time, val_num',
'sum': self._time_precision_query('MIN(time)') + ', SUM(val_num)',
'raw': self._time_precision_query('time') + ', val_num',
'raw.order': 'ORDER BY time ASC',
'raw.group': ''
}
Expand Down Expand Up @@ -1241,6 +1242,10 @@ def _precision_query(self, query):
return 'ROUND({}, {})'.format(query, self._precision)
return query

def _time_precision_query(self, query):
if self._time_precision < 3:
return 'ROUND({}, {})'.format(query, self._time_precision - 3)
return query

def _fetch_log(self, item, columns, start, end, step=None, count=100, group='', order=''):
_item = self.items.return_item(item)
Expand Down
7 changes: 7 additions & 0 deletions database/plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ parameters:
de: 'Genauigkeit der aus der Datenbank ausgelesenen Werte (Nachkommastellen).'
en: 'Precision of values read from database (digits after comma).'

time_precision:
type: int
default: 3
description:
de: 'Genauigkeit der aus der Datenbank ausgelesenen Zeitwerte (Nachkommastellen (für Sekunden)).'
en: 'Precision of time values read from database (digits after comma (for seconds).'

count_logentries:
type: bool
default: False
Expand Down
Loading