fix: rebase settings refactor

AntaresSimulatorTeam · Feb 7, 2025 · 74232bc · 74232bc
1 parent 431bc27
commit 74232bc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/src/antares/craft/model/study.py b/src/antares/craft/model/study.py
@@ -41,7 +41,7 @@
 from antares.craft.model.settings.study_settings import StudySettings
 from antares.craft.model.simulation import AntaresSimulationParameters, Job
 from antares.craft.service.api_services.services.settings import read_study_settings_api
-from antares.craft.service.base_services import BaseStudyService
+from antares.craft.service.base_services import BaseStudyService, BaseLinkService
 from antares.craft.service.local_services.services.settings import edit_study_settings, read_study_settings_local
 from antares.craft.service.service_factory import ServiceFactory
 from antares.craft.tools.ini_tool import IniFile, InitializationFilesTypes

diff --git a/src/antares/craft/service/api_services/renewable_api.py b/src/antares/craft/service/api_services/renewable_api.py
@@ -104,7 +104,7 @@ def read_renewables(
             renewable_name = renewable.pop("name")
 
             renewable_props = RenewableClusterProperties(**renewable)
-            renewable_cluster = RenewableCluster(self.config, renewable_id, renewable_name, renewable_props)
+            renewable_cluster = RenewableCluster(self, renewable_id, renewable_name, renewable_props)
             renewables.append(renewable_cluster)
 
         renewables.sort(key=lambda renewable: renewable.id)

diff --git a/src/antares/craft/service/api_services/thermal_api.py b/src/antares/craft/service/api_services/thermal_api.py
@@ -106,7 +106,4 @@ def read_thermal_clusters(
 
         thermals.sort(key=lambda thermal: thermal.id)
 
-        return thermals
-
-    def _extract_thermal_properties(self, thermal_data: dict[str, Any]) -> ThermalClusterProperties:
-        pass
+        return thermals
diff --git a/src/antares/craft/service/base_services.py b/src/antares/craft/service/base_services.py
@@ -463,11 +463,6 @@ def get_thermal_matrix(self, thermal_cluster: ThermalCluster, ts_name: ThermalCl
     def read_thermal_clusters(self, area_id: str) -> List[ThermalCluster]:
         pass
 
-    @abstractmethod
-    def _extract_thermal_properties(self, thermal_data: dict[str, Any]) -> ThermalClusterProperties:
-        pass
-
-
 class BaseBindingConstraintService(ABC):
     binding_constraints: dict[str, BindingConstraint]
 

diff --git a/src/antares/craft/service/local_services/area_local.py b/src/antares/craft/service/local_services/area_local.py
@@ -203,7 +203,7 @@ def create_hydro(
 
         IniFile.create_hydro_initialization_files_for_area(self.config.study_path, area_id)
 
-        return Hydro(self, area_id, local_hydro_properties.yield_hydro_properties())
+        return Hydro(self.hydro_service, area_id, local_hydro_properties.yield_hydro_properties())
 
     def read_hydro(
         self,