Refactor default parameters for initialization

modules/whisper/faster_whisper_inference.py

@@ -17,17 +17,15 @@ from modules.whisper.whisper_base import WhisperBase
 
 class FasterWhisperInference(WhisperBase):
     def __init__(self,
-                 model_dir: Optional[str] = None,
-                 diarization_model_dir: Optional[str] = None,
-                 output_dir: Optional[str] = None,
+                 model_dir: str = os.path.join("models", "Whisper", "faster-whisper"),
+                 diarization_model_dir: str = os.path.join("models", "Diarization"),
+                 output_dir: str = os.path.join("outputs"),
                  ):
         super().__init__(
             model_dir=model_dir,
             diarization_model_dir=diarization_model_dir,
             output_dir=output_dir
         )
-        if model_dir is None:
-            model_dir = os.path.join("models", "Whisper", "faster-whisper")
         self.model_dir = model_dir
         os.makedirs(self.model_dir, exist_ok=True)
 

modules/whisper/insanely_fast_whisper_inference.py

@@ -17,17 +17,15 @@ from modules.whisper.whisper_base import WhisperBase
 
 class InsanelyFastWhisperInference(WhisperBase):
     def __init__(self,
-                 model_dir: Optional[str] = None,
-                 diarization_model_dir: Optional[str] = None,
-                 output_dir: Optional[str] = None,
+                 model_dir: str = os.path.join("models", "Whisper", "insanely-fast-whisper"),
+                 diarization_model_dir: str = os.path.join("models", "Diarization"),
+                 output_dir: str = os.path.join("outputs"),
                  ):
         super().__init__(
             model_dir=model_dir,
             output_dir=output_dir,
             diarization_model_dir=diarization_model_dir
         )
-        if model_dir is None:
-            model_dir = os.path.join("models", "Whisper", "insanely-fast-whisper")
         self.model_dir = model_dir
         os.makedirs(self.model_dir, exist_ok=True)
 

modules/whisper/whisper_Inference.py

@@ -4,6 +4,7 @@ import time
 from typing import BinaryIO, Union, Tuple, List
 import numpy as np
 import torch
+import os
 from argparse import Namespace
 
 from modules.whisper.whisper_base import WhisperBase
@@ -12,9 +13,9 @@ from modules.whisper.whisper_parameter import *
 
 class WhisperInference(WhisperBase):
     def __init__(self,
-                 model_dir: Optional[str] = None,
-                 diarization_model_dir: Optional[str] = None,
-                 output_dir: Optional[str] = None,
+                 model_dir: str = os.path.join("models", "Whisper"),
+                 diarization_model_dir: str = os.path.join("models", "Diarization"),
+                 output_dir: str = os.path.join("outputs"),
                  ):
         super().__init__(
             model_dir=model_dir,

modules/whisper/whisper_base.py

@@ -19,17 +19,10 @@ from modules.vad.silero_vad import SileroVAD
 
 class WhisperBase(ABC):
     def __init__(self,
-                 model_dir: Optional[str] = None,
-                 diarization_model_dir: Optional[str] = None,
-                 output_dir: Optional[str] = None,
+                 model_dir: str = os.path.join("models", "Whisper"),
+                 diarization_model_dir: str = os.path.join("models", "Diarization"),
+                 output_dir: str = os.path.join("outputs"),
                  ):
-        if model_dir is None:
-            model_dir = os.path.join("models", "Whisper")
-        if diarization_model_dir is None:
-            diarization_model_dir = os.path.join("models", "Diarization")
-        if output_dir is None:
-            output_dir = os.path.join("outputs")
-
         self.model_dir = model_dir
         self.output_dir = output_dir
         os.makedirs(self.output_dir, exist_ok=True)

modules/whisper/whisper_factory.py

@@ -11,11 +11,11 @@ class WhisperFactory:
     @staticmethod
     def create_whisper_inference(
         whisper_type: str,
-        whisper_model_dir: Optional[str] = None,
-        faster_whisper_model_dir: Optional[str] = None,
-        insanely_fast_whisper_model_dir: Optional[str] = None,
-        diarization_model_dir: Optional[str] = None,
-        output_dir: Optional[str] = None,
+        whisper_model_dir: str = os.path.join("models", "Whisper"),
+        faster_whisper_model_dir: str = os.path.join("models", "Whisper", "faster-whisper"),
+        insanely_fast_whisper_model_dir: str = os.path.join("models", "Whisper", "insanely-fast-whisper"),
+        diarization_model_dir: str = os.path.join("models", "Diarization"),
+        output_dir: str = os.path.join("outputs"),
     ) -> "WhisperBase":
         """
         Create a whisper inference class based on the provided whisper_type.