Merge remote-tracking branch 'origin/master'

sgoldenlab · Dec 3, 2024 · 05aa07d · 05aa07d
2 parents e8a5bb1 + 3ee8ac0
commit 05aa07d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/simba/data_processors/egocentric_aligner.py b/simba/data_processors/egocentric_aligner.py
@@ -7,19 +7,21 @@
 import numpy as np
 import pandas as pd
 
-from simba.utils.checks import (check_all_file_names_are_represented_in_video_log,
-                                check_if_dir_exists, check_int, check_valid_dataframe,
-                                check_str, check_valid_tuple, check_valid_boolean, check_instance, check_if_valid_rgb_tuple)
+from simba.utils.checks import (
+    check_all_file_names_are_represented_in_video_log, check_if_dir_exists,
+    check_if_valid_rgb_tuple, check_instance, check_int, check_str,
+    check_valid_boolean, check_valid_dataframe, check_valid_tuple)
+from simba.utils.data import egocentrically_align_pose
 from simba.utils.enums import Formats, Options
 from simba.utils.printing import SimbaTimer
-from simba.utils.data import egocentrically_align_pose
-from simba.utils.read_write import (concatenate_videos_in_folder,
+from simba.utils.read_write import (bgr_to_rgb_tuple,
+                                    concatenate_videos_in_folder,
                                     find_core_cnt,
                                     find_files_of_filetypes_in_directory,
                                     find_video_of_file, get_fn_ext,
                                     get_video_meta_data, read_df,
-                                    read_frm_of_video, remove_a_folder,
-                                    write_df, read_video_info_csv, bgr_to_rgb_tuple)
+                                    read_frm_of_video, read_video_info_csv,
+                                    remove_a_folder, write_df)
 from simba.utils.warnings import FrameRangeWarning
 
 

diff --git a/simba/utils/read_write.py b/simba/utils/read_write.py
@@ -45,10 +45,11 @@
                                 check_if_filepath_list_is_empty,
                                 check_if_keys_exist_in_dict,
                                 check_if_string_value_is_valid_video_timestamp,
-                                check_instance, check_int,
-                                check_nvidea_gpu_available, check_str,
-                                check_valid_array, check_valid_boolean,
-                                check_valid_dataframe, check_valid_lst, check_if_valid_rgb_tuple)
+                                check_if_valid_rgb_tuple, check_instance,
+                                check_int, check_nvidea_gpu_available,
+                                check_str, check_valid_array,
+                                check_valid_boolean, check_valid_dataframe,
+                                check_valid_lst)
 from simba.utils.enums import ConfigKey, Dtypes, Formats, Keys, Options
 from simba.utils.errors import (DataHeaderError, DuplicationError,
                                 FFMPEGCodecGPUError, FileExistError,