Adapt existing callbacks to non using kwargs

Author: jaime-cespedes-sisniega

frouros/callbacks/batch/permutation_test.py

@@ -148,10 +148,22 @@ def _calculate_p_value(  # pylint: disable=too-many-arguments
         p_value = (permuted_statistic >= observed_statistic).mean()  # type: ignore
         return permuted_statistic, p_value
 
-    def on_compare_end(self, **kwargs) -> None:
-        """On compare end method."""
-        X_ref, X_test = kwargs["X_ref"], kwargs["X_test"]  # noqa: N806
-        observed_statistic = kwargs["result"][0]
+    def on_compare_end(
+        self,
+        result: Any,
+        X_ref: np.ndarray,  # noqa: N803
+        X_test: np.ndarray,
+    ) -> None:
+        """On compare end method.
+
+        :param result: result obtained from the `compare` method
+        :type result: Any
+        :param X_ref: reference data
+        :type X_ref: numpy.ndarray
+        :param X_test: test data
+        :type X_test: numpy.ndarray
+        """
+        observed_statistic = result.distance
         permuted_statistics, p_value = self._calculate_p_value(
             X_ref=X_ref,
             X_test=X_test,

frouros/callbacks/batch/reset.py

@@ -1,6 +1,8 @@
 """Reset batch callback module."""
 
-from typing import Optional
+from typing import Any, Optional
+
+import numpy as np  # type: ignore
 
 from frouros.callbacks.batch.base import BaseCallbackBatch
 from frouros.utils.logger import logger
@@ -58,10 +60,23 @@ def alpha(self, value: float) -> None:
             raise ValueError("value must be greater than 0.")
         self._alpha = value
 
-    def on_compare_end(self, **kwargs) -> None:
-        """On compare end method."""
-        p_value = kwargs["result"].p_value
-        if p_value < self.alpha:
+    def on_compare_end(
+        self,
+        result: Any,
+        X_ref: np.ndarray,  # noqa: N803
+        X_test: np.ndarray,
+    ) -> None:
+        """On compare end method.
+
+        :param result: result obtained from the `compare` method
+        :type result: Any
+        :param X_ref: reference data
+        :type X_ref: numpy.ndarray
+        :param X_test: test data
+        :type X_test: numpy.ndarray
+        """
+        p_value = result.p_value
+        if p_value <= self.alpha:
             logger.info("Drift detected. Resetting detector...")
             self.detector.reset()  # type: ignore
 

frouros/callbacks/streaming/history.py

@@ -1,6 +1,6 @@
 """History callback module."""
 
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from frouros.callbacks.streaming.base import BaseCallbackStreaming
 from frouros.utils.stats import BaseStat
@@ -62,9 +62,13 @@ def add_additional_vars(self, vars_: List[str]) -> None:
         self.additional_vars.extend(vars_)
         self.history = {**self.history, **{var: [] for var in self.additional_vars}}
 
-    def on_update_end(self, **kwargs) -> None:
-        """On update end method."""
-        self.history["value"].append(kwargs["value"])
+    def on_update_end(self, value: Union[int, float]) -> None:
+        """On update end method.
+
+        :param value: value used to update the detector
+        :type value: Union[int, float]
+        """
+        self.history["value"].append(value)
         self.history["num_instances"].append(
             self.detector.num_instances  # type: ignore
         )