Replace black with ruff (#1083)

* Use ruff code formatter.
* Reformat & fix.
* Fix amazon-kinesis-video-streams-consumer dependencies.

Author: denisvmedyantsev

Makefile

@@ -178,25 +178,9 @@ run-dev:
 clean:
 	find . -type d -name __pycache__ -exec rm -rf {} \+
 
-check-black:
-	black --check .
+check:
+	ruff check .
 
-check-unify:
-	unify --check-only --recursive savant | grep -- '--- before' | sed 's#--- before/##'
-	unify --check-only --recursive savant > /dev/null
-
-check-isort:
-	isort savant adapters gst_plugins samples scripts tests utils -c
-
-check: check-black check-unify check-isort
-
-run-unify:
-	unify --in-place --recursive savant adapters gst_plugins samples scripts tests utils services
-
-run-black:
-	black .
-
-run-isort:
-	isort savant adapters gst_plugins samples scripts tests utils services
-
-reformat: run-unify run-black run-isort
+reformat:
+	ruff check . --fix
+	ruff format .

adapters/ds/gst_plugins/python/always_on_rtsp_frame_processor.py

@@ -72,7 +72,7 @@ class AlwaysOnRtspFrameProcessor(LoggerMixin, GstBase.BaseTransform):
         'mode': (
             str,
             'Transfer mode.',
-            'Transfer mode (allowed: ' f'{", ".join([mode.value for mode in Mode])}).',
+            f'Transfer mode (allowed: {", ".join([mode.value for mode in Mode])}).',
             DEFAULT_MODE.value,
             GObject.ParamFlags.READWRITE,
         ),

adapters/ds/gst_plugins/python/savant_rs_video_player.py

@@ -181,8 +181,8 @@ def __init__(self, *args, **kwargs):
         self.add(self._decoder)
         self._decoder.connect('pad-added', self.on_pad_added)
 
-        assert self._source.link(self._queue), f'Failed to link source to queue'
-        assert self._queue.link(self._decoder), f'Failed to link queue to decoder'
+        assert self._source.link(self._queue), 'Failed to link source to queue'
+        assert self._queue.link(self._decoder), 'Failed to link queue to decoder'
 
     def do_get_property(self, prop):
         """Gst plugin get property function.

adapters/ds/sinks/always_on_rtsp/__main__.py

@@ -53,9 +53,9 @@ def main():
             ]
         )
         logger.info('Started MediaMTX, PID: %s', mediamtx_process.pid)
-        assert (
-            mediamtx_process.returncode is None
-        ), f'Failed to start MediaMTX. Exit code: {mediamtx_process.returncode}.'
+        assert mediamtx_process.returncode is None, (
+            f'Failed to start MediaMTX. Exit code: {mediamtx_process.returncode}.'
+        )
     else:
         mediamtx_process = None
 

adapters/ds/sinks/always_on_rtsp/app_config.py

@@ -20,22 +20,22 @@ def __init__(self):
 
         self.rtsp_uri = opt_config('RTSP_URI')
         if self.dev_mode:
-            assert (
-                self.rtsp_uri is None
-            ), '"RTSP_URI" cannot be set when "DEV_MODE=True"'
+            assert self.rtsp_uri is None, (
+                '"RTSP_URI" cannot be set when "DEV_MODE=True"'
+            )
             self.rtsp_uri = 'rtsp://localhost:554/stream'
         else:
-            assert (
-                self.rtsp_uri is not None
-            ), '"RTSP_URI" must be set when "DEV_MODE=False"'
+            assert self.rtsp_uri is not None, (
+                '"RTSP_URI" must be set when "DEV_MODE=False"'
+            )
 
         self.api_port = opt_config('API_PORT', 13000, int)
         assert 1 <= self.api_port <= 65535, 'Invalid value for "API_PORT".'
 
         self.status_poll_interval_ms = opt_config('STATUS_POLL_INTERVAL_MS', 1000, int)
-        assert (
-            self.status_poll_interval_ms > 0
-        ), 'Invalid value for "STATUS_POLL_INTERVAL_MS".'
+        assert self.status_poll_interval_ms > 0, (
+            'Invalid value for "STATUS_POLL_INTERVAL_MS".'
+        )
         self.status_poll_interval = self.status_poll_interval_ms / 1000
 
         self.fail_on_stream_error = opt_config('FAIL_ON_STREAM_ERROR', True, strtobool)

adapters/ds/sinks/always_on_rtsp/pipeline.py

@@ -23,9 +23,9 @@ def add_elements(
         assert gst_element is not None, f'Failed to create {element}'
         pipeline.add(gst_element)
         if gst_elements:
-            assert gst_elements[-1].link(
-                gst_element
-            ), f'Failed to link {gst_elements[-1].name} to {gst_element.name}'
+            assert gst_elements[-1].link(gst_element), (
+                f'Failed to link {gst_elements[-1].name} to {gst_element.name}'
+            )
         gst_elements.append(gst_element)
     return gst_elements
 

adapters/gst/gst_plugins/python/media_files_src_bin.py

@@ -185,14 +185,14 @@ def validate_properties(self):
         assert self.file_type is not None, '"file-type" property is required'
         if not self.loop_file:
             return
-        assert (
-            self.file_type == FileType.VIDEO
-        ), f'Only "file-type={FileType.VIDEO.value}" is allowed when "loop-file" is enabled'
+        assert self.file_type == FileType.VIDEO, (
+            f'Only "file-type={FileType.VIDEO.value}" is allowed when "loop-file" is enabled'
+        )
         if not isinstance(self.location, Path):
             return
-        assert (
-            self.download_path is not None
-        ), '"download-path" property is required when "loop-file" is enabled'
+        assert self.download_path is not None, (
+            '"download-path" property is required when "loop-file" is enabled'
+        )
         if self.download_path.exists():
             assert self.download_path.is_dir(), '"download-path" must be a directory'
 
@@ -210,9 +210,9 @@ def download_report(self, blocks: int, block_size: int, total: Optional[int]):
     def list_files(self):
         assert self.location.exists(), f'No such file or directory "{self.location}"'
         if self.location.is_dir():
-            assert (
-                not self.loop_file
-            ), f'Specifying directory as location is not allowed when "loop-file" is enabled'
+            assert not self.loop_file, (
+                'Specifying directory as location is not allowed when "loop-file" is enabled'
+            )
             all_files = sorted(
                 (f for f in self.location.iterdir() if f.is_file()),
                 key=(

adapters/gst/sinks/multistream_kvs.py

@@ -61,9 +61,9 @@ class BufferConfig:
     def __init__(self):
         self.low_threshold = opt_config('BUFFER_LOW_THRESHOLD', 30, int)
         self.high_threshold = opt_config('BUFFER_HIGH_THRESHOLD', 40, int)
-        assert (
-            self.low_threshold < self.high_threshold
-        ), 'BUFFER_LOW_THRESHOLD must be less than BUFFER_HIGH_THRESHOLD'
+        assert self.low_threshold < self.high_threshold, (
+            'BUFFER_LOW_THRESHOLD must be less than BUFFER_HIGH_THRESHOLD'
+        )
 
 
 class FpsMeterConfig:

adapters/gst/sinks/video_files.py

@@ -384,7 +384,6 @@ def _write_video_frame(
         ) or (None, None)
 
         if writer is None:
-
             video_writer = VideoFilesWriter(
                 location,
                 video_frame.source_id,

adapters/gst/sources/kvs/pipeline.py

@@ -66,7 +66,7 @@ def workload(self):
             try:
                 self.process_fragment()
             except Exception as e:
-                self.logger.error(f'Error processing fragment: %s', e, exc_info=True)
+                self.logger.error('Error processing fragment: %s', e, exc_info=True)
                 break
 
         self.is_running = False
@@ -142,7 +142,7 @@ def on_caps(self, pad: Gst.Pad, event: Gst.Event):
     def add_sink(self, pad: Gst.Pad, caps: Gst.Caps):
         """Add sink elements to the pipeline."""
 
-        self.logger.debug(f'Try to find codec for %r', caps[0].get_name())
+        self.logger.debug('Try to find codec for %r', caps[0].get_name())
         try:
             codec = caps_to_codec(caps)
         except ValueError:
@@ -212,9 +212,9 @@ def add_sink(self, pad: Gst.Pad, caps: Gst.Caps):
                     last_element.get_name(),
                     element.get_name(),
                 )
-                assert last_element.link(
-                    element
-                ), f'Failed to link {last_element.get_name()} to {element.get_name()}'
+                assert last_element.link(element), (
+                    f'Failed to link {last_element.get_name()} to {element.get_name()}'
+                )
             last_element = element
 
         parser_pad: Gst.Pad = parser.get_static_pad('sink')
@@ -225,9 +225,9 @@ def add_sink(self, pad: Gst.Pad, caps: Gst.Caps):
             element.sync_state_with_parent()
 
         parser_pad.send_event(self.build_stream_name_event())
-        assert (
-            pad.link(parser_pad) == Gst.PadLinkReturn.OK
-        ), f'Failed to link {pad.get_name()} to {parser_pad.get_name()}'
+        assert pad.link(parser_pad) == Gst.PadLinkReturn.OK, (
+            f'Failed to link {pad.get_name()} to {parser_pad.get_name()}'
+        )
 
     def build_stream_name_event(self) -> Gst.Event:
         tag_list: Gst.TagList = Gst.TagList.new_empty()