PyScada/PyScada-Influxdb
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Activity

fixed multible_read for django db and added write to django db as default temporary

Browse Source
This commit is contained in:
Martin Schroeder 2026-01-28 21:09:29 +00:00
parent b2014e23be
commit 327fd9c5f1
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pyscada/influxdb/models.py
View File

@ -117,10 +117,6 @@ class InfluxDatabase(models.Model):
def read_multiple(self, **kwargs): def read_multiple(self, **kwargs):
if self.only_write_to_influxdb:
django_database = self.get_django_database()
return django_database.read_multiple(**kwargs)
variable_ids = kwargs.pop("variable_ids") if "variable_ids" in kwargs else [] variable_ids = kwargs.pop("variable_ids") if "variable_ids" in kwargs else []
time_min = kwargs.pop("time_min") if "time_min" in kwargs else 0 time_min = kwargs.pop("time_min") if "time_min" in kwargs else 0
time_max = kwargs.pop("time_max") if "time_max" in kwargs else time.time() time_max = kwargs.pop("time_max") if "time_max" in kwargs else time.time()
@ -141,7 +137,15 @@ class InfluxDatabase(models.Model):
f_time_scale = 1000 f_time_scale = 1000
else: else:
f_time_scale = 1 f_time_scale = 1
if self.only_write_to_influxdb:
return self.get_django_database()._import_model().objects.db_data(
variable_ids=variable_ids,
time_min=time_min,
time_max=time_max,
time_in_ms=time_in_ms,
query_first_value=query_first_value,
**kwargs,
)
values = {} values = {}
query_api = self.get_query_api() query_api = self.get_query_api()
tmp_time_max = time_min*f_time_scale tmp_time_max = time_min*f_time_scale
@ -164,7 +168,7 @@ class InfluxDatabase(models.Model):
return values return values
def write_multiple(self, **kwargs): def write_multiple(self, **kwargs):
if self.only_write_to_influxdb: if self.only_write_to_influxdb or True:
django_database = self.get_django_database() django_database = self.get_django_database()
data_model = django_database._import_model() data_model = django_database._import_model()
@ -186,7 +190,7 @@ class InfluxDatabase(models.Model):
point = self.create_data_element_from_variable( point = self.create_data_element_from_variable(
item, cached_value[1], cached_value[0], **kwargs item, cached_value[1], cached_value[0], **kwargs
) )
if self.only_write_to_influxdb: if self.only_write_to_influxdb or True:
rc = data_model.objects.create_data_element_from_variable( rc = data_model.objects.create_data_element_from_variable(
item, cached_value[0], cached_value[0], **kwargs item, cached_value[0], cached_value[0], **kwargs
) )
@ -204,7 +208,7 @@ class InfluxDatabase(models.Model):
self.write_points(points) self.write_points(points)
points = [] points = []
if self.only_write_to_influxdb: if self.only_write_to_influxdb or True:
try: try:
data_model.objects.bulk_create(recordings, batch_size=batch_size, **kwargs) data_model.objects.bulk_create(recordings, batch_size=batch_size, **kwargs)
except IntegrityError: except IntegrityError: