diff --git a/src/aliby/pipeline.py b/src/aliby/pipeline.py index 3a3eef804aebfe7fc039106a664e8468a1deb11d..f084825e8af73a95f217423dedb929db023d5e6b 100644 --- a/src/aliby/pipeline.py +++ b/src/aliby/pipeline.py @@ -25,8 +25,11 @@ from aliby.haystack import initialise_tf from aliby.io.dataset import dispatch_dataset from aliby.io.image import dispatch_image from aliby.tile.tiler import Tiler, TilerParameters -from extraction.core.extractor import Extractor, ExtractorParameters -from extraction.core.functions.defaults import exparams_from_meta +from extraction.core.extractor import ( + Extractor, + ExtractorParameters, + extraction_params_from_meta, +) from postprocessor.core.postprocessing import ( PostProcessor, PostProcessorParameters, @@ -152,7 +155,7 @@ class PipelineParameters(ParametersABC): # default BABY parameters defaults["baby"] = BabyParameters.default(**baby).to_dict() # default Extraction parmeters - defaults["extraction"] = exparams_from_meta(meta_d) + defaults["extraction"] = extraction_params_from_meta(meta_d) # default PostProcessing parameters defaults["postprocessing"] = PostProcessorParameters.default( **postprocessing diff --git a/src/extraction/core/extractor.py b/src/extraction/core/extractor.py index 95ba13c6191b8951c0c60c5a06f674702757fe9c..61fb89a906c5b42260ac18e78c41b1447b06eea0 100644 --- a/src/extraction/core/extractor.py +++ b/src/extraction/core/extractor.py @@ -69,7 +69,7 @@ class ExtractorParameters(ParametersABC): @classmethod def from_meta(cls, meta): """Instantiate using meta data.""" - return cls(**exparams_from_meta(meta)) + return cls(**extraction_params_from_meta(meta)) class Extractor(StepABC):