gui changes for huggingface deployment

acodet/annotate.py

@@ -74,9 +74,7 @@ class MetaData:
             Amount of time that prediction took, by default "not calculated"
         """
         self.df.loc[f_ind, self.f_dt] = str(get_dt_filename(file).date())
-        self.df.loc[f_ind, self.filename] = Path(file).relative_to(
-            relativ_path
-        )
+        self.df.loc[f_ind, self.filename] = file.name
         # TODO relative_path muss noch dauerhaft geändert werden
         self.df.loc[f_ind, self.n_pred_col] = len(annot)
         df_clean = remove_str_flags_from_predictions(annot)
@@ -95,10 +93,18 @@ class MetaData:
             .joinpath(timestamp_foldername)
             .joinpath("stats.csv")
         )
-
+        
+def get_files_for_huggingface_deployment():
+    import streamlit as st
+    files = st.file_uploader("Choose your sound files (make sure they a time stamp of some format)", 
+                            accept_multiple_files=True)
+    if not files:
+        st.stop()
+    return files
 
 def run_annotation(train_date=None, **kwargs):
-    files = get_files(location=conf.SOUND_FILES_SOURCE, search_str="**/*")
+    # files = get_files(location=conf.SOUND_FILES_SOURCE, search_str="**/*")
+    files = get_files_for_huggingface_deployment()
     if not "timestamp_folder" in conf.session:
         timestamp_foldername = time.strftime(
             "%Y-%m-%d_%H-%M-%S", time.gmtime()
@@ -143,8 +149,8 @@ def run_annotation(train_date=None, **kwargs):
 
         st.session_state.progbar1 = 0
     for i, file in enumerate(files):
-        if file.is_dir():
-            continue
+        # if file.is_dir():
+        #     continue
 
         if conf.STREAMLIT:
             import streamlit as st

acodet/front_end/st_annotate.py

@@ -115,8 +115,8 @@ class PresetInterfaceSettings:
         #     "tests/test_files",
         #     help=help_strings.ENTER_PATH,
         # )
-        files = st.file_uploader("Choose your sound files (make sure they a time stamp of some format)", 
-                                 accept_multiple_files=True)
+        # files = st.file_uploader("Choose your sound files (make sure they a time stamp of some format)", 
+        #                          accept_multiple_files=True)
         # also hier kommen die files als so file objekte rein
         # ich muss irgendwie festlegen dass sie immer am selben ordner landen
         # und das er sich die ganze verzeichnis check sache spart. ich kann die
@@ -124,16 +124,16 @@ class PresetInterfaceSettings:
         # oder ich lad sie erst da hoch wo sie gebraucht werden
         # oder ich speicher sie hier erstmal ab. ist dann bisschen doppelt gemoppelt
         # aber dafuer muss sich die struktur so wenig wie moeglich aendern
-        import librosa as lb
-        import soundfile as sf
-        self.config["sound_files_source"] = 'user_audio_uploads'
+        # import librosa as lb
+        # import soundfile as sf
+        # self.config["sound_files_source"] = 'user_audio_uploads'
         
-        if len(files) > 0:
-            # if len(list(Path(self.config["sound_files_source"]).iterdir())) == 0:
-            for ind, file in enumerate(files):
-                st.progress(ind/len(files), 'Checking files...')
-                audio, sr = lb.load(file)
-                sf.write('user_audio_uploads/' + file.name, audio, sr)
+        # if len(files) > 0:
+        #     # if len(list(Path(self.config["sound_files_source"]).iterdir())) == 0:
+        #     for ind, file in enumerate(files):
+        #         st.progress(ind/len(files), 'Checking files...')
+        #         audio, sr = lb.load(file)
+        #         sf.write('user_audio_uploads/' + file.name, audio, sr)
                 
         self.config["thresh"] = utils.validate_float(
             utils.user_input(

acodet/front_end/utils.py

@@ -125,7 +125,7 @@ def make_nested_btns_false_on_click(btn_id):
 def prepare_run():
     if st.session_state.run_option == 1:
         st.markdown("""---""")
-        st.markdown("## Computation started, please wait.")
+        st.markdown("## Computation will start once files are uploaded, please wait.")
         if st.session_state.preset_option in [0, 1]:
             kwargs = {
                 "callbacks": TFPredictProgressBar,

acodet/funcs.py

@@ -51,8 +51,11 @@ def get_annots_for_file(annots: pd.DataFrame, file: str) -> pd.DataFrame:
 
 
 def get_dt_filename(file):
+    from streamlit.runtime.uploaded_file_manager import UploadedFile
     if isinstance(file, Path):
         stem = file.stem
+    elif isinstance(file, UploadedFile):
+        stem = Path(file.name).stem
     else:
         stem = file
 
@@ -126,6 +129,7 @@ def load_audio(file, channel=0, **kwargs) -> np.ndarray:
     audio_flat: np.ndarray
         audio array
     """
+    from streamlit.runtime.uploaded_file_manager import UploadedFile
     try:
         if conf.DOWNSAMPLE_SR and conf.SR != conf.DOWNSAMPLE_SR:
             with open(file, "rb") as f:
@@ -138,6 +142,10 @@ def load_audio(file, channel=0, **kwargs) -> np.ndarray:
             audio_flat = lb.resample(
                 audio_flat, orig_sr=conf.DOWNSAMPLE_SR, target_sr=conf.SR
             )
+        elif isinstance(file, UploadedFile):
+            audio_flat, _ = lb.load(file, sr=conf.SR, mono=False, **kwargs)
+            if len(audio_flat.shape) > 1:
+                audio_flat = audio_flat[channel]
         else:
             with open(file, "rb") as f:
                 audio_flat, _ = lb.load(f, sr=conf.SR, mono=False, **kwargs)
@@ -718,11 +726,11 @@ def gen_annotations(
         date time string foldername corresponding to the time the annotations were
         computed
     """
-    parent_dirs = manage_dir_structure(file)
+    # parent_dirs = manage_dir_structure(file)
 
-    channel = get_channel(get_top_dir(parent_dirs))
+    # channel = get_channel(get_top_dir(parent_dirs))
 
-    audio = load_audio(file, channel)
+    audio = load_audio(file)
     if audio is None:
         raise ImportError(
             f"The audio file `{str(file)}` cannot be loaded. Check if file has "
@@ -737,11 +745,11 @@ def gen_annotations(
         Path(conf.GEN_ANNOTS_DIR)
         .joinpath(timestamp_foldername)
         .joinpath(conf.THRESH_LABEL)
-        .joinpath(parent_dirs)
+        .joinpath('UploadedFiles')
     )
     save_path.mkdir(exist_ok=True, parents=True)
     annotation_df.to_csv(
-        save_path.joinpath(f"{file.stem}_annot_{mod_label}.txt"), sep="\t"
+        save_path.joinpath(f"{Path(file.name).stem}_annot_{mod_label}.txt"), sep="\t"
     )
 
     return annotation_df

streamlit_app.py

@@ -31,7 +31,7 @@ def select_preset():
 
 
 def run_computions(**kwargs):
-    utils.next_button(id=4, text="Run computations")
+    utils.next_button(id=4, text="Next step")
     if st.session_state.b4:
         display_not_implemented_text()
         kwargs = utils.prepare_run()