From 6fefd4dd48be0576a332a8aa8d8d7b4f8f074150 Mon Sep 17 00:00:00 2001
From: Bert Palm <bert.palm@ufz.de>
Date: Tue, 2 Mar 2021 14:23:01 +0100
Subject: [PATCH] fixed imports
---
saqc/__init__.py | 3 ++-
saqc/common.py | 15 +++++++++++++--
saqc/core/__init__.py | 2 +-
saqc/flagger/__init__.py | 2 +-
saqc/funcs/changepoints.py | 1 +
saqc/funcs/flagtools.py | 2 +-
saqc/lib/types.py | 15 ++++++++++++++-
7 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/saqc/__init__.py b/saqc/__init__.py
index 97de09a39..0c2bb6d4b 100644
--- a/saqc/__init__.py
+++ b/saqc/__init__.py
@@ -3,7 +3,8 @@
__version__ = "1.4"
-from saqc.core.core import SaQC
+# import order: from small to big
from saqc.common import *
from saqc.flagger import *
from saqc.core.register import register
+from saqc.core.core import SaQC
diff --git a/saqc/common.py b/saqc/common.py
index 21010a0c6..9d4e3d504 100644
--- a/saqc/common.py
+++ b/saqc/common.py
@@ -1,8 +1,17 @@
#!/usr/bin/env python
-from numpy import nan as _nan
+__all__ = [
+ "UNTOUCHED",
+ "UNFLAGGED",
+ "DOUBTFUL",
+ "BAD",
+ "GOOD",
+ "DOUBT",
+]
-UNTOUCHED = _nan
+import numpy as np
+
+UNTOUCHED = np.nan
UNFLAGGED = 0
DOUBTFUL = 25
BAD = 255
@@ -10,3 +19,5 @@ BAD = 255
# aliases
GOOD = UNFLAGGED
DOUBT = DOUBTFUL
+
+
diff --git a/saqc/core/__init__.py b/saqc/core/__init__.py
index 2f4234243..097236acb 100644
--- a/saqc/core/__init__.py
+++ b/saqc/core/__init__.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
-from saqc.core.core import SaQC, logger
from saqc.core.register import register
+from saqc.core.core import SaQC, logger
diff --git a/saqc/flagger/__init__.py b/saqc/flagger/__init__.py
index e5a86852f..bbf082531 100644
--- a/saqc/flagger/__init__.py
+++ b/saqc/flagger/__init__.py
@@ -1,5 +1,5 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
-from .flags import Flagger, initFlagsLike
from .history import History
+from .flags import Flagger, initFlagsLike
diff --git a/saqc/funcs/changepoints.py b/saqc/funcs/changepoints.py
index b6e3f8aa4..f7234aa6f 100644
--- a/saqc/funcs/changepoints.py
+++ b/saqc/funcs/changepoints.py
@@ -11,6 +11,7 @@ from typing_extensions import Literal
from dios import DictOfSeries
+from saqc.common import *
from saqc.core.register import register
from saqc.lib.tools import customRoller
from saqc.flagger import Flagger
diff --git a/saqc/funcs/flagtools.py b/saqc/funcs/flagtools.py
index 364256e29..40efed0f3 100644
--- a/saqc/funcs/flagtools.py
+++ b/saqc/funcs/flagtools.py
@@ -8,11 +8,11 @@ import pandas as pd
from dios import DictOfSeries
from saqc.common import *
+from saqc.lib.types import *
from saqc.core.register import register
from saqc.flagger import Flagger
-
@register(masking='field', module="flagtools")
def clearFlags(data: DictOfSeries, field: ColumnName, flagger: Flagger, **kwargs) -> Tuple[DictOfSeries, Flagger]:
flagger = flagger.clearFlags(field, **kwargs)
diff --git a/saqc/lib/types.py b/saqc/lib/types.py
index 650bfb0e7..9a437a2a9 100644
--- a/saqc/lib/types.py
+++ b/saqc/lib/types.py
@@ -1,5 +1,17 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
+__all__ = [
+ 'T',
+ 'ArrayLike',
+ 'PandasLike',
+ 'DiosLikeT',
+ 'FuncReturnT',
+ 'FreqString',
+ 'ColumnName',
+ 'IntegerWindow',
+ 'TimestampColumnName',
+ 'CurveFitter',
+]
from typing import TypeVar, Union, NewType
from typing_extensions import Protocol, Literal
@@ -7,13 +19,14 @@ from typing_extensions import Protocol, Literal
import numpy as np
import pandas as pd
from dios import DictOfSeries
+from saqc import Flagger
T = TypeVar("T")
ArrayLike = TypeVar("ArrayLike", np.ndarray, pd.Series, pd.DataFrame)
PandasLike = TypeVar("PandasLike", pd.Series, pd.DataFrame, DictOfSeries)
DiosLikeT = Union[DictOfSeries, pd.DataFrame]
-FuncReturnT = [dios.DictOfSeries, Flagger]
+FuncReturnT = [DictOfSeries, Flagger]
# we only support fixed length offsets
FreqString = NewType("FreqString", Literal["D", "H", "T", "min", "S", "L", "ms", "U", "us", "N"])
--
GitLab