Merge pull request #1065 from PowerGridModel/feature/even-more-ruff-checks

mgovers · web-flow · commit c4598ed0344e · 2025-08-05T13:33:21.000Z
Linting and Formatting: UP and RSE checks
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: reuse
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.12.0
+    rev: v0.12.7
     hooks:
       # Run the linter.
       - id: ruff-check
diff --git a/code_generation/code_gen.py b/code_generation/code_gen.py
@@ -75,7 +75,7 @@ def render_attribute_classes(self, template_path: Path, data_path: Path, output_
             attribute_class.attributes = new_attribute_list
             # get full attribute
             if attribute_class.base is not None:
-                base_class = list(filter(lambda x: x.name == attribute_class.base, dataset_meta_data.classes))[0]
+                base_class = next(filter(lambda x: x.name == attribute_class.base, dataset_meta_data.classes))
                 attribute_class.full_attributes = base_class.full_attributes + attribute_class.attributes
                 attribute_class.base_attributes = base_class.base_attributes.copy()
                 attribute_class.base_attributes[base_class.name] = base_class.full_attributes
diff --git a/code_generation/templates/src/power_grid_model/_core/dataset_class_maps.py.jinja b/code_generation/templates/src/power_grid_model/_core/dataset_class_maps.py.jinja
@@ -9,8 +9,9 @@
 {%- set dataset_types = all_map.keys() %}
 {%- set components = all_map['input'].keys() %}
 
+from collections.abc import Mapping
 from enum import Enum, EnumMeta
-from typing import Any, Mapping, TypeAlias, TypeVar
+from typing import Any, TypeAlias, TypeVar
 
 # fmt: off
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -142,8 +142,13 @@ select = [
     "ARG",
     "RET",
     "PIE",
-    "SLF"
+    "SLF",
+    "UP",
+    "RSE",
+    "RUF"
 ]
+# the rule is deprecated, https://docs.astral.sh/ruff/rules/non-pep604-isinstance/#deprecation
+ignore = ["UP038"]
 
 [tool.ruff.lint.isort]
 # Imports that are imported using keyword "as" and are from the same source - are combined.
diff --git a/src/power_grid_model/__init__.py b/src/power_grid_model/__init__.py
@@ -30,8 +30,6 @@
 from power_grid_model.typing import ComponentAttributeMapping
 
 __all__ = [
-    "attribute_dtype",
-    "attribute_empty_value",
     "AngleMeasurementType",
     "Branch3Side",
     "BranchSide",
@@ -43,12 +41,14 @@
     "DatasetType",
     "FaultPhase",
     "FaultType",
-    "initialize_array",
     "LoadGenType",
     "MeasuredTerminalType",
     "PowerGridModel",
-    "power_grid_meta_data",
     "ShortCircuitVoltageScaling",
     "TapChangingStrategy",
     "WindingType",
+    "attribute_dtype",
+    "attribute_empty_value",
+    "initialize_array",
+    "power_grid_meta_data",
 ]
diff --git a/src/power_grid_model/_core/data_handling.py b/src/power_grid_model/_core/data_handling.py
@@ -38,7 +38,7 @@ def get_output_type(*, calculation_type: CalculationType, symmetric: bool) -> Da
     if calculation_type == CalculationType.short_circuit:
         return DatasetType.sc_output
 
-    raise NotImplementedError()
+    raise NotImplementedError
 
 
 def prepare_input_view(input_data: SingleDataset) -> CConstDataset:
diff --git a/src/power_grid_model/_core/dataset_definitions.py b/src/power_grid_model/_core/dataset_definitions.py
@@ -6,8 +6,9 @@
 
 # This file is automatically generated. DO NOT modify it manually!
 
+from collections.abc import Mapping
 from enum import Enum, EnumMeta
-from typing import Any, Mapping, TypeAlias, TypeVar
+from typing import Any, TypeAlias, TypeVar
 
 # fmt: off
 
diff --git a/src/power_grid_model/_core/options.py b/src/power_grid_model/_core/options.py
@@ -6,7 +6,8 @@
 Option class
 """
 
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from power_grid_model._core.power_grid_core import OptionsPtr, power_grid_core as pgc
 
diff --git a/src/power_grid_model/_core/power_grid_core.py b/src/power_grid_model/_core/power_grid_core.py
@@ -6,10 +6,10 @@
 Loader for the dynamic library
 """
 
+from collections.abc import Callable
 from ctypes import CDLL, POINTER, c_char, c_char_p, c_double, c_size_t, c_void_p
 from inspect import signature
 from itertools import chain
-from typing import Callable
 
 from power_grid_model._core.index_integer import IdC, IdxC
 from power_grid_model._core.power_grid_model_c.get_pgm_dll_path import get_pgm_dll_path
@@ -166,7 +166,7 @@ def make_c_binding(func: Callable):
     if is_destroy_func:
         getattr(_CDLL, f"PGM_{name}").argtypes = c_argtypes
     else:
-        getattr(_CDLL, f"PGM_{name}").argtypes = [HandlePtr] + c_argtypes
+        getattr(_CDLL, f"PGM_{name}").argtypes = [HandlePtr, *c_argtypes]
     getattr(_CDLL, f"PGM_{name}").restype = c_restype
 
     # binding function
diff --git a/src/power_grid_model/_core/power_grid_dataset.py b/src/power_grid_model/_core/power_grid_dataset.py
@@ -6,7 +6,8 @@
 Power grid model raw dataset handler
 """
 
-from typing import Any, Mapping, cast
+from collections.abc import Mapping
+from typing import Any, cast
 
 from power_grid_model._core.buffer_handling import (
     BufferProperties,
diff --git a/src/power_grid_model/_core/power_grid_model.py b/src/power_grid_model/_core/power_grid_model.py
@@ -7,7 +7,6 @@
 """
 
 from enum import IntEnum
-from typing import Type
 
 import numpy as np
 
@@ -212,7 +211,7 @@ def _construct_output(
 
     @staticmethod
     def _options(**kwargs) -> Options:
-        def as_enum_value(key_enum: str, type_: Type[IntEnum]):
+        def as_enum_value(key_enum: str, type_: type[IntEnum]):
             if key_enum in kwargs:
                 value_enum = kwargs[key_enum]
                 if isinstance(value_enum, str):
diff --git a/src/power_grid_model/_core/utils.py b/src/power_grid_model/_core/utils.py
@@ -10,8 +10,9 @@
 We do not officially support this functionality and may remove features in this library at any given time!
 """
 
+from collections.abc import Sequence
 from copy import deepcopy
-from typing import Sequence, cast
+from typing import cast
 
 import numpy as np
 
diff --git a/src/power_grid_model/data_types.py b/src/power_grid_model/data_types.py
@@ -11,7 +11,7 @@
 
 # Import non class symbols as private to reassign and provide a docstring.
 # Not necessary for class, as sphinx autodoc finds their docstrings
-from power_grid_model._core.data_types import (  # noqa: F401, I001
+from power_grid_model._core.data_types import (  # noqa: F401
     AsymValue as _AsymValue,
     AttributeType as _AttributeType,
     AttributeValue as _AttributeValue,
diff --git a/src/power_grid_model/typing.py b/src/power_grid_model/typing.py
@@ -19,7 +19,7 @@
     DatasetMetaData,
     PowerGridMetaData,
 )
-from power_grid_model._core.typing import (  # noqa: F401
+from power_grid_model._core.typing import (
     ComponentAttributeMapping as _ComponentAttributeMapping,
 )
 from power_grid_model.enum import ComponentAttributeFilterOptions  # noqa: F401
diff --git a/src/power_grid_model/validation/__init__.py b/src/power_grid_model/validation/__init__.py
@@ -14,12 +14,12 @@
 from power_grid_model.validation.utils import errors_to_string
 
 __all__ = [
+    "ValidationError",
+    "ValidationException",
     "assert_valid_batch_data",
     "assert_valid_data_structure",
     "assert_valid_input_data",
     "errors_to_string",
     "validate_batch_data",
     "validate_input_data",
-    "ValidationError",
-    "ValidationException",
 ]
diff --git a/src/power_grid_model/validation/_rules.py b/src/power_grid_model/validation/_rules.py
@@ -35,8 +35,9 @@
 
 """
 
+from collections.abc import Callable
 from enum import Enum
-from typing import Any, Callable, Type, TypeVar
+from typing import Any, TypeVar
 
 import numpy as np
 
@@ -336,7 +337,7 @@ def none_match_comparison(  # noqa: PLR0913
     field: str,
     compare_fn: Callable,
     ref_value: ComparisonError.RefType,
-    error: Type[CompError] = ComparisonError,  # type: ignore
+    error: type[CompError] = ComparisonError,  # type: ignore
     default_value_1: np.ndarray | int | float | None = None,
     default_value_2: np.ndarray | int | float | None = None,
 ) -> list[CompError]:
@@ -370,7 +371,7 @@ def none_match_comparison(  # noqa: PLR0913
         _set_default_value(data=data, component=component, field=field, default_value=default_value_2)
     component_data = data[component]
     if not isinstance(component_data, np.ndarray):
-        raise NotImplementedError()  # TODO(mgovers): add support for columnar data
+        raise NotImplementedError  # TODO(mgovers): add support for columnar data
 
     if isinstance(ref_value, tuple):
         ref = tuple(_eval_expression(component_data, v) for v in ref_value)
@@ -524,7 +525,7 @@ def all_in_valid_values(
 
 
 def all_valid_enum_values(
-    data: SingleDataset, component: ComponentType, field: str, enum: Type[Enum] | list[Type[Enum]]
+    data: SingleDataset, component: ComponentType, field: str, enum: type[Enum] | list[type[Enum]]
 ) -> list[InvalidEnumValueError]:
     """
     Check that for all records of a particular type of component, the values in the 'field' column are valid values for
@@ -540,7 +541,7 @@ def all_valid_enum_values(
         A list containing zero or one InvalidEnumValueError, listing all ids where the value in the field of interest
         was not a valid value in the supplied enum type.
     """
-    enums: list[Type[Enum]] = enum if isinstance(enum, list) else [enum]
+    enums: list[type[Enum]] = enum if isinstance(enum, list) else [enum]
 
     valid = {_nan_type(component, field)}
     for enum_type in enums:
@@ -559,7 +560,7 @@ def all_valid_associated_enum_values(  # noqa: PLR0913
     field: str,
     ref_object_id_field: str,
     ref_components: list[ComponentType],
-    enum: Type[Enum] | list[Type[Enum]],
+    enum: type[Enum] | list[type[Enum]],
     **filters: Any,
 ) -> list[InvalidAssociatedEnumValueError]:
     """
@@ -576,7 +577,7 @@ def all_valid_associated_enum_values(  # noqa: PLR0913
         A list containing zero or one InvalidAssociatedEnumValueError, listing all ids where the value in the field
         of interest was not a valid value in the supplied enum type.
     """
-    enums: list[Type[Enum]] = enum if isinstance(enum, list) else [enum]
+    enums: list[type[Enum]] = enum if isinstance(enum, list) else [enum]
 
     valid_ids = _get_valid_ids(data=data, ref_components=ref_components)
     mask = np.logical_and(
@@ -762,7 +763,7 @@ def all_finite(data: SingleDataset, exceptions: dict[ComponentType, list[str]] |
     errors = []
     for component, array in data.items():
         if not isinstance(array, np.ndarray):
-            raise NotImplementedError()  # TODO(mgovers): add support for columnar data
+            raise NotImplementedError  # TODO(mgovers): add support for columnar data
 
         for field, (dtype, _) in array.dtype.fields.items():
             if not np.issubdtype(dtype, np.floating):
@@ -1165,7 +1166,7 @@ def any_voltage_angle_measurement_if_global_current_measurement(
 
     return [
         MissingVoltageAngleMeasurementError(
-            fields=[(component, angle_measurement_type_field)] + list(voltage_sensor_u_angle_measured.items()),
+            fields=[(component, angle_measurement_type_field), *list(voltage_sensor_u_angle_measured.items())],
             ids=[
                 (sensor_type, id_)
                 for sensor_type, sensor_data in voltage_and_current_sensor_ids.items()
diff --git a/src/power_grid_model/validation/errors.py b/src/power_grid_model/validation/errors.py
@@ -8,8 +8,9 @@
 
 import re
 from abc import ABC
+from collections.abc import Iterable
 from enum import Enum
-from typing import Any, Iterable, Type
+from typing import Any
 
 from power_grid_model import ComponentType
 from power_grid_model._core.dataset_definitions import DatasetType
@@ -271,10 +272,10 @@ class InvalidEnumValueError(SingleFieldValidationError):
     """
 
     _message = "Field {field} contains invalid {enum} values for {n} {objects}."
-    enum: Type[Enum] | list[Type[Enum]]
+    enum: type[Enum] | list[type[Enum]]
     __hash__ = None  # type: ignore[assignment]
 
-    def __init__(self, component: ComponentType, field: str, ids: list[int], enum: Type[Enum] | list[Type[Enum]]):
+    def __init__(self, component: ComponentType, field: str, ids: list[int], enum: type[Enum] | list[type[Enum]]):
         super().__init__(component, field, ids)
         self.enum = enum
 
@@ -523,15 +524,15 @@ class InvalidAssociatedEnumValueError(MultiFieldValidationError):
     """
 
     _message = "The combination of fields {field} results in invalid {enum} values for {n} {objects}."
-    enum: Type[Enum] | list[Type[Enum]]
+    enum: type[Enum] | list[type[Enum]]
     __hash__ = None  # type: ignore[assignment]
 
     def __init__(
         self,
         component: ComponentType,
         fields: list[str],
         ids: list[int],
-        enum: Type[Enum] | list[Type[Enum]],
+        enum: type[Enum] | list[type[Enum]],
     ):
         """
         Args:
diff --git a/src/power_grid_model/validation/utils.py b/src/power_grid_model/validation/utils.py
@@ -111,7 +111,7 @@ def _update_component_data(
     if isinstance(input_data, np.ndarray) and isinstance(update_data, np.ndarray):
         return _update_component_array_data(component=component, input_data=input_data, update_data=update_data)
 
-    raise NotImplementedError()  # TODO(mgovers): add support for columnar data
+    raise NotImplementedError  # TODO(mgovers): add support for columnar data
 
 
 def _update_component_array_data(component: ComponentType, input_data: SingleArray, update_data: SingleArray) -> None:
diff --git a/tests/unit/test_0Z_model_validation.py b/tests/unit/test_0Z_model_validation.py
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
+from collections.abc import Callable
 from copy import copy
 from pathlib import Path
-from typing import Callable
 
 import numpy as np
 import pytest
diff --git a/tests/unit/test_data_handling.py b/tests/unit/test_data_handling.py
@@ -23,12 +23,12 @@ def columnar_array(component_type, n_components, attributes=None, batch_size_tup
         set(component_dtype.names) & set(attributes) if attributes is not None else component_dtype.names
     )
     return {
-        attr: np.empty((n_components,) + batch_size_tuple, dtype=component_dtype[attr]) for attr in required_attributes
+        attr: np.empty((n_components, *batch_size_tuple), dtype=component_dtype[attr]) for attr in required_attributes
     }
 
 
 def row_array(component_type, n_components, batch_size_tuple=()):
-    return initialize_array(DT.sym_output, component_type, (n_components,) + batch_size_tuple)
+    return initialize_array(DT.sym_output, component_type, (n_components, *batch_size_tuple))
 
 
 @pytest.fixture(params=[1, 15])
diff --git a/tests/unit/test_serialization.py b/tests/unit/test_serialization.py
@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: MPL-2.0
 
 import json
-from typing import Any, Mapping
+from collections.abc import Mapping
+from typing import Any
 
 import msgpack
 import numpy as np
diff --git a/tests/unit/validation/test_input_validation.py b/tests/unit/validation/test_input_validation.py
@@ -365,7 +365,7 @@ def original_data() -> dict[ComponentType, np.ndarray]:
     asym_current_sensor["angle_measurement_type"] = [0, 1, 10, 2, 0]
 
     fault = initialize_array(DatasetType.input, ComponentType.fault, 20)
-    fault["id"] = [1] + list(range(32, 51))
+    fault["id"] = [1, *list(range(32, 51))]
     fault["status"] = [0, -1, 2] + 17 * [1]
     fault["fault_type"] = 6 * [0] + 4 * [1] + 4 * [2] + 4 * [3] + [_nan_type(ComponentType.fault, "fault_type"), 4]
     fault["fault_phase"] = (
@@ -763,7 +763,7 @@ def test_validate_input_data_sym_calculation(input_data):
 
     assert NotBooleanError(ComponentType.fault, "status", [32, 33]) in validation_errors
     assert (
-        InvalidIdError(ComponentType.fault, "fault_object", [1] + list(range(32, 42)), [ComponentType.node])
+        InvalidIdError(ComponentType.fault, "fault_object", [1, *list(range(32, 42))], [ComponentType.node])
         in validation_errors
     )
 
@@ -955,7 +955,7 @@ def test_fault(input_data):
     assert validation_errors is not None
     assert InvalidEnumValueError(ComponentType.fault, "fault_type", [50], FaultType) in validation_errors
     assert InvalidEnumValueError(ComponentType.fault, "fault_phase", [50], FaultPhase) in validation_errors
-    assert FaultPhaseError(ComponentType.fault, ["fault_type", "fault_phase"], [1] + list(range(32, 51)))
+    assert FaultPhaseError(ComponentType.fault, ["fault_type", "fault_phase"], [1, *list(range(32, 51))])
     assert NotGreaterOrEqualError(ComponentType.fault, "r_f", [1], 0) in validation_errors
     assert (
         NotIdenticalError(
