enable more rules

Signed-off-by: Ashwin Vaidya <[email protected]>

Author: ashwinvaidya17

model_api/python/model_api/adapters/openvino_adapter.py

@@ -133,7 +133,7 @@ def __init__(
         self.is_onnx_file = False
         self.onnx_metadata = {}
 
-        if isinstance(self.model_path, (str, Path)):
+        if isinstance(self.model_path, str | Path):
             if Path(self.model_path).suffix == ".onnx" and weights_path:
                 log.warning(
                     'For model in ONNX format should set only "model_path" parameter.'
@@ -301,7 +301,7 @@ def await_any(self) -> None:
     def _get_meta_from_ngraph(self, layers_info):
         for node in self.model.get_ordered_ops():
             layer_name = node.get_friendly_name()
-            if layer_name not in layers_info.keys():
+            if layer_name not in layers_info:
                 continue
             layers_info[layer_name].meta = node.get_attributes()
             layers_info[layer_name].type = node.get_type_name()

model_api/python/model_api/adapters/ovms_adapter.py

@@ -185,7 +185,7 @@ def _verify_model_available(client, model_name, model_version):
 def _prepare_inputs(dict_data, inputs_meta):
     inputs = {}
     for input_name, input_data in dict_data.items():
-        if input_name not in inputs_meta.keys():
+        if input_name not in inputs_meta:
             raise ValueError("Input data does not match model inputs")
         input_info = inputs_meta[input_name]
         model_precision = _tf2np_precision[input_info["dtype"]]

model_api/python/model_api/adapters/utils.py

@@ -6,8 +6,8 @@
 from __future__ import annotations  # TODO: remove when Python3.9 support is dropped
 
 import math
+from collections.abc import Callable
 from functools import partial
-from typing import Callable
 
 import cv2
 import numpy as np

model_api/python/model_api/models/instance_segmentation.py

@@ -207,9 +207,8 @@ def postprocess(self, outputs, meta):
                         output_mask,
                     ),
                 )
-            if has_feature_vector_name:
-                if confidence > self.confidence_threshold:
-                    saliency_maps[cls - 1].append(resized_mask)
+            if has_feature_vector_name and confidence > self.confidence_threshold:
+                saliency_maps[cls - 1].append(resized_mask)
         return InstanceSegmentationResult(
             objects,
             _average_and_normalize(saliency_maps),

model_api/python/model_api/models/types.py

@@ -69,13 +69,12 @@ def validate(self, value):
                 ),
             )
             return errors
-        if len(self.choices):
-            if value not in self.choices:
-                errors.append(
-                    ConfigurableValueError(
-                        f"Incorrect value {value}: out of allowable list - {self.choices}",
-                    ),
-                )
+        if len(self.choices) and value not in self.choices:
+            errors.append(
+                ConfigurableValueError(
+                    f"Incorrect value {value}: out of allowable list - {self.choices}",
+                ),
+            )
         if self.min is not None and value < self.min:
             errors.append(
                 ConfigurableValueError(
@@ -188,7 +187,7 @@ def validate(self, value):
         errors = super().validate(value)
         if not value:
             return errors
-        if not isinstance(value, (tuple, list)):
+        if not isinstance(value, tuple | list):
             errors.append(
                 ConfigurableValueError(
                     f"Incorrect value type - {type(value)}: should be list or tuple",

model_api/python/model_api/models/yolo.py

@@ -318,7 +318,7 @@ def iou(box_1, box_2):
 
     def _parse_outputs(self, outputs, meta):
         detections = []
-        for layer_name in self.yolo_layer_params.keys():
+        for layer_name in self.yolo_layer_params:
             out_blob = outputs[layer_name]
             layer_params = self.yolo_layer_params[layer_name]
             out_blob.shape = layer_params[0]

model_api/python/model_api/pipelines/async_pipeline.py

@@ -5,7 +5,7 @@
 
 from time import perf_counter
 
-from ..performance_metrics import PerformanceMetrics
+from model_api.performance_metrics import PerformanceMetrics
 
 
 class AsyncPipeline:

model_api/python/pyproject.toml

@@ -92,12 +92,12 @@ preview = true
 lint.select = [
     # "F",    # Pyflakes (`F`)
     "E",    # pycodestyle error (`E`)
-    # "W",    # pycodestyle warning (`W`)
+    "W",    # pycodestyle warning (`W`)
     # "C90",  # mccabe (`C90`)
     "I",    # isort (`I`)
     # "N",    # pep8-naming (`N`)
     # "D",    # pydocstyle (`D`)
-    # "UP",   # pyupgrade (`UP`)
+    "UP",   # pyupgrade (`UP`)
     # "YTT",  # flake8-2020 (`YTT`)
     # "ANN",  # flake8-annotations (`ANN`)
     # "S",    # flake8-bandit (`S`)
@@ -106,9 +106,9 @@ lint.select = [
     # "B",    # flake8-bugbear (`B`)
     # "A",    # flake8-builtins (`A`)
     # "COM",  # flake8-commas (`COM`)
-    # "CPY",  # flake8-copyright (`CPY`)
+    "CPY",  # flake8-copyright (`CPY`)
     # "C4",   # flake8-comprehensions (`C4`)
-    # "DTZ",  # flake8-datatimez (`DTZ`)
+    "DTZ",  # flake8-datatimez (`DTZ`)
     # "T10",  # flake8-debugger (`T10`)
     # "EM",   # flake8-errmsg (`EM`)
     # "FA",   # flake8-future-annotations (`FA`)
@@ -118,22 +118,22 @@ lint.select = [
     # "PT",   # flake8-pytest-style (`PT`)
     # "RSE",  # flake8-raise (`RSE`)
     # "RET",  # flake8-return (`RET`)
-    # "SLF",  # flake8-self (`SLF`)
-    # "SIM",  # flake8-simplify (`SIM`)
-    # "TID",  # flake8-tidy-imports (`TID`)
+    "SLF",  # flake8-self (`SLF`)
+    "SIM",  # flake8-simplify (`SIM`)
+    "TID",  # flake8-tidy-imports (`TID`)
     # "TCH",  # flake8-type-checking (`TCH`)
     # "INT",  # flake8-gettext (`INT`)
     # "ARG",  # flake8-unsused-arguments (`ARG`)
     # "PTH",  # flake8-use-pathlib (`PTH`)
     # "TD",   # flake8-todos (`TD`)
     # "FIX",  # flake8-fixme (`FIX`)
     # "ERA",  # eradicate (`ERA`)
-    # "PD",   # pandas-vet (`PD`)
-    # "PGH",  # pygrep-hooks (`PGH`)
+    "PD",   # pandas-vet (`PD`)
+    "PGH",  # pygrep-hooks (`PGH`)
     # "PL",   # pylint (`PL`)
     # "TRY",  # tryceratos (`TRY`)
     # "FLY",  # flynt (`FLY`)
-    # "NPY",  # NumPy-specific rules (`NPY`)
+    "NPY",  # NumPy-specific rules (`NPY`)
     # "PERF", # Perflint (`PERF`)
     # "RUF",  # Ruff-specific rules (`RUF`)
     # "FURB", # refurb (`FURB`) - ERROR: Unknown rule selector: `FURB`