Skip to content
Snippets Groups Projects
Commit b7297e41 authored by Bert Palm's avatar Bert Palm 🎇
Browse files

fixed core signatures again

parent 7a257b97
No related branches found
No related tags found
No related merge requests found
Pipeline #36816 passed with stage
in 2 minutes and 28 seconds
...@@ -9,8 +9,8 @@ from saqc.core import ( ...@@ -9,8 +9,8 @@ from saqc.core import (
flagging, flagging,
initFlagsLike, initFlagsLike,
Flags, Flags,
SaQC,
FloatTranslator, FloatTranslator,
DmpTranslator, DmpTranslator,
PositionalTranslator, PositionalTranslator,
SaQC,
) )
...@@ -28,7 +28,7 @@ class ChangePoints(ModuleBase): ...@@ -28,7 +28,7 @@ class ChangePoints(ModuleBase):
reduce_window: FreqString = None, reduce_window: FreqString = None,
reduce_func: Callable[[np.ndarray, np.ndarray], int] = lambda x, _: x.argmax(), reduce_func: Callable[[np.ndarray, np.ndarray], int] = lambda x, _: x.argmax(),
flag: float = BAD, flag: float = BAD,
**kwargs **kwargs,
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("flagChangePoints", locals()) return self.defer("flagChangePoints", locals())
...@@ -51,6 +51,6 @@ class ChangePoints(ModuleBase): ...@@ -51,6 +51,6 @@ class ChangePoints(ModuleBase):
flag_changepoints: bool = False, flag_changepoints: bool = False,
assign_cluster: bool = True, assign_cluster: bool = True,
flag: float = BAD, flag: float = BAD,
**kwargs **kwargs,
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("assignChangePointCluster", locals()) return self.defer("assignChangePointCluster", locals())
...@@ -36,6 +36,6 @@ class FlagTools(ModuleBase): ...@@ -36,6 +36,6 @@ class FlagTools(ModuleBase):
mflag: Any = 1, mflag: Any = 1,
method: Literal["plain", "ontime", "left-open", "right-open"] = "plain", method: Literal["plain", "ontime", "left-open", "right-open"] = "plain",
flag: float = BAD, flag: float = BAD,
**kwargs **kwargs,
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("flagManual", locals()) return self.defer("flagManual", locals())
...@@ -7,7 +7,7 @@ from typing import Callable ...@@ -7,7 +7,7 @@ from typing import Callable
import numpy as np import numpy as np
import pandas as pd import pandas as pd
from saqc.constants import BAD from saqc.constants import UNFLAGGED, BAD
from saqc.core.modules.base import ModuleBase from saqc.core.modules.base import ModuleBase
import saqc import saqc
...@@ -18,7 +18,8 @@ class Generic(ModuleBase): ...@@ -18,7 +18,8 @@ class Generic(ModuleBase):
field: str, field: str,
func: Callable[[pd.Series], pd.Series], func: Callable[[pd.Series], pd.Series],
nodata: float = np.nan, nodata: float = np.nan,
**kwargs to_mask: float = UNFLAGGED,
**kwargs,
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("process", locals()) return self.defer("process", locals())
...@@ -28,6 +29,7 @@ class Generic(ModuleBase): ...@@ -28,6 +29,7 @@ class Generic(ModuleBase):
func: Callable[[pd.Series], pd.Series], func: Callable[[pd.Series], pd.Series],
nodata: float = np.nan, nodata: float = np.nan,
flag: float = BAD, flag: float = BAD,
**kwargs to_mask: float = UNFLAGGED,
**kwargs,
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("flag", locals()) return self.defer("flag", locals())
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import annotations from __future__ import annotations
import numpy import numpy as np
import pandas as pd import pandas as pd
from typing import Callable from typing import Callable
...@@ -17,12 +17,13 @@ class Noise(ModuleBase): ...@@ -17,12 +17,13 @@ class Noise(ModuleBase):
def flagByStatLowPass( def flagByStatLowPass(
self, self,
field: ColumnName, field: ColumnName,
stat: Callable[[numpy.array, pd.Series], float], stat: Callable[[np.array, pd.Series], float],
winsz: FreqString, winsz: FreqString,
thresh: PositiveFloat, thresh: PositiveFloat,
sub_winsz: FreqString = None, sub_winsz: FreqString = None,
sub_thresh: PositiveFloat = None, sub_thresh: PositiveFloat = None,
min_periods: PositiveInt = None, min_periods: PositiveInt = None,
flag: float = BAD, flag: float = BAD,
**kwargs
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("flagByStatLowPass", locals()) return self.defer("flagByStatLowPass", locals())
...@@ -11,23 +11,11 @@ import saqc ...@@ -11,23 +11,11 @@ import saqc
class Pattern(ModuleBase): class Pattern(ModuleBase):
def flagPatternByDTW( def flagPatternByDTW(
self, self, field, ref_field, max_distance=0.0, normalize=True, flag=BAD, **kwargs
field: str,
ref_field: str,
max_distance: float = 0.0,
normalize=True,
flag: float = BAD,
**kwargs
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("flagPatternByDTW", locals()) return self.defer("flagPatternByDTW", locals())
def flagPatternByWavelet( def flagPatternByWavelet(
self, self, field, ref_field, widths=(1, 2, 4, 8), waveform="mexh", flag=BAD, **kwargs
field: str,
ref_field: str,
widths: Sequence[int] = (1, 2, 4, 8),
waveform: str = "mexh",
flag: float = BAD,
**kwargs
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("flagPatternByWavelet", locals()) return self.defer("flagPatternByWavelet", locals())
...@@ -33,9 +33,7 @@ class Resampling(ModuleBase): ...@@ -33,9 +33,7 @@ class Resampling(ModuleBase):
field: str, field: str,
freq: str, freq: str,
method: Literal["fshift", "bshift", "nshift"] = "nshift", method: Literal["fshift", "bshift", "nshift"] = "nshift",
freq_check: Optional[ freq_check: Optional[Literal["check", "auto"]] = None,
Literal["check", "auto"]
] = None, # TODO: not a user decision
**kwargs, **kwargs,
) -> saqc.SaQC: ) -> saqc.SaQC:
return self.defer("shift", locals()) return self.defer("shift", locals())
...@@ -66,6 +64,7 @@ class Resampling(ModuleBase): ...@@ -66,6 +64,7 @@ class Resampling(ModuleBase):
"inverse_fshift", "inverse_fshift",
"inverse_bshift", "inverse_bshift",
"inverse_nshift", "inverse_nshift",
"inverse_interpolation",
], ],
source: str, source: str,
freq: Optional[str] = None, freq: Optional[str] = None,
......
...@@ -6,7 +6,7 @@ from typing import Union, Callable ...@@ -6,7 +6,7 @@ from typing import Union, Callable
import numpy as np import numpy as np
import pandas as pd import pandas as pd
from saqc.constants import * from saqc.constants import BAD
from saqc.core.modules.base import ModuleBase from saqc.core.modules.base import ModuleBase
import saqc import saqc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment