add RUF check and fixes

Signed-off-by: Laurynas Jagutis <[email protected]>

Author: Laurynas-Jagutis

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

pyproject.toml

@@ -125,7 +125,8 @@ select = [
     "PIE",
     "SLF",
     "UP",
-    "RSE"
+    "RSE",
+    "RUF"
 ]
 # the rule is deprecated, https://docs.astral.sh/ruff/rules/non-pep604-isinstance/#deprecation
 ignore = ["UP038"]

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",
 ]

src/power_grid_model/_core/power_grid_core.py

@@ -184,7 +184,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

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,

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

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",
 ]

src/power_grid_model/validation/_rules.py

@@ -1166,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()

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])

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(