Update black. Reformat. Update savant-rs to 0.2.19. (#726)

adapters/ds/sinks/always_on_rtsp/__main__.py

@@ -1,4 +1,5 @@
 """Entrypoint for Always-On-RTSP sink."""
+
 import signal
 import time
 from pathlib import Path

adapters/gst/gst_plugins/python/ffmpeg_src.py

@@ -1,4 +1,5 @@
 """FFmpeg src."""
+
 import inspect
 from typing import Dict, NamedTuple, Optional
 

adapters/gst/gst_plugins/python/savant_parse_bin.py

@@ -1,4 +1,5 @@
 """SavantParseBin element."""
+
 from typing import Optional
 
 from savant.gstreamer import GObject, Gst  # noqa:F401

adapters/gst/gst_plugins/python/zeromq_sink.py

@@ -1,4 +1,5 @@
 """ZeroMQ sink."""
+
 import inspect
 import json
 from fractions import Fraction

gst_plugins/python/savant_rs_add_frames.py

@@ -1,4 +1,5 @@
 """SavantRsAddFrames element."""
+
 import inspect
 from typing import Any, NamedTuple, Optional
 

gst_plugins/python/savant_rs_video_decode_bin.py

@@ -1,4 +1,5 @@
 """SavantRsVideoDecodeBin element."""
+
 import time
 from dataclasses import dataclass
 from threading import Event, Lock

gst_plugins/python/savant_rs_video_demux.py

@@ -1,4 +1,5 @@
 """SavantRsVideoDemux element."""
+
 import inspect
 import time
 from contextlib import contextmanager

gst_plugins/python/zeromq_properties.py

@@ -1,4 +1,5 @@
 """ZeroMQ properties."""
+
 from savant.gstreamer import GObject
 
 

gst_plugins/python/zeromq_source_bin.py

@@ -1,4 +1,5 @@
 """ZeroMQ src bin."""
+
 from typing import Optional
 
 from savant_rs.pipeline2 import VideoPipeline

gst_plugins/python/zeromq_src.py

@@ -1,4 +1,5 @@
 """ZeroMQ src."""
+
 import inspect
 from typing import Optional, Tuple
 

requirements/dev.txt

@@ -1,4 +1,4 @@
-black~=22.3.0
+black~=24.3.0
 unify~=0.5
 pytest~=7.4.3
 isort~=5.12.0

samples/age_gender_recognition/age_gender_converter.py

@@ -1,4 +1,5 @@
 """Age gender converter module."""
+
 from typing import Any, List, Optional, Tuple
 
 import numpy as np
@@ -19,7 +20,7 @@ def __call__(
         self,
         *output_layers: np.ndarray,
         model: AttributeModel,
-        roi: Tuple[float, float, float, float]
+        roi: Tuple[float, float, float, float],
     ) -> List[Tuple[str, Any, Optional[float]]]:
         """Converts age gender model output vector to age and gender attribute."""
         age = np.sum(np.multiply(output_layers[0], age_range)).item()

samples/age_gender_recognition/overlay.py

@@ -1,4 +1,5 @@
 """Overlay dashboard module."""
+
 from savant_rs.draw_spec import LabelDraw, ObjectDraw
 
 from savant.deepstream.drawfunc import NvDsDrawFunc

samples/age_gender_recognition/smoothed_counter.py

@@ -1,4 +1,5 @@
 """Smoothed counter module."""
+
 import queue
 from collections import defaultdict
 from typing import Any, Dict

samples/age_gender_recognition/smoothing.py

@@ -1,4 +1,5 @@
 """Analytics module."""
+
 from typing import Dict, Tuple
 
 from samples.age_gender_recognition.smoothed_counter import SmoothedCounter

samples/animegan/animegan_converter.py

@@ -12,7 +12,7 @@ def __call__(
         self,
         *output_layers: np.ndarray,
         model: AttributeModel,
-        roi: Tuple[float, float, float, float]
+        roi: Tuple[float, float, float, float],
     ) -> List[Tuple[str, Any, Optional[float]]]:
 
         img = output_layers[0]

samples/face_reid/src/index_builder_client.py

@@ -1,4 +1,5 @@
 """Index builder module."""
+
 import argparse
 import os
 import pathlib

samples/face_reid/src/recognition.py

@@ -1,4 +1,5 @@
 """Recognition module."""
+
 import os
 
 import hnswlib

samples/fisheye_line_crossing/converter.py

@@ -1,4 +1,5 @@
 """YOLOv7 OBB detector output to bbox converter."""
+
 from typing import Tuple
 
 import numpy as np

samples/fisheye_line_crossing/similari_tracker.py

@@ -1,4 +1,5 @@
 """Similari SORT tracker module."""
+
 import math
 
 from savant_rs.primitives.geometry import RBBox

samples/fisheye_line_crossing/utils.py

@@ -1,4 +1,5 @@
 """Line crossing trackers."""
+
 import colorsys
 import math
 import random

samples/intersection_traffic_meter/utils.py

@@ -1,4 +1,5 @@
 """Line crossing trackers."""
+
 import colorsys
 import math
 import random

samples/keypoint_detection/converter.py

@@ -1,4 +1,5 @@
 """YOLOv8Pose postprocessing (converter)."""
+
 from typing import Any, Tuple
 
 import numpy as np

samples/license_plate_recognition/lprnet_converter.py

@@ -1,4 +1,5 @@
 """LPRNet model output converter."""
+
 from pathlib import Path
 from typing import Any, List, Optional, Tuple
 

samples/license_plate_recognition/overlay.py

@@ -1,4 +1,5 @@
 """Draw func adds license plate"""
+
 from savant_rs.draw_spec import LabelDraw, ObjectDraw
 
 from savant.deepstream.drawfunc import NvDsDrawFunc

samples/nvidia_car_classification/overlay.py

@@ -1,4 +1,5 @@
 """Draw func adds car classification models outputs: car color, car make, car type."""
+
 from savant_rs.draw_spec import LabelDraw, ObjectDraw
 
 from savant.deepstream.drawfunc import NvDsDrawFunc

samples/opencv_cuda_bg_remover_mog2/bgremover.py

@@ -1,4 +1,5 @@
 """Background remover module."""
+
 import cv2
 
 from savant.deepstream.meta.frame import NvDsFrameMeta

samples/panoptic_driving_perception/pytorch_infer.py

@@ -1,4 +1,5 @@
 """Custom PyFunc implementation inference PyTorch model."""
+
 import cv2
 import torch
 import torchvision

samples/pass_through_processing/py_func_metrics_example.py

@@ -1,4 +1,5 @@
 """Example of how to use metrics in PyFunc."""
+
 from savant.deepstream.meta.frame import NvDsFrameMeta
 from savant.deepstream.pyfunc import NvDsPyFuncPlugin
 from savant.gstreamer import Gst

samples/peoplenet_detector/analytics.py

@@ -1,4 +1,5 @@
 """Analytics module."""
+
 from collections import defaultdict
 
 import numpy as np

samples/peoplenet_detector/animation.py

@@ -1,4 +1,5 @@
 """Animation module."""
+
 from pathlib import Path
 
 import cv2

samples/peoplenet_detector/overlay.py

@@ -1,4 +1,5 @@
 """Overlay dashboard module."""
+
 from pathlib import Path
 
 import cv2

samples/peoplenet_detector/person_face_matching.py

@@ -1,4 +1,5 @@
 """Person-face matching module."""
+
 from typing import List
 
 import numpy as np

samples/peoplenet_detector/smoothed_counter.py

@@ -1,4 +1,5 @@
 """Smoothed counter module."""
+
 from typing import Any
 
 

samples/peoplenet_detector/utils.py

@@ -1,4 +1,5 @@
 """Utilies module."""
+
 from typing import Tuple
 
 import cv2

samples/source_adapter_with_json_metadata/metric.py

@@ -1,4 +1,5 @@
 """Analytics module."""
+
 from savant.deepstream.meta.frame import NvDsFrameMeta
 from savant.deepstream.pyfunc import NvDsPyFuncPlugin
 from savant.gstreamer import Gst

samples/super_resolution/overlay.py

@@ -1,4 +1,5 @@
 """Overlay."""
+
 import cv2
 import numpy as np
 

samples/template/src/module/custom_pyfunc.py

@@ -1,4 +1,5 @@
 """Custom PyFunc implementation."""
+
 from savant.deepstream.meta.frame import NvDsFrameMeta
 from savant.deepstream.pyfunc import NvDsPyFuncPlugin
 from savant.gstreamer import Gst

samples/template/src/module/overlay_custom.py

@@ -1,4 +1,5 @@
 """Custom DrawFunc implementation."""
+
 from savant.deepstream.drawfunc import NvDsDrawFunc
 from savant.deepstream.meta.frame import NvDsFrameMeta
 from savant.utils.artist import Artist

samples/template/src/module/overlay_draw_spec.py

@@ -1,4 +1,5 @@
 """Custom DrawFunc implementation."""
+
 from savant_rs.draw_spec import BoundingBoxDraw, ColorDraw, ObjectDraw, PaddingDraw
 
 from savant.deepstream.drawfunc import NvDsDrawFunc

samples/traffic_meter/utils.py

@@ -1,4 +1,5 @@
 """Line crossing trackers."""
+
 import colorsys
 import math
 import random

samples/yolov8_seg/module/converter.py

@@ -1,4 +1,5 @@
 """YOLOv8-seg postprocessing (converter)."""
+
 from typing import Any, List, Tuple
 
 import cv2

samples/yolov8_seg/module/gpu_converter.py

@@ -1,4 +1,5 @@
 """YOLOv8-seg postprocessing (converter)."""
+
 from typing import Any, List, Tuple
 
 import cupy as cp

samples/yolov8_seg/module/overlay.py

@@ -1,4 +1,5 @@
 """Custom DrawFunc implementation."""
+
 import numpy as np
 
 from savant.deepstream.drawfunc import NvDsDrawFunc

savant/VERSION

@@ -1,3 +1,3 @@
 SAVANT=0.4.0
-SAVANT_RS=0.2.17
+SAVANT_RS=0.2.19
 DEEPSTREAM=6.4

savant/base/converter.py

@@ -1,4 +1,5 @@
 """Base model output converters."""
+
 from abc import abstractmethod
 from enum import Enum
 from typing import Any, List, Optional, Tuple, Union

savant/base/frame_filter.py

@@ -1,4 +1,5 @@
 """Ingress / egress filters module."""
+
 from abc import abstractmethod
 
 from savant_rs.primitives import VideoFrame

savant/base/input_preproc.py

@@ -1,4 +1,5 @@
 """Base model input preprocessors."""
+
 from abc import abstractmethod
 from typing import Callable, Optional
 

savant/base/model.py

@@ -1,4 +1,5 @@
 """Base deep learning model configuration templates."""
+
 from dataclasses import dataclass, field
 from enum import Enum
 from typing import List, Optional, Tuple

savant/base/pyfunc.py

@@ -1,4 +1,5 @@
 """PyFunc definitions."""
+
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from importlib import util as importlib_util

savant/base/selector.py

@@ -1,4 +1,5 @@
 """Base object selectors."""
+
 from abc import abstractmethod
 
 import numpy as np

savant/client/__init__.py

@@ -1,4 +1,5 @@
 """Source/Sink framework for development and QA purposes."""
+
 from .builder.sink import SinkBuilder
 from .builder.source import SourceBuilder
 from .frame_source import FrameSource

savant/client/image_source/img_header_parse.py

@@ -1,4 +1,5 @@
 """Image header parse utility."""
+
 import re
 from os import PathLike
 from typing import BinaryIO, Tuple, Union

savant/client/utils/__init__.py

@@ -1,2 +1,3 @@
 """Savant Client SDK utilities."""
+
 from .img_resize import resize_preserving_aspect

savant/client/utils/img_resize.py

@@ -1,4 +1,5 @@
 """Image resizing utilities."""
+
 import math
 from typing import Tuple
 

savant/config/__init__.py

@@ -1,4 +1,5 @@
 """Module configuration."""
+
 from omegaconf import OmegaConf
 
 from .calc_resolver import calc_resolver

savant/config/calc_resolver.py

@@ -1,4 +1,5 @@
 """Calculator resolver for OmegaConf."""
+
 from simpleeval import simple_eval
 
 

savant/config/json_resolver.py

@@ -1,4 +1,5 @@
 """JSON resolver for OmegaConf."""
+
 import json
 from typing import Optional, Union
 

savant/config/module_config.py

@@ -1,4 +1,5 @@
 """Module configuration."""
+
 import re
 from pathlib import Path
 from typing import IO, Any, Callable, Iterable, Optional, Tuple, Type, Union

savant/config/schema.py

@@ -1,4 +1,5 @@
 """Module and pipeline elements configuration templates."""
+
 import json
 from dataclasses import asdict, dataclass, field
 from typing import Any, Dict, List, Optional, Union

savant/converter/__init__.py

@@ -1,3 +1,4 @@
 """Model output postprocessing."""
+
 from .classifier import TensorToLabelConverter
 from .vector_attribute import TensorToItemConverter, TensorToVectorConverter

savant/converter/classifier.py

@@ -1,4 +1,5 @@
 """Tensor to label converter."""
+
 from typing import List, Optional, Tuple
 
 import numpy as np
@@ -21,7 +22,7 @@ def __call__(
         self,
         *output_layers: np.ndarray,
         model: AttributeModel,
-        roi: Tuple[float, float, float, float]
+        roi: Tuple[float, float, float, float],
     ) -> List[Tuple[str, str, Optional[float]]]:
         """Converts attribute (complex) model output layer values to
         ``(attr_name, label, confidence)`` tuples."""

savant/converter/rapid.py

@@ -1,4 +1,5 @@
 """Tensor to bounding box converter."""
+
 from typing import Tuple
 
 import numpy as np