clean date shift action

ecml_tools/create/input.py

@@ -466,25 +466,22 @@ def __repr__(self):
         return super().__repr__(content)
 
 
-class _DatesShiftAction(Action):
-    def __init__(self, context, action_path, _delta, **kwargs):
+class DateShiftAction(Action):
+    def __init__(self, context, action_path, delta, **kwargs):
         super().__init__(context, action_path, **kwargs)
 
-        if isinstance(_delta, str):
-            if _delta[0] == "-":
-                _delta, sign = int(_delta[1:]), -1
+        if isinstance(delta, str):
+            if delta[0] == "-":
+                delta, sign = int(delta[1:]), -1
             else:
-                _delta, sign = int(_delta), 1
-            _delta = datetime.timedelta(hours=sign * _delta)
-        assert isinstance(_delta, int), _delta
-        _delta = datetime.timedelta(hours=_delta)
-        self.delta = _delta
+                delta, sign = int(delta), 1
+            delta = datetime.timedelta(hours=sign * delta)
+        assert isinstance(delta, int), delta
+        delta = datetime.timedelta(hours=delta)
+        self.delta = delta
 
         self.content = action_factory(kwargs, context, self.action_path + ["shift"])
 
-    def is_shift_action(cls, name):
-        return "-" in name or "+" in name
-
     @trace_select
     def select(self, dates):
         shifted_dates = [d + self.delta for d in dates]
@@ -773,23 +770,16 @@ def action_factory(config, context, action_path):
     if isinstance(config[key], dict):
         args, kwargs = [], config[key]
 
-    if "-" in key or "+" in key:
-        new_key, delta = parse_function_name(key)
-        new_config = dict(_dates_shift={"_delta": delta, new_key: config[key]})
-        return action_factory(new_config, context, action_path)
-
-    else:
-        cls = dict(
-            _dates_shift=_DatesShiftAction,
-            concat=ConcatAction,
-            join=JoinAction,
-            # label=LabelAction,
-            pipe=PipeAction,
-            # source=SourceAction,
-            function=FunctionAction,
-            dates=DateAction,
-            # dependency=DependencyAction,
-        ).get(key)
+    cls = dict(
+        date_shift=DateShiftAction,
+        # date_filter=DateFilterAction,
+        # include=IncludeAction,
+        concat=ConcatAction,
+        join=JoinAction,
+        pipe=PipeAction,
+        function=FunctionAction,
+        dates=DateAction,
+    ).get(key)
 
     if cls is None:
         if not is_function(key, "actions"):

tests/create-shift.yaml

@@ -30,19 +30,8 @@ input:
         param:
           - insolation
 
-
-    - constants-3h:
-        template: ${input.join.0.mars}
-        param:
-          - insolation
-    - constants+6h:
-        template: ${input.join.0.mars}
-        param:
-          - insolation
-
-    - _dates_shift: # private, do not use directly
-        #_delta: 6
-        _delta: -25
+    - date_shift:
+        delta: -25
         constants:
           template: ${input.join.0.mars}
           param: