Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
sronilsson committed Nov 7, 2024
2 parents c5389d7 + f0531cf commit 5b08679
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 10 deletions.
6 changes: 4 additions & 2 deletions simba/model/grid_search_rf.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
from simba.mixins.config_reader import ConfigReader
from simba.mixins.train_model_mixin import TrainModelMixin
from simba.utils.checks import check_if_filepath_list_is_empty
from simba.utils.enums import (ConfigKey, Dtypes, Formats, Methods, MLParamKeys, Options)
from simba.utils.enums import (ConfigKey, Dtypes, Formats, Methods,
MLParamKeys, Options)
from simba.utils.errors import InvalidInputError, NoDataError
from simba.utils.printing import stdout_success
from simba.utils.read_write import (read_config_entry, read_simba_meta_files, write_df)
from simba.utils.read_write import (read_config_entry, read_simba_meta_files,
write_df)


class GridSearchRandomForestClassifier(ConfigReader, TrainModelMixin):
Expand Down
9 changes: 6 additions & 3 deletions simba/model/inference_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@

import os
from copy import deepcopy
from typing import Union, Optional
from typing import Optional, Union

import numpy as np

from simba.mixins.config_reader import ConfigReader
from simba.mixins.train_model_mixin import TrainModelMixin
from simba.utils.checks import (check_all_file_names_are_represented_in_video_log, check_if_keys_exist_in_dict, check_if_dir_exists)
from simba.utils.checks import (
check_all_file_names_are_represented_in_video_log, check_if_dir_exists,
check_if_keys_exist_in_dict)
from simba.utils.data import plug_holes_shortest_bout
from simba.utils.enums import TagNames
from simba.utils.errors import NoFilesFoundError
from simba.utils.printing import SimbaTimer, log_event, stdout_success
from simba.utils.read_write import get_fn_ext, read_df, write_df, find_files_of_filetypes_in_directory
from simba.utils.read_write import (find_files_of_filetypes_in_directory,
get_fn_ext, read_df, write_df)


class InferenceBatch(TrainModelMixin, ConfigReader):
Expand Down
8 changes: 5 additions & 3 deletions simba/model/train_rf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

import ast
import os
from typing import Union, Optional
from typing import Optional, Union

import pandas as pd
from sklearn.model_selection import train_test_split

from simba.mixins.config_reader import ConfigReader
from simba.mixins.train_model_mixin import TrainModelMixin
from simba.utils.checks import check_if_filepath_list_is_empty, check_int, check_if_dir_exists
from simba.utils.enums import (ConfigKey, Dtypes, Formats, Methods, MLParamKeys, Options)
from simba.utils.checks import (check_if_dir_exists,
check_if_filepath_list_is_empty, check_int)
from simba.utils.enums import (ConfigKey, Dtypes, Formats, Methods,
MLParamKeys, Options)
from simba.utils.printing import SimbaTimer, stdout_success
from simba.utils.read_write import read_config_entry, write_df

Expand Down
5 changes: 3 additions & 2 deletions simba/video_processors/video_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@
NoFilesFoundError, NotDirectoryError,
ResolutionError)
from simba.utils.lookups import (get_ffmpeg_crossfade_methods, get_fonts,
percent_to_crf_lookup, percent_to_qv_lk,
video_quality_to_preset_lookup, get_named_colors)
get_named_colors, percent_to_crf_lookup,
percent_to_qv_lk,
video_quality_to_preset_lookup)
from simba.utils.printing import SimbaTimer, stdout_success
from simba.utils.read_write import (
check_if_hhmmss_timestamp_is_valid_part_of_video,
Expand Down

0 comments on commit 5b08679

Please sign in to comment.