UP check and fixes

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

Author: Laurynas-Jagutis

.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

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
 

pyproject.toml

@@ -123,8 +123,11 @@ select = [
     "ARG",
     "RET",
     "PIE",
-    "SLF"
+    "SLF",
+    "UP"
 ]
+# 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.

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
 

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
 

src/power_grid_model/_core/power_grid_core.py

@@ -8,11 +8,11 @@
 
 import os
 import platform
+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 pathlib import Path
-from typing import Callable
 
 from power_grid_model._core.index_integer import IdC, IdxC
 

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,

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

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
 

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]:
@@ -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(