Merge remote-tracking branch 'origin/master'

sgoldenlab · Jul 7, 2024 · 7e5f8d6 · 7e5f8d6
2 parents c8ccaba + 6c93bca
commit 7e5f8d6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/simba/data_processors/advanced_interpolator.py b/simba/data_processors/advanced_interpolator.py
@@ -5,6 +5,7 @@
 
 import numpy as np
 import pandas as pd
+
 pd.options.mode.chained_assignment = None
 
 try:
@@ -13,11 +14,14 @@
     from typing_extensions import Literal
 
 from simba.mixins.config_reader import ConfigReader
-from simba.utils.checks import (check_valid_boolean, check_instance, check_that_column_exist, check_str, check_file_exist_and_readable)
+from simba.utils.checks import (check_file_exist_and_readable, check_instance,
+                                check_str, check_that_column_exist,
+                                check_valid_boolean)
 from simba.utils.errors import DataHeaderError, InvalidInputError
 from simba.utils.printing import SimbaTimer, stdout_success
-from simba.utils.read_write import (find_files_of_filetypes_in_directory, get_fn_ext, read_df, write_df, copy_files_to_directory)
-
+from simba.utils.read_write import (copy_files_to_directory,
+                                    find_files_of_filetypes_in_directory,
+                                    get_fn_ext, read_df, write_df)
 
 BODY_PART_TYPE = 'body-part'
 ANIMAL_TYPE = 'animal'

diff --git a/simba/data_processors/advanced_smoothing.py b/simba/data_processors/advanced_smoothing.py
@@ -3,6 +3,7 @@
 import os
 from copy import deepcopy
 from typing import Any, Dict, Optional, Union
+
 import pandas as pd
 
 try:
@@ -11,14 +12,18 @@
     from typing_extensions import Literal
 
 from simba.mixins.config_reader import ConfigReader
-from simba.utils.checks import (check_valid_boolean, check_instance, check_str, check_int, check_that_column_exist, check_file_exist_and_readable)
+from simba.utils.checks import (check_file_exist_and_readable, check_instance,
+                                check_int, check_str, check_that_column_exist,
+                                check_valid_boolean)
+from simba.utils.data import df_smoother, savgol_smoother
 from simba.utils.enums import TagNames
-from simba.utils.errors import DataHeaderError, NoFilesFoundError, InvalidInputError
+from simba.utils.errors import (DataHeaderError, InvalidInputError,
+                                NoFilesFoundError)
 from simba.utils.printing import SimbaTimer, log_event, stdout_success
-from simba.utils.read_write import (find_files_of_filetypes_in_directory,
+from simba.utils.read_write import (copy_files_to_directory,
+                                    find_files_of_filetypes_in_directory,
                                     find_video_of_file, get_fn_ext,
-                                    get_video_meta_data, read_df, write_df, copy_files_to_directory)
-from simba.utils.data import savgol_smoother, df_smoother
+                                    get_video_meta_data, read_df, write_df)
 
 BODY_PART_TYPE = 'body-part'
 ANIMAL_TYPE = 'animal'