diff --git a/docs/quickstart.md b/docs/quickstart.md index 9b302519..5ef465dc 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -4,7 +4,6 @@ To start using Antares Craft create a study using either the API or local modes, Exemple: - study = create_study_local("test_study", 880, {"local_path": "test_study", "study_name": "test_study"}) - + from antares.craft.model.study import create_study_local -::: src.antares.model.study + study = create_study_local("test_study", 880, {"local_path": "test_study", "study_name": "test_study"}) diff --git a/pyproject.toml b/pyproject.toml index 8fce8482..921b2756 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,11 @@ authors = [ ] requires-python = ">=3.9" dependencies = [ - + "configparser~=5.0.2", + "numpy~=1.26.4", + "pandas~=2.2.2", + "pydantic~=2.7.1", + "requests~=2.32.0" ] classifiers = [ # Classifiers here: https://pypi.org/classifiers/ diff --git a/src/antares/__init__.py b/src/antares/craft/__init__.py similarity index 84% rename from src/antares/__init__.py rename to src/antares/craft/__init__.py index 036f3c53..9f7ee3df 100644 --- a/src/antares/__init__.py +++ b/src/antares/craft/__init__.py @@ -10,6 +10,6 @@ # # This file is part of the Antares project. -from antares.model.study import create_study_api, create_study_local +from antares.craft.model.study import create_study_api, create_study_local __all__ = ["create_study_api", "create_study_local"] diff --git a/src/antares/api_conf/__init__.py b/src/antares/craft/api_conf/__init__.py similarity index 100% rename from src/antares/api_conf/__init__.py rename to src/antares/craft/api_conf/__init__.py diff --git a/src/antares/api_conf/api_conf.py b/src/antares/craft/api_conf/api_conf.py similarity index 92% rename from src/antares/api_conf/api_conf.py rename to src/antares/craft/api_conf/api_conf.py index 257615a6..ad621cab 100644 --- a/src/antares/api_conf/api_conf.py +++ b/src/antares/craft/api_conf/api_conf.py @@ -12,8 +12,8 @@ import requests -from antares.config.base_configuration import BaseConfiguration -from antares.exceptions.exceptions import MissingTokenError +from antares.craft.config.base_configuration import BaseConfiguration +from antares.craft.exceptions.exceptions import MissingTokenError class APIconf(BaseConfiguration): diff --git a/src/antares/api_conf/request_wrapper.py b/src/antares/craft/api_conf/request_wrapper.py similarity index 97% rename from src/antares/api_conf/request_wrapper.py rename to src/antares/craft/api_conf/request_wrapper.py index fade01b9..047ef27c 100644 --- a/src/antares/api_conf/request_wrapper.py +++ b/src/antares/craft/api_conf/request_wrapper.py @@ -16,7 +16,7 @@ import requests -from antares.exceptions.exceptions import APIError +from antares.craft.exceptions.exceptions import APIError DATA_TYPE = Union[ Iterable[bytes], diff --git a/src/antares/config/__init__.py b/src/antares/craft/config/__init__.py similarity index 100% rename from src/antares/config/__init__.py rename to src/antares/craft/config/__init__.py diff --git a/src/antares/config/base_configuration.py b/src/antares/craft/config/base_configuration.py similarity index 100% rename from src/antares/config/base_configuration.py rename to src/antares/craft/config/base_configuration.py diff --git a/src/antares/config/local_configuration.py b/src/antares/craft/config/local_configuration.py similarity index 91% rename from src/antares/config/local_configuration.py rename to src/antares/craft/config/local_configuration.py index 725877a0..bb13de89 100644 --- a/src/antares/config/local_configuration.py +++ b/src/antares/craft/config/local_configuration.py @@ -12,7 +12,7 @@ from pathlib import Path -from antares.config.base_configuration import BaseConfiguration +from antares.craft.config.base_configuration import BaseConfiguration class LocalConfiguration(BaseConfiguration): diff --git a/src/antares/exceptions/__init__.py b/src/antares/craft/exceptions/__init__.py similarity index 100% rename from src/antares/exceptions/__init__.py rename to src/antares/craft/exceptions/__init__.py diff --git a/src/antares/exceptions/exceptions.py b/src/antares/craft/exceptions/exceptions.py similarity index 100% rename from src/antares/exceptions/exceptions.py rename to src/antares/craft/exceptions/exceptions.py diff --git a/src/antares/model/__init__.py b/src/antares/craft/model/__init__.py similarity index 100% rename from src/antares/model/__init__.py rename to src/antares/craft/model/__init__.py diff --git a/src/antares/model/area.py b/src/antares/craft/model/area.py similarity index 95% rename from src/antares/model/area.py rename to src/antares/craft/model/area.py index a8fb65a7..b4ab30eb 100644 --- a/src/antares/model/area.py +++ b/src/antares/craft/model/area.py @@ -21,18 +21,17 @@ import pandas as pd +from antares.craft.model.commons import FilterOption, sort_filter_values +from antares.craft.model.hydro import Hydro, HydroMatrixName, HydroProperties +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties +from antares.craft.model.st_storage import STStorage, STStorageProperties +from antares.craft.model.thermal import ThermalCluster, ThermalClusterProperties +from antares.craft.tools.alias_generators import to_space +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.contents_tool import EnumIgnoreCase, transform_name_to_id from pydantic import BaseModel, computed_field from pydantic.alias_generators import to_camel -from antares.model.commons import FilterOption, sort_filter_values -from antares.model.hydro import Hydro, HydroMatrixName, HydroProperties -from antares.model.renewable import RenewableCluster, RenewableClusterProperties -from antares.model.st_storage import STStorage, STStorageProperties -from antares.model.thermal import ThermalCluster, ThermalClusterProperties -from antares.tools.alias_generators import to_space -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.contents_tool import EnumIgnoreCase, transform_name_to_id - class AdequacyPatchMode(EnumIgnoreCase): """ diff --git a/src/antares/model/binding_constraint.py b/src/antares/craft/model/binding_constraint.py similarity index 97% rename from src/antares/model/binding_constraint.py rename to src/antares/craft/model/binding_constraint.py index a2b43aae..667415f0 100644 --- a/src/antares/model/binding_constraint.py +++ b/src/antares/craft/model/binding_constraint.py @@ -15,12 +15,11 @@ import pandas as pd +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.contents_tool import EnumIgnoreCase, transform_name_to_id from pydantic import BaseModel, Field, model_validator from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.contents_tool import EnumIgnoreCase, transform_name_to_id - class BindingConstraintFrequency(EnumIgnoreCase): HOURLY = "hourly" diff --git a/src/antares/model/cluster.py b/src/antares/craft/model/cluster.py similarity index 100% rename from src/antares/model/cluster.py rename to src/antares/craft/model/cluster.py diff --git a/src/antares/model/commons.py b/src/antares/craft/model/commons.py similarity index 100% rename from src/antares/model/commons.py rename to src/antares/craft/model/commons.py diff --git a/src/antares/model/hydro.py b/src/antares/craft/model/hydro.py similarity index 98% rename from src/antares/model/hydro.py rename to src/antares/craft/model/hydro.py index 345d7c65..5da835f7 100644 --- a/src/antares/model/hydro.py +++ b/src/antares/craft/model/hydro.py @@ -15,11 +15,10 @@ import pandas as pd +from antares.craft.tools.all_optional_meta import all_optional_model from pydantic import BaseModel from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model - class HydroMatrixName(Enum): SERIES_ROR = "ror" diff --git a/src/antares/model/link.py b/src/antares/craft/model/link.py similarity index 95% rename from src/antares/model/link.py rename to src/antares/craft/model/link.py index 8a3195a7..73a47359 100644 --- a/src/antares/model/link.py +++ b/src/antares/craft/model/link.py @@ -15,13 +15,12 @@ import pandas as pd +from antares.craft.model.commons import FilterOption, sort_filter_values +from antares.craft.tools.alias_generators import to_kebab +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.contents_tool import transform_name_to_id from pydantic import BaseModel -from antares.model.commons import FilterOption, sort_filter_values -from antares.tools.alias_generators import to_kebab -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.contents_tool import transform_name_to_id - class TransmissionCapacities(Enum): ENABLED = "enabled" diff --git a/src/antares/model/output.py b/src/antares/craft/model/output.py similarity index 100% rename from src/antares/model/output.py rename to src/antares/craft/model/output.py diff --git a/src/antares/model/renewable.py b/src/antares/craft/model/renewable.py similarity index 95% rename from src/antares/model/renewable.py rename to src/antares/craft/model/renewable.py index 8062a9ce..97b1a52e 100644 --- a/src/antares/model/renewable.py +++ b/src/antares/craft/model/renewable.py @@ -15,9 +15,9 @@ import pandas as pd -from antares.model.cluster import ClusterProperties -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.contents_tool import transform_name_to_id +from antares.craft.model.cluster import ClusterProperties +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.contents_tool import transform_name_to_id class RenewableClusterGroup(Enum): diff --git a/src/antares/model/settings/__init__.py b/src/antares/craft/model/settings/__init__.py similarity index 100% rename from src/antares/model/settings/__init__.py rename to src/antares/craft/model/settings/__init__.py diff --git a/src/antares/model/settings/adequacy_patch.py b/src/antares/craft/model/settings/adequacy_patch.py similarity index 97% rename from src/antares/model/settings/adequacy_patch.py rename to src/antares/craft/model/settings/adequacy_patch.py index e6310722..6159c1d1 100644 --- a/src/antares/model/settings/adequacy_patch.py +++ b/src/antares/craft/model/settings/adequacy_patch.py @@ -12,11 +12,10 @@ from enum import Enum +from antares.craft.tools.all_optional_meta import all_optional_model from pydantic import BaseModel, ConfigDict, Field from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model - class PriceTakingOrder(Enum): DENS = "DENS" diff --git a/src/antares/model/settings/advanced_parameters.py b/src/antares/craft/model/settings/advanced_parameters.py similarity index 96% rename from src/antares/model/settings/advanced_parameters.py rename to src/antares/craft/model/settings/advanced_parameters.py index a642c072..b145ef1f 100644 --- a/src/antares/model/settings/advanced_parameters.py +++ b/src/antares/craft/model/settings/advanced_parameters.py @@ -13,14 +13,13 @@ from enum import Enum from typing import Any, Optional +from antares.craft.model.settings.general import OutputChoices +from antares.craft.tools.alias_generators import to_kebab +from antares.craft.tools.all_optional_meta import all_optional_model from pydantic import BaseModel, ConfigDict, Field, model_validator from pydantic.alias_generators import to_camel from typing_extensions import Self -from antares.model.settings.general import OutputChoices -from antares.tools.alias_generators import to_kebab -from antares.tools.all_optional_meta import all_optional_model - class InitialReservoirLevel(Enum): COLD_START = "cold start" diff --git a/src/antares/model/settings/general.py b/src/antares/craft/model/settings/general.py similarity index 97% rename from src/antares/model/settings/general.py rename to src/antares/craft/model/settings/general.py index 9937d026..7871c45e 100644 --- a/src/antares/model/settings/general.py +++ b/src/antares/craft/model/settings/general.py @@ -10,12 +10,11 @@ # # This file is part of the Antares project. +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.contents_tool import EnumIgnoreCase from pydantic import BaseModel, ConfigDict, Field from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.contents_tool import EnumIgnoreCase - class Mode(EnumIgnoreCase): ECONOMY = "economy" diff --git a/src/antares/model/settings/optimization.py b/src/antares/craft/model/settings/optimization.py similarity index 98% rename from src/antares/model/settings/optimization.py rename to src/antares/craft/model/settings/optimization.py index f54dd189..8154786f 100644 --- a/src/antares/model/settings/optimization.py +++ b/src/antares/craft/model/settings/optimization.py @@ -13,11 +13,10 @@ from enum import Enum from typing import Union +from antares.craft.tools.all_optional_meta import all_optional_model from pydantic import BaseModel, ConfigDict, Field from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model - class LegacyTransmissionCapacities(Enum): INFINITE = "infinite" diff --git a/src/antares/model/settings/playlist_parameters.py b/src/antares/craft/model/settings/playlist_parameters.py similarity index 100% rename from src/antares/model/settings/playlist_parameters.py rename to src/antares/craft/model/settings/playlist_parameters.py diff --git a/src/antares/model/settings/study_settings.py b/src/antares/craft/model/settings/study_settings.py similarity index 75% rename from src/antares/model/settings/study_settings.py rename to src/antares/craft/model/settings/study_settings.py index 3a7c38cd..d243f942 100644 --- a/src/antares/model/settings/study_settings.py +++ b/src/antares/craft/model/settings/study_settings.py @@ -11,18 +11,20 @@ # This file is part of the Antares project. from typing import Optional +from antares.craft.model.settings.adequacy_patch import AdequacyPatchParametersLocal, DefaultAdequacyPatchParameters +from antares.craft.model.settings.advanced_parameters import AdvancedParametersLocal, DefaultAdvancedParameters +from antares.craft.model.settings.general import DefaultGeneralParameters, GeneralParametersLocal +from antares.craft.model.settings.optimization import DefaultOptimizationParameters, OptimizationParametersLocal +from antares.craft.model.settings.playlist_parameters import PlaylistParameters +from antares.craft.model.settings.thematic_trimming import ( + DefaultThematicTrimmingParameters, + ThematicTrimmingParametersLocal, +) +from antares.craft.model.settings.time_series import DefaultTimeSeriesParameters, TimeSeriesParametersLocal +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.ini_tool import get_ini_fields_for_ini from pydantic import BaseModel, model_serializer -from antares.model.settings.adequacy_patch import AdequacyPatchParametersLocal, DefaultAdequacyPatchParameters -from antares.model.settings.advanced_parameters import AdvancedParametersLocal, DefaultAdvancedParameters -from antares.model.settings.general import DefaultGeneralParameters, GeneralParametersLocal -from antares.model.settings.optimization import DefaultOptimizationParameters, OptimizationParametersLocal -from antares.model.settings.playlist_parameters import PlaylistParameters -from antares.model.settings.thematic_trimming import DefaultThematicTrimmingParameters, ThematicTrimmingParametersLocal -from antares.model.settings.time_series import DefaultTimeSeriesParameters, TimeSeriesParametersLocal -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.ini_tool import get_ini_fields_for_ini - class DefaultStudySettings(BaseModel): general_parameters: DefaultGeneralParameters = DefaultGeneralParameters() diff --git a/src/antares/model/settings/thematic_trimming.py b/src/antares/craft/model/settings/thematic_trimming.py similarity index 99% rename from src/antares/model/settings/thematic_trimming.py rename to src/antares/craft/model/settings/thematic_trimming.py index 3315b042..8d1460fd 100644 --- a/src/antares/model/settings/thematic_trimming.py +++ b/src/antares/craft/model/settings/thematic_trimming.py @@ -11,11 +11,10 @@ # This file is part of the Antares project. from enum import Enum +from antares.craft.tools.all_optional_meta import all_optional_model from pydantic import BaseModel from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model - class DefaultThematicTrimmingParameters(BaseModel, alias_generator=to_camel): """ diff --git a/src/antares/model/settings/time_series.py b/src/antares/craft/model/settings/time_series.py similarity index 96% rename from src/antares/model/settings/time_series.py rename to src/antares/craft/model/settings/time_series.py index d4cb0fc4..19381518 100644 --- a/src/antares/model/settings/time_series.py +++ b/src/antares/craft/model/settings/time_series.py @@ -13,12 +13,11 @@ from enum import Enum from typing import Optional +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.model_tools import filter_out_empty_model_fields from pydantic import BaseModel, Field from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.model_tools import filter_out_empty_model_fields - class SeasonCorrelation(Enum): MONTHLY = "monthly" diff --git a/src/antares/model/simulation.py b/src/antares/craft/model/simulation.py similarity index 100% rename from src/antares/model/simulation.py rename to src/antares/craft/model/simulation.py diff --git a/src/antares/model/st_storage.py b/src/antares/craft/model/st_storage.py similarity index 97% rename from src/antares/model/st_storage.py rename to src/antares/craft/model/st_storage.py index ebaf5619..edd3bc65 100644 --- a/src/antares/model/st_storage.py +++ b/src/antares/craft/model/st_storage.py @@ -15,12 +15,11 @@ import pandas as pd +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.contents_tool import transform_name_to_id from pydantic import BaseModel from pydantic.alias_generators import to_camel -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.contents_tool import transform_name_to_id - class STStorageGroup(Enum): # todo: this class should disappear with Simulator version 9.1 diff --git a/src/antares/model/study.py b/src/antares/craft/model/study.py similarity index 93% rename from src/antares/model/study.py rename to src/antares/craft/model/study.py index 42433841..40d5bb66 100644 --- a/src/antares/model/study.py +++ b/src/antares/craft/model/study.py @@ -20,21 +20,21 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.config.local_configuration import LocalConfiguration -from antares.exceptions.exceptions import APIError, LinkCreationError, StudyCreationError -from antares.model.area import Area, AreaProperties, AreaUi -from antares.model.binding_constraint import BindingConstraint, BindingConstraintProperties, ConstraintTerm -from antares.model.link import Link, LinkProperties, LinkUi -from antares.model.output import Output -from antares.model.settings.study_settings import DefaultStudySettings, StudySettings, StudySettingsLocal -from antares.model.settings.time_series import correlation_defaults -from antares.model.simulation import AntaresSimulationParameters, Job -from antares.service.api_services.study_api import _returns_study_settings -from antares.service.base_services import BaseStudyService -from antares.service.service_factory import ServiceFactory -from antares.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.exceptions.exceptions import APIError, LinkCreationError, StudyCreationError +from antares.craft.model.area import Area, AreaProperties, AreaUi +from antares.craft.model.binding_constraint import BindingConstraint, BindingConstraintProperties, ConstraintTerm +from antares.craft.model.link import Link, LinkProperties, LinkUi +from antares.craft.model.output import Output +from antares.craft.model.settings.study_settings import DefaultStudySettings, StudySettings, StudySettingsLocal +from antares.craft.model.settings.time_series import correlation_defaults +from antares.craft.model.simulation import AntaresSimulationParameters, Job +from antares.craft.service.api_services.study_api import _returns_study_settings +from antares.craft.service.base_services import BaseStudyService +from antares.craft.service.service_factory import ServiceFactory +from antares.craft.tools.ini_tool import IniFile, IniFileTypes """ The study module defines the data model for antares study. diff --git a/src/antares/model/thermal.py b/src/antares/craft/model/thermal.py similarity index 97% rename from src/antares/model/thermal.py rename to src/antares/craft/model/thermal.py index ed0cba52..abf4c4b0 100644 --- a/src/antares/model/thermal.py +++ b/src/antares/craft/model/thermal.py @@ -15,9 +15,9 @@ import pandas as pd -from antares.model.cluster import ClusterProperties -from antares.tools.all_optional_meta import all_optional_model -from antares.tools.contents_tool import transform_name_to_id +from antares.craft.model.cluster import ClusterProperties +from antares.craft.tools.all_optional_meta import all_optional_model +from antares.craft.tools.contents_tool import transform_name_to_id class LawOption(Enum): diff --git a/src/antares/service/__init__.py b/src/antares/craft/service/__init__.py similarity index 100% rename from src/antares/service/__init__.py rename to src/antares/craft/service/__init__.py diff --git a/src/antares/service/api_services/__init__.py b/src/antares/craft/service/api_services/__init__.py similarity index 100% rename from src/antares/service/api_services/__init__.py rename to src/antares/craft/service/api_services/__init__.py diff --git a/src/antares/service/api_services/area_api.py b/src/antares/craft/service/api_services/area_api.py similarity index 96% rename from src/antares/service/api_services/area_api.py rename to src/antares/craft/service/api_services/area_api.py index 2e2b76d1..98edf210 100644 --- a/src/antares/service/api_services/area_api.py +++ b/src/antares/craft/service/api_services/area_api.py @@ -14,9 +14,9 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import ( APIError, AreaCreationError, AreaDeletionError, @@ -32,20 +32,20 @@ ThermalCreationError, ThermalDeletionError, ) -from antares.model.area import Area, AreaProperties, AreaUi -from antares.model.hydro import Hydro, HydroMatrixName, HydroProperties -from antares.model.renewable import RenewableCluster, RenewableClusterProperties -from antares.model.st_storage import STStorage, STStorageProperties -from antares.model.thermal import ThermalCluster, ThermalClusterProperties -from antares.service.api_services.utils import get_matrix, upload_series -from antares.service.base_services import ( +from antares.craft.model.area import Area, AreaProperties, AreaUi +from antares.craft.model.hydro import Hydro, HydroMatrixName, HydroProperties +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties +from antares.craft.model.st_storage import STStorage, STStorageProperties +from antares.craft.model.thermal import ThermalCluster, ThermalClusterProperties +from antares.craft.service.api_services.utils import get_matrix, upload_series +from antares.craft.service.base_services import ( BaseAreaService, BaseRenewableService, BaseShortTermStorageService, BaseThermalService, ) -from antares.tools.contents_tool import AreaUiResponse -from antares.tools.matrix_tool import prepare_args_replace_matrix +from antares.craft.tools.contents_tool import AreaUiResponse +from antares.craft.tools.matrix_tool import prepare_args_replace_matrix class AreaApiService(BaseAreaService): diff --git a/src/antares/service/api_services/binding_constraint_api.py b/src/antares/craft/service/api_services/binding_constraint_api.py similarity index 95% rename from src/antares/service/api_services/binding_constraint_api.py rename to src/antares/craft/service/api_services/binding_constraint_api.py index a6136faa..60c26100 100644 --- a/src/antares/service/api_services/binding_constraint_api.py +++ b/src/antares/craft/service/api_services/binding_constraint_api.py @@ -15,9 +15,9 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import ( APIError, BindingConstraintCreationError, ConstraintMatrixDownloadError, @@ -26,14 +26,14 @@ ConstraintTermAdditionError, ConstraintTermDeletionError, ) -from antares.model.binding_constraint import ( +from antares.craft.model.binding_constraint import ( BindingConstraint, BindingConstraintProperties, ConstraintMatrixName, ConstraintTerm, ) -from antares.service.api_services.utils import get_matrix -from antares.service.base_services import BaseBindingConstraintService +from antares.craft.service.api_services.utils import get_matrix +from antares.craft.service.base_services import BaseBindingConstraintService class BindingConstraintApiService(BaseBindingConstraintService): diff --git a/src/antares/service/api_services/link_api.py b/src/antares/craft/service/api_services/link_api.py similarity index 96% rename from src/antares/service/api_services/link_api.py rename to src/antares/craft/service/api_services/link_api.py index d324dd06..30627d0f 100644 --- a/src/antares/service/api_services/link_api.py +++ b/src/antares/craft/service/api_services/link_api.py @@ -14,9 +14,9 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import ( APIError, LinkCreationError, LinkDeletionError, @@ -25,9 +25,9 @@ LinkUiUpdateError, LinkUploadError, ) -from antares.model.link import Link, LinkProperties, LinkUi -from antares.service.api_services.utils import get_matrix, upload_series -from antares.service.base_services import BaseLinkService +from antares.craft.model.link import Link, LinkProperties, LinkUi +from antares.craft.service.api_services.utils import get_matrix, upload_series +from antares.craft.service.base_services import BaseLinkService class LinkApiService(BaseLinkService): diff --git a/src/antares/service/api_services/output_api.py b/src/antares/craft/service/api_services/output_api.py similarity index 78% rename from src/antares/service/api_services/output_api.py rename to src/antares/craft/service/api_services/output_api.py index e97349bf..64b4d4dc 100644 --- a/src/antares/service/api_services/output_api.py +++ b/src/antares/craft/service/api_services/output_api.py @@ -11,11 +11,11 @@ # This file is part of the Antares project. -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import APIError, OutputsRetrievalError -from antares.model.output import Output -from antares.service.base_services import BaseOutputService +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import APIError, OutputsRetrievalError +from antares.craft.model.output import Output +from antares.craft.service.base_services import BaseOutputService class OutputApiService(BaseOutputService): diff --git a/src/antares/service/api_services/renewable_api.py b/src/antares/craft/service/api_services/renewable_api.py similarity index 86% rename from src/antares/service/api_services/renewable_api.py rename to src/antares/craft/service/api_services/renewable_api.py index 95791ff6..64bf6007 100644 --- a/src/antares/service/api_services/renewable_api.py +++ b/src/antares/craft/service/api_services/renewable_api.py @@ -15,12 +15,12 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import APIError, RenewableMatrixDownloadError, RenewablePropertiesUpdateError -from antares.model.renewable import RenewableCluster, RenewableClusterProperties -from antares.service.api_services.utils import get_matrix -from antares.service.base_services import BaseRenewableService +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import APIError, RenewableMatrixDownloadError, RenewablePropertiesUpdateError +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties +from antares.craft.service.api_services.utils import get_matrix +from antares.craft.service.base_services import BaseRenewableService class RenewableApiService(BaseRenewableService): diff --git a/src/antares/service/api_services/run_api.py b/src/antares/craft/service/api_services/run_api.py similarity index 93% rename from src/antares/service/api_services/run_api.py rename to src/antares/craft/service/api_services/run_api.py index 11618e41..f1693c24 100644 --- a/src/antares/service/api_services/run_api.py +++ b/src/antares/craft/service/api_services/run_api.py @@ -13,9 +13,9 @@ from typing import Any, Optional -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import ( AntaresSimulationRunningError, AntaresSimulationUnzipError, APIError, @@ -24,8 +24,8 @@ TaskFailedError, TaskTimeOutError, ) -from antares.model.simulation import AntaresSimulationParameters, Job, JobStatus -from antares.service.base_services import BaseRunService +from antares.craft.model.simulation import AntaresSimulationParameters, Job, JobStatus +from antares.craft.service.base_services import BaseRunService class RunApiService(BaseRunService): diff --git a/src/antares/service/api_services/st_storage_api.py b/src/antares/craft/service/api_services/st_storage_api.py similarity index 91% rename from src/antares/service/api_services/st_storage_api.py rename to src/antares/craft/service/api_services/st_storage_api.py index c5fc6ba5..ec96abf4 100644 --- a/src/antares/service/api_services/st_storage_api.py +++ b/src/antares/craft/service/api_services/st_storage_api.py @@ -13,16 +13,16 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import ( APIError, STStorageMatrixDownloadError, STStorageMatrixUploadError, STStoragePropertiesUpdateError, ) -from antares.model.st_storage import STStorage, STStorageMatrixName, STStorageProperties -from antares.service.base_services import BaseShortTermStorageService +from antares.craft.model.st_storage import STStorage, STStorageMatrixName, STStorageProperties +from antares.craft.service.base_services import BaseShortTermStorageService class ShortTermStorageApiService(BaseShortTermStorageService): diff --git a/src/antares/service/api_services/study_api.py b/src/antares/craft/service/api_services/study_api.py similarity index 80% rename from src/antares/service/api_services/study_api.py rename to src/antares/craft/service/api_services/study_api.py index d95b8456..5c9dc929 100644 --- a/src/antares/service/api_services/study_api.py +++ b/src/antares/craft/service/api_services/study_api.py @@ -11,30 +11,30 @@ # This file is part of the Antares project. from typing import TYPE_CHECKING, Optional -import antares.model.study as study +import antares.craft.model.study as study -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import ( APIError, BindingConstraintDeletionError, StudyDeletionError, StudySettingsUpdateError, StudyVariantCreationError, ) -from antares.model.binding_constraint import BindingConstraint -from antares.model.settings.adequacy_patch import AdequacyPatchParameters -from antares.model.settings.advanced_parameters import AdvancedParameters -from antares.model.settings.general import GeneralParameters -from antares.model.settings.optimization import OptimizationParameters -from antares.model.settings.playlist_parameters import PlaylistData, PlaylistParameters -from antares.model.settings.study_settings import StudySettings -from antares.model.settings.thematic_trimming import ThematicTrimmingParameters -from antares.model.settings.time_series import TimeSeriesParameters -from antares.service.base_services import BaseStudyService +from antares.craft.model.binding_constraint import BindingConstraint +from antares.craft.model.settings.adequacy_patch import AdequacyPatchParameters +from antares.craft.model.settings.advanced_parameters import AdvancedParameters +from antares.craft.model.settings.general import GeneralParameters +from antares.craft.model.settings.optimization import OptimizationParameters +from antares.craft.model.settings.playlist_parameters import PlaylistData, PlaylistParameters +from antares.craft.model.settings.study_settings import StudySettings +from antares.craft.model.settings.thematic_trimming import ThematicTrimmingParameters +from antares.craft.model.settings.time_series import TimeSeriesParameters +from antares.craft.service.base_services import BaseStudyService if TYPE_CHECKING: - from antares.model.study import Study + from antares.craft.model.study import Study def _returns_study_settings( diff --git a/src/antares/service/api_services/thermal_api.py b/src/antares/craft/service/api_services/thermal_api.py similarity index 86% rename from src/antares/service/api_services/thermal_api.py rename to src/antares/craft/service/api_services/thermal_api.py index ec4d8f64..5e5f707f 100644 --- a/src/antares/service/api_services/thermal_api.py +++ b/src/antares/craft/service/api_services/thermal_api.py @@ -15,12 +15,12 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.api_conf.request_wrapper import RequestWrapper -from antares.exceptions.exceptions import APIError, ThermalMatrixDownloadError, ThermalPropertiesUpdateError -from antares.model.thermal import ThermalCluster, ThermalClusterMatrixName, ThermalClusterProperties -from antares.service.api_services.utils import get_matrix -from antares.service.base_services import BaseThermalService +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.api_conf.request_wrapper import RequestWrapper +from antares.craft.exceptions.exceptions import APIError, ThermalMatrixDownloadError, ThermalPropertiesUpdateError +from antares.craft.model.thermal import ThermalCluster, ThermalClusterMatrixName, ThermalClusterProperties +from antares.craft.service.api_services.utils import get_matrix +from antares.craft.service.base_services import BaseThermalService class ThermalApiService(BaseThermalService): diff --git a/src/antares/service/api_services/utils.py b/src/antares/craft/service/api_services/utils.py similarity index 93% rename from src/antares/service/api_services/utils.py rename to src/antares/craft/service/api_services/utils.py index 98bb2cf7..d7ad96df 100644 --- a/src/antares/service/api_services/utils.py +++ b/src/antares/craft/service/api_services/utils.py @@ -12,7 +12,7 @@ import pandas as pd -from antares.api_conf.request_wrapper import RequestWrapper +from antares.craft.api_conf.request_wrapper import RequestWrapper def upload_series(base_url: str, study_id: str, wrapper: RequestWrapper, series: pd.DataFrame, path: str) -> None: diff --git a/src/antares/service/base_services.py b/src/antares/craft/service/base_services.py similarity index 95% rename from src/antares/service/base_services.py rename to src/antares/craft/service/base_services.py index fd4e6a51..99458c84 100644 --- a/src/antares/service/base_services.py +++ b/src/antares/craft/service/base_services.py @@ -15,25 +15,25 @@ import pandas as pd -from antares.config.base_configuration import BaseConfiguration -from antares.model.area import Area, AreaProperties, AreaUi -from antares.model.binding_constraint import ( +from antares.craft.config.base_configuration import BaseConfiguration +from antares.craft.model.area import Area, AreaProperties, AreaUi +from antares.craft.model.binding_constraint import ( BindingConstraint, BindingConstraintProperties, ConstraintMatrixName, ConstraintTerm, ) -from antares.model.hydro import Hydro, HydroMatrixName, HydroProperties -from antares.model.link import Link, LinkProperties, LinkUi -from antares.model.output import Output -from antares.model.renewable import RenewableCluster, RenewableClusterProperties -from antares.model.settings.study_settings import StudySettings -from antares.model.simulation import AntaresSimulationParameters, Job -from antares.model.st_storage import STStorage, STStorageProperties -from antares.model.thermal import ThermalCluster, ThermalClusterMatrixName, ThermalClusterProperties +from antares.craft.model.hydro import Hydro, HydroMatrixName, HydroProperties +from antares.craft.model.link import Link, LinkProperties, LinkUi +from antares.craft.model.output import Output +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties +from antares.craft.model.settings.study_settings import StudySettings +from antares.craft.model.simulation import AntaresSimulationParameters, Job +from antares.craft.model.st_storage import STStorage, STStorageProperties +from antares.craft.model.thermal import ThermalCluster, ThermalClusterMatrixName, ThermalClusterProperties if TYPE_CHECKING: - from antares.model.study import Study + from antares.craft.model.study import Study class BaseAreaService(ABC): diff --git a/src/antares/service/local_services/__init__.py b/src/antares/craft/service/local_services/__init__.py similarity index 100% rename from src/antares/service/local_services/__init__.py rename to src/antares/craft/service/local_services/__init__.py diff --git a/src/antares/service/local_services/area_local.py b/src/antares/craft/service/local_services/area_local.py similarity index 92% rename from src/antares/service/local_services/area_local.py rename to src/antares/craft/service/local_services/area_local.py index c49f1b33..90db3423 100644 --- a/src/antares/service/local_services/area_local.py +++ b/src/antares/craft/service/local_services/area_local.py @@ -18,24 +18,24 @@ import pandas as pd -from antares.config.local_configuration import LocalConfiguration -from antares.exceptions.exceptions import AreaCreationError, ThermalCreationError -from antares.model.area import Area, AreaProperties, AreaPropertiesLocal, AreaUi, AreaUiLocal -from antares.model.hydro import Hydro, HydroMatrixName, HydroProperties, HydroPropertiesLocal -from antares.model.renewable import RenewableCluster, RenewableClusterProperties, RenewableClusterPropertiesLocal -from antares.model.st_storage import STStorage, STStorageProperties, STStoragePropertiesLocal -from antares.model.thermal import ThermalCluster, ThermalClusterProperties, ThermalClusterPropertiesLocal -from antares.service.base_services import ( +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.exceptions.exceptions import AreaCreationError, ThermalCreationError +from antares.craft.model.area import Area, AreaProperties, AreaPropertiesLocal, AreaUi, AreaUiLocal +from antares.craft.model.hydro import Hydro, HydroMatrixName, HydroProperties, HydroPropertiesLocal +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties, RenewableClusterPropertiesLocal +from antares.craft.model.st_storage import STStorage, STStorageProperties, STStoragePropertiesLocal +from antares.craft.model.thermal import ThermalCluster, ThermalClusterProperties, ThermalClusterPropertiesLocal +from antares.craft.service.base_services import ( BaseAreaService, BaseRenewableService, BaseShortTermStorageService, BaseThermalService, ) -from antares.tools.contents_tool import transform_name_to_id -from antares.tools.ini_tool import IniFile, IniFileTypes -from antares.tools.matrix_tool import read_timeseries -from antares.tools.prepro_folder import PreproFolder -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.tools.contents_tool import transform_name_to_id +from antares.craft.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.matrix_tool import read_timeseries +from antares.craft.tools.prepro_folder import PreproFolder +from antares.craft.tools.time_series_tool import TimeSeriesFileType def _sets_ini_content() -> ConfigParser: diff --git a/src/antares/service/local_services/binding_constraint_local.py b/src/antares/craft/service/local_services/binding_constraint_local.py similarity index 95% rename from src/antares/service/local_services/binding_constraint_local.py rename to src/antares/craft/service/local_services/binding_constraint_local.py index d05e0a9f..0e02e461 100644 --- a/src/antares/service/local_services/binding_constraint_local.py +++ b/src/antares/craft/service/local_services/binding_constraint_local.py @@ -14,11 +14,9 @@ import numpy as np import pandas as pd -from pydantic import Field - -from antares.config.local_configuration import LocalConfiguration -from antares.exceptions.exceptions import BindingConstraintCreationError -from antares.model.binding_constraint import ( +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.exceptions.exceptions import BindingConstraintCreationError +from antares.craft.model.binding_constraint import ( BindingConstraint, BindingConstraintFrequency, BindingConstraintOperator, @@ -27,10 +25,11 @@ ConstraintTerm, DefaultBindingConstraintProperties, ) -from antares.service.base_services import BaseBindingConstraintService -from antares.tools.ini_tool import IniFile, IniFileTypes -from antares.tools.matrix_tool import df_read, df_save -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.service.base_services import BaseBindingConstraintService +from antares.craft.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.matrix_tool import df_read, df_save +from antares.craft.tools.time_series_tool import TimeSeriesFileType +from pydantic import Field class BindingConstraintPropertiesLocal(DefaultBindingConstraintProperties): diff --git a/src/antares/service/local_services/link_local.py b/src/antares/craft/service/local_services/link_local.py similarity index 91% rename from src/antares/service/local_services/link_local.py rename to src/antares/craft/service/local_services/link_local.py index 501ada6a..32963da9 100644 --- a/src/antares/service/local_services/link_local.py +++ b/src/antares/craft/service/local_services/link_local.py @@ -17,15 +17,15 @@ import pandas as pd -from antares.config.local_configuration import LocalConfiguration -from antares.exceptions.exceptions import LinkCreationError -from antares.model.link import Link, LinkProperties, LinkPropertiesLocal, LinkUi, LinkUiLocal -from antares.service.base_services import BaseLinkService -from antares.tools.contents_tool import sort_ini_sections -from antares.tools.custom_raw_config_parser import CustomRawConfigParser -from antares.tools.ini_tool import IniFile, IniFileTypes -from antares.tools.matrix_tool import read_timeseries -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.exceptions.exceptions import LinkCreationError +from antares.craft.model.link import Link, LinkProperties, LinkPropertiesLocal, LinkUi, LinkUiLocal +from antares.craft.service.base_services import BaseLinkService +from antares.craft.tools.contents_tool import sort_ini_sections +from antares.craft.tools.custom_raw_config_parser import CustomRawConfigParser +from antares.craft.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.matrix_tool import read_timeseries +from antares.craft.tools.time_series_tool import TimeSeriesFileType class LinkLocalService(BaseLinkService): diff --git a/src/antares/service/local_services/output_local.py b/src/antares/craft/service/local_services/output_local.py similarity index 79% rename from src/antares/service/local_services/output_local.py rename to src/antares/craft/service/local_services/output_local.py index 83b9cf5a..4c907692 100644 --- a/src/antares/service/local_services/output_local.py +++ b/src/antares/craft/service/local_services/output_local.py @@ -11,9 +11,9 @@ # This file is part of the Antares project. from typing import Any -from antares.config.local_configuration import LocalConfiguration -from antares.model.output import Output -from antares.service.base_services import BaseOutputService +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.model.output import Output +from antares.craft.service.base_services import BaseOutputService class OutputLocalService(BaseOutputService): diff --git a/src/antares/service/local_services/renewable_local.py b/src/antares/craft/service/local_services/renewable_local.py similarity index 84% rename from src/antares/service/local_services/renewable_local.py rename to src/antares/craft/service/local_services/renewable_local.py index 106d8935..3d9f651e 100644 --- a/src/antares/service/local_services/renewable_local.py +++ b/src/antares/craft/service/local_services/renewable_local.py @@ -15,12 +15,12 @@ import pandas as pd -from antares.config.local_configuration import LocalConfiguration -from antares.model.renewable import RenewableCluster, RenewableClusterProperties, RenewableClusterPropertiesLocal -from antares.service.base_services import BaseRenewableService -from antares.tools.ini_tool import IniFile, IniFileTypes -from antares.tools.matrix_tool import read_timeseries -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties, RenewableClusterPropertiesLocal +from antares.craft.service.base_services import BaseRenewableService +from antares.craft.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.matrix_tool import read_timeseries +from antares.craft.tools.time_series_tool import TimeSeriesFileType class RenewableLocalService(BaseRenewableService): diff --git a/src/antares/service/local_services/run_local.py b/src/antares/craft/service/local_services/run_local.py similarity index 80% rename from src/antares/service/local_services/run_local.py rename to src/antares/craft/service/local_services/run_local.py index 4ff32706..a7ceab9b 100644 --- a/src/antares/service/local_services/run_local.py +++ b/src/antares/craft/service/local_services/run_local.py @@ -11,9 +11,9 @@ # This file is part of the Antares project. from typing import Any, Optional -from antares.config.local_configuration import LocalConfiguration -from antares.model.simulation import AntaresSimulationParameters, Job -from antares.service.base_services import BaseRunService +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.model.simulation import AntaresSimulationParameters, Job +from antares.craft.service.base_services import BaseRunService class RunLocalService(BaseRunService): diff --git a/src/antares/service/local_services/st_storage_local.py b/src/antares/craft/service/local_services/st_storage_local.py similarity index 80% rename from src/antares/service/local_services/st_storage_local.py rename to src/antares/craft/service/local_services/st_storage_local.py index 8738eb63..aa21b593 100644 --- a/src/antares/service/local_services/st_storage_local.py +++ b/src/antares/craft/service/local_services/st_storage_local.py @@ -12,9 +12,9 @@ from typing import Any, List -from antares.config.local_configuration import LocalConfiguration -from antares.model.st_storage import STStorage, STStorageProperties -from antares.service.base_services import BaseShortTermStorageService +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.model.st_storage import STStorage, STStorageProperties +from antares.craft.service.base_services import BaseShortTermStorageService class ShortTermStorageLocalService(BaseShortTermStorageService): diff --git a/src/antares/service/local_services/study_local.py b/src/antares/craft/service/local_services/study_local.py similarity index 79% rename from src/antares/service/local_services/study_local.py rename to src/antares/craft/service/local_services/study_local.py index e6841a03..94641a22 100644 --- a/src/antares/service/local_services/study_local.py +++ b/src/antares/craft/service/local_services/study_local.py @@ -12,13 +12,13 @@ from typing import TYPE_CHECKING, Any, Optional -from antares.config.local_configuration import LocalConfiguration -from antares.model.binding_constraint import BindingConstraint -from antares.model.settings.study_settings import StudySettings -from antares.service.base_services import BaseStudyService +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.model.binding_constraint import BindingConstraint +from antares.craft.model.settings.study_settings import StudySettings +from antares.craft.service.base_services import BaseStudyService if TYPE_CHECKING: - from antares.model.study import Study + from antares.craft.model.study import Study class StudyLocalService(BaseStudyService): diff --git a/src/antares/service/local_services/thermal_local.py b/src/antares/craft/service/local_services/thermal_local.py similarity index 93% rename from src/antares/service/local_services/thermal_local.py rename to src/antares/craft/service/local_services/thermal_local.py index 61b6d6f6..82788052 100644 --- a/src/antares/service/local_services/thermal_local.py +++ b/src/antares/craft/service/local_services/thermal_local.py @@ -14,17 +14,17 @@ import pandas as pd -from antares.config.local_configuration import LocalConfiguration -from antares.model.thermal import ( +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.model.thermal import ( ThermalCluster, ThermalClusterMatrixName, ThermalClusterProperties, ThermalClusterPropertiesLocal, ) -from antares.service.base_services import BaseThermalService -from antares.tools.ini_tool import IniFile, IniFileTypes -from antares.tools.matrix_tool import read_timeseries -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.service.base_services import BaseThermalService +from antares.craft.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.matrix_tool import read_timeseries +from antares.craft.tools.time_series_tool import TimeSeriesFileType class ThermalLocalService(BaseThermalService): diff --git a/src/antares/service/service_factory.py b/src/antares/craft/service/service_factory.py similarity index 78% rename from src/antares/service/service_factory.py rename to src/antares/craft/service/service_factory.py index 61f05db1..0bd71f58 100644 --- a/src/antares/service/service_factory.py +++ b/src/antares/craft/service/service_factory.py @@ -10,19 +10,19 @@ # # This file is part of the Antares project. -from antares.api_conf.api_conf import APIconf -from antares.config.base_configuration import BaseConfiguration -from antares.config.local_configuration import LocalConfiguration -from antares.service.api_services.area_api import AreaApiService -from antares.service.api_services.binding_constraint_api import BindingConstraintApiService -from antares.service.api_services.link_api import LinkApiService -from antares.service.api_services.output_api import OutputApiService -from antares.service.api_services.renewable_api import RenewableApiService -from antares.service.api_services.run_api import RunApiService -from antares.service.api_services.st_storage_api import ShortTermStorageApiService -from antares.service.api_services.study_api import StudyApiService -from antares.service.api_services.thermal_api import ThermalApiService -from antares.service.base_services import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.config.base_configuration import BaseConfiguration +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.service.api_services.area_api import AreaApiService +from antares.craft.service.api_services.binding_constraint_api import BindingConstraintApiService +from antares.craft.service.api_services.link_api import LinkApiService +from antares.craft.service.api_services.output_api import OutputApiService +from antares.craft.service.api_services.renewable_api import RenewableApiService +from antares.craft.service.api_services.run_api import RunApiService +from antares.craft.service.api_services.st_storage_api import ShortTermStorageApiService +from antares.craft.service.api_services.study_api import StudyApiService +from antares.craft.service.api_services.thermal_api import ThermalApiService +from antares.craft.service.base_services import ( BaseAreaService, BaseBindingConstraintService, BaseLinkService, @@ -33,15 +33,15 @@ BaseStudyService, BaseThermalService, ) -from antares.service.local_services.area_local import AreaLocalService -from antares.service.local_services.binding_constraint_local import BindingConstraintLocalService -from antares.service.local_services.link_local import LinkLocalService -from antares.service.local_services.output_local import OutputLocalService -from antares.service.local_services.renewable_local import RenewableLocalService -from antares.service.local_services.run_local import RunLocalService -from antares.service.local_services.st_storage_local import ShortTermStorageLocalService -from antares.service.local_services.study_local import StudyLocalService -from antares.service.local_services.thermal_local import ThermalLocalService +from antares.craft.service.local_services.area_local import AreaLocalService +from antares.craft.service.local_services.binding_constraint_local import BindingConstraintLocalService +from antares.craft.service.local_services.link_local import LinkLocalService +from antares.craft.service.local_services.output_local import OutputLocalService +from antares.craft.service.local_services.renewable_local import RenewableLocalService +from antares.craft.service.local_services.run_local import RunLocalService +from antares.craft.service.local_services.st_storage_local import ShortTermStorageLocalService +from antares.craft.service.local_services.study_local import StudyLocalService +from antares.craft.service.local_services.thermal_local import ThermalLocalService ERROR_MESSAGE = "Unsupported configuration type: " diff --git a/src/antares/tools/__init__.py b/src/antares/craft/tools/__init__.py similarity index 100% rename from src/antares/tools/__init__.py rename to src/antares/craft/tools/__init__.py diff --git a/src/antares/tools/alias_generators.py b/src/antares/craft/tools/alias_generators.py similarity index 100% rename from src/antares/tools/alias_generators.py rename to src/antares/craft/tools/alias_generators.py diff --git a/src/antares/tools/all_optional_meta.py b/src/antares/craft/tools/all_optional_meta.py similarity index 100% rename from src/antares/tools/all_optional_meta.py rename to src/antares/craft/tools/all_optional_meta.py diff --git a/src/antares/tools/contents_tool.py b/src/antares/craft/tools/contents_tool.py similarity index 97% rename from src/antares/tools/contents_tool.py rename to src/antares/craft/tools/contents_tool.py index 1d9a25b3..98963681 100644 --- a/src/antares/tools/contents_tool.py +++ b/src/antares/craft/tools/contents_tool.py @@ -17,10 +17,9 @@ from pathlib import Path from typing import Any, Dict, Optional +from antares.craft.tools.custom_raw_config_parser import CustomRawConfigParser from pydantic import BaseModel -from antares.tools.custom_raw_config_parser import CustomRawConfigParser - # Invalid chars was taken from Antares Simulator (C++). _sub_invalid_chars = re.compile(r"[^a-zA-Z0-9_(),& -]+").sub diff --git a/src/antares/tools/custom_raw_config_parser.py b/src/antares/craft/tools/custom_raw_config_parser.py similarity index 100% rename from src/antares/tools/custom_raw_config_parser.py rename to src/antares/craft/tools/custom_raw_config_parser.py diff --git a/src/antares/tools/ini_tool.py b/src/antares/craft/tools/ini_tool.py similarity index 98% rename from src/antares/tools/ini_tool.py rename to src/antares/craft/tools/ini_tool.py index 1f15ede6..966923fc 100644 --- a/src/antares/tools/ini_tool.py +++ b/src/antares/craft/tools/ini_tool.py @@ -14,11 +14,10 @@ from pathlib import Path from typing import Any, Iterable, Optional, Union +from antares.craft.tools.custom_raw_config_parser import CustomRawConfigParser +from antares.craft.tools.model_tools import filter_out_empty_model_fields from pydantic import BaseModel -from antares.tools.custom_raw_config_parser import CustomRawConfigParser -from antares.tools.model_tools import filter_out_empty_model_fields - class IniFileTypes(Enum): """ diff --git a/src/antares/tools/matrix_tool.py b/src/antares/craft/tools/matrix_tool.py similarity index 96% rename from src/antares/tools/matrix_tool.py rename to src/antares/craft/tools/matrix_tool.py index 81b603e6..e767a48d 100644 --- a/src/antares/tools/matrix_tool.py +++ b/src/antares/craft/tools/matrix_tool.py @@ -16,7 +16,7 @@ import pandas as pd -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.tools.time_series_tool import TimeSeriesFileType def prepare_args_replace_matrix(series: pd.DataFrame, series_path: str) -> Dict: diff --git a/src/antares/tools/model_tools.py b/src/antares/craft/tools/model_tools.py similarity index 100% rename from src/antares/tools/model_tools.py rename to src/antares/craft/tools/model_tools.py diff --git a/src/antares/tools/prepro_folder.py b/src/antares/craft/tools/prepro_folder.py similarity index 90% rename from src/antares/tools/prepro_folder.py rename to src/antares/craft/tools/prepro_folder.py index 4cb48af1..4bf20905 100644 --- a/src/antares/tools/prepro_folder.py +++ b/src/antares/craft/tools/prepro_folder.py @@ -15,9 +15,9 @@ import numpy as np import pandas as pd -from antares.tools.ini_tool import IniFile, IniFileTypes -from antares.tools.matrix_tool import df_save -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.matrix_tool import df_save +from antares.craft.tools.time_series_tool import TimeSeriesFileType class PreproFolder(Enum): diff --git a/src/antares/tools/time_series_tool.py b/src/antares/craft/tools/time_series_tool.py similarity index 100% rename from src/antares/tools/time_series_tool.py rename to src/antares/craft/tools/time_series_tool.py diff --git a/tests/antares/delete/test_delete_api.py b/tests/antares/delete/test_delete_api.py index fc963d0a..33a41a17 100644 --- a/tests/antares/delete/test_delete_api.py +++ b/tests/antares/delete/test_delete_api.py @@ -13,8 +13,8 @@ import pytest import requests_mock -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ( AreaDeletionError, BindingConstraintDeletionError, ConstraintTermDeletionError, @@ -23,19 +23,19 @@ STStorageDeletionError, ThermalDeletionError, ) -from antares.model.area import Area -from antares.model.binding_constraint import BindingConstraint -from antares.model.link import Link -from antares.model.renewable import RenewableCluster -from antares.model.st_storage import STStorage -from antares.model.thermal import ThermalCluster -from antares.service.api_services.area_api import AreaApiService -from antares.service.api_services.binding_constraint_api import BindingConstraintApiService -from antares.service.api_services.link_api import LinkApiService -from antares.service.api_services.renewable_api import RenewableApiService -from antares.service.api_services.st_storage_api import ShortTermStorageApiService -from antares.service.api_services.study_api import StudyApiService -from antares.service.api_services.thermal_api import ThermalApiService +from antares.craft.model.area import Area +from antares.craft.model.binding_constraint import BindingConstraint +from antares.craft.model.link import Link +from antares.craft.model.renewable import RenewableCluster +from antares.craft.model.st_storage import STStorage +from antares.craft.model.thermal import ThermalCluster +from antares.craft.service.api_services.area_api import AreaApiService +from antares.craft.service.api_services.binding_constraint_api import BindingConstraintApiService +from antares.craft.service.api_services.link_api import LinkApiService +from antares.craft.service.api_services.renewable_api import RenewableApiService +from antares.craft.service.api_services.st_storage_api import ShortTermStorageApiService +from antares.craft.service.api_services.study_api import StudyApiService +from antares.craft.service.api_services.thermal_api import ThermalApiService class TestDeleteAPI: diff --git a/tests/antares/integration/conftest.py b/tests/antares/integration/conftest.py index d43899cc..5b9d9b52 100644 --- a/tests/antares/integration/conftest.py +++ b/tests/antares/integration/conftest.py @@ -12,9 +12,9 @@ import pytest -from antares import create_study_local -from antares.model.area import Area -from antares.model.study import Study +from antares.craft import create_study_local +from antares.craft.model.area import Area +from antares.craft.model.study import Study @pytest.fixture diff --git a/tests/antares/integration/test_local_client.py b/tests/antares/integration/test_local_client.py index 0bc14006..9eac428c 100644 --- a/tests/antares/integration/test_local_client.py +++ b/tests/antares/integration/test_local_client.py @@ -14,23 +14,20 @@ import numpy as np import pandas as pd -from antares import create_study_local -from antares.exceptions.exceptions import ( - AreaCreationError, - LinkCreationError, -) -from antares.model.area import AdequacyPatchMode, Area, AreaProperties, AreaUi -from antares.model.binding_constraint import BindingConstraintProperties, ClusterData, ConstraintTerm, LinkData -from antares.model.commons import FilterOption -from antares.model.link import Link, LinkProperties, LinkUi -from antares.model.renewable import RenewableClusterGroup, RenewableClusterProperties -from antares.model.settings.general import GeneralParametersLocal, Mode -from antares.model.settings.playlist_parameters import PlaylistParameters -from antares.model.settings.study_settings import StudySettingsLocal -from antares.model.st_storage import STStorageGroup, STStorageProperties -from antares.model.study import Study -from antares.model.thermal import ThermalCluster, ThermalClusterGroup, ThermalClusterProperties -from antares.tools.ini_tool import IniFile, IniFileTypes +from antares.craft import create_study_local +from antares.craft.exceptions.exceptions import AreaCreationError, LinkCreationError +from antares.craft.model.area import AdequacyPatchMode, Area, AreaProperties, AreaUi +from antares.craft.model.binding_constraint import BindingConstraintProperties, ClusterData, ConstraintTerm, LinkData +from antares.craft.model.commons import FilterOption +from antares.craft.model.link import Link, LinkProperties, LinkUi +from antares.craft.model.renewable import RenewableClusterGroup, RenewableClusterProperties +from antares.craft.model.settings.general import GeneralParametersLocal, Mode +from antares.craft.model.settings.playlist_parameters import PlaylistParameters +from antares.craft.model.settings.study_settings import StudySettingsLocal +from antares.craft.model.st_storage import STStorageGroup, STStorageProperties +from antares.craft.model.study import Study +from antares.craft.model.thermal import ThermalCluster, ThermalClusterGroup, ThermalClusterProperties +from antares.craft.tools.ini_tool import IniFile, IniFileTypes class TestLocalClient: diff --git a/tests/antares/model/settings/conftest.py b/tests/antares/model/settings/conftest.py index af5976f2..8b5255e6 100644 --- a/tests/antares/model/settings/conftest.py +++ b/tests/antares/model/settings/conftest.py @@ -12,7 +12,7 @@ import pytest -from antares.model.settings.playlist_parameters import PlaylistData, PlaylistParameters +from antares.craft.model.settings.playlist_parameters import PlaylistData, PlaylistParameters @pytest.fixture diff --git a/tests/antares/model/settings/test_playlist_parameters.py b/tests/antares/model/settings/test_playlist_parameters.py index 7d124d16..d709e931 100644 --- a/tests/antares/model/settings/test_playlist_parameters.py +++ b/tests/antares/model/settings/test_playlist_parameters.py @@ -11,7 +11,7 @@ # This file is part of the Antares project. import pytest -from antares.model.settings.playlist_parameters import PlaylistData, PlaylistParameters +from antares.craft.model.settings.playlist_parameters import PlaylistData, PlaylistParameters class TestCreatePlaylistParameters: diff --git a/tests/antares/services/api_services/test_area_api.py b/tests/antares/services/api_services/test_area_api.py index db5bfa4d..87d971d6 100644 --- a/tests/antares/services/api_services/test_area_api.py +++ b/tests/antares/services/api_services/test_area_api.py @@ -15,21 +15,21 @@ import numpy as np import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ( AreaPropertiesUpdateError, AreaUiUpdateError, RenewableCreationError, STStorageCreationError, ThermalCreationError, ) -from antares.model.area import Area, AreaProperties, AreaUi -from antares.model.hydro import Hydro, HydroMatrixName, HydroProperties -from antares.model.renewable import RenewableCluster, RenewableClusterProperties -from antares.model.st_storage import STStorage, STStorageProperties -from antares.model.thermal import ThermalCluster, ThermalClusterProperties -from antares.service.api_services.area_api import AreaApiService -from antares.service.service_factory import ServiceFactory +from antares.craft.model.area import Area, AreaProperties, AreaUi +from antares.craft.model.hydro import Hydro, HydroMatrixName, HydroProperties +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties +from antares.craft.model.st_storage import STStorage, STStorageProperties +from antares.craft.model.thermal import ThermalCluster, ThermalClusterProperties +from antares.craft.service.api_services.area_api import AreaApiService +from antares.craft.service.service_factory import ServiceFactory class TestCreateAPI: diff --git a/tests/antares/services/api_services/test_binding_constraint_api.py b/tests/antares/services/api_services/test_binding_constraint_api.py index 3577d459..d5cd1395 100644 --- a/tests/antares/services/api_services/test_binding_constraint_api.py +++ b/tests/antares/services/api_services/test_binding_constraint_api.py @@ -15,12 +15,12 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ConstraintMatrixDownloadError, ConstraintPropertiesUpdateError -from antares.model.area import Area -from antares.model.binding_constraint import BindingConstraint, BindingConstraintProperties, ConstraintMatrixName -from antares.model.study import Study -from antares.service.service_factory import ServiceFactory +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ConstraintMatrixDownloadError, ConstraintPropertiesUpdateError +from antares.craft.model.area import Area +from antares.craft.model.binding_constraint import BindingConstraint, BindingConstraintProperties, ConstraintMatrixName +from antares.craft.model.study import Study +from antares.craft.service.service_factory import ServiceFactory @pytest.fixture diff --git a/tests/antares/services/api_services/test_link_api.py b/tests/antares/services/api_services/test_link_api.py index c6f1fa53..fe1e3b1e 100644 --- a/tests/antares/services/api_services/test_link_api.py +++ b/tests/antares/services/api_services/test_link_api.py @@ -15,18 +15,18 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ( LinkDownloadError, LinkPropertiesUpdateError, LinkUiUpdateError, LinkUploadError, ) -from antares.model.area import Area -from antares.model.commons import FilterOption -from antares.model.link import Link, LinkProperties, LinkUi -from antares.model.study import Study -from antares.service.service_factory import ServiceFactory +from antares.craft.model.area import Area +from antares.craft.model.commons import FilterOption +from antares.craft.model.link import Link, LinkProperties, LinkUi +from antares.craft.model.study import Study +from antares.craft.service.service_factory import ServiceFactory class TestCreateAPI: diff --git a/tests/antares/services/api_services/test_matrix_api.py b/tests/antares/services/api_services/test_matrix_api.py index 05a6b05d..29cbcb3a 100644 --- a/tests/antares/services/api_services/test_matrix_api.py +++ b/tests/antares/services/api_services/test_matrix_api.py @@ -15,11 +15,11 @@ import numpy as np import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import MatrixDownloadError, MatrixUploadError -from antares.model.area import Area -from antares.service.api_services.area_api import AreaApiService -from antares.service.service_factory import ServiceFactory +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import MatrixDownloadError, MatrixUploadError +from antares.craft.model.area import Area +from antares.craft.service.api_services.area_api import AreaApiService +from antares.craft.service.service_factory import ServiceFactory class TestMatrixAPI: diff --git a/tests/antares/services/api_services/test_renewable_api.py b/tests/antares/services/api_services/test_renewable_api.py index 865c5ecb..8de2738d 100644 --- a/tests/antares/services/api_services/test_renewable_api.py +++ b/tests/antares/services/api_services/test_renewable_api.py @@ -15,13 +15,13 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import RenewableMatrixDownloadError, RenewablePropertiesUpdateError -from antares.model.area import Area -from antares.model.renewable import RenewableCluster, RenewableClusterProperties -from antares.service.api_services.area_api import AreaApiService -from antares.service.api_services.renewable_api import RenewableApiService -from antares.service.service_factory import ServiceFactory +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import RenewableMatrixDownloadError, RenewablePropertiesUpdateError +from antares.craft.model.area import Area +from antares.craft.model.renewable import RenewableCluster, RenewableClusterProperties +from antares.craft.service.api_services.area_api import AreaApiService +from antares.craft.service.api_services.renewable_api import RenewableApiService +from antares.craft.service.service_factory import ServiceFactory class TestCreateAPI: diff --git a/tests/antares/services/api_services/test_st_storage_api.py b/tests/antares/services/api_services/test_st_storage_api.py index d8f5cfa4..d9149d17 100644 --- a/tests/antares/services/api_services/test_st_storage_api.py +++ b/tests/antares/services/api_services/test_st_storage_api.py @@ -15,17 +15,17 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ( STStorageMatrixDownloadError, STStorageMatrixUploadError, STStoragePropertiesUpdateError, ) -from antares.model.area import Area -from antares.model.st_storage import STStorage, STStorageProperties -from antares.service.api_services.area_api import AreaApiService -from antares.service.api_services.st_storage_api import ShortTermStorageApiService -from antares.service.service_factory import ServiceFactory +from antares.craft.model.area import Area +from antares.craft.model.st_storage import STStorage, STStorageProperties +from antares.craft.service.api_services.area_api import AreaApiService +from antares.craft.service.api_services.st_storage_api import ShortTermStorageApiService +from antares.craft.service.service_factory import ServiceFactory class TestCreateAPI: diff --git a/tests/antares/services/api_services/test_study_api.py b/tests/antares/services/api_services/test_study_api.py index dd459d07..1e646651 100644 --- a/tests/antares/services/api_services/test_study_api.py +++ b/tests/antares/services/api_services/test_study_api.py @@ -18,8 +18,8 @@ from json import dumps from unittest.mock import Mock, patch -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ( AreaCreationError, BindingConstraintCreationError, LinkCreationError, @@ -30,15 +30,15 @@ StudySettingsUpdateError, StudyVariantCreationError, ) -from antares.model.area import Area, AreaProperties, AreaUi -from antares.model.binding_constraint import BindingConstraint, BindingConstraintProperties -from antares.model.hydro import HydroProperties -from antares.model.link import Link, LinkProperties, LinkUi -from antares.model.settings.general import GeneralParameters -from antares.model.settings.study_settings import StudySettings -from antares.model.simulation import AntaresSimulationParameters, Job, JobStatus, Solver -from antares.model.study import Study, create_study_api, create_variant_api, read_study_api -from antares.service.service_factory import ServiceFactory +from antares.craft.model.area import Area, AreaProperties, AreaUi +from antares.craft.model.binding_constraint import BindingConstraint, BindingConstraintProperties +from antares.craft.model.hydro import HydroProperties +from antares.craft.model.link import Link, LinkProperties, LinkUi +from antares.craft.model.settings.general import GeneralParameters +from antares.craft.model.settings.study_settings import StudySettings +from antares.craft.model.simulation import AntaresSimulationParameters, Job, JobStatus, Solver +from antares.craft.model.study import Study, create_study_api, create_variant_api, read_study_api +from antares.craft.service.service_factory import ServiceFactory class TestCreateAPI: diff --git a/tests/antares/services/api_services/test_thermal_api.py b/tests/antares/services/api_services/test_thermal_api.py index b28bd33d..35cf1c9a 100644 --- a/tests/antares/services/api_services/test_thermal_api.py +++ b/tests/antares/services/api_services/test_thermal_api.py @@ -15,14 +15,14 @@ import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ThermalMatrixDownloadError, ThermalPropertiesUpdateError -from antares.model.area import Area -from antares.model.study import Study -from antares.model.thermal import ThermalCluster, ThermalClusterMatrixName, ThermalClusterProperties -from antares.service.api_services.area_api import AreaApiService -from antares.service.api_services.thermal_api import ThermalApiService -from antares.service.service_factory import ServiceFactory +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ThermalMatrixDownloadError, ThermalPropertiesUpdateError +from antares.craft.model.area import Area +from antares.craft.model.study import Study +from antares.craft.model.thermal import ThermalCluster, ThermalClusterMatrixName, ThermalClusterProperties +from antares.craft.service.api_services.area_api import AreaApiService +from antares.craft.service.api_services.thermal_api import ThermalApiService +from antares.craft.service.service_factory import ServiceFactory @pytest.fixture diff --git a/tests/antares/services/local_services/conftest.py b/tests/antares/services/local_services/conftest.py index e6ae1cbd..a2223aff 100644 --- a/tests/antares/services/local_services/conftest.py +++ b/tests/antares/services/local_services/conftest.py @@ -13,25 +13,25 @@ import pandas as pd -from antares.model.area import Area -from antares.model.binding_constraint import ( +from antares.craft.model.area import Area +from antares.craft.model.binding_constraint import ( BindingConstraint, BindingConstraintFrequency, BindingConstraintOperator, BindingConstraintProperties, ) -from antares.model.hydro import HydroProperties -from antares.model.renewable import RenewableClusterGroup, RenewableClusterProperties, TimeSeriesInterpretation -from antares.model.st_storage import STStorageGroup, STStorageProperties -from antares.model.study import Study, create_study_local -from antares.model.thermal import ( +from antares.craft.model.hydro import HydroProperties +from antares.craft.model.renewable import RenewableClusterGroup, RenewableClusterProperties, TimeSeriesInterpretation +from antares.craft.model.st_storage import STStorageGroup, STStorageProperties +from antares.craft.model.study import Study, create_study_local +from antares.craft.model.thermal import ( LawOption, LocalTSGenerationBehavior, ThermalClusterGroup, ThermalClusterProperties, ThermalCostGeneration, ) -from antares.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.ini_tool import IniFile, IniFileTypes @pytest.fixture diff --git a/tests/antares/services/local_services/test_area.py b/tests/antares/services/local_services/test_area.py index 170200be..c4301d66 100644 --- a/tests/antares/services/local_services/test_area.py +++ b/tests/antares/services/local_services/test_area.py @@ -22,19 +22,19 @@ import numpy as np import pandas as pd -from antares.config.local_configuration import LocalConfiguration -from antares.exceptions.exceptions import ThermalCreationError -from antares.model.hydro import Hydro -from antares.model.renewable import ( +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.exceptions.exceptions import ThermalCreationError +from antares.craft.model.hydro import Hydro +from antares.craft.model.renewable import ( RenewableCluster, RenewableClusterGroup, RenewableClusterProperties, RenewableClusterPropertiesLocal, TimeSeriesInterpretation, ) -from antares.model.st_storage import STStorage, STStorageGroup, STStorageProperties, STStoragePropertiesLocal -from antares.model.study import read_study_local -from antares.model.thermal import ( +from antares.craft.model.st_storage import STStorage, STStorageGroup, STStorageProperties, STStoragePropertiesLocal +from antares.craft.model.study import read_study_local +from antares.craft.model.thermal import ( LawOption, LocalTSGenerationBehavior, ThermalCluster, @@ -43,9 +43,9 @@ ThermalClusterPropertiesLocal, ThermalCostGeneration, ) -from antares.tools.ini_tool import IniFile, IniFileTypes -from antares.tools.matrix_tool import df_save -from antares.tools.time_series_tool import TimeSeriesFileType +from antares.craft.tools.ini_tool import IniFile, IniFileTypes +from antares.craft.tools.matrix_tool import df_save +from antares.craft.tools.time_series_tool import TimeSeriesFileType class TestCreateThermalCluster: diff --git a/tests/antares/services/local_services/test_study.py b/tests/antares/services/local_services/test_study.py index f4845ef6..3ad09a0e 100644 --- a/tests/antares/services/local_services/test_study.py +++ b/tests/antares/services/local_services/test_study.py @@ -22,24 +22,24 @@ import numpy as np import pandas as pd -from antares.config.local_configuration import LocalConfiguration -from antares.exceptions.exceptions import ( +from antares.craft.config.local_configuration import LocalConfiguration +from antares.craft.exceptions.exceptions import ( AreaCreationError, BindingConstraintCreationError, CustomError, LinkCreationError, ) -from antares.model.area import AreaProperties, AreaPropertiesLocal, AreaUi, AreaUiLocal -from antares.model.binding_constraint import ( +from antares.craft.model.area import AreaProperties, AreaPropertiesLocal, AreaUi, AreaUiLocal +from antares.craft.model.binding_constraint import ( BindingConstraint, BindingConstraintFrequency, BindingConstraintOperator, BindingConstraintProperties, ConstraintTerm, ) -from antares.model.commons import FilterOption -from antares.model.hydro import Hydro -from antares.model.link import ( +from antares.craft.model.commons import FilterOption +from antares.craft.model.hydro import Hydro +from antares.craft.model.link import ( AssetType, Link, LinkProperties, @@ -49,11 +49,11 @@ LinkUiLocal, TransmissionCapacities, ) -from antares.model.settings.adequacy_patch import ( +from antares.craft.model.settings.adequacy_patch import ( DefaultAdequacyPatchParameters, PriceTakingOrder, ) -from antares.model.settings.advanced_parameters import ( +from antares.craft.model.settings.advanced_parameters import ( AdvancedParametersLocal, HydroHeuristicPolicy, HydroPricingMode, @@ -64,25 +64,28 @@ SimulationCore, UnitCommitmentMode, ) -from antares.model.settings.general import ( +from antares.craft.model.settings.general import ( BuildingMode, GeneralParametersLocal, Mode, Month, WeekDay, ) -from antares.model.settings.optimization import ( +from antares.craft.model.settings.optimization import ( ExportMPS, OptimizationParametersLocal, OptimizationTransmissionCapacities, SimplexOptimizationRange, UnfeasibleProblemBehavior, ) -from antares.model.settings.playlist_parameters import PlaylistData, PlaylistParameters -from antares.model.settings.study_settings import DefaultStudySettings, StudySettingsLocal -from antares.model.settings.thematic_trimming import DefaultThematicTrimmingParameters, ThematicTrimmingParametersLocal -from antares.model.study import create_study_local -from antares.tools.ini_tool import IniFileTypes +from antares.craft.model.settings.playlist_parameters import PlaylistData, PlaylistParameters +from antares.craft.model.settings.study_settings import DefaultStudySettings, StudySettingsLocal +from antares.craft.model.settings.thematic_trimming import ( + DefaultThematicTrimmingParameters, + ThematicTrimmingParametersLocal, +) +from antares.craft.model.study import create_study_local +from antares.craft.tools.ini_tool import IniFileTypes class TestCreateStudy: @@ -1440,7 +1443,7 @@ def mock_error_in_sets_ini(): area_id = "test" - monkeypatch.setattr("antares.service.local_services.area_local._sets_ini_content", mock_error_in_sets_ini) + monkeypatch.setattr("antares.craft.service.local_services.area_local._sets_ini_content", mock_error_in_sets_ini) with pytest.raises( AreaCreationError, match=f"Could not create the area {area_id}: {error_message}", diff --git a/tests/antares/services/local_services/test_study_read.py b/tests/antares/services/local_services/test_study_read.py index 5667359f..bbabf1fd 100644 --- a/tests/antares/services/local_services/test_study_read.py +++ b/tests/antares/services/local_services/test_study_read.py @@ -16,7 +16,7 @@ from pathlib import Path -from antares.model.study import read_study_local +from antares.craft.model.study import read_study_local class TestReadStudy: diff --git a/tests/antares/tools/test_contents_tool.py b/tests/antares/tools/test_contents_tool.py index cdcf31a6..a469e22d 100644 --- a/tests/antares/tools/test_contents_tool.py +++ b/tests/antares/tools/test_contents_tool.py @@ -13,7 +13,7 @@ import numpy as np import pandas as pd -from antares.tools.matrix_tool import prepare_args_replace_matrix +from antares.craft.tools.matrix_tool import prepare_args_replace_matrix def test_prepare_args(): diff --git a/tests/antares/tools/test_custom_raw_config_parser.py b/tests/antares/tools/test_custom_raw_config_parser.py index ebda89ba..542b1da7 100644 --- a/tests/antares/tools/test_custom_raw_config_parser.py +++ b/tests/antares/tools/test_custom_raw_config_parser.py @@ -12,7 +12,7 @@ from pathlib import Path -from antares.tools.custom_raw_config_parser import CustomRawConfigParser +from antares.craft.tools.custom_raw_config_parser import CustomRawConfigParser class TestCustomRawConfigParser: diff --git a/tests/antares/tools/test_ini_tool.py b/tests/antares/tools/test_ini_tool.py index 1638b455..bc17e003 100644 --- a/tests/antares/tools/test_ini_tool.py +++ b/tests/antares/tools/test_ini_tool.py @@ -9,7 +9,7 @@ # SPDX-License-Identifier: MPL-2.0 # # This file is part of the Antares project. -from antares.tools.ini_tool import get_ini_fields_for_ini, merge_dicts_for_ini +from antares.craft.tools.ini_tool import get_ini_fields_for_ini, merge_dicts_for_ini from pydantic import BaseModel diff --git a/tests/integration/test_web_client.py b/tests/integration/test_web_client.py index 176a8709..c0b3954b 100644 --- a/tests/integration/test_web_client.py +++ b/tests/integration/test_web_client.py @@ -14,25 +14,25 @@ import numpy as np import pandas as pd -from antares.api_conf.api_conf import APIconf -from antares.exceptions.exceptions import ( +from antares.craft.api_conf.api_conf import APIconf +from antares.craft.exceptions.exceptions import ( AreaDeletionError, BindingConstraintCreationError, ConstraintMatrixUpdateError, MatrixUploadError, STStorageMatrixUploadError, ) -from antares.model.area import AdequacyPatchMode, AreaProperties, AreaUi, FilterOption -from antares.model.binding_constraint import BindingConstraintProperties, ClusterData, ConstraintTerm, LinkData -from antares.model.link import LinkProperties, LinkStyle, LinkUi -from antares.model.renewable import RenewableClusterGroup, RenewableClusterProperties, TimeSeriesInterpretation -from antares.model.settings.advanced_parameters import AdvancedParameters, UnitCommitmentMode -from antares.model.settings.general import GeneralParameters, Mode -from antares.model.settings.study_settings import PlaylistParameters, StudySettings -from antares.model.simulation import AntaresSimulationParameters, Job, JobStatus -from antares.model.st_storage import STStorageGroup, STStorageMatrixName, STStorageProperties -from antares.model.study import create_study_api, create_variant_api, read_study_api -from antares.model.thermal import ThermalClusterGroup, ThermalClusterProperties +from antares.craft.model.area import AdequacyPatchMode, AreaProperties, AreaUi, FilterOption +from antares.craft.model.binding_constraint import BindingConstraintProperties, ClusterData, ConstraintTerm, LinkData +from antares.craft.model.link import LinkProperties, LinkStyle, LinkUi +from antares.craft.model.renewable import RenewableClusterGroup, RenewableClusterProperties, TimeSeriesInterpretation +from antares.craft.model.settings.advanced_parameters import AdvancedParameters, UnitCommitmentMode +from antares.craft.model.settings.general import GeneralParameters, Mode +from antares.craft.model.settings.study_settings import PlaylistParameters, StudySettings +from antares.craft.model.simulation import AntaresSimulationParameters, Job, JobStatus +from antares.craft.model.st_storage import STStorageGroup, STStorageMatrixName, STStorageProperties +from antares.craft.model.study import create_study_api, create_variant_api, read_study_api +from antares.craft.model.thermal import ThermalClusterGroup, ThermalClusterProperties from tests.integration.antares_web_desktop import AntaresWebDesktop