feat[DEI-263]: add multi-year parameters to parser

Author: wschoonveld

decoimpact/business/entities/rules/time_aggregation_rule.py

@@ -58,11 +58,21 @@ def multi_year_start(self) -> Optional[int]:
         """Start year for the aggregation (inclusive)"""
         return self._multi_year_start
 
+    @multi_year_start.setter
+    def multi_year_start(self, value: Optional[int]) -> None:
+        # optional validation here
+        self._multi_year_start = value
+
     @property
     def multi_year_end(self) -> Optional[int]:
         """End year for the aggregation (inclusive)"""
         return self._multi_year_end
 
+    @multi_year_end.setter
+    def multi_year_end(self, value: Optional[int]) -> None:
+        # optional validation here
+        self._multi_year_end = value
+
     def validate(self, logger: ILogger) -> bool:
         """Validates if the rule is valid
 

decoimpact/business/workflow/model_builder.py

@@ -147,6 +147,8 @@ def _create_rule(rule_data: IRuleData) -> IRule:
             )
             rule.settings.percentile_value = rule_data.percentile_value
             rule.settings.time_scale = rule_data.time_scale
+            rule.multi_year_start = rule_data.multi_year_start
+            rule.multi_year_end = rule_data.multi_year_end
         elif isinstance(rule_data, IRollingStatisticsRuleData):
             rule = RollingStatisticsRule(
                 rule_data.name, [rule_data.input_variable], rule_data.operation
@@ -159,7 +161,7 @@ def _create_rule(rule_data: IRuleData) -> IRule:
                 rule_data.name,
                 rule_data.input_variable_names,
                 MultiArrayOperationType[rule_data.operation_type],
-                rule_data.ignore_nan
+                rule_data.ignore_nan,
             )
         elif isinstance(rule_data, IResponseCurveRuleData):
             rule = ResponseCurveRule(

decoimpact/data/entities/time_aggregation_rule_data.py

@@ -47,7 +47,17 @@ def multi_year_start(self) -> Optional[int]:
         """Start year for aggregation"""
         return self._multi_year_start
 
+    @multi_year_start.setter
+    def multi_year_start(self, value: Optional[int]) -> None:
+        # optional validation here
+        self._multi_year_start = value
+
     @property
     def multi_year_end(self) -> Optional[int]:
         """End year for aggregation"""
         return self._multi_year_end
+
+    @multi_year_end.setter
+    def multi_year_end(self, value: Optional[int]) -> None:
+        # optional validation here
+        self._multi_year_end = value

decoimpact/data/parsers/parser_time_aggregation_rule.py

@@ -42,6 +42,8 @@ def parse_dict(self, dictionary: Dict[str, Any], logger: ILogger) -> IRuleData:
         input_variable_name: str = get_dict_element("input_variable", dictionary)
         operation: str = get_dict_element("operation", dictionary)
         time_scale: str = get_dict_element("time_scale", dictionary)
+        multi_year_start: int = get_dict_element("multi_year_start", dictionary, False)
+        multi_year_end: int = get_dict_element("multi_year_end", dictionary, False)
         output_variable_name: str = get_dict_element("output_variable", dictionary)
 
         operation_value, percentile_value = parse_operation_values(operation)
@@ -50,6 +52,8 @@ def parse_dict(self, dictionary: Dict[str, Any], logger: ILogger) -> IRuleData:
 
         rule_data.percentile_value = percentile_value
         rule_data.time_scale = time_scale
+        rule_data.multi_year_start = multi_year_start
+        rule_data.multi_year_end = multi_year_end
         rule_data.output_variable = output_variable_name
         rule_data.description = description
 

template_input.yaml

@@ -29,6 +29,8 @@ rules:
       time_scale:
       input_variable:
       output_variable:
+      multi_year_start:
+      multi_year_end:
 
     - step_function_rule:
       name: