Merge remote-tracking branch 'origin/master'

Author: sronilsson

simba/data_processors/cuda/utils.py

@@ -4,6 +4,7 @@
 
 import numpy as np
 from numba import cuda, float64
+
 try:
     import PyNvVideoCodec as nvc
 except ImportError:
@@ -314,7 +315,8 @@ def get_nvc_decoder(video_path: Union[str, os.PathLike],
                     use_device_memory: bool = False,
                     output_color_type: nvc.OutputColorType = nvc.OutputColorType.RGB):
 
-    from simba.utils.checks import check_file_exist_and_readable, check_instance, check_int
+    from simba.utils.checks import (check_file_exist_and_readable,
+                                    check_instance, check_int)
     from simba.utils.errors import SimBAGPUError
     if nvc is None:
         raise SimBAGPUError(msg='PyNvVideoCodec is not installed. Install it to use GPU accelerated video decoding.', source=get_nvc_decoder.__name__)

simba/data_processors/movement_calculator.py

@@ -2,7 +2,7 @@
 import argparse
 import os
 import sys
-from typing import List, Optional, Tuple, Union, Dict
+from typing import Dict, List, Optional, Tuple, Union
 
 import numpy as np
 import pandas as pd
@@ -13,13 +13,14 @@
 from simba.mixins.feature_extraction_supplement_mixin import \
     FeatureExtractionSupplemental
 from simba.utils.checks import (
-    check_all_file_names_are_represented_in_video_log, check_float, check_str,
-    check_that_column_exist, check_valid_boolean, check_valid_lst,
-    check_valid_tuple, check_instance, check_valid_dict, check_if_keys_exist_in_dict)
-from simba.utils.errors import InvalidInputError, NoDataError, FrameRangeError
+    check_all_file_names_are_represented_in_video_log, check_float,
+    check_if_keys_exist_in_dict, check_instance, check_str,
+    check_that_column_exist, check_valid_boolean, check_valid_dict,
+    check_valid_lst, check_valid_tuple)
+from simba.utils.errors import FrameRangeError, InvalidInputError, NoDataError
 from simba.utils.printing import SimbaTimer, stdout_information, stdout_success
-from simba.utils.read_write import (find_files_of_filetypes_in_directory, get_fn_ext, read_df, seconds_to_timestamp)
-
+from simba.utils.read_write import (find_files_of_filetypes_in_directory,
+                                    get_fn_ext, read_df, seconds_to_timestamp)
 
 START, END = 'START', 'END'
 

simba/third_party_label_appenders/transform/litpose_crop_annotations.py

@@ -1,14 +1,14 @@
 import glob
 import os
-import shutil
 import random
+import shutil
 from typing import Optional, Tuple, Union
 
 import cv2
 import numpy as np
 import pandas as pd
 
-from simba.utils.checks import (check_if_dir_exists, check_int)
+from simba.utils.checks import check_if_dir_exists, check_int
 from simba.utils.errors import InvalidInputError
 from simba.utils.printing import SimbaTimer, stdout_success, stdout_warning
 from simba.utils.read_write import get_fn_ext

simba/video_processors/async_frame_reader_gpu.py

@@ -1,10 +1,12 @@
 import os
+
 os.environ["KMP_DUPLICATE_LIB_OK"] = "TRUE"
 import queue
 import threading
 from typing import Generator, Optional, Union
-import numpy as np
+
 import cv2
+import numpy as np
 
 try:
     import PyNvVideoCodec as nvc
@@ -14,9 +16,11 @@
     torch = None
 
 from simba.data_processors.cuda.utils import get_nvc_decoder
-from simba.utils.checks import check_int, check_nvidea_gpu_available, check_valid_boolean
+from simba.utils.checks import (check_int, check_nvidea_gpu_available,
+                                check_valid_boolean)
 from simba.utils.errors import SimBAGPUError, SimBAModuleNotFoundError
 
+
 class NvDecReader:
     """
     Async GPU-accelerated video frame reader using NVIDIA NVDEC.
@@ -195,6 +199,7 @@ def __len__(self):
 if __name__ == "__main__":
     import glob
     import time
+
     from simba.utils.printing import stdout_information
     from simba.utils.read_write import get_fn_ext