refactor progress

modules/whisper/faster_whisper_inference.py

@@ -35,8 +35,8 @@ class FasterWhisperInference(WhisperBase):
     @spaces.GPU(duration=120)
     def transcribe(self,
                    audio: Union[str, BinaryIO, np.ndarray],
-                   progress: gr.Progress,
                    *whisper_params,
+                   progress: gr.Progress = gr.Progress(),
                    ) -> Tuple[List[dict], float]:
         """
         transcribe method for faster-whisper.
@@ -96,7 +96,7 @@ class FasterWhisperInference(WhisperBase):
     def update_model(self,
                      model_size: str,
                      compute_type: str,
-                     progress: gr.Progress
+                     progress: gr.Progress = gr.Progress(),
                      ):
         """
         Update current model setting

modules/whisper/whisper_base.py

@@ -45,8 +45,8 @@ class WhisperBase(ABC):
     @spaces.GPU(duration=120)
     def transcribe(self,
                    audio: Union[str, BinaryIO, np.ndarray],
-                   progress: gr.Progress,
                    *whisper_params,
+                   progress: gr.Progress = gr.Progress(),
                    ):
         pass
 
@@ -55,15 +55,15 @@ class WhisperBase(ABC):
     def update_model(self,
                      model_size: str,
                      compute_type: str,
-                     progress: gr.Progress
+                     progress: gr.Progress = gr.Progress(),
                      ):
         pass
 
     @spaces.GPU(duration=120)
     def run(self,
             audio: Union[str, BinaryIO, np.ndarray],
-            progress: gr.Progress,
             *whisper_params,
+            progress: gr.Progress = gr.Progress(),
             ) -> Tuple[List[dict], float]:
         """
         Run transcription with conditional pre-processing and post-processing.
@@ -111,8 +111,8 @@ class WhisperBase(ABC):
 
         result, elapsed_time = self.transcribe(
             audio,
-            progress,
-            *astuple(params)
+            *astuple(params),
+            progress=progress
         )
 
         if params.is_diarize:
@@ -162,8 +162,8 @@ class WhisperBase(ABC):
                 print("run started: ")
                 transcribed_segments, time_for_task = self.run(
                     file.name,
-                    progress,
                     *whisper_params,
+                    progress=progress
                 )
                 print("run finished: ")
 
@@ -203,8 +203,8 @@ class WhisperBase(ABC):
     def transcribe_mic(self,
                        mic_audio: str,
                        file_format: str,
-                       progress=gr.Progress(),
                        *whisper_params,
+                       progress: gr.Progress = gr.Progress(),
                        ) -> list:
         """
         Write subtitle file from microphone
@@ -231,8 +231,8 @@ class WhisperBase(ABC):
             progress(0, desc="Loading Audio..")
             transcribed_segments, time_for_task = self.run(
                 mic_audio,
-                progress,
                 *whisper_params,
+                progress=progress
             )
             progress(1, desc="Completed!")
 
@@ -257,8 +257,8 @@ class WhisperBase(ABC):
                            youtube_link: str,
                            file_format: str,
                            add_timestamp: bool,
-                           progress=gr.Progress(),
                            *whisper_params,
+                           progress: gr.Progress = gr.Progress(),
                            ) -> list:
         """
         Write subtitle file from Youtube
@@ -290,8 +290,8 @@ class WhisperBase(ABC):
 
             transcribed_segments, time_for_task = self.run(
                 audio,
-                progress,
                 *whisper_params,
+                progress=progress
             )
 
             progress(1, desc="Completed!")