diff --git a/packages/data/src/pyearthtools/data/modifications/modification.py b/packages/data/src/pyearthtools/data/modifications/modification.py index 06f70204..4aaadf57 100644 --- a/packages/data/src/pyearthtools/data/modifications/modification.py +++ b/packages/data/src/pyearthtools/data/modifications/modification.py @@ -149,4 +149,4 @@ def __call__(self, dataset: xr.Dataset, variable: str) -> Union[xr.DataArray, xr if isinstance(data, xr.Dataset): data = data[variable] - return pyearthtools.data.transforms.attributes.update(self.attribute_update)(data) + return pyearthtools.data.transforms.attributes.SetAttributes(self.attribute_update)(data) diff --git a/packages/data/src/pyearthtools/data/transforms/__init__.py b/packages/data/src/pyearthtools/data/transforms/__init__.py index 71016b3a..9afa8fa4 100644 --- a/packages/data/src/pyearthtools/data/transforms/__init__.py +++ b/packages/data/src/pyearthtools/data/transforms/__init__.py @@ -71,7 +71,7 @@ def apply(self, dataset): from pyearthtools.data.transforms.default import get_default_transforms # from pyearthtools.data.transforms.mask import MaskTransform as mask -from pyearthtools.data.transforms.derive import derive, Derive +from pyearthtools.data.transforms.derive import Derive from pyearthtools.data.transforms import projection @@ -92,7 +92,6 @@ def apply(self, dataset): "region", "mask", "get_default_transform", - "derive", "Derive", "projection", "get_default_transforms", diff --git a/packages/data/src/pyearthtools/data/transforms/attributes.py b/packages/data/src/pyearthtools/data/transforms/attributes.py index 6cac0376..3f420441 100644 --- a/packages/data/src/pyearthtools/data/transforms/attributes.py +++ b/packages/data/src/pyearthtools/data/transforms/attributes.py @@ -23,7 +23,6 @@ import xarray as xr from pyearthtools.data.transforms import Transform -from pyearthtools.utils.decorators import BackwardsCompatibility def _get_attributes_from_ds(reference: xr.DataArray | xr.Dataset) -> dict[str, dict[str, Any]]: @@ -108,13 +107,6 @@ def apply(self, data_obj): return data_obj -@BackwardsCompatibility(SetAttributes) -def set_attributes(*args, **kwargs) -> Transform: ... - - -update = set_attributes - - def _get_encoding_from_ds(reference: xr.DataArray | xr.Dataset, limit: list[str] | None = None): encoding: dict[str, dict[str, Any]] = {} relevant_encoding = limit or [ @@ -204,10 +196,6 @@ def update(x: xr.DataArray): return dataset -@BackwardsCompatibility(SetEncoding) -def set_encoding(*args, **kwargs) -> Transform: ... - - class SetType(Transform): """Set type of variables""" @@ -252,10 +240,6 @@ def apply(self, dataset: xr.DataArray | xr.Dataset) -> xr.DataArray | xr.Dataset return dataset -@BackwardsCompatibility(SetType) -def set_type(*args, **kwargs) -> Transform: ... - - class Rename(Transform): """Rename Components inside Dataset""" @@ -285,7 +269,3 @@ def __init__(self, names: dict[str, Any] | None = None, **extra_names: Any): def apply(self, dataset: xr.Dataset) -> xr.Dataset: return dataset.rename(**{key: self._names[key] for key in self._names if key in dataset}) - - -@BackwardsCompatibility(Rename) -def rename(*args, **kwargs) -> Transform: ... diff --git a/packages/data/src/pyearthtools/data/transforms/coordinates.py b/packages/data/src/pyearthtools/data/transforms/coordinates.py index 5dda2890..84024eaf 100644 --- a/packages/data/src/pyearthtools/data/transforms/coordinates.py +++ b/packages/data/src/pyearthtools/data/transforms/coordinates.py @@ -29,8 +29,6 @@ from pyearthtools.data.warnings import pyearthtoolsDataWarning from pyearthtools.data.exceptions import DataNotFoundError -from pyearthtools.utils.decorators import BackwardsCompatibility - DASK_IMPORTED = False try: import dask @@ -560,10 +558,6 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset | xr.DataArray: return dataset -@BackwardsCompatibility(Expand) -def expand(*args, **kwargs) -> Transform: ... - - def SelectFlatten( coordinates: dict[str, tuple[Any] | Any] | None = None, tolerance: float = 0.01, @@ -682,7 +676,3 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset: # @property # def _info_(self) -> Any | dict: # return dict(coordinates=self._coordinates, **self._kwargs) - - -@BackwardsCompatibility(Pad) -def pad(*args, **kwargs) -> Transform: ... diff --git a/packages/data/src/pyearthtools/data/transforms/default.py b/packages/data/src/pyearthtools/data/transforms/default.py index bfaa95f1..4a227218 100644 --- a/packages/data/src/pyearthtools/data/transforms/default.py +++ b/packages/data/src/pyearthtools/data/transforms/default.py @@ -44,6 +44,6 @@ def get_default_transforms( transforms.append(pyearthtools.data.transforms.coordinates.StandardCoordinateNames(**REPLACEMENT_NAMES)) # type: ignore # transforms.append(pyearthtools.data.transforms.coordinates.StandardLongitude()) # if intelligence_level > 1: - # transforms.append(pyearthtools.data.transforms.coordinates.set_type("float")) + # transforms.append(pyearthtools.data.transforms.coordinates.SetType("float")) return transforms diff --git a/packages/data/src/pyearthtools/data/transforms/derive.py b/packages/data/src/pyearthtools/data/transforms/derive.py index 34931d4f..7e097756 100644 --- a/packages/data/src/pyearthtools/data/transforms/derive.py +++ b/packages/data/src/pyearthtools/data/transforms/derive.py @@ -29,7 +29,6 @@ from pyearthtools.data.transforms import Transform -from pyearthtools.utils.decorators import BackwardsCompatibility LOG = logging.getLogger("pyearthtools.data") @@ -509,10 +508,6 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset: return derive_equations(dataset, drop=self._drop, equation=self._equation) -@BackwardsCompatibility(Derive) -def derive(*args, **kwargs) -> Transform: ... - - # def equations(equation: str): # class KnownEquations(Transform): # @property diff --git a/packages/data/src/pyearthtools/data/transforms/dimensions.py b/packages/data/src/pyearthtools/data/transforms/dimensions.py index 7bbbbbda..92ad4397 100644 --- a/packages/data/src/pyearthtools/data/transforms/dimensions.py +++ b/packages/data/src/pyearthtools/data/transforms/dimensions.py @@ -19,7 +19,6 @@ import xarray as xr from pyearthtools.data.transforms.transform import Transform -from pyearthtools.utils.decorators import BackwardsCompatibility XR = TypeVar("XR", xr.Dataset, xr.DataArray) @@ -60,10 +59,6 @@ def apply(self, dataset: xr.Dataset): return dataset -@BackwardsCompatibility(StandardDimensionNames) -def force_standard_dimension_names(*args, **kwargs: str) -> Transform: ... - - class Expand(Transform): """Expand Dimensions""" @@ -138,7 +133,3 @@ def apply(self, dataset: XR) -> XR: data = dataset.expand_dims(_dim, axis=self._axis, **self._kwargs) return data - - -@BackwardsCompatibility(Expand) -def expand(*args, **kwargs) -> Transform: ... diff --git a/packages/data/src/pyearthtools/data/transforms/interpolation.py b/packages/data/src/pyearthtools/data/transforms/interpolation.py index e4c565b4..3cb279b0 100644 --- a/packages/data/src/pyearthtools/data/transforms/interpolation.py +++ b/packages/data/src/pyearthtools/data/transforms/interpolation.py @@ -25,8 +25,6 @@ from pyearthtools.data.transforms.transform import Transform from pyearthtools.data.transforms.utils import parse_dataset -from pyearthtools.utils.decorators import BackwardsCompatibility - xESMF_IMPORTED = True try: import xesmf as xe # type: ignore @@ -263,10 +261,6 @@ def encode(x): ) # type: ignore -@BackwardsCompatibility(InterpolateNan) -def interpolate_na(*args, **kwargs): ... - - ### Model levels to pressure level transform needed diff --git a/packages/data/src/pyearthtools/data/transforms/mask.py b/packages/data/src/pyearthtools/data/transforms/mask.py index 7b0d127a..b6f14854 100644 --- a/packages/data/src/pyearthtools/data/transforms/mask.py +++ b/packages/data/src/pyearthtools/data/transforms/mask.py @@ -26,8 +26,6 @@ from pyearthtools.data.transforms.transform import Transform from pyearthtools.data.transforms.utils import parse_dataset -from pyearthtools.utils.decorators import BackwardsCompatibility - OPERATIONS = ["==", "!=", ">", "<", ">=", "<="] OPERATIONS_TYPE = Literal["==", "!=", ">", "<", ">=", "<="] @@ -305,10 +303,6 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset: ) -@BackwardsCompatibility(Dataset) -def dataset(*a, **k): ... - - class Replace(UnderlyingMaskTransform): def __init__( self, @@ -351,8 +345,4 @@ def apply(self, data): ) -@BackwardsCompatibility(Replace) -def replace_value(*a, **k): ... - - __all__ = ["Dataset", "Replace"] diff --git a/packages/data/src/pyearthtools/data/transforms/optimisation.py b/packages/data/src/pyearthtools/data/transforms/optimisation.py index 23ee59c1..a0858a3d 100644 --- a/packages/data/src/pyearthtools/data/transforms/optimisation.py +++ b/packages/data/src/pyearthtools/data/transforms/optimisation.py @@ -20,8 +20,6 @@ import xarray as xr from pyearthtools.data.transforms.transform import Transform -from pyearthtools.utils.decorators import BackwardsCompatibility - class Rechunk(Transform): """Rechunk data""" @@ -48,7 +46,3 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset: raise ValueError(f"Could not find 'chunksizes' in encoding of {var}") dataset[var].data = dataset[var].data.rechunk(chunks) return dataset - - -@BackwardsCompatibility(Rechunk) -def rechunk(*args, **kwargs): ... diff --git a/packages/data/src/pyearthtools/data/transforms/region.py b/packages/data/src/pyearthtools/data/transforms/region.py index e642de65..23808589 100644 --- a/packages/data/src/pyearthtools/data/transforms/region.py +++ b/packages/data/src/pyearthtools/data/transforms/region.py @@ -33,8 +33,6 @@ from pyearthtools.data.transforms import Transform from pyearthtools.data.transforms.utils import parse_dataset -from pyearthtools.utils.decorators import BackwardsCompatibility - RegionLookupFILE = Path(__file__).parent / "RegionLookup.yaml" @@ -137,10 +135,6 @@ def apply(self, dataset: xr.Dataset): return subset_dataset -@BackwardsCompatibility(Select) -def sel(*args, **kwargs): ... - - class ISelect(Transform): """ISelect""" @@ -160,10 +154,6 @@ def apply(self, dataset: xr.Dataset): return subset_dataset -@BackwardsCompatibility(ISelect) -def isel(*args, **kwargs): ... - - def PointBox(point: tuple[float], size: float) -> Transform: """ Create a region bounding box of `size` around `point` @@ -187,10 +177,6 @@ def PointBox(point: tuple[float], size: float) -> Transform: return Bounding(edges[0][0], edges[1][0], edges[0][1], edges[1][1]) -@BackwardsCompatibility(PointBox) -def point_box(*args, **kwargs): ... - - def Lookup(key: str, regionfile: str | Path = RegionLookupFILE) -> Transform: """ Use string to retrieve preset lat and lon extent to transform geospatial extent @@ -222,10 +208,6 @@ def Lookup(key: str, regionfile: str | Path = RegionLookupFILE) -> Transform: return Bounding(*bounding_box) -@BackwardsCompatibility(Lookup) -def lookup(*args, **kwargs): ... - - class ShapeFile(Transform): def __init__(self, shapefile, crs: str | None = None): """ @@ -283,10 +265,6 @@ def plot(self, **kwargs): self._shapefile.plot(**kwargs) -@BackwardsCompatibility(ShapeFile) -def from_shapefile(*args, **kwargs): ... - - def Geosearch( key: str, column: str | None = None, @@ -328,7 +306,3 @@ def Geosearch( shapefile = geo.geometry return ShapeFile(shapefile, crs=crs) - - -@BackwardsCompatibility(Geosearch) -def from_geosearch(*args, **kwargs): ... diff --git a/packages/data/src/pyearthtools/data/transforms/values.py b/packages/data/src/pyearthtools/data/transforms/values.py index 8111d1cb..196e08b1 100644 --- a/packages/data/src/pyearthtools/data/transforms/values.py +++ b/packages/data/src/pyearthtools/data/transforms/values.py @@ -25,7 +25,6 @@ import pyearthtools.data from pyearthtools.data.transforms.transform import Transform -from pyearthtools.utils.decorators import BackwardsCompatibility class Fill(Transform): @@ -137,10 +136,6 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset: return dataset -@BackwardsCompatibility(Fill) -def fill(*args, **kwargs): ... - - def ffill(*a, **b): return Fill(*a, direction=b.pop("direction", "forward"), **b) diff --git a/packages/data/src/pyearthtools/data/transforms/variables.py b/packages/data/src/pyearthtools/data/transforms/variables.py index fec0253f..ff52a834 100644 --- a/packages/data/src/pyearthtools/data/transforms/variables.py +++ b/packages/data/src/pyearthtools/data/transforms/variables.py @@ -20,10 +20,8 @@ import pyearthtools.data.transforms.attributes as attr from pyearthtools.data.transforms.transform import Transform -from pyearthtools.utils.decorators import BackwardsCompatibility - # Backwards compatability -rename_variables = attr.rename +rename_variables = attr.Rename replace_name_deviation = rename_variables @@ -58,14 +56,6 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset: return dataset[var_included] -@BackwardsCompatibility(Trim) -def trim(*args) -> Transform: ... - - -@BackwardsCompatibility(Trim) -def variable_trim(*args) -> Transform: ... - - class Drop(Transform): """Drop dataset variables""" @@ -142,7 +132,3 @@ def apply(self, dataset: xr.Dataset) -> xr.Dataset: return dataset return dataset[list(var_included)] - - -@BackwardsCompatibility(Drop) -def drop(*args) -> Transform: ... diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/dask/normalisation.py b/packages/pipeline/src/pyearthtools/pipeline/operations/dask/normalisation.py index 2870ab2f..7cbef698 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/dask/normalisation.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/dask/normalisation.py @@ -26,7 +26,6 @@ from pyearthtools.data.utils import parse_path -from pyearthtools.utils.decorators import BackwardsCompatibility from pyearthtools.pipeline.operations.dask.dask import DaskOperation @@ -137,10 +136,6 @@ def denormalise(self, sample): return sample * self.expand(self.division_factor, sample) -@BackwardsCompatibility(Division) -def TemporalDifference(*a, **k): ... - - class Evaluated(daskNormalisation): """ `eval` based normalisation diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/numpy/normalisation.py b/packages/pipeline/src/pyearthtools/pipeline/operations/numpy/normalisation.py index 0b135894..2a186844 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/numpy/normalisation.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/numpy/normalisation.py @@ -21,7 +21,6 @@ from pyearthtools.data.utils import parse_path -from pyearthtools.utils.decorators import BackwardsCompatibility from pyearthtools.pipeline.operation import Operation @@ -130,10 +129,6 @@ def denormalise(self, sample): return sample * self.expand(self.division_factor, sample) -@BackwardsCompatibility(Division) -def TemporalDifference(*a, **k): ... - - class Evaluated(numpyNormalisation): """ `eval` based normalisation diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/transform/add_coordinates.py b/packages/pipeline/src/pyearthtools/pipeline/operations/transform/add_coordinates.py index 704dce1d..3e9e8a1e 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/transform/add_coordinates.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/transform/add_coordinates.py @@ -53,9 +53,9 @@ def __init__(self, coordinates: Union[str, list[str]], *extra_coords: str): def apply(self, data: xr.Dataset): dims = list(data.dims) - rebuild_encoding = pyearthtools.data.transforms.attributes.set_encoding( + rebuild_encoding = pyearthtools.data.transforms.attributes.SetEncoding( reference=data - ) + pyearthtools.data.transforms.attributes.set_attributes(reference=data) + ) + pyearthtools.data.transforms.attributes.SetAttributes(reference=data) for coord in self.coordinates: if coord in data: diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/metadata.py b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/metadata.py index 5642492e..a9849660 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/metadata.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/metadata.py @@ -52,10 +52,10 @@ def __init__(self, rename: Optional[dict[str, str]], **rename_kwargs): self._rename = rename def apply_func(self, sample: xr.Dataset) -> xr.Dataset: - return pyearthtools.data.transforms.attributes.rename(self._rename)(sample) + return pyearthtools.data.transforms.attributes.Rename(self._rename)(sample) def undo_func(self, sample: xr.Dataset) -> xr.Dataset: - return pyearthtools.data.transforms.attributes.rename({val: key for key, val in self._rename.items()})(sample) + return pyearthtools.data.transforms.attributes.Rename({val: key for key, val in self._rename.items()})(sample) class Encoding(Operation): @@ -88,7 +88,7 @@ def __init__( recognised_types=(xr.Dataset, xr.DataArray), ) self.record_initialisation() - self._encoding = pyearthtools.data.transforms.attributes.set_encoding(encoding) + self._encoding = pyearthtools.data.transforms.attributes.SetEncoding(encoding) def apply_func(self, sample: T) -> T: return self._encoding(sample) @@ -124,13 +124,13 @@ def __init__(self, reference: Optional[str] = None, limit: Optional[list[str]] = self._encoding = ( None if reference is None - else pyearthtools.data.transforms.attributes.set_encoding(reference=xr.open_dataset(reference), limit=limit) + else pyearthtools.data.transforms.attributes.SetEncoding(reference=xr.open_dataset(reference), limit=limit) ) self._limit = limit def apply_func(self, sample: T) -> T: if not self._encoding: - self._encoding = pyearthtools.data.transforms.attributes.set_encoding(reference=sample, limit=self._limit) + self._encoding = pyearthtools.data.transforms.attributes.SetEncoding(reference=sample, limit=self._limit) return sample def undo_func(self, sample: T) -> T: @@ -178,7 +178,7 @@ def __init__( recognised_types=(xr.Dataset, xr.DataArray), ) self.record_initialisation() - self._attributes = pyearthtools.data.transforms.attributes.set_attributes(attrs=attributes, apply_on=apply_on) + self._attributes = pyearthtools.data.transforms.attributes.SetAttributes(attrs=attributes, apply_on=apply_on) def apply_func(self, sample: T) -> T: return self._attributes(sample) @@ -214,12 +214,12 @@ def __init__(self, reference: Optional[str] = None): self._attributes = ( None if reference is None - else pyearthtools.data.transforms.attributes.set_attributes(reference=xr.open_dataset(reference)) + else pyearthtools.data.transforms.attributes.SetAttributes(reference=xr.open_dataset(reference)) ) def apply_func(self, sample: T) -> T: if not self._attributes: - self._attributes = pyearthtools.data.transforms.attributes.set_attributes(reference=sample) + self._attributes = pyearthtools.data.transforms.attributes.SetAttributes(reference=sample) return sample def undo_func(self, sample: T) -> T: diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/normalisation.py b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/normalisation.py index 68fe514f..abc0f1e9 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/normalisation.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/normalisation.py @@ -22,7 +22,6 @@ from pyearthtools.data.utils import parse_path -from pyearthtools.utils.decorators import BackwardsCompatibility from pyearthtools.pipeline.operation import Operation @@ -234,10 +233,6 @@ def denormalise(self, sample): return sample * self.division_factor -@BackwardsCompatibility(Division) -def TemporalDifference(*a, **k): ... - - class Evaluated(xarrayNormalisation): """ `eval` based normalisation diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/reshape.py b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/reshape.py index 3fc8e572..93b53bde 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/reshape.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/reshape.py @@ -118,4 +118,4 @@ def apply_func(self, ds): return pyearthtools.data.transforms.coordinates.Flatten(self.coords, skip_missing=self._skip_missing)(ds) def undo_func(self, ds): - return pyearthtools.data.transforms.coordinates.expand(self.coords)(ds) + return pyearthtools.data.transforms.coordinates.Expand(self.coords)(ds) diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/select.py b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/select.py index eb99386e..0500f481 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/select.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/select.py @@ -52,7 +52,7 @@ def __init__( self.variables = variables def apply_func(self, sample: xr.Dataset): - return pyearthtools.data.transforms.variables.trim(self.variables)(sample) + return pyearthtools.data.transforms.variables.Trim(self.variables)(sample) class DropDataset(Operation): @@ -87,7 +87,7 @@ def __init__( self.variables = variables def apply_func(self, sample: xr.Dataset): - return pyearthtools.data.transforms.variables.drop(self.variables)(sample) + return pyearthtools.data.transforms.variables.Drop(self.variables)(sample) class SliceDataset(Operation): diff --git a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/values.py b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/values.py index b2ac63a6..2b18ca49 100644 --- a/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/values.py +++ b/packages/pipeline/src/pyearthtools/pipeline/operations/xarray/values.py @@ -210,8 +210,8 @@ def __init__( derivation = derivation or {} derivation.update(derivations) - self._derive = pyearthtools.data.transforms.derive(derivation) - self._drop = pyearthtools.data.transform.variables.drop(list(derivation.keys())) if drop else None + self._derive = pyearthtools.data.transforms.Derive(derivation) + self._drop = pyearthtools.data.transform.variables.Drop(list(derivation.keys())) if drop else None def apply_func(self, sample): return self._derive(sample) diff --git a/packages/training/src/pyearthtools/training/dataindex.py b/packages/training/src/pyearthtools/training/dataindex.py index e0d1364a..89dfd91e 100644 --- a/packages/training/src/pyearthtools/training/dataindex.py +++ b/packages/training/src/pyearthtools/training/dataindex.py @@ -33,7 +33,7 @@ import pyearthtools.training.wrapper -ATTRIBUTE_MARK = pyearthtools.data.transforms.attributes.set_attributes( +ATTRIBUTE_MARK = pyearthtools.data.transforms.attributes.SetAttributes( purpose="Research Use Only.", contact="For further information or support, contact the Data Science and Emerging Technologies Team.", crpyearthtools="Generated with `pyearthtools`, a research endeavour under the DSET team, and Project 3.1.", @@ -170,7 +170,7 @@ def _generate( # Apply attribute marks to the prediction data if self.data_attributes is not None: attrs = yaml.safe_load(open(str(self.data_attributes), "r")) - predictions = pyearthtools.data.transforms.attributes.set_attributes(attrs, apply_on="dataset")(predictions) + predictions = pyearthtools.data.transforms.attributes.SetAttributes(attrs, apply_on="dataset")(predictions) return predictions diff --git a/packages/training/src/pyearthtools/training/wrapper/predict/__init__.py b/packages/training/src/pyearthtools/training/wrapper/predict/__init__.py index 313332a0..664aa12e 100644 --- a/packages/training/src/pyearthtools/training/wrapper/predict/__init__.py +++ b/packages/training/src/pyearthtools/training/wrapper/predict/__init__.py @@ -19,8 +19,6 @@ Prediction Wrappers """ -from pyearthtools.utils.decorators import BackwardsCompatibility - from pyearthtools.training.wrapper.predict.predict import Predictor from pyearthtools.training.wrapper.predict.timeseries import ( TimeSeriesPredictor, @@ -28,19 +26,3 @@ TimeSeriesManagedPredictor, ManualTimeSeriesPredictor, ) - - -@BackwardsCompatibility(TimeSeriesPredictor) -def TimeSeriesPredictionWrapper(): ... - - -@BackwardsCompatibility(TimeSeriesAutoRecurrentPredictor) -def TimeSeriesAutoRecurrent(): ... - - -@BackwardsCompatibility(TimeSeriesManagedPredictor) -def TimeSeriesManagedRecurrent(): ... - - -@BackwardsCompatibility(ManualTimeSeriesPredictor) -def ManualTimeSeriesPredictionWrapper(): ... diff --git a/packages/zoo/src/pyearthtools/zoo/model.py b/packages/zoo/src/pyearthtools/zoo/model.py index 588e79e8..67e7304f 100644 --- a/packages/zoo/src/pyearthtools/zoo/model.py +++ b/packages/zoo/src/pyearthtools/zoo/model.py @@ -794,7 +794,7 @@ def _get_index(self, cache: os.PathLike | None, **kwargs) -> "pyearthtools.train full_index_kwargs["pattern_kwargs"] = pattern_kwargs post_transforms = ( - pyearthtools.data.transforms.attributes.set_attributes( + pyearthtools.data.transforms.attributes.SetAttributes( pyearthtools_models=f"{self.get_name()}: {VERSION}", apply_on="both", ) diff --git a/packages/zoo/src/pyearthtools/zoo/predict.py b/packages/zoo/src/pyearthtools/zoo/predict.py index 2083f65d..50326ba7 100644 --- a/packages/zoo/src/pyearthtools/zoo/predict.py +++ b/packages/zoo/src/pyearthtools/zoo/predict.py @@ -215,7 +215,7 @@ def predict( # pylint: disable=R0913 data_cache_str = " " if data_cache is None else f" --data_cache {data_cache}" # Add a transform to add the command line to the history attributes - post_transforms = pyearthtools.data.transforms.attributes.set_attributes( + post_transforms = pyearthtools.data.transforms.attributes.SetAttributes( history=f"pet predict {model!r} --pipeline_name {pipeline_name!r} --output {output!s}" f"{f' --config_path {config_path}' if config_path else ''} " f"--time {time}{data_cache_str} {extra_kwargs_str}".replace(" ", " ")