refactor: reorganise filter registries

src/anemoi/transform/filters/fields/accum_to_interval.py

@@ -10,7 +10,7 @@
 from anemoi.transform.fields import new_field_from_numpy
 from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 @filter_registry.register("accum_to_interval")

src/anemoi/transform/filters/fields/apply_mask.py

@@ -13,7 +13,7 @@
 import numpy as np
 
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 LOG = logging.getLogger(__name__)
 

src/anemoi/transform/filters/fields/clear_step.py

@@ -17,7 +17,7 @@
 from anemoi.transform.fields import new_field_with_valid_datetime
 from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 LOG = logging.getLogger(__name__)
 

src/anemoi/transform/filters/fields/clipper.py

@@ -12,7 +12,7 @@
 import numpy as np
 
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 @filter_registry.register("clip")

src/anemoi/transform/filters/fields/cos_sin_from_rad.py

@@ -14,7 +14,7 @@
 import earthkit.data as ekd
 import numpy as np
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/cos_sin_mean_wave_direction.py

@@ -14,7 +14,7 @@
 import earthkit.data as ekd
 import numpy as np
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/dewpoint.py

@@ -13,7 +13,7 @@
 import earthkit.data as ekd
 from earthkit.meteo import thermo
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 from .matching import MatchingFieldsFilter
 from .matching import matching

src/anemoi/transform/filters/fields/empty.py

@@ -12,7 +12,7 @@
 
 from anemoi.transform.fields import new_empty_fieldlist
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 @filter_registry.register("empty")

src/anemoi/transform/filters/fields/glacier_mask.py

@@ -12,7 +12,7 @@
 import numpy as np
 
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 def mask_glaciers(snow_depth: np.ndarray, glacier_mask: np.ndarray) -> np.ndarray:

src/anemoi/transform/filters/fields/icon_refinement_level.py

@@ -17,7 +17,7 @@
 from anemoi.transform.fields import new_field_from_numpy
 from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.grids.icon import icon_grid
 
 LOG = logging.getLogger(__name__)

src/anemoi/transform/filters/fields/lambda_filters.py

@@ -13,7 +13,7 @@
 from earthkit.data.core.fieldlist import Field
 
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 @filter_registry.register("earthkitfieldlambda")

src/anemoi/transform/filters/fields/land_parameters.py

@@ -13,7 +13,7 @@
 import earthkit.data as ekd
 import numpy as np
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/lnsp_to_sp.py

@@ -13,7 +13,7 @@
 import numpy as np
 
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 class LnspToSp(SingleFieldFilter):

src/anemoi/transform/filters/fields/noop.py

@@ -11,7 +11,7 @@
 import earthkit.data as ekd
 
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 @filter_registry.register("noop")

src/anemoi/transform/filters/fields/oras6_clipping.py

@@ -12,7 +12,7 @@
 import earthkit.data as ekd
 import numpy as np
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/orog_to_z.py

@@ -13,7 +13,7 @@
 
 from anemoi.transform.constants import g_gravitational_acceleration
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 class Orography(SingleFieldFilter):

src/anemoi/transform/filters/fields/q_height.py

@@ -16,7 +16,7 @@
 from numpy.typing import NDArray
 
 from anemoi.transform.constants import model_level_AB as predefined_AB
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 from .matching import MatchingFieldsFilter
 from .matching import matching

src/anemoi/transform/filters/fields/q_to_r.py

@@ -13,7 +13,7 @@
 import earthkit.data as ekd
 import earthkit.meteo.thermo.array as thermo
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 from .matching import MatchingFieldsFilter
 from .matching import matching

src/anemoi/transform/filters/fields/regrid.py

@@ -21,7 +21,7 @@
 from anemoi.transform.fields import new_field_from_numpy
 from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 LOG = logging.getLogger(__name__)
 

src/anemoi/transform/filters/fields/remove_nans.py

@@ -17,7 +17,7 @@
 from anemoi.transform.fields import new_field_from_numpy
 from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 LOG = logging.getLogger(__name__)
 

src/anemoi/transform/filters/fields/rename.py

@@ -13,7 +13,7 @@
 
 from anemoi.transform.fields import new_field_with_metadata
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 class FormatRename:

src/anemoi/transform/filters/fields/repeat_members.py

@@ -16,7 +16,7 @@
 from anemoi.transform.fields import new_field_from_numpy
 from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 LOG = logging.getLogger(__name__)
 

src/anemoi/transform/filters/fields/rescale.py

@@ -13,7 +13,7 @@
 import earthkit.data as ekd
 
 from anemoi.transform.filter import SingleFieldFilter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 class Rescaler:

src/anemoi/transform/filters/fields/rodeo_opera_clipping.py

@@ -11,7 +11,7 @@
 
 import earthkit.data as ekd
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/rodeo_opera_preprocessing.py

@@ -12,7 +12,7 @@
 import earthkit.data as ekd
 import numpy as np
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/rotate_winds.py

@@ -13,7 +13,7 @@
 from earthkit.geo.rotate import rotate_vector
 from pyproj import CRS
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/snow_cover.py

@@ -1,4 +1,4 @@
-# (C) Copyright 2024 Anemoi contributors.
+# (C) Copyright 2024- Anemoi contributors.
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
@@ -12,7 +12,7 @@
 import earthkit.data as ekd
 import numpy as np
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/sum.py

@@ -16,7 +16,7 @@
 from anemoi.transform.fields import new_field_from_numpy
 from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.transform.filter import Filter
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 
 @filter_registry.register("sum")

src/anemoi/transform/filters/fields/timeseries.py

@@ -14,7 +14,7 @@
 import earthkit.data as ekd
 import numpy as np
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/uv_to_ddff.py

@@ -14,7 +14,7 @@
 from earthkit.meteo.wind.array import polar_to_xy
 from earthkit.meteo.wind.array import xy_to_polar
 
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 from anemoi.transform.filters.fields.matching import MatchingFieldsFilter
 from anemoi.transform.filters.fields.matching import matching
 

src/anemoi/transform/filters/fields/w_to_wz.py

@@ -14,7 +14,7 @@
 import earthkit.data as ekd
 
 from anemoi.transform.constants import g_gravitational_acceleration
-from anemoi.transform.filters import filter_registry
+from anemoi.transform.filters.fields import filter_registry
 
 from .matching import MatchingFieldsFilter
 from .matching import matching

tests/test_create.py

@@ -14,13 +14,15 @@
 
 def test_create_filters() -> None:
     """Test the creation of filters."""
-    from anemoi.transform.filters import filter_registry
+    from anemoi.transform.filters.fields import filter_registry as fields_filter_registry
+    from anemoi.transform.filters.tabular import filter_registry as tabular_filter_registry
 
-    for n in filter_registry.registered:
-        try:
-            filter_registry.create(n)
-        except Exception as e:
-            LOG.error(f"Error creating filter {n}: {e}")
+    for reg in (fields_filter_registry, tabular_filter_registry):
+        for n in reg.registered:
+            try:
+                reg.create(n)
+            except Exception as e:
+                LOG.error(f"Error creating filter {n}: {e}")
 
 
 if __name__ == "__main__":