Skip to content

Commit

Permalink
chore: resolve some sonar issues
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinBelthle committed Feb 5, 2025
1 parent 081b711 commit bc60e99
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 24 deletions.
6 changes: 3 additions & 3 deletions src/antares/craft/model/binding_constraint.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# This file is part of the Antares project.

from enum import Enum
from typing import Any, Dict, List, Optional, Union
from typing import Any, Dict, List, Optional

import pandas as pd

Expand Down Expand Up @@ -72,7 +72,7 @@ class ClusterData(BaseModel):


class ConstraintTerm(TermOperators):
data: Union[LinkData, ClusterData]
data: LinkData | ClusterData
id: str = Field(init=False)

@model_validator(mode="before")
Expand All @@ -81,7 +81,7 @@ def fill_id(cls, v: Dict[str, Any]) -> Dict[str, Any]:
return v

@classmethod
def generate_id(cls, data: Union[Dict[str, str], LinkData, ClusterData]) -> str:
def generate_id(cls, data: Dict[str, str] | LinkData | ClusterData) -> str:
if isinstance(data, dict):
if "area1" in data:
return "%".join(sorted((data["area1"].lower(), data["area2"].lower())))
Expand Down
4 changes: 2 additions & 2 deletions src/antares/craft/model/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# This file is part of the Antares project.
from enum import Enum
from typing import Optional, Union
from typing import Optional

import pandas as pd

Expand Down Expand Up @@ -60,7 +60,7 @@ class AggregationEntry(BaseModel):
columns_names: names or regexes (if query_file is of type details) to select columns
"""

query_file: Union[MCAllAreas, MCIndAreas, MCAllLinks, MCIndLinks]
query_file: MCAllAreas | MCIndAreas | MCAllLinks | MCIndLinks
frequency: Frequency
mc_years: Optional[list[str]] = None
type_ids: Optional[list[str]] = None
Expand Down
5 changes: 2 additions & 3 deletions src/antares/craft/model/settings/optimization.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# This file is part of the Antares project.

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
Expand Down Expand Up @@ -57,8 +56,8 @@ class DefaultOptimizationParameters(BaseModel, alias_generator=to_camel):
simplex_optimization_range: SimplexOptimizationRange = Field(
default=SimplexOptimizationRange.WEEK, validate_default=True
)
transmission_capacities: Union[bool, Union[LegacyTransmissionCapacities, OptimizationTransmissionCapacities]] = (
Field(default=OptimizationTransmissionCapacities.LOCAL_VALUES, validate_default=True)
transmission_capacities: bool | LegacyTransmissionCapacities | OptimizationTransmissionCapacities = Field(
default=OptimizationTransmissionCapacities.LOCAL_VALUES, validate_default=True
)
binding_constraints: bool = True
hurdle_costs: bool = True
Expand Down
4 changes: 2 additions & 2 deletions src/antares/craft/model/study.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from pathlib import Path, PurePath
from types import MappingProxyType
from typing import List, Optional, Union
from typing import List, Optional

import pandas as pd

Expand Down Expand Up @@ -262,7 +262,7 @@ def __init__(
name: str,
version: str,
service_factory: ServiceFactory,
settings: Union[StudySettings, StudySettingsLocal, None] = None,
settings: StudySettings | StudySettingsLocal | None = None,
path: PurePath = PurePath("."),
):
self.name = name
Expand Down
4 changes: 2 additions & 2 deletions src/antares/craft/service/api_services/area_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# This file is part of the Antares project.

from typing import Dict, List, Optional, Union
from typing import Dict, List, Optional

import pandas as pd

Expand Down Expand Up @@ -272,7 +272,7 @@ def _create_thermal_series(

self._replace_matrix_request(json_payload)

def _replace_matrix_request(self, json_payload: Union[Dict, List[Dict]]) -> None:
def _replace_matrix_request(self, json_payload: dict | List[dict]) -> None:
"""
Send a POST request with the given JSON payload to commands endpoint.
Expand Down
15 changes: 6 additions & 9 deletions src/antares/craft/service/local_services/area_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,16 +379,13 @@ def read_areas(self) -> List[Area]:
self.config.study_path, InitializationFilesTypes.AREA_UI_INI, area_id=element.name
).ini_dict
thermal_area_dict = IniFile(self.config.study_path, InitializationFilesTypes.THERMAL_AREAS_INI).ini_dict
nodal_optimization = optimization_dict["nodal optimization"]
area_properties = AreaPropertiesLocal(
non_dispatch_power=optimization_dict["nodal optimization"].get("non-dispatchable-power"),
dispatch_hydro_power=optimization_dict["nodal optimization"].get("dispatchable-hydro-power"),
other_dispatch_power=optimization_dict["nodal optimization"].get("other-dispatchable-power"),
spread_unsupplied_energy_cost=optimization_dict["nodal optimization"].get(
"spread-unsupplied-energy-cost"
),
spread_spilled_energy_cost=optimization_dict["nodal optimization"].get(
"spread-spilled-energy-cost"
),
non_dispatch_power=nodal_optimization.get("non-dispatchable-power"),
dispatch_hydro_power=nodal_optimization.get("dispatchable-hydro-power"),
other_dispatch_power=nodal_optimization.get("other-dispatchable-power"),
spread_unsupplied_energy_cost=nodal_optimization.get("spread-unsupplied-energy-cost"),
spread_spilled_energy_cost=nodal_optimization.get("spread-spilled-energy-cost"),
energy_cost_unsupplied=thermal_area_dict["unserverdenergycost"].get(element.name),
energy_cost_spilled=thermal_area_dict["spilledenergycost"].get(element.name),
filter_synthesis=set(optimization_dict["filtering"].get("filter-synthesis").split(", ")),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ def read_renewables(self, area_id: str) -> List[RenewableCluster]:
return renewables_clusters

def update_renewable_matrix(self, renewable_cluster: RenewableCluster, matrix: pd.DataFrame) -> None:
pass
raise NotImplementedError
4 changes: 2 additions & 2 deletions src/antares/craft/tools/ini_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from configparser import DuplicateSectionError
from enum import Enum
from pathlib import Path
from typing import Any, Iterable, Optional, Union
from typing import Any, Iterable, Optional

from antares.craft.tools.custom_raw_config_parser import CustomRawConfigParser
from antares.craft.tools.model_tools import filter_out_empty_model_fields
Expand Down Expand Up @@ -75,7 +75,7 @@ def __init__(
ini_file_type: InitializationFilesTypes,
area_id: Optional[str] = None,
cluster_id: Optional[str] = None,
ini_contents: Union[CustomRawConfigParser, dict[str, dict[str, str]], None] = None,
ini_contents: CustomRawConfigParser | dict[str, dict[str, str]] | None = None,
) -> None:
if "{area_id}" in ini_file_type.value and not area_id:
raise ValueError(f"Area name not provided, ini type {ini_file_type.name} requires 'area_id'")
Expand Down

0 comments on commit bc60e99

Please sign in to comment.