anemoi-datasets 0.5.26__py3-none-any.whl → 0.5.28__py3-none-any.whl

anemoi/datasets/create/input/data_sources.py

@@ -10,9 +10,6 @@
 import logging
 from functools import cached_property
 from typing import Any
-from typing import Dict
-from typing import List
-from typing import Union
 
 from earthkit.data import FieldList
 
@@ -20,7 +17,7 @@ from ...dates.groups import GroupOfDates
 from .action import Action
 from .action import action_factory
 from .misc import _tidy
-from .result import Result
+from .result.field import Result
 
 LOG = logging.getLogger(__name__)
 
@@ -31,9 +28,9 @@ class DataSourcesAction(Action):
     def __init__(
         self,
         context: object,
-        action_path: List[str],
-        sources: Union[Dict[str, Any], List[Dict[str, Any]]],
-        input: Dict[str, Any],
+        action_path: list[str],
+        sources: dict[str, Any] | list[dict[str, Any]],
+        input: dict[str, Any],
     ) -> None:
         """Initializes a DataSourcesAction instance.
 
@@ -58,6 +55,7 @@ class DataSourcesAction(Action):
 
         self.sources = [action_factory(config, context, ["data_sources"] + [a_path]) for a_path, config in configs]
         self.input = action_factory(input, context, ["input"])
+        self.names = [a_path for a_path, config in configs]
 
     def select(self, group_of_dates: GroupOfDates) -> "DataSourcesResult":
         """Selects the data sources result for the given group of dates.
@@ -93,10 +91,10 @@ class DataSourcesResult(Result):
     def __init__(
         self,
         context: object,
-        action_path: List[str],
+        action_path: list[str],
         dates: object,
         input_result: Result,
-        sources_results: List[Result],
+        sources_results: list[Result],
     ) -> None:
         """Initializes a DataSourcesResult instance.
 

anemoi/datasets/create/input/misc.py

@@ -8,11 +8,6 @@
 # nor does it submit to any jurisdiction.
 
 import logging
-from functools import wraps
-from typing import Any
-from typing import Callable
-from typing import Tuple
-from typing import Union
 
 from earthkit.data import FieldList
 from earthkit.data.core.fieldlist import MultiFieldList
@@ -20,75 +15,7 @@ from earthkit.data.core.fieldlist import MultiFieldList
 LOG = logging.getLogger(__name__)
 
 
-def parse_function_name(name: str) -> Tuple[str, Union[int, None]]:
-    """Parses a function name to extract the base name and an optional time delta.
-
-    Parameters
-    ----------
-    name : str
-        The function name to parse.
-
-    Returns
-    -------
-    tuple of (str, int or None)
-        The base name and an optional time delta.
-    """
-    if name.endswith("h") and name[:-1].isdigit():
-
-        if "-" in name:
-            name, delta = name.split("-")
-            sign = -1
-
-        elif "+" in name:
-            name, delta = name.split("+")
-            sign = 1
-
-        else:
-            return name, None
-
-        assert delta[-1] == "h", (name, delta)
-        delta = sign * int(delta[:-1])
-        return name, delta
-
-    return name, None
-
-
-def assert_fieldlist(method: Callable[..., Any]) -> Callable[..., Any]:
-    """Decorator to assert that the result of a method is an instance of FieldList.
-
-    Parameters
-    ----------
-    method : Callable[..., Any]
-        The method to decorate.
-
-    Returns
-    -------
-    Callable[..., Any]
-        The decorated method.
-    """
-
-    @wraps(method)
-    def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
-
-        result = method(self, *args, **kwargs)
-        assert isinstance(result, FieldList), type(result)
-        return result
-
-    return wrapper
-
-
-def assert_is_fieldlist(obj: object) -> None:
-    """Asserts that the given object is an instance of FieldList.
-
-    Parameters
-    ----------
-    obj : object
-        The object to check.
-    """
-    assert isinstance(obj, FieldList), type(obj)
-
-
-def _flatten(ds: Union[MultiFieldList, FieldList]) -> list:
+def _flatten(ds: MultiFieldList | FieldList) -> list:
     """Flattens a MultiFieldList or FieldList into a list of FieldList objects.
 
     Parameters
@@ -106,7 +33,7 @@ def _flatten(ds: Union[MultiFieldList, FieldList]) -> list:
     return [ds]
 
 
-def _tidy(ds: Union[MultiFieldList, FieldList], indent: int = 0) -> Union[MultiFieldList, FieldList]:
+def _tidy(ds: MultiFieldList | FieldList, indent: int = 0) -> MultiFieldList | FieldList:
     """Tidies up a MultiFieldList or FieldList by removing empty sources.
 
     Parameters

anemoi/datasets/create/input/repeated_dates.py

@@ -10,26 +10,13 @@
 
 import logging
 from collections import defaultdict
+from collections.abc import Generator
 from typing import Any
-from typing import Dict
-from typing import Generator
-from typing import List
-from typing import Optional
-from typing import Set
-from typing import Tuple
 
 import numpy as np
-from anemoi.transform.fields import new_field_with_valid_datetime
-from anemoi.transform.fields import new_fieldlist_from_list
 from anemoi.utils.dates import as_datetime
 from anemoi.utils.dates import frequency_to_timedelta
 
-from .action import Action
-from .action import action_factory
-from .join import JoinResult
-from .result import Result
-from .trace import trace_select
-
 LOG = logging.getLogger(__name__)
 
 
@@ -37,7 +24,7 @@ class DateMapper:
     """A factory class to create DateMapper instances based on the given mode."""
 
     @staticmethod
-    def from_mode(mode: str, source: Any, config: Dict[str, Any]) -> "DateMapper":
+    def from_mode(mode: str, source: Any, config: dict[str, Any]) -> "DateMapper":
         """Create a DateMapper instance based on the given mode.
 
         Parameters
@@ -87,10 +74,10 @@ class DateMapperClosest(DateMapper):
         self.maximum: Any = frequency_to_timedelta(maximum)
         self.frequency: Any = frequency_to_timedelta(frequency)
         self.skip_all_nans: bool = skip_all_nans
-        self.tried: Set[Any] = set()
-        self.found: Set[Any] = set()
+        self.tried: set[Any] = set()
+        self.found: set[Any] = set()
 
-    def transform(self, group_of_dates: Any) -> Generator[Tuple[Any, Any], None, None]:
+    def transform(self, group_of_dates: Any) -> Generator[tuple[Any, Any], None, None]:
         """Transform the group of dates to the closest available dates.
 
         Parameters
@@ -185,7 +172,7 @@ class DateMapperClosest(DateMapper):
 class DateMapperClimatology(DateMapper):
     """A DateMapper implementation that maps dates to specified climatology dates."""
 
-    def __init__(self, source: Any, year: int, day: int, hour: Optional[int] = None) -> None:
+    def __init__(self, source: Any, year: int, day: int, hour: int | None = None) -> None:
         """Initialize DateMapperClimatology.
 
         Parameters
@@ -201,9 +188,9 @@ class DateMapperClimatology(DateMapper):
         """
         self.year: int = year
         self.day: int = day
-        self.hour: Optional[int] = hour
+        self.hour: int | None = hour
 
-    def transform(self, group_of_dates: Any) -> Generator[Tuple[Any, Any], None, None]:
+    def transform(self, group_of_dates: Any) -> Generator[tuple[Any, Any], None, None]:
         """Transform the group of dates to the specified climatology dates.
 
         Parameters
@@ -239,7 +226,7 @@ class DateMapperClimatology(DateMapper):
 class DateMapperConstant(DateMapper):
     """A DateMapper implementation that maps dates to a constant date."""
 
-    def __init__(self, source: Any, date: Optional[Any] = None) -> None:
+    def __init__(self, source: Any, date: Any | None = None) -> None:
         """Initialize DateMapperConstant.
 
         Parameters
@@ -250,9 +237,9 @@ class DateMapperConstant(DateMapper):
             The constant date to map to.
         """
         self.source: Any = source
-        self.date: Optional[Any] = date
+        self.date: Any | None = date
 
-    def transform(self, group_of_dates: Any) -> Tuple[Any, Any]:
+    def transform(self, group_of_dates: Any) -> tuple[Any, Any]:
         """Transform the group of dates to a constant date.
 
         Parameters
@@ -281,109 +268,3 @@ class DateMapperConstant(DateMapper):
                 group_of_dates,
             )
         ]
-
-
-class DateMapperResult(Result):
-    """A Result implementation that updates the valid datetime of the datasource."""
-
-    def __init__(
-        self,
-        context: Any,
-        action_path: List[str],
-        group_of_dates: Any,
-        source_result: Any,
-        mapper: DateMapper,
-        original_group_of_dates: Any,
-    ) -> None:
-        """Initialize DateMapperResult.
-
-        Parameters
-        ----------
-        context : Any
-            The context.
-        action_path : list of str
-            The action path.
-        group_of_dates : Any
-            The group of dates.
-        source_result : Any
-            The source result.
-        mapper : DateMapper
-            The date mapper.
-        original_group_of_dates : Any
-            The original group of dates.
-        """
-        super().__init__(context, action_path, group_of_dates)
-
-        self.source_results: Any = source_result
-        self.mapper: DateMapper = mapper
-        self.original_group_of_dates: Any = original_group_of_dates
-
-    @property
-    def datasource(self) -> Any:
-        """Get the datasource with updated valid datetime."""
-        result: list = []
-
-        for field in self.source_results.datasource:
-            for date in self.original_group_of_dates:
-                result.append(new_field_with_valid_datetime(field, date))
-
-        if not result:
-            raise ValueError("repeated_dates: no input data found")
-
-        return new_fieldlist_from_list(result)
-
-
-class RepeatedDatesAction(Action):
-    """An Action implementation that selects and transforms a group of dates."""
-
-    def __init__(self, context: Any, action_path: List[str], source: Any, mode: str, **kwargs: Any) -> None:
-        """Initialize RepeatedDatesAction.
-
-        Args:
-            context (Any): The context.
-            action_path (List[str]): The action path.
-            source (Any): The data source.
-            mode (str): The mode for date mapping.
-            **kwargs (Any): Additional arguments.
-        """
-        super().__init__(context, action_path, source, mode, **kwargs)
-
-        self.source: Any = action_factory(source, context, action_path + ["source"])
-        self.mapper: DateMapper = DateMapper.from_mode(mode, self.source, kwargs)
-
-    @trace_select
-    def select(self, group_of_dates: Any) -> JoinResult:
-        """Select and transform the group of dates.
-
-        Args:
-            group_of_dates (Any): The group of dates to select.
-
-        Returns
-        -------
-        JoinResult
-            The result of the join operation.
-        """
-        results: list = []
-        for one_date_group, many_dates_group in self.mapper.transform(group_of_dates):
-            results.append(
-                DateMapperResult(
-                    self.context,
-                    self.action_path,
-                    one_date_group,
-                    self.source.select(one_date_group),
-                    self.mapper,
-                    many_dates_group,
-                )
-            )
-
-        return JoinResult(self.context, self.action_path, group_of_dates, results)
-
-    def __repr__(self) -> str:
-        """Get the string representation of the action.
-
-        Returns
-        -------
-        str
-            The string representation.
-        """
-        return f"MultiDateMatchAction({self.source}, {self.mapper})"

anemoi/datasets/{utils → create/input/result}/__init__.py

@@ -1,4 +1,4 @@
-# (C) Copyright 2024 Anemoi contributors.
+# (C) Copyright 2025 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.
@@ -6,3 +6,12 @@
 # In applying this licence, ECMWF does not waive the privileges and immunities
 # granted to it by virtue of its status as an intergovernmental organisation
 # nor does it submit to any jurisdiction.
+
+import logging
+from abc import ABC
+
+LOG = logging.getLogger(__name__)
+
+
+class Result(ABC):
+    pass