Merge pull request #1023 from PowerGridModel/feature/add-more-ruff-checks

Formatting and Linting: add a couple more Ruff checks

Author: mgovers

code_generation/code_gen.py

@@ -102,10 +102,7 @@ def render_dataset_class_maps(self, template_path: Path, data_path: Path, output
         # create list
         all_map = {}
         for dataset in dataset_meta_data:
-            if dataset.is_template:
-                prefixes = ["sym_", "asym_"]
-            else:
-                prefixes = [""]
+            prefixes = ["sym_", "asym_"] if dataset.is_template else [""]
             for prefix in prefixes:
                 all_components = {}
                 for component in dataset.components:

code_generation/templates/src/power_grid_model/_core/dataset_class_maps.py.jinja

@@ -25,7 +25,7 @@ class _MetaEnum(EnumMeta):
         Returns:
             bool: True if the member is part of the Enum, False otherwise.
         """
-        return member in cls.__members__.keys()
+        return member in cls.__members__
 
 
 class DatasetType(str, Enum, metaclass=_MetaEnum):

pyproject.toml

@@ -113,8 +113,8 @@ select = [
     "FURB",
     "FLY",
     "SLOT",
+    "NPY",
 ]
-ignore = ["SIM108", "SIM118", "SIM110", "SIM211"]
 
 [tool.ruff.lint.isort]
 # Imports that are imported using keyword "as" and are from the same source - are combined.

setup.py

@@ -76,10 +76,7 @@ def get_tag(self):
 class MyBuildExt(build_ext):
     def build_extensions(self):
         if not if_win:
-            if "CXX" in os.environ:
-                cxx = os.environ["CXX"]
-            else:
-                cxx = self.compiler.compiler_cxx[0]
+            cxx = os.environ.get("CXX", self.compiler.compiler_cxx[0])
             # check setuptools has an update change in the version 72.2 about cxx compiler options
             # to be compatible with both version, we check if compiler_so_cxx exists
             if not hasattr(self.compiler, "compiler_so_cxx"):
@@ -93,10 +90,7 @@ def build_extensions(self):
             linker_so_cxx[0] = cxx
             self.compiler.compiler_cxx = [cxx]
             # add link time optimization
-            if "clang" in cxx:
-                lto_flag = "-flto=thin"
-            else:
-                lto_flag = "-flto"
+            lto_flag = "-flto=thin" if "clang" in cxx else "-flto"
             compiler_so_cxx += [lto_flag]
             linker_so_cxx += [lto_flag]
             # remove debug and optimization flags

src/power_grid_model/_core/dataset_definitions.py

@@ -22,7 +22,7 @@ def __contains__(cls, member):
         Returns:
             bool: True if the member is part of the Enum, False otherwise.
         """
-        return member in cls.__members__.keys()
+        return member in cls.__members__
 
 
 class DatasetType(str, Enum, metaclass=_MetaEnum):

src/power_grid_model/_core/power_grid_core.py

@@ -126,10 +126,7 @@ def _load_core() -> CDLL:
 
     """
     # first try to find the DLL local
-    if platform.system() == "Windows":
-        dll_file = "_power_grid_core.dll"
-    else:
-        dll_file = "_power_grid_core.so"
+    dll_file = "_power_grid_core.dll" if platform.system() == "Windows" else "_power_grid_core.so"
     dll_path = Path(__file__).parent / dll_file
 
     # if local DLL is not found, try to find the DLL from conda environment
@@ -192,10 +189,7 @@ def make_c_binding(func: Callable):
 
     # binding function
     def cbind_func(self, *args, **kwargs):
-        if "destroy" in name:
-            c_inputs = []
-        else:
-            c_inputs = [self._handle]
+        c_inputs = [] if "destroy" in name else [self._handle]
         args = chain(args, (kwargs[key] for key in py_argnames[len(args) :]))
         for arg in args:
             if isinstance(arg, str):

src/power_grid_model/_core/power_grid_model.py

@@ -189,10 +189,7 @@ def _get_output_component_count(self, calculation_type: CalculationType):
         }.get(calculation_type, [])
 
         def include_type(component_type: ComponentType):
-            for exclude_type in exclude_types:
-                if exclude_type.value in component_type.value:
-                    return False
-            return True
+            return all(exclude_type.value not in component_type.value for exclude_type in exclude_types)
 
         return {ComponentType[k]: v for k, v in self.all_component_count.items() if include_type(k)}
 

src/power_grid_model/_core/utils.py

@@ -651,10 +651,12 @@ def _extract_columnar_data(
     """
     not_columnar_data_message = "Expected columnar data"
 
-    if is_batch is not None:
-        allowed_dims = [2, 3] if is_batch else [1, 2]
-    else:
+    if is_batch is None:
         allowed_dims = [1, 2, 3]
+    elif is_batch:
+        allowed_dims = [2, 3]
+    else:
+        allowed_dims = [1, 2]
 
     sub_data = data["data"] if is_sparse(data) else data
 
@@ -683,10 +685,12 @@ def _extract_row_based_data(
     Returns:
         SingleArray | DenseBatchArray: the contents of row based data
     """
-    if is_batch is not None:
-        allowed_dims = [2] if is_batch else [1]
-    else:
+    if is_batch is None:
         allowed_dims = [1, 2]
+    elif is_batch:
+        allowed_dims = [2]
+    else:
+        allowed_dims = [1]
 
     sub_data = data["data"] if is_sparse(data) else data
 

src/power_grid_model/validation/_rules.py

@@ -892,10 +892,7 @@ def none_missing(data: SingleDataset, component: ComponentType, fields: str | li
         fields = [fields]
     for field in fields:
         nan = _nan_type(component, field)
-        if np.isnan(nan):
-            invalid = np.isnan(data[component][field])
-        else:
-            invalid = np.equal(data[component][field], nan)
+        invalid = np.isnan(data[component][field]) if np.isnan(nan) else np.equal(data[component][field], nan)
 
         if invalid.any():
             # handle both symmetric and asymmetric values

src/power_grid_model/validation/utils.py

@@ -101,7 +101,7 @@ def _update_input_data(input_data: SingleDataset, update_data: SingleDataset):
     """
 
     merged_data = {component: array.copy() for component, array in input_data.items()}
-    for component in update_data.keys():
+    for component in update_data:
         _update_component_data(component, merged_data[component], update_data[component])
     return merged_data
 
@@ -140,10 +140,7 @@ def _update_component_array_data(
         if field == "id":
             continue
         nan = _nan_type(component, field, DatasetType.update)
-        if np.isnan(nan):
-            mask = ~np.isnan(update_data[field])
-        else:
-            mask = np.not_equal(update_data[field], nan)
+        mask = ~np.isnan(update_data[field]) if np.isnan(nan) else np.not_equal(update_data[field], nan)
 
         if mask.ndim == 2:
             for phase in range(mask.shape[1]):