feat(version): use class StudyVersion to handle versions

antarest/launcher/adapters/abstractlauncher.py

@@ -15,6 +15,8 @@
 from pathlib import Path
 from typing import Callable, Dict, List, NamedTuple, Optional
 
+from antares.study.version import SolverVersion
+
 from antarest.core.config import Config
 from antarest.core.interfaces.cache import ICache
 from antarest.core.interfaces.eventbus import Event, EventChannelDirectory, EventType, IEventBus
@@ -71,7 +73,7 @@ def run_study(
         self,
         study_uuid: str,
         job_id: str,
-        version: str,
+        version: SolverVersion,
         launcher_parameters: LauncherParametersDTO,
         params: RequestParameters,
     ) -> None:

antarest/launcher/adapters/local_launcher/local_launcher.py

@@ -22,6 +22,8 @@
 from typing import Callable, Dict, Optional, Tuple, cast
 from uuid import UUID
 
+from antares.study.version import SolverVersion
+
 from antarest.core.config import Config
 from antarest.core.interfaces.cache import ICache
 from antarest.core.interfaces.eventbus import IEventBus
@@ -75,11 +77,11 @@ def run_study(
         self,
         study_uuid: str,
         job_id: str,
-        version: str,
+        version: SolverVersion,
         launcher_parameters: LauncherParametersDTO,
         params: RequestParameters,
     ) -> None:
-        antares_solver_path = self._select_best_binary(version)
+        antares_solver_path = self._select_best_binary(f"{version:ddd}")
 
         job = threading.Thread(
             target=LocalLauncher._compute,

antarest/launcher/adapters/slurm_launcher/slurm_launcher.py

@@ -22,6 +22,7 @@
 import typing as t
 from pathlib import Path
 
+from antares.study.version import SolverVersion
 from antareslauncher.data_repo.data_repo_tinydb import DataRepoTinydb
 from antareslauncher.main import MainParameters, run_with
 from antareslauncher.main_option_parser import MainOptionParser, ParserParameters
@@ -496,7 +497,7 @@ def _run_study(
         study_uuid: str,
         launch_uuid: str,
         launcher_params: LauncherParametersDTO,
-        version: str,
+        version: SolverVersion,
     ) -> None:
         study_path = Path(self.launcher_args.studies_in) / launch_uuid
 
@@ -512,7 +513,7 @@ def _run_study(
 
                 append_log(launch_uuid, "Checking study version...")
                 available_versions = self.slurm_config.antares_versions_on_remote_server
-                if version not in available_versions:
+                if f"{version:ddd}" not in available_versions:
                     raise VersionNotSupportedError(
                         f"Study version '{version}' is not supported. Currently supported versions are"
                         f" {', '.join(available_versions)}"
@@ -591,7 +592,7 @@ def run_study(
         self,
         study_uuid: str,
         job_id: str,
-        version: str,
+        version: SolverVersion,
         launcher_parameters: LauncherParametersDTO,
         params: RequestParameters,
     ) -> None:
@@ -644,11 +645,15 @@ def kill_job(self, job_id: str, dispatch: bool = True) -> None:
             )
 
 
-def _override_solver_version(study_path: Path, version: str) -> None:
+def _override_solver_version(study_path: Path, version: SolverVersion) -> None:
     study_info_path = study_path / "study.antares"
     study_info = IniReader().read(study_info_path)
     if "antares" in study_info:
-        study_info["antares"]["solver_version"] = version
+        if version.major < 9:  # should be written as XYZ
+            version_to_write = f"{version:ddd}"
+        else:  # should be written as X.Y
+            version_to_write = f"{version:2d}"
+        study_info["antares"]["solver_version"] = version_to_write
         IniWriter().write(study_info, study_info_path)
     else:
         logger.warning("Failed to find antares study info")

antarest/launcher/service.py

@@ -20,6 +20,7 @@
 from typing import Dict, List, Optional, cast
 from uuid import UUID, uuid4
 
+from antares.study.version import SolverVersion
 from fastapi import HTTPException
 
 from antarest.core.config import Config, Launcher, NbCoresConfig
@@ -228,7 +229,7 @@ def run_study(
         job_uuid = self._generate_new_id()
         logger.info(f"New study launch (study={study_uuid}, job_id={job_uuid})")
         study_info = self.study_service.get_study_information(uuid=study_uuid, params=params)
-        solver_version = study_version or study_info.version
+        solver_version = SolverVersion.parse(study_version or study_info.version)
 
         self._assert_launcher_is_initialized(launcher)
         assert_permission(
@@ -252,7 +253,7 @@ def run_study(
         self.launchers[launcher].run_study(
             study_uuid,
             job_uuid,
-            str(solver_version),
+            solver_version,
             launcher_parameters,
             params,
         )

antarest/study/business/adequacy_patch_management.py

@@ -17,7 +17,7 @@
 from antarest.study.business.all_optional_meta import all_optional_model
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.business.utils import GENERAL_DATA_PATH, FieldInfo, FormFieldsBaseModel, execute_or_add_commands
-from antarest.study.model import Study
+from antarest.study.model import STUDY_VERSION_8_3, STUDY_VERSION_8_5, Study
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.model.command.update_config import UpdateConfig
 
@@ -52,47 +52,47 @@ class AdequacyPatchFormFields(FormFieldsBaseModel):
     "enable_adequacy_patch": {
         "path": f"{ADEQUACY_PATCH_PATH}/include-adq-patch",
         "default_value": False,
-        "start_version": 830,
+        "start_version": STUDY_VERSION_8_3,
     },
     "ntc_from_physical_areas_out_to_physical_areas_in_adequacy_patch": {
         "path": f"{ADEQUACY_PATCH_PATH}/set-to-null-ntc-from-physical-out-to-physical-in-for-first-step",
         "default_value": True,
-        "start_version": 830,
+        "start_version": STUDY_VERSION_8_3,
     },
     "ntc_between_physical_areas_out_adequacy_patch": {
         "path": f"{ADEQUACY_PATCH_PATH}/set-to-null-ntc-between-physical-out-for-first-step",
         "default_value": True,
-        "start_version": 830,
+        "start_version": STUDY_VERSION_8_3,
     },
     "price_taking_order": {
         "path": f"{ADEQUACY_PATCH_PATH}/price-taking-order",
         "default_value": PriceTakingOrder.DENS.value,
-        "start_version": 850,
+        "start_version": STUDY_VERSION_8_5,
     },
     "include_hurdle_cost_csr": {
         "path": f"{ADEQUACY_PATCH_PATH}/include-hurdle-cost-csr",
         "default_value": False,
-        "start_version": 850,
+        "start_version": STUDY_VERSION_8_5,
     },
     "check_csr_cost_function": {
         "path": f"{ADEQUACY_PATCH_PATH}/check-csr-cost-function",
         "default_value": False,
-        "start_version": 850,
+        "start_version": STUDY_VERSION_8_5,
     },
     "threshold_initiate_curtailment_sharing_rule": {
         "path": f"{ADEQUACY_PATCH_PATH}/threshold-initiate-curtailment-sharing-rule",
         "default_value": 0.0,
-        "start_version": 850,
+        "start_version": STUDY_VERSION_8_5,
     },
     "threshold_display_local_matching_rule_violations": {
         "path": f"{ADEQUACY_PATCH_PATH}/threshold-display-local-matching-rule-violations",
         "default_value": 0.0,
-        "start_version": 850,
+        "start_version": STUDY_VERSION_8_5,
     },
     "threshold_csr_variable_bounds_relaxation": {
         "path": f"{ADEQUACY_PATCH_PATH}/threshold-csr-variable-bounds-relaxation",
         "default_value": 3,
-        "start_version": 850,
+        "start_version": STUDY_VERSION_8_5,
     },
 }
 
@@ -113,7 +113,7 @@ def get_value(field_info: FieldInfo) -> Any:
             path = field_info["path"]
             start_version = field_info.get("start_version", -1)
             target_name = path.split("/")[-1]
-            is_in_version = file_study.config.version >= start_version  # type: ignore
+            is_in_version = file_study.config.version >= start_version
 
             return parent.get(target_name, field_info["default_value"]) if is_in_version else None
 

antarest/study/business/advanced_parameters_management.py

@@ -12,14 +12,15 @@
 
 from typing import Any, Dict, List
 
+from antares.study.version import StudyVersion
 from pydantic import field_validator
 from pydantic.types import StrictInt, StrictStr
 
 from antarest.core.exceptions import InvalidFieldForVersionError
 from antarest.study.business.all_optional_meta import all_optional_model
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.business.utils import GENERAL_DATA_PATH, FieldInfo, FormFieldsBaseModel, execute_or_add_commands
-from antarest.study.model import Study
+from antarest.study.model import STUDY_VERSION_8_8, Study
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.model.command.update_config import UpdateConfig
 
@@ -255,7 +256,7 @@ def set_field_values(self, study: Study, field_values: AdvancedParamsFormFields)
                 if (
                     field_name == "unit_commitment_mode"
                     and value == UnitCommitmentMode.MILP
-                    and int(study.version) < 880
+                    and StudyVersion.parse(study.version) < STUDY_VERSION_8_8
                 ):
                     raise InvalidFieldForVersionError("Unit commitment mode `MILP` only exists in v8.8+ studies")
 

antarest/study/business/areas/properties_management.py

@@ -19,7 +19,7 @@
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.study.business.all_optional_meta import all_optional_model
 from antarest.study.business.utils import FieldInfo, FormFieldsBaseModel, execute_or_add_commands
-from antarest.study.model import Study
+from antarest.study.model import STUDY_VERSION_8_3, Study
 from antarest.study.storage.rawstudy.model.filesystem.config.area import AdequacyPatchMode
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.model.command.update_config import UpdateConfig
@@ -113,7 +113,7 @@ def validation(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
     "adequacy_patch_mode": {
         "path": f"{AREA_PATH}/adequacy_patch/adequacy-patch/adequacy-patch-mode",
         "default_value": AdequacyPatchMode.OUTSIDE.value,
-        "start_version": 830,
+        "start_version": STUDY_VERSION_8_3,
     },
 }
 

antarest/study/business/areas/renewable_management.py

@@ -13,6 +13,7 @@
 import collections
 import typing as t
 
+from antares.study.version import StudyVersion
 from pydantic import field_validator
 
 from antarest.core.exceptions import DuplicateRenewableCluster, RenewableClusterConfigNotFound, RenewableClusterNotFound
@@ -82,7 +83,7 @@ def validate_name(cls, name: t.Optional[str]) -> str:
             raise ValueError("name must not be empty")
         return name
 
-    def to_config(self, study_version: t.Union[str, int]) -> RenewableConfigType:
+    def to_config(self, study_version: StudyVersion) -> RenewableConfigType:
         values = self.model_dump(by_alias=False, exclude_none=True)
         return create_renewable_config(study_version=study_version, **values)
 
@@ -109,11 +110,11 @@ def json_schema_extra(schema: t.MutableMapping[str, t.Any]) -> None:
 
 
 def create_renewable_output(
-    study_version: t.Union[str, int],
+    study_version: str,
     cluster_id: str,
     config: t.Mapping[str, t.Any],
 ) -> "RenewableClusterOutput":
-    obj = create_renewable_config(study_version=study_version, **config, id=cluster_id)
+    obj = create_renewable_config(study_version=StudyVersion.parse(study_version), **config, id=cluster_id)
     kwargs = obj.model_dump(by_alias=False)
     return RenewableClusterOutput(**kwargs)
 
@@ -182,12 +183,11 @@ def get_all_renewables_props(
         except KeyError:
             raise RenewableClusterConfigNotFound(path)
 
-        study_version = study.version
         renewables_by_areas: t.MutableMapping[str, t.MutableMapping[str, RenewableClusterOutput]]
         renewables_by_areas = collections.defaultdict(dict)
         for area_id, cluster_obj in clusters.items():
             for cluster_id, cluster in cluster_obj.items():
-                renewables_by_areas[area_id][cluster_id] = create_renewable_output(study_version, cluster_id, cluster)
+                renewables_by_areas[area_id][cluster_id] = create_renewable_output(study.version, cluster_id, cluster)
 
         return renewables_by_areas
 
@@ -206,7 +206,7 @@ def create_cluster(
             The newly created cluster.
         """
         file_study = self._get_file_study(study)
-        cluster = cluster_data.to_config(study.version)
+        cluster = cluster_data.to_config(StudyVersion.parse(study.version))
         command = self._make_create_cluster_cmd(area_id, cluster)
         execute_or_add_commands(
             study,
@@ -272,7 +272,7 @@ def update_cluster(
             RenewableClusterNotFound: If the cluster to update is not found.
         """
 
-        study_version = study.version
+        study_version = StudyVersion.parse(study.version)
         file_study = self._get_file_study(study)
         path = _CLUSTER_PATH.format(area_id=area_id, cluster_id=cluster_id)
 
@@ -356,7 +356,7 @@ def duplicate_cluster(
         current_cluster = self.get_cluster(study, area_id, source_id)
         current_cluster.name = new_cluster_name
         creation_form = RenewableClusterCreation(**current_cluster.model_dump(by_alias=False, exclude={"id"}))
-        new_config = creation_form.to_config(study.version)
+        new_config = creation_form.to_config(StudyVersion.parse(study.version))
         create_cluster_cmd = self._make_create_cluster_cmd(area_id, new_config)
 
         # Matrix edition
@@ -395,7 +395,7 @@ def update_renewables_props(
 
                 # Convert the DTO to a configuration object and update the configuration file.
                 properties = create_renewable_config(
-                    study.version, **new_cluster.model_dump(by_alias=False, exclude_none=True)
+                    StudyVersion.parse(study.version), **new_cluster.model_dump(by_alias=False, exclude_none=True)
                 )
                 path = _CLUSTER_PATH.format(area_id=area_id, cluster_id=renewable_id)
                 cmd = UpdateConfig(