Change NonOptional to Default

src/antares/model/area.py

@@ -49,7 +49,7 @@ class AdequacyPatchMode(EnumIgnoreCase):
     VIRTUAL = "virtual"
 
 
-class NonOptionalAreaProperties(BaseModel, extra="forbid", populate_by_name=True):
+class DefaultAreaProperties(BaseModel, extra="forbid", populate_by_name=True):
     """
     DTO for updating area properties
     """
@@ -80,15 +80,15 @@ class NonOptionalAreaProperties(BaseModel, extra="forbid", populate_by_name=True
 
 
 @all_optional_model
-class AreaProperties(NonOptionalAreaProperties, alias_generator=to_camel):
+class AreaProperties(DefaultAreaProperties, alias_generator=to_camel):
     pass
 
 
 def config_alias_generator(field_name: str) -> str:
     return field_name.replace("_", " ")
 
 
-class AreaPropertiesLocal(NonOptionalAreaProperties, alias_generator=config_alias_generator):
+class AreaPropertiesLocal(DefaultAreaProperties, alias_generator=config_alias_generator):
     @computed_field  # type: ignore[misc]
     @property
     def nodal_optimization(self) -> Mapping[str, str]:

src/antares/model/hydro.py

@@ -32,7 +32,7 @@ class HydroMatrixName(Enum):
     COMMON_CREDIT_MODULATIONS = "creditmodulations"
 
 
-class NonOptionalHydroProperties(BaseModel, extra="forbid", populate_by_name=True, alias_generator=to_camel):
+class DefaultHydroProperties(BaseModel, extra="forbid", populate_by_name=True, alias_generator=to_camel):
     """
     Properties of hydro system read from the configuration files.
 
@@ -57,11 +57,11 @@ class NonOptionalHydroProperties(BaseModel, extra="forbid", populate_by_name=Tru
 
 
 @all_optional_model
-class HydroProperties(NonOptionalHydroProperties):
+class HydroProperties(DefaultHydroProperties):
     pass
 
 
-class HydroPropertiesLocal(NonOptionalHydroProperties):
+class HydroPropertiesLocal(DefaultHydroProperties):
     area_id: str
 
     @computed_field  # type: ignore[misc]

src/antares/model/link.py

@@ -45,7 +45,7 @@ def link_aliasing(string: str) -> str:
     return string.replace("_", "-")
 
 
-class NonOptionalLinkProperties(BaseModel, extra="forbid", populate_by_name=True, alias_generator=link_aliasing):
+class DefaultLinkProperties(BaseModel, extra="forbid", populate_by_name=True, alias_generator=link_aliasing):
     """
     DTO for updating link properties
     """
@@ -73,11 +73,11 @@ class NonOptionalLinkProperties(BaseModel, extra="forbid", populate_by_name=True
 
 
 @all_optional_model
-class LinkProperties(NonOptionalLinkProperties):
+class LinkProperties(DefaultLinkProperties):
     pass
 
 
-class LinkPropertiesLocal(NonOptionalLinkProperties):
+class LinkPropertiesLocal(DefaultLinkProperties):
     @computed_field  # type: ignore[misc]
     @property
     def ini_fields(self) -> Mapping[str, str]:
@@ -99,7 +99,7 @@ def yield_link_properties(self) -> LinkProperties:
         return LinkProperties.model_validate(self.model_dump(mode="json", exclude=excludes))
 
 
-class NonOptionalLinkUi(BaseModel, extra="forbid", populate_by_name=True, alias_generator=link_aliasing):
+class DefaultLinkUi(BaseModel, extra="forbid", populate_by_name=True, alias_generator=link_aliasing):
     """
     DTO for updating link UI
     """
@@ -112,11 +112,11 @@ class NonOptionalLinkUi(BaseModel, extra="forbid", populate_by_name=True, alias_
 
 
 @all_optional_model
-class LinkUi(NonOptionalLinkUi):
+class LinkUi(DefaultLinkUi):
     pass
 
 
-class LinkUiLocal(NonOptionalLinkUi):
+class LinkUiLocal(DefaultLinkUi):
     @computed_field  # type: ignore[misc]
     @property
     def ini_fields(self) -> Mapping[str, str]:

src/antares/model/renewable.py

@@ -55,7 +55,7 @@ class TimeSeriesInterpretation(Enum):
     PRODUCTION_FACTOR = "production-factor"
 
 
-class NonOptionalRenewableClusterProperties(ClusterProperties):
+class DefaultRenewableClusterProperties(ClusterProperties):
     """
     Properties of a renewable cluster read from the configuration files.
     """
@@ -65,11 +65,11 @@ class NonOptionalRenewableClusterProperties(ClusterProperties):
 
 
 @all_optional_model
-class RenewableClusterProperties(NonOptionalRenewableClusterProperties):
+class RenewableClusterProperties(DefaultRenewableClusterProperties):
     pass
 
 
-class RenewableClusterPropertiesLocal(NonOptionalRenewableClusterProperties):
+class RenewableClusterPropertiesLocal(DefaultRenewableClusterProperties):
     renewable_name: str
 
     @computed_field  # type: ignore[misc]

src/antares/model/st_storage.py

@@ -42,7 +42,7 @@ class STStorageMatrixName(Enum):
     INFLOWS = "inflows"
 
 
-class NonOptionalSTStorageProperties(BaseModel, extra="forbid", populate_by_name=True, alias_generator=to_camel):
+class DefaultSTStorageProperties(BaseModel, extra="forbid", populate_by_name=True, alias_generator=to_camel):
     """
     Properties of a short-term storage system read from the configuration files.
 
@@ -61,11 +61,11 @@ class NonOptionalSTStorageProperties(BaseModel, extra="forbid", populate_by_name
 
 
 @all_optional_model
-class STStorageProperties(NonOptionalSTStorageProperties):
+class STStorageProperties(DefaultSTStorageProperties):
     pass
 
 
-class STStoragePropertiesLocal(NonOptionalSTStorageProperties):
+class STStoragePropertiesLocal(DefaultSTStorageProperties):
     st_storage_name: str
 
     @computed_field  # type: ignore[misc]

src/antares/model/thermal.py

@@ -65,7 +65,7 @@ class ThermalCostGeneration(Enum):
     USE_COST_TIME_SERIES = "useCostTimeseries"
 
 
-class NonOptionalThermalProperties(ClusterProperties):
+class DefaultThermalProperties(ClusterProperties):
     """
     Thermal cluster configuration model.
     This model describes the configuration parameters for a thermal cluster.
@@ -108,11 +108,11 @@ class NonOptionalThermalProperties(ClusterProperties):
 
 
 @all_optional_model
-class ThermalClusterProperties(NonOptionalThermalProperties):
+class ThermalClusterProperties(DefaultThermalProperties):
     pass
 
 
-class ThermalClusterPropertiesLocal(NonOptionalThermalProperties):
+class ThermalClusterPropertiesLocal(DefaultThermalProperties):
     thermal_name: str
 
     @computed_field  # type: ignore[misc]