Merge branch 'filter-application' into 'master'

Filter application

Closes #12

See merge request !161

geomagio/processing/__init__.py

@@ -5,7 +5,7 @@ and should be considered less stable than other packages in the library.
 """
 from .factory import get_edge_factory, get_miniseed_factory
 from .derived import adjusted, average, sqdist_minute
-from .obsrio import obsrio_minute, obsrio_second, obsrio_temperatures, obsrio_tenhertz
+from .filters import minute_filter, second_filter
 
 
 __all__ = [
@@ -13,9 +13,7 @@ __all__ = [
     "average",
     "get_edge_factory",
     "get_miniseed_factory",
-    "obsrio_minute",
-    "obsrio_second",
-    "obsrio_temperatures",
-    "obsrio_tenhertz",
+    "minute_filter",
+    "second_filter",
     "sqdist_minute",
 ]

geomagio/processing/efield.py

@@ -3,7 +3,7 @@ import typer
 from ..adjusted import AdjustedMatrix
 from .derived import adjusted
 from .factory import get_edge_factory
-from .obsrio import obsrio_minute
+from .filters import minute_filter
 
 app = typer.Typer()
 
@@ -40,7 +40,7 @@ def efield_realtime(
         realtime_interval=realtime_interval,
         update_limit=update_limit,
     )
-    obsrio_minute(
+    minute_filter(
         observatory=observatory,
         channels=["E-E", "E-N"],
         input_factory=get_edge_factory(host=host, data_type="variation"),
@@ -48,7 +48,7 @@ def efield_realtime(
         realtime_interval=realtime_interval,
         update_limit=update_limit,
     )
-    obsrio_minute(
+    minute_filter(
         observatory=observatory,
         channels=["E-E", "E-N"],
         input_factory=get_edge_factory(host=host, data_type="adjusted"),

geomagio/processing/factory.py

 import os
 
-from ..TimeseriesFactory import TimeseriesFactory
 from ..edge import EdgeFactory, MiniSeedFactory
 
 
@@ -9,7 +8,7 @@ def get_edge_factory(
     host=os.getenv("EDGE_HOST", "127.0.0.1"),
     interval="second",
     **kwargs
-) -> TimeseriesFactory:
+) -> EdgeFactory:
     return EdgeFactory(host=host, interval=interval, type=data_type, **kwargs)
 
 
@@ -18,5 +17,5 @@ def get_miniseed_factory(
     host=os.getenv("EDGE_HOST", "127.0.0.1"),
     interval="second",
     **kwargs
-) -> TimeseriesFactory:
+) -> MiniSeedFactory:
     return MiniSeedFactory(host=host, interval=interval, type=data_type, **kwargs)

pyproject.toml

@@ -71,4 +71,4 @@ geomag-monitor = "geomagio.processing.monitor:main"
 geomag-py = "geomagio.Controller:main"
 magproc-prepfiles = "geomagio.processing.magproc:main"
 make-cal = "geomagio.processing.make_cal:main"
-obsrio-filter = "geomagio.processing.obsrio:main"
+geomag-filter = "geomagio.processing.filters:main"