all UTs ok

AntaresSimulatorTeam · Mar 6, 2025 · 0100fcd · 0100fcd
1 parent 3e17730
commit 0100fcd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/antares/craft/service/local_services/models/binding_constraint.py b/src/antares/craft/service/local_services/models/binding_constraint.py
@@ -19,7 +19,7 @@
     BindingConstraintProperties,
     BindingConstraintPropertiesUpdate,
 )
-from antares.craft.model.commons import filtering_option, FilterOption
+from antares.craft.model.commons import FilterOption, filtering_option
 from antares.craft.service.local_services.models.base_model import LocalBaseModel
 from pydantic import Field
 

diff --git a/tests/antares/services/local_services/conftest.py b/tests/antares/services/local_services/conftest.py
@@ -23,6 +23,7 @@
     ConstraintTerm,
     LinkData,
 )
+from antares.craft.model.commons import FILTER_VALUES
 from antares.craft.model.hydro import HydroProperties, HydroPropertiesUpdate
 from antares.craft.model.renewable import RenewableClusterGroup, RenewableClusterProperties, TimeSeriesInterpretation
 from antares.craft.model.st_storage import STStorageGroup, STStorageProperties
@@ -281,7 +282,7 @@ def default_constraint_properties() -> BindingConstraintProperties:
         time_step=BindingConstraintFrequency.HOURLY,
         operator=BindingConstraintOperator.LESS,
         comments="",
-        filter_year_by_year="hourly",
-        filter_synthesis="hourly",
+        filter_year_by_year=FILTER_VALUES,
+        filter_synthesis=FILTER_VALUES,
         group="default",
     )
diff --git a/tests/antares/services/local_services/test_study.py b/tests/antares/services/local_services/test_study.py
@@ -1199,8 +1199,8 @@ def test_constraints_ini_have_correct_default_content(
 type = hourly
 operator = less
 comments = 
-filter-year-by-year = hourly
-filter-synthesis = hourly
+filter-year-by-year = annual, daily, hourly, monthly, weekly
+filter-synthesis = annual, daily, hourly, monthly, weekly
 group = default
 
 """
@@ -1224,7 +1224,7 @@ def test_constraints_and_ini_have_custom_properties(self, local_study_with_const
             time_step=BindingConstraintFrequency.WEEKLY,
             operator=BindingConstraintOperator.BOTH,
             comments="test comment",
-            filter_year_by_year="yearly",
+            filter_year_by_year="annual",
             filter_synthesis="monthly",
             group="test group",
         )
@@ -1235,8 +1235,8 @@ def test_constraints_and_ini_have_custom_properties(self, local_study_with_const
 type = hourly
 operator = less
 comments = 
-filter-year-by-year = hourly
-filter-synthesis = hourly
+filter-year-by-year = annual, daily, hourly, monthly, weekly
+filter-synthesis = annual, daily, hourly, monthly, weekly
 group = default
 
 [1]
@@ -1246,7 +1246,7 @@ def test_constraints_and_ini_have_custom_properties(self, local_study_with_const
 type = weekly
 operator = both
 comments = test comment
-filter-year-by-year = yearly
+filter-year-by-year = annual
 filter-synthesis = monthly
 group = test group
 
@@ -1280,8 +1280,8 @@ def test_constraint_term_and_ini_have_correct_defaults(self, local_study_with_co
 type = hourly
 operator = less
 comments = 
-filter-year-by-year = hourly
-filter-synthesis = hourly
+filter-year-by-year = annual, daily, hourly, monthly, weekly
+filter-synthesis = annual, daily, hourly, monthly, weekly
 group = default
 at%fr = 1
 
@@ -1305,8 +1305,8 @@ def test_constraint_term_with_offset_and_ini_have_correct_values(
 type = hourly
 operator = less
 comments = 
-filter-year-by-year = hourly
-filter-synthesis = hourly
+filter-year-by-year = annual, daily, hourly, monthly, weekly
+filter-synthesis = annual, daily, hourly, monthly, weekly
 group = default
 at%fr = 1%1