add priority update option, Cruise Tracking API

Author: ethanandrews

habhub-dataserver/config/settings/base.py

@@ -335,6 +335,11 @@
         "task": "habhub.ifcb_datasets.tasks.get_ifcb_dashboard_data",
         "schedule": crontab(minute=0, hour=2),
     },
+    "get_ifcb_dashboard_data_high_priority_task": {
+            "task": "habhub.ifcb_datasets.tasks.get_ifcb_dashboard_data_high_priority",
+            # Executes every 5 minutes
+            'schedule': crontab(minute='*/10'), 
+        },
     # "prewarm_api_cache_task": {
     #    "task": "habhub.core.tasks.prewarm_api_cache",
     #    "schedule": crontab(minute="*/5"),

habhub-dataserver/config/settings/production.py

@@ -131,7 +131,7 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#default-from-email
 DEFAULT_FROM_EMAIL = env(
-    "DJANGO_DEFAULT_FROM_EMAIL", default="Starterkit <noreply@example.com>"
+    "DJANGO_DEFAULT_FROM_EMAIL", default="HABhub <noreply@example.com>"
 )
 # https://docs.djangoproject.com/en/dev/ref/settings/#server-email
 SERVER_EMAIL = env("DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)

habhub-dataserver/habhub/core/api/urls.py

@@ -14,6 +14,7 @@
     AutoclassScoreViewSet,
     BinMetadataViewSet,
     DatasetBasicViewSet,
+    CruiseTrackViewSet
 )
 from habhub.closures.api.views import (
     ShellfishAreaViewSet,
@@ -40,6 +41,7 @@
 router.register(r"scores", AutoclassScoreViewSet, "scores")
 router.register(r"bins", BinMetadataViewSet, "bins")
 router.register(r"datasets", DatasetBasicViewSet, "datasets")
+router.register(r"cruise-tracks", CruiseTrackViewSet, "cruise-tracks")
 router.register(r"monitoring-systems", MonitoringSystemViewSet, "monitoring-systems")
 router.register(r"forecasting-systems", ForecastingSystemViewSet, "forecasting-systems")
 

habhub-dataserver/habhub/core/migrations/0021_alter_targetspecies_primary_color.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.14 on 2026-08-09 18:28
+
+import colorfield.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0020_auto_20231128_1935'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='targetspecies',
+            name='primary_color',
+            field=colorfield.fields.ColorField(default='#FF0000', image_field=None, max_length=25, samples=None),
+        ),
+    ]

habhub-dataserver/habhub/esp_instrument/migrations/0010_alter_deployment_year.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.14 on 2026-08-09 18:28
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('esp_instrument', '0009_auto_20231128_1935'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deployment',
+            name='year',
+            field=models.IntegerField(validators=[django.core.validators.MinValueValidator(1984), django.core.validators.MaxValueValidator(2026)]),
+        ),
+    ]

habhub-dataserver/habhub/ifcb_datasets/admin.py

@@ -13,7 +13,8 @@ class DatasetAdmin(LeafletGeoAdmin):
         "dashboard_base_url",
         "dashboard_id_name",
         "fixed_location",
-        "geom",
+        "high_priority_updates",
+        "geom",    
     )
     list_editable = ("geom",)
 

habhub-dataserver/habhub/ifcb_datasets/api/mixins.py

@@ -29,7 +29,7 @@ def handle_query_param_filters(self, queryset):
         if start_date:
             start_date_obj = datetime.datetime.strptime(start_date, "%Y-%m-%d").date()
         else:
-            start_date_obj = timezone.now() - relativedelta(years=1)
+            start_date_obj = (timezone.now() - relativedelta(years=1)).date()
 
         print("LIMIT", limit_start_date)
         if limit_start_date:
@@ -46,7 +46,7 @@ def handle_query_param_filters(self, queryset):
         if end_date:
             end_date_obj = datetime.datetime.strptime(end_date, "%Y-%m-%d").date()
         else:
-            end_date_obj = timezone.now()
+            end_date_obj = timezone.now().date()
 
         if end_date_obj < start_date_obj:
             # check if end_date is BEFORE start_date. Invalid option, so reset to no results
@@ -95,10 +95,10 @@ def handle_query_param_filters(self, queryset):
                 print("RANGES", date_ranges)
                 for dr in date_ranges:
                     date_q_filters |= Q(
-                        sample_time__range=(dr["start_date"], dr["end_date"])
+                        sample_time__date__range=(dr["start_date"], dr["end_date"])
                     )  # 'or' the Q objects together
             else:
-                date_q_filters |= Q(sample_time__range=([start_date_obj, end_date_obj]))
+                date_q_filters |= Q(sample_time__date__range=([start_date_obj, end_date_obj]))
 
         queryset = (
             queryset.filter(date_q_filters)
@@ -145,7 +145,7 @@ def handle_query_param_filters(self, queryset):
         if start_date:
             start_date_obj = datetime.datetime.strptime(start_date, "%Y-%m-%d").date()
         else:
-            start_date_obj = timezone.now() - relativedelta(years=1)
+            start_date_obj = (timezone.now() - relativedelta(years=1)).date()
 
         if limit_start_date:
             # if limit_start_date param exists, limit results to specified range
@@ -160,7 +160,7 @@ def handle_query_param_filters(self, queryset):
         if end_date:
             end_date_obj = datetime.datetime.strptime(end_date, "%Y-%m-%d").date()
         else:
-            end_date_obj = timezone.now()
+            end_date_obj = timezone.now().date()
 
         if end_date_obj < start_date_obj:
             # check if end_date is BEFORE start_date. Invalid option, so reset to no results
@@ -210,10 +210,10 @@ def handle_query_param_filters(self, queryset):
 
                 for dr in date_ranges:
                     date_q_filters |= Q(
-                        sample_time__range=(dr["start_date"], dr["end_date"])
+                        sample_time__date__range=(dr["start_date"], dr["end_date"])
                     )  # 'or' the Q objects together
             else:
-                date_q_filters |= Q(sample_time__range=([start_date_obj, end_date_obj]))
+                date_q_filters |= Q(sample_time__date__range=([start_date_obj, end_date_obj]))
 
         queryset = queryset.prefetch_related(
             Prefetch(

habhub-dataserver/habhub/ifcb_datasets/api/serializers.py

@@ -40,7 +40,17 @@ class Meta:
             "cell_concentration_data",
         ]
 
-
+class CruiseTrackViewSetSerializer(serializers.ModelSerializer):
+    bins = BinSerializer(many=True, read_only=True) 
+    class Meta:
+        model = Dataset
+        fields = [
+            "id",
+            "name",
+            "location",
+            "dashboard_id_name",
+            "bins"
+        ]
 class AutoclassScoreSerializer(serializers.ModelSerializer):
     os_id = serializers.SerializerMethodField()
     image_pid = serializers.CharField(source="pid")

habhub-dataserver/habhub/ifcb_datasets/api/views.py

@@ -22,6 +22,7 @@
     BinSpatialGridDetailSerializer,
     AutoclassScoreSerializer,
     DatasetBasicSerializer,
+    CruiseTrackViewSetSerializer
 )
 from .mixins import DatasetFiltersMixin, BinFiltersMixin
 
@@ -180,3 +181,13 @@ def retrieve(self, request, pk=None):
         # set cache
         cache.set(cache_key, serializer.data)
         return Response(serializer.data)
+
+# Viewset to show full cruise track of vessel-based Datasets
+class CruiseTrackViewSet(DatasetFiltersMixin, viewsets.ReadOnlyModelViewSet):
+    serializer_class = CruiseTrackViewSetSerializer
+
+    def get_queryset(self):
+        queryset = Dataset.objects.filter(fixed_location=False).defer('bins')
+        # call custom filter method from mixin
+        queryset = self.handle_query_param_filters(queryset)
+        return queryset

habhub-dataserver/habhub/ifcb_datasets/api_requests.py

@@ -16,7 +16,7 @@
 env = environ.Env()
 
 # IFCB_DASHBOARD_URL = env("IFCB_DASHBOARD_URL", default="https://habon-ifcb.whoi.edu")
-IFCB_DASHBOARD_THROTTLE_RATE = env("IFCB_DASHBOARD_THROTTLE_RATE", default=50)
+IFCB_DASHBOARD_THROTTLE_RATE = env("IFCB_DASHBOARD_THROTTLE_RATE", default=500)
 MVCO_GEOM_POINT = Point(41.325, -70.5667)
 
 
@@ -71,17 +71,20 @@ def run_species_classifed_import(dataset_obj):
 """
 
 
-def run_species_classifed_import(dataset_obj):
+def run_species_classifed_import(dataset_obj, throttle_rate=100):
     """
     Function to run import of Bins/Autoclass/Image data from IFCB dashboard
     Args: 'dataset_obj' - Dataset object
     """
     # Get all new bins
     _get_ifcb_bins_dataset(dataset_obj)
+    print("Throttle Rate", throttle_rate)
     print("Complete Bin import.")
-    bins = dataset_obj.bins.filter(cell_concentration_data__isnull=True)[
-        :IFCB_DASHBOARD_THROTTLE_RATE
-    ]
+    if throttle_rate:
+        bins = dataset_obj.bins.filter(cell_concentration_data__isnull=True)[throttle_rate]
+    else:
+        bins = dataset_obj.bins.filter(cell_concentration_data__isnull=True)
+        
     for bin in bins:
         print("Start autoclass processing...")
         _get_ifcb_autoclass_file(bin)