Updated data products API and added run methods to service layer.

Author: Ken Lippold

django/core/sta/admin.py

@@ -153,6 +153,12 @@ def delete_observations(self, request, queryset):
                         datastream_id=datastream.id
                     )
                     observations.delete()
+                    datastream.phenomenon_begin_time = None
+                    datastream.phenomenon_end_time = None
+                    datastream.result_begin_time = None
+                    datastream.result_end_time = None
+                    datastream.value_count = 0
+                    datastream.save()
             self.message_user(request, "Observations deleted successfully.")
         else:
             self.message_user(

django/interfaces/api/schemas/monitoring/rule.py

@@ -1,6 +1,6 @@
 import uuid
 from datetime import datetime
-from typing import Optional, Literal, Union
+from typing import Optional, Literal
 
 from ninja import Field, Query
 
@@ -15,7 +15,8 @@
 )
 
 
-WindowUnits = Literal["minutes", "hours", "days"]
+WindowIntervalUnits = Literal["minutes", "hours", "days"]
+RuleType = Literal["range", "rate_of_change", "persistence", "missing_data"]
 
 
 class MonitoringRuleOrderBy(OrderByField):
@@ -36,123 +37,48 @@ class MonitoringRuleQueryParameters(CollectionQueryParameters):
     )
 
 
-# --- Per-type response schemas ---
-
-class RangeRuleResponse(BaseGetResponse):
-    rule_type: Literal["range"] = Field(alias="type")
+class MonitoringRuleResponse(BaseGetResponse):
+    id: uuid.UUID
+    datastream: DatastreamSummaryResponse
+    rule_type: RuleType
+    last_checked_at: Optional[datetime] = None
     min_value: Optional[float] = None
     max_value: Optional[float] = None
+    window_interval: Optional[int] = None
+    window_interval_units: Optional[WindowIntervalUnits] = None
 
+    @staticmethod
+    def resolve_datastream(obj):
+        return obj.datastream
 
-class RateOfChangeRuleResponse(BaseGetResponse):
-    rule_type: Literal["rate_of_change"] = Field(alias="type")
-    max_change: float
-    window: int
-    window_units: WindowUnits
-
-
-class PersistenceRuleResponse(BaseGetResponse):
-    rule_type: Literal["persistence"] = Field(alias="type")
-    persist_value: Optional[float] = None
-    window: int
-    window_units: WindowUnits
-
-
-class MissingDataRuleResponse(BaseGetResponse):
-    rule_type: Literal["missing_data"] = Field(alias="type")
-    window: int
-    window_units: WindowUnits
-
-
-# --- Per-type post body schemas ---
-
-class RangeRulePostBody(BasePostBody, RangeRuleResponse):
-    ...
-
-
-class RateOfChangeRulePostBody(BasePostBody, RateOfChangeRuleResponse):
-    ...
-
-
-class PersistenceRulePostBody(BasePostBody, PersistenceRuleResponse):
-    ...
-
-
-class MissingDataRulePostBody(BasePostBody, MissingDataRuleResponse):
-    ...
-
-
-# --- Per-type patch body schemas ---
-
-class RangeRulePatchBody(BasePatchBody, RangeRuleResponse):
-    ...
-
-
-class RateOfChangeRulePatchBody(BasePatchBody, RateOfChangeRuleResponse):
-    ...
-
-
-class PersistenceRulePatchBody(BasePatchBody, PersistenceRuleResponse):
-    ...
-
-
-class MissingDataRulePatchBody(BasePatchBody, MissingDataRuleResponse):
-    ...
-
-
-# --- Shared resolve_rule helper ---
-
-def _resolve_rule(obj) -> dict:
-    return {
-        "rule_type": obj.rule_type,
-        "min_value": obj.min_value,
-        "max_value": obj.max_value,
-        "max_change": obj.max_change,
-        "persist_value": obj.persist_value,
-        "window": obj.window,
-        "window_units": obj.window_units,
-    }
-
-
-# --- Top-level rule schemas ---
 
 class MonitoringRuleDetailResponse(BaseGetResponse):
-    """Rule details without the datastream — used when nested under a MonitoredDatastreamResponse."""
     id: uuid.UUID
+    rule_type: RuleType
     last_checked_at: Optional[datetime] = None
-    rule: Union[RangeRuleResponse, RateOfChangeRuleResponse, PersistenceRuleResponse, MissingDataRuleResponse]
-
-    @staticmethod
-    def resolve_rule(obj):
-        return _resolve_rule(obj)
+    min_value: Optional[float] = None
+    max_value: Optional[float] = None
+    window_interval: Optional[int] = None
+    window_interval_units: Optional[WindowIntervalUnits] = None
 
 
 class MonitoredDatastreamResponse(BaseGetResponse):
-    """A datastream and all its rules for a given monitoring task."""
     datastream: DatastreamSummaryResponse
     rules: list[MonitoringRuleDetailResponse]
 
 
-class MonitoringRuleResponse(BaseGetResponse):
-    id: uuid.UUID
-    datastream: DatastreamSummaryResponse
-    last_checked_at: Optional[datetime] = None
-    rule: Union[RangeRuleResponse, RateOfChangeRuleResponse, PersistenceRuleResponse, MissingDataRuleResponse]
-
-    @staticmethod
-    def resolve_datastream(obj):
-        return obj.datastream
-
-    @staticmethod
-    def resolve_rule(obj):
-        return _resolve_rule(obj)
-
-
 class MonitoringRulePostBody(BasePostBody):
     uid: uuid.UUID | Unset = Field(Unset, alias="id")
     datastream_id: uuid.UUID
-    rule: Union[RangeRulePostBody, RateOfChangeRulePostBody, PersistenceRulePostBody, MissingDataRulePostBody]
+    rule_type: RuleType
+    min_value: Optional[float] = None
+    max_value: Optional[float] = None
+    window_interval: Optional[int] = None
+    window_interval_units: Optional[WindowIntervalUnits] = None
 
 
 class MonitoringRulePatchBody(BasePatchBody):
-    rule: Union[RangeRulePatchBody, RateOfChangeRulePatchBody, PersistenceRulePatchBody, MissingDataRulePatchBody]
+    min_value: Optional[float]
+    max_value: Optional[float]
+    window_interval: Optional[int]
+    window_interval_units: Optional[WindowIntervalUnits]

django/interfaces/api/schemas/products/__init__.py

@@ -0,0 +1,11 @@
+from interfaces.api.schemas.products.rating_curve import (
+    RatingCurveSummaryResponse, RatingCurveResponse,
+    RatingCurvePostBody, RatingCurvePatchBody,
+    RatingCurveQueryParameters,
+)
+from interfaces.api.schemas.products.task import (
+    DataProductTaskResponse,
+    DataProductTaskPostBody,
+    DataProductTaskPatchBody,
+    DataProductTaskQueryParameters,
+)

django/interfaces/api/schemas/products/expression.py

@@ -13,7 +13,7 @@
 )
 
 
-FittingMethod = Literal["linear", "power_law", "polynomial", "spline"]
+FittingMethod = Literal["linear", "power_law", "polynomial"]
 
 
 class RatingCurveOrderBy(OrderByField):
@@ -37,13 +37,19 @@ class RatingCurveQueryParameters(CollectionQueryParameters):
     )
 
 
+class RatingCurveSummaryResponse(BaseGetResponse):
+    id: uuid.UUID
+    name: str
+    fitting_method: FittingMethod
+
+
 class RatingCurveResponse(BaseGetResponse):
     id: uuid.UUID
     name: str
     description: Optional[str] = None
     fitting_method: FittingMethod
     thing: ThingSummaryResponse
-    points: list[tuple[float, Optional[float]]]
+    points: list[tuple[float, float]]
 
     @staticmethod
     def resolve_points(obj):
@@ -56,11 +62,11 @@ class RatingCurvePostBody(BasePostBody):
     description: Optional[str] = None
     fitting_method: FittingMethod
     thing_id: uuid.UUID
-    points: list[tuple[float, Optional[float]]] = []
+    points: list[tuple[float, float]] = []
 
 
 class RatingCurvePatchBody(BasePatchBody):
     name: str
     description: Optional[str] = None
     fitting_method: FittingMethod
-    points: list[tuple[float, Optional[float]]] = []
+    points: list[tuple[float, float]]