Merge branch 'develop'

Author: thusser

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7-slim AS compile-image
 RUN apt-get update \
-  && apt-get install -y build-essential libmariadbclient-dev \
+  && apt-get install -y build-essential libmariadbclient-dev-compat \
   && rm -rf /var/lib/apt/lists/*
 COPY requirements.txt .
 RUN pip install --user -r requirements.txt

pyobs_weather/weather/management/commands/dump_good.py

@@ -0,0 +1,17 @@
+from django.core.management.base import BaseCommand
+from astropy.time import Time
+
+from pyobs_weather.weather.models import GoodWeather
+
+
+class Command(BaseCommand):
+    help = 'Dump good weather status to command line as CSV'
+
+    def handle(self, *args, **options):
+        # header
+        print('datetime,good')
+
+        # loop good status
+        for good in GoodWeather.objects.order_by('time').all():
+            t = Time(good.time)
+            print(f'{t.isot},{good.good}')

pyobs_weather/weather/management/commands/dump_weather.py

@@ -0,0 +1,43 @@
+from astropy.time import Time
+from django.core.management.base import BaseCommand
+from django_celery_beat.schedulers import CrontabSchedule, IntervalSchedule, PeriodicTask
+
+from pyobs_weather.weather.models import Station, Value, SensorType
+
+
+class Command(BaseCommand):
+    help = 'Init pyobs-weather'
+
+    def add_arguments(self, parser):
+        parser.add_argument('-s', '--start', type=str, help='Start date to dump')
+        parser.add_argument('-e', '--end', type=str, help='End date to dump')
+
+    def handle(self, start: str, end: str, *args, **options):
+        # get average station
+        station = Station.objects.filter(code='average').first()
+
+        # get all sensor types and print header
+        sensor_types = [st.code for st in SensorType.objects.all()]
+        print('datetime,' + ','.join(sensor_types))
+
+        # get all timestamps for station in range
+        query = Value.objects.filter(sensor__station=station)
+        if start is not None:
+            query = query.filter(time__gte=start)
+        if end is not None:
+            query = query.filter(time__lte=end)
+        timestamps = query.order_by('time').values_list('time', flat=True)
+
+        # now loop all times
+        for t in timestamps:
+            # get all values
+            values = dict(Value.objects.filter(sensor__station=station, time=t)
+                          .values_list('sensor__type__code', 'value').all())
+
+            # dump it in correct order
+            line = Time(t).isot
+            for st in sensor_types:
+                line += ','
+                if st in values and values[st] is not None:
+                    line += str(values[st])
+            print(line)

pyobs_weather/weather/models.py

@@ -13,6 +13,7 @@
 
 class Evaluator(models.Model):
     """A sensor evaluator."""
+    id = models.AutoField(primary_key=True)
     name = models.CharField('Name of evaluator', max_length=15, unique=True)
     class_name = models.CharField('Python class to call', max_length=50)
     kwargs = models.CharField('JSON encoded kwargs to pass to constructor', max_length=50, blank=True, null=True)
@@ -24,6 +25,7 @@ def __str__(self):
 
 class Station(models.Model):
     """A weather station."""
+    id = models.AutoField(primary_key=True)
     code = models.CharField('Code for weather station', max_length=10, unique=True)
     name = models.CharField('Name of weather station', max_length=50)
     class_name = models.CharField('Name of Python class to handle station', max_length=100)
@@ -80,6 +82,7 @@ def delete(self, *args, **kwargs):
 
 class SensorType(models.Model):
     """A sensor type."""
+    id = models.AutoField(primary_key=True)
     code = models.CharField('Code for sensor type', max_length=10, unique=True)
     name = models.CharField('Name of sensor type', max_length=50)
     unit = models.CharField('Unit for value', max_length=10)
@@ -91,6 +94,7 @@ def __str__(self):
 
 class Sensor(models.Model):
     """A sensor."""
+    id = models.AutoField(primary_key=True)
     station = models.ForeignKey(Station, on_delete=models.CASCADE, db_index=True)
     type = models.ForeignKey(SensorType, on_delete=models.CASCADE)
     evaluators = models.ManyToManyField(Evaluator, blank=True)
@@ -111,6 +115,7 @@ class Meta:
 
 class Value(models.Model):
     """A single value from a sensor."""
+    id = models.AutoField(primary_key=True)
     sensor = models.ForeignKey(Sensor, on_delete=models.CASCADE, db_index=True)
     time = models.DateTimeField('Date and time when value was measured', db_index=True)
     value = models.FloatField('Measured value', null=True, blank=True)
@@ -129,5 +134,6 @@ class Meta:
 
 class GoodWeather(models.Model):
     """Times of changes from good to bad weather and vice versa."""
+    id = models.AutoField(primary_key=True)
     time = models.DateTimeField('Date and time of status change', db_index=True, auto_now_add=True)
     good = models.BooleanField('Weather now good?')