Merge pull request #1 from wmo-raf/dev

update forecast manager

Author: Grace-Amondi

MANIFEST.in

@@ -2,4 +2,5 @@ include README.md
 include LICENSE
 recursive-include forecastmanager *.py
 recursive-include forecastmanager/templates *
-recursive-include forecastmanager *.html
+recursive-include forecastmanager/static *
+recursive-include forecastmanager *.html

forecastmanager/blocks.py

@@ -0,0 +1,20 @@
+from wagtail import blocks
+from django.utils.translation import gettext_lazy as _
+
+
+class ExtremeMeasurementBlock(blocks.StructBlock):
+    station_name = blocks.CharBlock(required=True)
+    extreme_value = blocks.FloatBlock(required=True)
+
+    class Meta:
+        template = 'blocks/extreme_block_item.html'
+
+
+class ExtremeBlock(blocks.StructBlock):
+    title = blocks.CharBlock(required=True)
+    measurements = blocks.StreamBlock([
+        ('measurements',ExtremeMeasurementBlock() )
+    ])
+
+    class Meta:
+        template = 'blocks/extreme_block.html'

forecastmanager/management/commands/generate_forecast.py

@@ -6,7 +6,7 @@
 import requests
 
 from wagtailgeowidget.helpers import geosgeometry_str_to_struct
-from forecastmanager.models import City,Forecast, ConditionCategory
+from forecastmanager.models import City,Forecast
 
 
 # Define the base URL for the Met Norway API
@@ -64,17 +64,12 @@ def extract_values(group):
                     # Extract the minimum and maximum values of air temperature, wind speed, and wind direction
                     min_temp = group['data.instant.details.air_temperature'].min()
                     max_temp = group['data.instant.details.air_temperature'].max()
-                    wind_speed = group['data.instant.details.wind_speed'].mean()
-                    wind_dir = group['data.instant.details.wind_from_direction'].mean()
                     # Extract the value of next_12_hours summary
                     next_12_hours = group['data.next_12_hours.summary.symbol_code'].iloc[0]
                     # Create a dictionary of the extracted values
-                    values = {'min_temp': min_temp, 'max_temp': max_temp, 'wind_speed': wind_speed,
-                            'wind_dir': wind_dir, 
+                    values = {'min_temp': min_temp, 'max_temp': max_temp, 
                             'next_12_hours': next_12_hours}
                     return pd.Series(values, index=['min_temp', 'max_temp', 
-                                                    'wind_speed', 
-                                                    'wind_dir', 
                                                     'next_12_hours'])
 
                 # Group the DataFrame by date and apply the extract_values() function to each group
@@ -90,17 +85,15 @@ def extract_values(group):
                     time = index.to_pydatetime()
                     min_temp = row['min_temp']
                     max_temp = row['max_temp']
-                    wind_speed = row['wind_speed']
-                    wind_dir = row['wind_dir']
 
                     # Create or update the child object with the parent and the name from the second column
                     # prioritize condition for the next 1 hour 
                     if 'next_1_hours' in row:
-                        condition = ConditionCategory.objects.get(short_name=row['next_1_hours']) 
+                        condition = row['next_1_hours'].split("_")[0]
                     elif 'next_6_hours' in row:
-                        condition = ConditionCategory.objects.get(short_name=row['next_6_hours']) 
+                        condition = row['next_6_hours'].split("_")[0]
                     else:
-                        condition = ConditionCategory.objects.get(short_name=row['next_12_hours']) 
+                        condition = row['next_12_hours'].split("_")[0]
 
                     # use update_or_create to update existing data
                     # and create new ones if the data does not exist
@@ -110,8 +103,6 @@ def extract_values(group):
                         defaults={
                             'min_temp': min_temp,
                             'max_temp': max_temp,
-                            'wind_speed': wind_speed,
-                            'wind_direction': wind_dir,
                             'condition': condition
                         }
                     )

forecastmanager/migrations/0001_initial.py

@@ -1,9 +1,11 @@
-# Generated by Django 4.2.2 on 2023-06-18 16:15
+# Generated by Django 4.2.2 on 2023-07-04 14:49
 
 import django.contrib.gis.db.models.fields
 from django.db import migrations, models
 import django.db.models.deletion
 import uuid
+import wagtail.blocks
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -12,7 +14,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('wagtailcore', '0083_workflowcontenttype'),
-        ('wagtailimages', '0025_alter_image_file_alter_rendition_file'),
     ]
 
     operations = [
@@ -29,21 +30,20 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name='ConditionCategory',
+            name='DailyWeather',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(help_text='Weather Condition Title', max_length=50, verbose_name='Weather Condtion Title')),
-                ('short_name', models.CharField(blank=True, editable=False, help_text='Weather Condition Short Name (helpgul for yr.no weather api)', max_length=50, null=True, verbose_name='Weather Condtion Short Name')),
-                ('description', models.CharField(blank=True, max_length=250, null=True, verbose_name='Description')),
-                ('icon_image', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Icon image')),
+                ('issued_on', models.DateField(auto_now_add=True, null=True)),
+                ('forecast_date', models.DateField(verbose_name='Forecast Date')),
+                ('forecast_desc', wagtail.fields.RichTextField(verbose_name='Weather Forecast Description')),
+                ('summary_date', models.DateField(verbose_name='Summary Date')),
+                ('summary_desc', wagtail.fields.RichTextField(verbose_name='Weather Summary Description')),
+                ('extreme_date', models.DateField(blank=True, null=True, verbose_name='Extreme Date')),
+                ('extremes', wagtail.fields.StreamField([('extremes', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=True)), ('measurements', wagtail.blocks.StreamBlock([('measurements', wagtail.blocks.StructBlock([('station_name', wagtail.blocks.CharBlock(required=True)), ('extreme_value', wagtail.blocks.FloatBlock(required=True))]))]))]))], use_json_field=True)),
             ],
-            options={
-                'verbose_name': 'Weather Condition Category',
-                'verbose_name_plural': 'Weather Condition Categories',
-            },
         ),
         migrations.CreateModel(
-            name='Setting',
+            name='ForecastSetting',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('enable_auto_forecast', models.BooleanField(default=True, verbose_name='Enable automated forecasts')),
@@ -64,13 +64,12 @@ class Migration(migrations.Migration):
                 ('min_temp', models.IntegerField(blank=True, verbose_name='Minimum Temperaure')),
                 ('wind_direction', models.IntegerField(blank=True, null=True, verbose_name='Wind Direction')),
                 ('wind_speed', models.IntegerField(blank=True, null=True, verbose_name='Wind Speed')),
+                ('condition', models.CharField(choices=[('clearsky', 'Clear sky'), ('cloudy', 'Cloudy'), ('fair', 'Fair'), ('fog', 'Fog'), ('heavyrain', 'Heavy Rain'), ('heavyrainandthunder', 'Heavy Rain and Thunder'), ('heavyrainshowers', 'Heavy Rain Showers'), ('heavyrainshowersandthunder', 'Heavy Rain Showers and Thunder'), ('heavysleet', 'Heavy Sleet'), ('heavysleetandthunder', 'Heavy Sleet and Thunder'), ('heavysleetshowers', 'Heavy Sleet Showers'), ('heavysleetshowersandthunder', 'Heavy Sleet Showers and Thunder'), ('heavysnow', 'Heavy Snow'), ('heavysnowandthunder', 'Heavy Snow and Thunder'), ('heavysnowshowers', 'Heavy Snow Showers'), ('heavysnowshowersandthunder', 'Heavy Snow Showers and Thunder'), ('lightrain', 'Light Rain'), ('lightrainandthunder', 'Light Rain and Thunder'), ('lightrainshowers', 'Light Rain Showers'), ('lightrainshowersandthunder', 'Light Rain Showers and Thunder'), ('lightsleet', 'Light Sleet'), ('lightsleetandthunder', 'Light Sleet and Thunder'), ('lightsleetshowers', 'Light Sleet Showers'), ('lightsleetshowersandthunder', 'Light Sleet Showers and Thunder'), ('lightsnowshowersandthunder', 'Light Snow Showers and Thunder'), ('partlycloudy', 'Partly Cloudy'), ('rain', 'Rain'), ('rainandthunder', 'Rain and Thunder'), ('rainshowers', 'Rain showers'), ('rainshowersandthunder', 'Rain Showes and Thunder'), ('sleet', 'Sleet'), ('sleetandthunder', 'Sleet and Thunder'), ('sleetshowers', 'Sleet Showers'), ('sleetshowersandthunder', 'Sleet Showes and Thunder'), ('snow', 'Snow'), ('snowandthunder', 'Snow and Thunder'), ('snowshowers', 'Snow Showers'), ('snowshowersandthunder', 'Snow Showers and Thunder')], help_text='E.g Light Showers', max_length=255, null=True, verbose_name='General Weather Condition')),
                 ('city', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forecastmanager.city', verbose_name='City')),
-                ('condition', models.ForeignKey(help_text='E.g Light Showers', null=True, on_delete=django.db.models.deletion.CASCADE, to='forecastmanager.conditioncategory', verbose_name='General Weather Condition')),
             ],
             options={
                 'verbose_name': 'Forecast',
                 'verbose_name_plural': 'Forecasts',
-                'unique_together': {('city', 'forecast_date')},
             },
         ),
     ]

forecastmanager/models.py

@@ -1,11 +1,47 @@
 import uuid
-import json
-from django.utils.functional import cached_property
 from django.contrib.gis.db import models
 from django.utils.translation import gettext_lazy as _
 from wagtailgeowidget.panels import LeafletPanel
 from wagtailgeowidget.helpers import geosgeometry_str_to_struct
-from wagtail.admin.panels import FieldPanel
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField, StreamField
+from wagtail.snippets.models import register_snippet
+
+from .blocks import ExtremeBlock
+
+# @register_snippet
+class DailyWeather(models.Model):
+    issued_on = models.DateField(auto_now_add=True, null=True)
+    forecast_date = models.DateField(_("Forecast Date"), auto_now=False, auto_now_add=False)
+    forecast_desc = RichTextField(verbose_name=_('Weather Forecast Description'))
+    summary_date = models.DateField(_("Summary Date"), auto_now=False, auto_now_add=False)
+    summary_desc = RichTextField(verbose_name=_('Weather Summary Description'))
+    extreme_date = models.DateField(_("Extreme Date"), auto_now=False, auto_now_add=False, null=True, blank=True)
+    extremes = StreamField([
+        ('extremes', ExtremeBlock())
+    ], use_json_field=True)
+
+    panels = [
+        MultiFieldPanel([
+            FieldPanel('summary_date'),
+            FieldPanel('summary_desc'),
+        ], heading="Weather Summary"),
+        MultiFieldPanel([
+            FieldPanel('forecast_date'),
+            FieldPanel('forecast_desc'),
+        ], heading="Weather Forecast"),
+        MultiFieldPanel([
+            FieldPanel('extreme_date'),
+            FieldPanel('extremes')
+        ], heading="Extremes")
+
+        
+    ]
+
+    def __str__(self) -> str:
+        return f'Daily Weather - Issued on {self.issued_on.strftime("%Y-%m-%d")}'
+
+
 
 # Create your models here.
 class City(models.Model):
@@ -30,62 +66,66 @@ class Meta:
     def __str__(self) -> str:
         return self.name
 
-    @cached_property
-    def point(self):
-        return json.dumps(geosgeometry_str_to_struct(str(self.location)))
-
     @property
-    def lat(self):
-        return self.point['y']
+    def coordinates(self):
+        location = geosgeometry_str_to_struct(str(self.location))
+        return [location['x'],location['y'] ]
 
-    @property
-    def lng(self):
-        return self.point['x']
- 
-
-class ConditionCategory(models.Model):
-    title = models.CharField(max_length=50, help_text=_("Weather Condition Title"), verbose_name=_("Weather Condtion Title"))
-    short_name = models.CharField(max_length=50, help_text=_("Weather Condition Short Name (helpgul for yr.no weather api)"), verbose_name=_("Weather Condtion Short Name"), null=True, blank=True, editable=False)
-    description = models.CharField(max_length=250, blank=True, null=True, verbose_name=_("Description"))
-    icon_image = models.ForeignKey(
-        'wagtailimages.Image',
-        null=True,
-        blank=False,
-        on_delete=models.SET_NULL,
-        related_name='+',
-        verbose_name=_("Icon image")
-    )
-
-
-    class Meta:
-        verbose_name = _("Weather Condition Category")
-        verbose_name_plural = _("Weather Condition Categories")
-
-    
-    def __str__(self):
-        return self.title
-        
-
-    def save(self, *args, **kwargs):
-        if not self.short_name:
-            self.short_name = self.icon_image.file.name.split('/')[-1].split('.')[0]
-        super(ConditionCategory, self).save(*args, **kwargs)
+class Forecast(models.Model):
+    CONDITION_CHOICES = (
+        ('clearsky', 'Clear sky'),
+        ('cloudy','Cloudy'),
+        ('fair','Fair'),
+        ('fog','Fog'),
+        ('heavyrain','Heavy Rain'),
+        ('heavyrainandthunder','Heavy Rain and Thunder'),
+        ('heavyrainshowers','Heavy Rain Showers'),
+        ('heavyrainshowersandthunder','Heavy Rain Showers and Thunder'),
+        ('heavysleet','Heavy Sleet'),
+        ('heavysleetandthunder','Heavy Sleet and Thunder'),
+        ('heavysleetshowers','Heavy Sleet Showers'),
+        ('heavysleetshowersandthunder','Heavy Sleet Showers and Thunder'),
+        ('heavysnow','Heavy Snow'),
+        ('heavysnowandthunder','Heavy Snow and Thunder'),
+        ('heavysnowshowers','Heavy Snow Showers'),
+        ('heavysnowshowersandthunder','Heavy Snow Showers and Thunder'),
+        ('lightrain','Light Rain'),
+        ('lightrainandthunder','Light Rain and Thunder'),
+        ('lightrainshowers','Light Rain Showers'),
+        ('lightrainshowersandthunder','Light Rain Showers and Thunder'),
+        ('lightsleet','Light Sleet'),
+        ('lightsleetandthunder','Light Sleet and Thunder'),
+        ('lightsleetshowers','Light Sleet Showers'),
+        ('lightsleetshowersandthunder','Light Sleet Showers and Thunder'),
+        ('lightsnowshowersandthunder','Light Snow Showers and Thunder'),
+        ('partlycloudy','Partly Cloudy'),
+        ('rain','Rain'),
+        ('rainandthunder','Rain and Thunder'),
+        ('rainshowers','Rain showers'),
+        ('rainshowersandthunder','Rain Showes and Thunder'),
+        ('sleet','Sleet'),
+        ('sleetandthunder','Sleet and Thunder'),
+        ('sleetshowers','Sleet Showers'),
+        ('sleetshowersandthunder','Sleet Showes and Thunder'),
+        ('snow','Snow'),
+        ('snowandthunder','Snow and Thunder'),
+        ('snowshowers','Snow Showers'),
+        ('snowshowersandthunder','Snow Showers and Thunder'),
 
+    )
 
-class Forecast(models.Model):
     city = models.ForeignKey(City, on_delete=models.CASCADE, verbose_name=_("City"))
     forecast_date = models.DateField( auto_now=False, auto_now_add=False, verbose_name=_("Forecasts Date"))
     max_temp = models.IntegerField(verbose_name=_("Maximum Temperature"), blank=True)
     min_temp = models.IntegerField(verbose_name=_("Minimum Temperaure"), blank=True)
     wind_direction = models.IntegerField(verbose_name=_("Wind Direction"), blank=True, null=True)
     wind_speed = models.IntegerField(verbose_name=_("Wind Speed"), blank=True, null=True)
-    # condition = models.CharField(verbose_name=_("General Weather Condition", max_length=255, blank=True, help_text="E.g Light Showers", default="Light Showers")
-    condition = models.ForeignKey(ConditionCategory, verbose_name=_("General Weather Condition"), on_delete=models.CASCADE, help_text=_("E.g Light Showers"), null=True)
+    condition = models.CharField(choices=CONDITION_CHOICES, verbose_name=_("General Weather Condition"), help_text=_("E.g Light Showers"), null=True, max_length=255)
 
     class Meta:
         verbose_name = _("Forecast")
         verbose_name_plural = _("Forecasts")
-        unique_together = ('city', 'forecast_date')
+        # unique_together = (('city', 'forecast_date'))
 
     panels = [
         FieldPanel("city"),
@@ -100,3 +140,4 @@ class Meta:
     # def __str__(self):
     #     return f"{self.city} - {self.forecast_date}" 
 
+    

forecastmanager/serializers.py

@@ -0,0 +1,78 @@
+from rest_framework import serializers, status
+from .models import City, Forecast
+from rest_framework.response import Response
+
+
+class CitySerializer(serializers.ModelSerializer):
+
+    coordinates = serializers.SerializerMethodField()
+
+    class Meta:
+        model = City
+        fields = ('name', 'coordinates')
+
+    def get_coordinates(self, obj):
+        # Implement the logic to compute the property value here
+
+        return obj.coordinates
+    
+
+class ForecastSerializer(serializers.ModelSerializer):
+
+    city_detail =  serializers.SerializerMethodField()
+    condition_display = serializers.SerializerMethodField()
+    list_serializer_class = serializers.ListSerializer
+
+    class Meta:
+        model = Forecast
+        fields =['id','forecast_date','max_temp','min_temp', 'condition_display', 'city', 'city_detail', 'condition']
+
+
+    @staticmethod
+    def get_city_detail(obj):
+        serializer = CitySerializer(obj.city)
+        return serializer.data
+    
+    def get_condition_display(self, obj):
+            return obj.get_condition_display()
+    
+    def to_representation(self, instance):
+        representation = super().to_representation(instance)
+
+        forecast_feature = {
+            "type": "Feature",
+            "properties": {
+                'id': representation['id'],
+                'city_name': representation['city_detail']['name'],
+                'forecast_date': representation['forecast_date'],
+                'max_temp': representation['max_temp'],
+                'min_temp': representation['min_temp'],
+                'condition':representation['condition_display'],
+                'condition_icon': f'/static/forecastmanager/img/{representation["condition"]}.png',
+            },
+            "geometry": {
+                "coordinates": representation['city_detail']['coordinates'],
+                "type": "Point"
+            }
+        }
+
+        return forecast_feature
+
+
+    def create(self, validated_data):
+        forecast, created =  Forecast.objects.update_or_create(
+            forecast_date=validated_data['forecast_date'],
+            city=validated_data['city'], 
+            defaults={
+                'min_temp': validated_data['min_temp'],
+                'max_temp': validated_data['max_temp'],
+                'condition': validated_data['condition'],
+            }
+        )
+
+        return forecast
+    
+        
+        
+        
+