fix(detector): add minimum floor as parameters

Author: Kl0ven

Dockerfile

@@ -23,7 +23,7 @@ ENV PIP_DEFAULT_TIMEOUT=100 \
 
 # get poetry
 RUN apk update \
-    && apk add --update --no-cache curl==7.88.1-r0 gcc=12.2.1_git20220924-r4 linux-headers=5.19.5-r0 build-base=0.5-r3 \
+    && apk add --update --no-cache curl==7.88.1-r1 gcc=12.2.1_git20220924-r4 linux-headers=5.19.5-r0 build-base=0.5-r3 \
     && curl -sSL https://install.python-poetry.org | python -
 
 RUN python -m venv "$VENV_PATH"

controller/sentry/admin.py

@@ -83,6 +83,7 @@ def get_chart_data(self, sentry_id):
             return None
 
         threshold = project.detection_param["threshold"]
+        floor = project.detection_param.get("floor", 50)
 
         options = settings.DEFAULT_GRAPH_OPTION
         labels, series, signal, avg_filter, std_filter = list(zip(*project.detection_result))
@@ -107,7 +108,8 @@ def get_chart_data(self, sentry_id):
                     "backgroundColor": "#9966ff",
                     "borderColor": "#9966ff",
                     "data": [
-                        avg_filter + threshold * std_filter for avg_filter, std_filter in zip(avg_filter, std_filter)
+                        max(floor, avg_filter + threshold * std_filter)
+                        for avg_filter, std_filter in zip(avg_filter, std_filter)
                     ],
                     "yAxisID": "series",
                 },
@@ -127,9 +129,9 @@ def save_model(self, request: "HttpRequest", obj: Project, form: "ModelForm[Proj
             form (ModelForm[Project]): form
             change (bool): change
         """
+        super().save_model(request, obj, form, change)
         if change:
             perform_detect.delay(obj.sentry_id)
-        return super().save_model(request, obj, form, change)
 
 
 @admin.register(Event)

controller/sentry/detector.py

@@ -47,17 +47,19 @@ class SpikesDetector:
             so the threshold can react to structural breaks quickly.
     """
 
-    def __init__(self, lag: int = 48, threshold: int = 5, influence: float = 0) -> None:
+    def __init__(self, lag: int = 48, threshold: int = 5, influence: float = 0, floor: int = 50) -> None:
         """Init detector.
 
         Args:
             lag (int): The lag
             threshold (int): The threshold
             influence (float): The influence
+            floor (int): The minimum floor
         """
         self.lag = lag
         self.threshold = threshold
         self.influence = influence
+        self.floor = floor
 
     @classmethod
     def from_project(cls, project: Project) -> "SpikesDetector":
@@ -119,7 +121,8 @@ def compute(self, data) -> tuple[list[int], list[float], list[float]]:
         std_filter[self.lag - 1] = stdev(data[: self.lag])
 
         for i, item in enumerate(data[self.lag :], start=self.lag):
-            if abs(item - avg_filter[i - 1]) > self.threshold * std_filter[i - 1]:
+            threshold = max(self.floor, avg_filter[i - 1] + self.threshold * std_filter[i - 1])
+            if item > threshold:
                 signals.append(1 if item > avg_filter[i - 1] else 0)
                 filtered_data[i] = self.influence * item + (1 - self.influence) * filtered_data[i - 1]
             else:

controller/sentry/tests/test_admin.py

@@ -418,7 +418,7 @@ def test_project_chart(super_call: Mock, admin_with_user):
     project = Project(sentry_id="123")
     project.detection_result = [
         ("a", 0, 0, 0, 0),
-        ("b", 5, 1, 1, 2),
+        ("b", 55, 1, 1, 2),
     ]
     project.save()
     super_call.return_value = MockResponse(context_data=True)
@@ -433,7 +433,7 @@ def test_project_chart(super_call: Mock, admin_with_user):
                         "label": "Series",
                         "backgroundColor": "#36a2eb",
                         "borderColor": "#36a2eb",
-                        "data": (0, 5),
+                        "data": (0, 55),
                         "yAxisID": "series",
                     },
                     {
@@ -447,7 +447,7 @@ def test_project_chart(super_call: Mock, admin_with_user):
                         "label": "Threshold",
                         "backgroundColor": "#9966ff",
                         "borderColor": "#9966ff",
-                        "data": [0, 11],
+                        "data": [50, 50],
                         "yAxisID": "series",
                     },
                 ],

controller/settings.py

@@ -328,6 +328,7 @@
     "lag": int(os.getenv("SPIKE_DETECTION_LAG", "48")),
     "threshold": int(os.getenv("SPIKE_DETECTION_THRESHOLD", "5")),
     "influence": float(os.getenv("SPIKE_DETECTION_INFLUENCE", "0.01")),
+    "floor": int(os.getenv("SPIKE_DETECTION_FLOOR", "50")),
 }