add `Files` to output

modules/faster_whisper_inference.py

@@ -42,7 +42,7 @@ class FasterWhisperInference(BaseInterface):
                         no_speech_threshold: float,
                         compute_type: str,
                         progress=gr.Progress()
-                        ) -> str:
+                        ) -> list:
         """
         Write subtitle file from Files
 
@@ -78,7 +78,9 @@ class FasterWhisperInference(BaseInterface):
 
         Returns
         ----------
+        A List of
         String to return to gr.Textbox()
+        Files to return to gr.Files()
         """
         try:
             self.update_model_if_needed(model_size=model_size, compute_type=compute_type, progress=progress)
@@ -95,16 +97,15 @@ class FasterWhisperInference(BaseInterface):
                     progress=progress
                 )
 
-                file_name, file_ext = os.path.splitext(os.path.basename(fileobj.orig_name))
+                file_name, file_ext = os.path.splitext(os.path.basename(fileobj.name))
                 file_name = safe_filename(file_name)
-                subtitle = self.generate_and_write_file(
+                subtitle, file_path = self.generate_and_write_file(
                     file_name=file_name,
                     transcribed_segments=transcribed_segments,
                     add_timestamp=add_timestamp,
                     file_format=file_format
                 )
-                print(f"{subtitle}")
-                files_info[file_name] = {"subtitle": subtitle, "time_for_task": time_for_task}
+                files_info[file_name] = {"subtitle": subtitle, "time_for_task": time_for_task, "path":  file_path}
 
             total_result = ''
             total_time = 0
@@ -114,7 +115,10 @@ class FasterWhisperInference(BaseInterface):
                 total_result += f'{info["subtitle"]}'
                 total_time += info["time_for_task"]
 
-            return f"Done in {self.format_time(total_time)}! Subtitle is in the outputs folder.\n\n{total_result}"
+            gr_str = f"Done in {self.format_time(total_time)}! Subtitle is in the outputs folder.\n\n{total_result}"
+            gr_file_path = [info['path'] for info in files_info.values()]
+
+            return [gr_str, gr_file_path]
 
         except Exception as e:
             print(f"Error transcribing file on line {e}")
@@ -134,7 +138,7 @@ class FasterWhisperInference(BaseInterface):
                            no_speech_threshold: float,
                            compute_type: str,
                            progress=gr.Progress()
-                           ) -> str:
+                           ) -> list:
         """
         Write subtitle file from Youtube
 
@@ -170,7 +174,9 @@ class FasterWhisperInference(BaseInterface):
 
         Returns
         ----------
+        A List of
         String to return to gr.Textbox()
+        Files to return to gr.Files()
         """
         try:
             self.update_model_if_needed(model_size=model_size, compute_type=compute_type, progress=progress)
@@ -192,15 +198,18 @@ class FasterWhisperInference(BaseInterface):
             progress(1, desc="Completed!")
 
             file_name = safe_filename(yt.title)
-            subtitle = self.generate_and_write_file(
+            subtitle, file_path = self.generate_and_write_file(
                 file_name=file_name,
                 transcribed_segments=transcribed_segments,
                 add_timestamp=add_timestamp,
                 file_format=file_format
             )
-            return f"Done in {self.format_time(time_for_task)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+            gr_str = f"Done in {self.format_time(time_for_task)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+
+            return [gr_str, file_path]
+
         except Exception as e:
-            return f"Error: {str(e)}"
+            print(f"Error transcribing file on line {e}")
         finally:
             try:
                 if 'yt' not in locals():
@@ -225,7 +234,7 @@ class FasterWhisperInference(BaseInterface):
                        no_speech_threshold: float,
                        compute_type: str,
                        progress=gr.Progress()
-                       ) -> str:
+                       ) -> list:
         """
         Write subtitle file from microphone
 
@@ -259,7 +268,9 @@ class FasterWhisperInference(BaseInterface):
 
         Returns
         ----------
+        A List of
         String to return to gr.Textbox()
+        Files to return to gr.Files()
         """
         try:
             self.update_model_if_needed(model_size=model_size, compute_type=compute_type, progress=progress)
@@ -277,15 +288,17 @@ class FasterWhisperInference(BaseInterface):
             )
             progress(1, desc="Completed!")
 
-            subtitle = self.generate_and_write_file(
+            subtitle, file_path = self.generate_and_write_file(
                 file_name="Mic",
                 transcribed_segments=transcribed_segments,
                 add_timestamp=True,
                 file_format=file_format
             )
-            return f"Done in {self.format_time(time_for_task)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+
+            gr_str = f"Done in {self.format_time(time_for_task)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+            return [gr_str, file_path]
         except Exception as e:
-            return f"Error: {str(e)}"
+            print(f"Error transcribing file on line {e}")
         finally:
             self.release_cuda_memory()
             self.remove_input_files([micaudio])
@@ -395,16 +408,19 @@ class FasterWhisperInference(BaseInterface):
 
         if file_format == "SRT":
             content = get_srt(transcribed_segments)
-            write_file(content, f"{output_path}.srt")
+            output_path += '.srt'
+            write_file(content, output_path)
 
         elif file_format == "WebVTT":
             content = get_vtt(transcribed_segments)
-            write_file(content, f"{output_path}.vtt")
+            output_path += '.vtt'
+            write_file(content, output_path)
 
         elif file_format == "txt":
             content = get_txt(transcribed_segments)
-            write_file(content, f"{output_path}.txt")
-        return content
+            output_path += '.txt'
+            write_file(content, output_path)
+        return content, output_path
 
     @staticmethod
     def format_time(elapsed_time: float) -> str:

modules/nllb_inference.py

@@ -34,7 +34,7 @@ class NLLBInference(BaseInterface):
                        src_lang: str,
                        tgt_lang: str,
                        add_timestamp: bool,
-                       progress=gr.Progress()):
+                       progress=gr.Progress()) -> list:
         """
         Translate subtitle file from source language to target language
 
@@ -53,6 +53,12 @@ class NLLBInference(BaseInterface):
         progress: gr.Progress
             Indicator to show progress directly in gradio.
             I use a forked version of whisper for this. To see more info : https://github.com/jhj0517/jhj0517-whisper/tree/add-progress-callback
+
+        Returns
+        ----------
+        A List of
+        String to return to gr.Textbox()
+        Files to return to gr.Files()
         """
         try:
             if model_size != self.current_model_size or self.model is None:
@@ -92,8 +98,9 @@ class NLLBInference(BaseInterface):
                         output_path = os.path.join("outputs", "translations", f"{file_name}-{timestamp}")
                     else:
                         output_path = os.path.join("outputs", "translations", f"{file_name}")
+                    output_path += '.srt'
 
-                    write_file(subtitle, f"{output_path}.srt")
+                    write_file(subtitle, output_path)
 
                 elif file_ext == ".vtt":
                     parsed_dicts = parse_vtt(file_path=file_path)
@@ -109,8 +116,9 @@ class NLLBInference(BaseInterface):
                         output_path = os.path.join("outputs", "translations", f"{file_name}-{timestamp}")
                     else:
                         output_path = os.path.join("outputs", "translations", f"{file_name}")
+                    output_path += '.vtt'
 
-                    write_file(subtitle, f"{output_path}.vtt")
+                    write_file(subtitle, output_path)
 
                 files_info[file_name] = subtitle
 
@@ -120,9 +128,10 @@ class NLLBInference(BaseInterface):
                 total_result += f'{file_name}\n\n'
                 total_result += f'{subtitle}'
 
-            return f"Done! Subtitle is in the outputs/translation folder.\n\n{total_result}"
+            gr_str = f"Done! Subtitle is in the outputs/translation folder.\n\n{total_result}"
+            return [gr_str, output_path]
         except Exception as e:
-            return f"Error: {str(e)}"
+            print(f"Error: {str(e)}")
         finally:
             self.release_cuda_memory()
             self.remove_input_files([fileobj.name for fileobj in fileobjs])

modules/whisper_Inference.py

@@ -37,7 +37,7 @@ class WhisperInference(BaseInterface):
                         log_prob_threshold: float,
                         no_speech_threshold: float,
                         compute_type: str,
-                        progress=gr.Progress()):
+                        progress=gr.Progress()) -> list:
         """
         Write subtitle file from Files
 
@@ -70,8 +70,13 @@ class WhisperInference(BaseInterface):
         progress: gr.Progress
             Indicator to show progress directly in gradio.
             I use a forked version of whisper for this. To see more info : https://github.com/jhj0517/jhj0517-whisper/tree/add-progress-callback
-        """
 
+        Returns
+        ----------
+        A List of
+        String to return to gr.Textbox()
+        Files to return to gr.Files()
+        """
         try:
             self.update_model_if_needed(model_size=model_size, compute_type=compute_type, progress=progress)
 
@@ -91,16 +96,15 @@ class WhisperInference(BaseInterface):
                                                        )
                 progress(1, desc="Completed!")
 
-                file_name, file_ext = os.path.splitext(os.path.basename(fileobj.orig_name))
+                file_name, file_ext = os.path.splitext(os.path.basename(fileobj.name))
                 file_name = safe_filename(file_name)
-                subtitle = self.generate_and_write_file(
+                subtitle, file_path = self.generate_and_write_file(
                     file_name=file_name,
                     transcribed_segments=result,
                     add_timestamp=add_timestamp,
                     file_format=file_format
                 )
-
-                files_info[file_name] = {"subtitle": subtitle, "elapsed_time": elapsed_time}
+                files_info[file_name] = {"subtitle": subtitle, "elapsed_time": elapsed_time, "path":  file_path}
 
             total_result = ''
             total_time = 0
@@ -110,10 +114,12 @@ class WhisperInference(BaseInterface):
                 total_result += f"{info['subtitle']}"
                 total_time += info["elapsed_time"]
 
-            return f"Done in {self.format_time(total_time)}! Subtitle is in the outputs folder.\n\n{total_result}"
+            gr_str = f"Done in {self.format_time(total_time)}! Subtitle is in the outputs folder.\n\n{total_result}"
+            gr_file_path = [info['path'] for info in files_info.values()]
+
+            return [gr_str, gr_file_path]
         except Exception as e:
             print(f"Error transcribing file: {str(e)}")
-            return f"Error transcribing file: {str(e)}"
         finally:
             self.release_cuda_memory()
             self.remove_input_files([fileobj.name for fileobj in fileobjs])
@@ -129,7 +135,7 @@ class WhisperInference(BaseInterface):
                            log_prob_threshold: float,
                            no_speech_threshold: float,
                            compute_type: str,
-                           progress=gr.Progress()):
+                           progress=gr.Progress()) -> list:
         """
         Write subtitle file from Youtube
 
@@ -162,6 +168,12 @@ class WhisperInference(BaseInterface):
         progress: gr.Progress
             Indicator to show progress directly in gradio.
             I use a forked version of whisper for this. To see more info : https://github.com/jhj0517/jhj0517-whisper/tree/add-progress-callback
+
+        Returns
+        ----------
+        A List of
+        String to return to gr.Textbox()
+        Files to return to gr.Files()
         """
         try:
             self.update_model_if_needed(model_size=model_size, compute_type=compute_type, progress=progress)
@@ -181,17 +193,17 @@ class WhisperInference(BaseInterface):
             progress(1, desc="Completed!")
 
             file_name = safe_filename(yt.title)
-            subtitle = self.generate_and_write_file(
+            subtitle, file_path = self.generate_and_write_file(
                 file_name=file_name,
                 transcribed_segments=result,
                 add_timestamp=add_timestamp,
                 file_format=file_format
             )
 
-            return f"Done in {self.format_time(elapsed_time)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+            gr_str = f"Done in {self.format_time(elapsed_time)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+            return [gr_str, file_path]
         except Exception as e:
             print(f"Error transcribing youtube video: {str(e)}")
-            return f"Error transcribing youtube video: {str(e)}"
         finally:
             try:
                 if 'yt' not in locals():
@@ -215,7 +227,7 @@ class WhisperInference(BaseInterface):
                        log_prob_threshold: float,
                        no_speech_threshold: float,
                        compute_type: str,
-                       progress=gr.Progress()):
+                       progress=gr.Progress()) -> list:
         """
         Write subtitle file from microphone
 
@@ -246,8 +258,13 @@ class WhisperInference(BaseInterface):
         progress: gr.Progress
             Indicator to show progress directly in gradio.
             I use a forked version of whisper for this. To see more info : https://github.com/jhj0517/jhj0517-whisper/tree/add-progress-callback
-        """
 
+        Returns
+        ----------
+        A List of
+        String to return to gr.Textbox()
+        Files to return to gr.Files()
+        """
         try:
             self.update_model_if_needed(model_size=model_size, compute_type=compute_type, progress=progress)
 
@@ -261,17 +278,17 @@ class WhisperInference(BaseInterface):
                                                    progress=progress)
             progress(1, desc="Completed!")
 
-            subtitle = self.generate_and_write_file(
+            subtitle, file_path = self.generate_and_write_file(
                 file_name="Mic",
                 transcribed_segments=result,
                 add_timestamp=True,
                 file_format=file_format
             )
 
-            return f"Done in {self.format_time(elapsed_time)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+            gr_str = f"Done in {self.format_time(elapsed_time)}! Subtitle file is in the outputs folder.\n\n{subtitle}"
+            return [gr_str, file_path]
         except Exception as e:
             print(f"Error transcribing mic: {str(e)}")
-            return f"Error transcribing mic: {str(e)}"
         finally:
             self.release_cuda_memory()
             self.remove_input_files([micaudio])
@@ -377,16 +394,19 @@ class WhisperInference(BaseInterface):
 
         if file_format == "SRT":
             content = get_srt(transcribed_segments)
-            write_file(content, f"{output_path}.srt")
+            output_path += '.srt'
+            write_file(content, output_path)
 
         elif file_format == "WebVTT":
             content = get_vtt(transcribed_segments)
-            write_file(content, f"{output_path}.vtt")
+            output_path += '.vtt'
+            write_file(content, output_path)
 
         elif file_format == "txt":
             content = get_txt(transcribed_segments)
-            write_file(content, f"{output_path}.vtt")
-        return content
+            output_path += '.txt'
+            write_file(content, output_path)
+        return content, output_path
 
     @staticmethod
     def format_time(elapsed_time: float) -> str: