chore(dashboard): replace Altair by a eCharts.js to render graphs in the frontend

containers/mosqlimate/Dockerfile

@@ -63,7 +63,7 @@ COPY --chown=mosqlimate:mosqlimate pyproject.toml /opt/services/mosqlimate
 RUN pip install "cython<3.0.0" \
   && pip install --no-build-isolation "pyyaml<6.0" \ 
   && poetry config virtualenvs.create false \
-  && poetry install --without pre-commit,dev,docs
+  && poetry install --no-root --without pre-commit,dev,docs
 
 COPY --chown=mosqlimate:mosqlimate containers/entrypoint.sh /opt/entrypoint.sh
 ADD --chown=mosqlimate:mosqlimate src/ /opt/services/mosqlimate/

src/datastore/migrations/0007_alter_copernicusbrasil_table.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.18 on 2025-02-03 11:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("datastore", "0006_sprint202425_delete_sprint202425schema"),
+    ]
+
+    operations = [
+        migrations.AlterModelTable(
+            name="copernicusbrasil",
+            table="copernicus_bra",
+        ),
+    ]

src/datastore/models.py

@@ -193,7 +193,7 @@ class Meta:
 
 class CopernicusBrasil(models.Model):
     date = models.DateField(db_column="date", primary_key=True)
-    geocodigo = models.BigIntegerField(db_column="geocodigo")
+    geocodigo = models.BigIntegerField(db_column="geocode")
     temp_min = models.FloatField(db_column="temp_min")
     temp_med = models.FloatField(db_column="temp_med")
     temp_max = models.FloatField(db_column="temp_max")
@@ -210,7 +210,7 @@ class CopernicusBrasil(models.Model):
 
     class Meta:
         managed = False
-        db_table = "copernicus_brasil"
+        db_table = "copernicus_bra"
         constraints = [
             models.UniqueConstraint(
                 fields=["date", "geocodigo"], name="composite_primary_key"

src/main/templatetags/vis_echarts_components.py

@@ -32,9 +32,6 @@ def vis_echarts(context):
         }
     )
 
-    from pprint import pprint
-
-    pprint(br_info_data)
     context.update(br_info_data)
 
     return context

src/main/views.py

@@ -165,23 +165,6 @@ def get(self, request, model_id: int):
         context = {
             "model": model,
             "implementation_languages": languages,
-            "diseases": [
-                ("dengue", "Dengue"),
-                ("zika", "Zika"),
-                ("chikungunya", "Chikungunya"),
-            ],
-            "adm_levels": [
-                (0, _("National")),
-                (1, _("State")),
-                (2, _("Municipality")),
-                (3, _("Sub Municipality")),
-            ],
-            "time_resolutions": [
-                ("day", _("Day")),
-                ("week", _("Week")),
-                ("month", _("Month")),
-                ("year", _("Year")),
-            ],
         }
         return render(request, self.template_name, context)
 
@@ -219,11 +202,6 @@ def post(self, request, model_id: int):
                     ),
                     "spatial": form.data.get("model_spatial") == "True",
                     "temporal": form.data.get("model_temporal") == "True",
-                    "ADM_level": form.cleaned_data["model_adm_level"],
-                    "disease": form.cleaned_data["model_disease"],
-                    "time_resolution": form.cleaned_data[
-                        "model_time_resolution"
-                    ],
                 }
 
                 status_code, model = update_model(

src/mosqlimate/settings/base.py

@@ -63,6 +63,9 @@
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 
 MIDDLEWARE = [
+    "django.middleware.cache.UpdateCacheMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.cache.FetchFromCacheMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",

src/registry/migrations/0041_prediction_color.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.17 on 2025-01-15 14:30
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registry", "0040_alter_predictiondatarow_adm_0"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="prediction",
+            name="color",
+            field=models.CharField(
+                help_text="Color in hexadecimal format. E.g: #ffffff",
+                max_length=7,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Color must be in hexadecimal format, e.g., #ffffff",
+                        regex="^#[0-9A-Fa-f]{6}$",
+                    )
+                ],
+            ),
+        ),
+    ]

src/registry/migrations/0042_alter_prediction_model.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.17 on 2025-01-15 17:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registry", "0041_prediction_color"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="prediction",
+            name="model",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="predictions",
+                to="registry.model",
+            ),
+        ),
+    ]

src/registry/migrations/0043_tag_group.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.17 on 2025-01-15 20:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registry", "0042_alter_prediction_model"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="tag",
+            name="group",
+            field=models.CharField(null=True, unique=True),
+        ),
+    ]

src/registry/migrations/0044_prediction_tags_alter_model_tags.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.17 on 2025-01-16 13:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registry", "0043_tag_group"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="prediction",
+            name="tags",
+            field=models.ManyToManyField(
+                default=[], related_name="prediction_tags", to="registry.tag"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="model",
+            name="tags",
+            field=models.ManyToManyField(
+                default=[], related_name="model_tags", to="registry.tag"
+            ),
+        ),
+    ]

src/registry/migrations/0045_alter_tag_group.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.18 on 2025-01-20 14:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registry", "0044_prediction_tags_alter_model_tags"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tag",
+            name="group",
+            field=models.CharField(null=True),
+        ),
+    ]

src/registry/migrations/0046_alter_prediction_color.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.18 on 2025-01-23 14:20
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registry", "0045_alter_tag_group"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="prediction",
+            name="color",
+            field=models.CharField(
+                default="#000000",
+                help_text="Color in hexadecimal format. E.g: #ffffff",
+                max_length=7,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Color must be in hexadecimal format, e.g., #ffffff",
+                        regex="^#[0-9A-Fa-f]{6}$",
+                    )
+                ],
+            ),
+        ),
+    ]

src/registry/migrations/0047_prediction_crps_prediction_interval_score_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.18 on 2025-01-30 16:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registry", "0046_alter_prediction_color"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="prediction",
+            name="crps",
+            field=models.FloatField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name="prediction",
+            name="interval_score",
+            field=models.FloatField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name="prediction",
+            name="log_score",
+            field=models.FloatField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name="prediction",
+            name="mae",
+            field=models.FloatField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name="prediction",
+            name="mse",
+            field=models.FloatField(default=None, null=True),
+        ),
+    ]

src/registry/models.py

@@ -21,6 +21,7 @@ def get_plangs_path() -> str:
 
 class Tag(models.Model):
     name = models.CharField(max_length=30, unique=True)
+    group = models.CharField(unique=False, null=True)
     color = models.CharField(
         max_length=7,
         null=True,
@@ -181,7 +182,7 @@ class ADM_levels(models.IntegerChoices):
     )
     name = models.CharField(max_length=100, null=False, blank=False)
     description = models.TextField(max_length=500, null=True, blank=True)
-    tags = models.ManyToManyField(Tag, related_name="tags", default=[])
+    tags = models.ManyToManyField(Tag, related_name="model_tags", default=[])
     repository = models.CharField(max_length=100, null=False, blank=False)
     implementation_language = models.ForeignKey(
         ImplementationLanguage,
@@ -220,11 +221,30 @@ class Meta:
 
 
 class Prediction(models.Model):
-    model = models.ForeignKey(Model, on_delete=models.CASCADE, null=False)
+    model = models.ForeignKey(
+        Model, on_delete=models.CASCADE, null=False, related_name="predictions"
+    )
     description = models.TextField(max_length=500, null=True, blank=True)
     commit = models.CharField(max_length=100, null=False, blank=False)
     predict_date = models.DateField()
+    tags = models.ManyToManyField(
+        Tag, related_name="prediction_tags", default=[]
+    )
     # Metadata
+    color = models.CharField(
+        max_length=7,
+        null=False,
+        default="#000000",
+        validators=[
+            RegexValidator(
+                regex=r"^#[0-9A-Fa-f]{6}$",
+                message=_(
+                    "Color must be in hexadecimal format, e.g., #ffffff"
+                ),
+            ),
+        ],
+        help_text=_("Color in hexadecimal format. E.g: #ffffff"),
+    )
     visualizable = models.BooleanField(default=False)
     metadata = models.CharField(null=True, default=None)
     adm_0_geocode = models.CharField(max_length=3, null=True, default="BRA")
@@ -233,6 +253,12 @@ class Prediction(models.Model):
     adm_3_geocode = models.IntegerField(null=True, default=None)  # TODO
     date_ini_prediction = models.DateTimeField(null=True, default=None)
     date_end_prediction = models.DateTimeField(null=True, default=None)
+    # scores
+    mae = models.FloatField(null=True, default=None)
+    mse = models.FloatField(null=True, default=None)
+    crps = models.FloatField(null=True, default=None)
+    log_score = models.FloatField(null=True, default=None)
+    interval_score = models.FloatField(null=True, default=None)
 
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
@@ -276,6 +302,16 @@ def to_json(self) -> str:
 
         return json.dumps(data)
 
+    @property
+    def scores(self) -> dict:
+        return {
+            "mae": self.mae,
+            "mse": self.mse,
+            "crps": self.crps,
+            "log_score": self.log_score,
+            "interval_score": self.interval_score,
+        }
+
     def parse_metadata(self):
         if not self.to_dataframe().empty:
             self._add_adm_geocode()