Merge branch 'controller-derived-option' into 'master'

Make derived factory optional for controller

See merge request !137

code.json

@@ -3,7 +3,7 @@
     "name": "geomag-algorithms",
     "organization": "U.S. Geological Survey",
     "description": "Library for processing Geomagnetic timeseries data.",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "status": "Development",
 
     "permissions": {
@@ -34,7 +34,7 @@
     },
 
     "date": {
-      "metadataLastUpdated": "2021-08-24"
+      "metadataLastUpdated": "2021-08-26"
     }
   }
 ]

geomagio/Controller.py

@@ -548,7 +548,7 @@ def get_input_factory(args):
             input_factory = StreamTimeseriesFactory(
                 factory=input_factory, stream=input_stream
             )
-    return DerivedTimeseriesFactory(input_factory)
+    return input_factory
 
 
 def get_output_factory(args):
@@ -725,6 +725,8 @@ def _main(args):
     """
     # create controller
     input_factory = get_input_factory(args)
+    if args.input_derived:
+        input_factory = DerivedTimeseriesFactory(input_factory)
     output_factory = get_output_factory(args)
     algorithm = algorithms[args.algorithm]()
     algorithm.configure(args)
@@ -766,6 +768,12 @@ def parse_args(args):
         help='Input format (Default "edge")',
     )
 
+    input_group.add_argument(
+        "--input-derived",
+        action="store_true",
+        default=False,
+        help="Wrap the input factory in a DerivedTimeseriesFactory",
+    )
     input_group.add_argument(
         "--input-file", help="Read from specified file", metavar="FILE"
     )

pyproject.toml

@@ -17,7 +17,7 @@ packages = [
   {include = "geomagio" }
 ]
 repository="https://code.usgs.gov/ghsc/geomag/geomag-algorithms"
-version = "1.4.1"
+version = "1.4.2"
 
 
 [tool.poetry.dependencies]