From f87348c60343416e3c11a3a65c2582a715b172b9 Mon Sep 17 00:00:00 2001 From: salemsd Date: Wed, 11 Dec 2024 13:21:03 +0100 Subject: [PATCH] refactor(local): reformat --- .../local_services/binding_constraint_local.py | 17 ++++++----------- .../services/local_services/test_study.py | 3 +-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/antares/service/local_services/binding_constraint_local.py b/src/antares/service/local_services/binding_constraint_local.py index e5fe5635..fc71dc7e 100644 --- a/src/antares/service/local_services/binding_constraint_local.py +++ b/src/antares/service/local_services/binding_constraint_local.py @@ -13,10 +13,11 @@ import numpy as np import pandas as pd -from pydantic import ValidationError, Field + +from pydantic import Field from antares.config.local_configuration import LocalConfiguration -from antares.exceptions.exceptions import BindingConstraintCreationError, ConstraintTermAdditionError +from antares.exceptions.exceptions import BindingConstraintCreationError from antares.model.binding_constraint import ( BindingConstraint, BindingConstraintFrequency, @@ -116,13 +117,11 @@ def _create_local_property_args(constraint: BindingConstraint) -> dict[str, Unio "constraint_name": constraint.name, "constraint_id": constraint.id, "terms": constraint.get_terms(), - **constraint.properties.model_dump(mode="json", exclude_none=True) + **constraint.properties.model_dump(mode="json", exclude_none=True), } def _generate_local_properties(self, constraint: BindingConstraint) -> BindingConstraintPropertiesLocal: - return BindingConstraintPropertiesLocal.model_validate( - self._create_local_property_args(constraint) - ) + return BindingConstraintPropertiesLocal.model_validate(self._create_local_property_args(constraint)) def _store_time_series( self, @@ -188,11 +187,7 @@ def _write_binding_constraint_ini( # Persist the updated INI content self.ini_file.write_ini_file() else: - terms_dict = {term.id: term for term in terms} if terms else {} - - full_properties = BindingConstraintPropertiesLocal( - **local_properties.model_dump() - ) + full_properties = BindingConstraintPropertiesLocal(**local_properties.model_dump()) section_index = len(current_ini_content) current_ini_content[str(section_index)] = full_properties.list_ini_fields diff --git a/tests/antares/services/local_services/test_study.py b/tests/antares/services/local_services/test_study.py index d63e64d0..39a9cc88 100644 --- a/tests/antares/services/local_services/test_study.py +++ b/tests/antares/services/local_services/test_study.py @@ -83,7 +83,6 @@ from antares.model.settings.thematic_trimming import DefaultThematicTrimmingParameters, ThematicTrimmingParametersLocal from antares.model.study import create_study_local from antares.service.local_services.area_local import AreaLocalService -from antares.service.local_services.binding_constraint_local import BindingConstraintPropertiesLocal from antares.service.local_services.link_local import LinkLocalService from antares.service.local_services.renewable_local import RenewableLocalService from antares.service.local_services.st_storage_local import ShortTermStorageLocalService @@ -2285,4 +2284,4 @@ def test_submitted_time_series_is_saved(self, local_study): actual_time_series = pd.read_csv(actual_file_path, sep="\t", header=None, dtype=float) # Then - assert actual_time_series.equals(expected_time_series) \ No newline at end of file + assert actual_time_series.equals(expected_time_series)