Feat(server): support WHISPER_MODEL_NAME/WHISPER_MODEL_SIZE (e.g. tiny); prefer local <name>.pt; improve error guidance

server_wrapper.py

@@ -15,29 +15,42 @@ _online = None
 
 
 def _get_model_path():
-    """Get the path to the Whisper model. Download if needed."""
+    """Get the path to the Whisper model.
+
+    Behavior:
+    - Prefer `WHISPER_MODEL_PATH` env var if provided.
+    - Otherwise prefer `./large-v3.pt` (repo-local file) or cached `~/.cache/whisper/large-v3.pt`.
+    - Do NOT attempt to download the model automatically (downloading at runtime can hang Spaces).
+    - If not found, raise FileNotFoundError with guidance.
+    """
     import os
+
+    # allow user to override with env var path
+    env_path = os.environ.get('WHISPER_MODEL_PATH') or os.environ.get('MODEL_PATH')
+    if env_path:
+        if os.path.exists(env_path):
+            return env_path
+        else:
+            raise FileNotFoundError(f"WHISPER_MODEL_PATH is set but file not found: {env_path}")
+
+    # allow user to request a model name/size (e.g. 'tiny', 'base', 'large-v3')
+    model_name = os.environ.get('WHISPER_MODEL_NAME') or os.environ.get('WHISPER_MODEL_SIZE') or 'large-v3'
+
+    # check local repo file first (e.g. ./tiny.pt or ./large-v3.pt)
+    local_path = f'./{model_name}.pt'
+    if os.path.exists(local_path):
+        return local_path
+
+    # check cache path (pre-downloaded by build or other process)
     model_dir = os.path.expanduser('~/.cache/whisper')
-    
-    # Create model directory if it doesn't exist
-    if not os.path.exists(model_dir):
-        os.makedirs(model_dir, exist_ok=True)
-    
-    model_path = os.path.join(model_dir, 'large-v3.pt')
-    
-    if not os.path.exists(model_path):
-        print(f"Model not found at {model_path}. Downloading...")
-        try:
-            import whisper
-            whisper.load_model('large-v3')
-            print(f"Model downloaded to {model_path}")
-        except Exception as e:
-            print(f"Warning: Could not download model: {e}")
-            # Fallback to trying current directory
-            if os.path.exists('./large-v3.pt'):
-                return './large-v3.pt'
-    
-    return model_path
+    model_path = os.path.join(model_dir, f'{model_name}.pt')
+    if os.path.exists(model_path):
+        return model_path
+
+    # Do not attempt to download automatically in runtime.
+    raise FileNotFoundError(
+        'Whisper model not found. Set WHISPER_MODEL_PATH to a local model file, or set WHISPER_MODEL_NAME to a model name (e.g. tiny) and pre-download the corresponding "<name>.pt" file into the repo or ~/.cache/whisper/.'
+    )
 
 def _make_args():
     # Minimal args required by simul_asr_factory
@@ -68,9 +81,16 @@ def init_model():
     with _lock:
         if _initialized:
             return
-        args = _make_args()
-        _asr, _online = simul_asr_factory(args)
-        _initialized = True
+        try:
+            args = _make_args()
+            _asr, _online = simul_asr_factory(args)
+            _initialized = True
+        except FileNotFoundError as e:
+            print(f"Model initialization aborted: {e}")
+            # leave _initialized False so callers know model not ready
+        except Exception as e:
+            print(f"Unexpected error initializing model: {e}")
+            # don't raise here; allow the app to continue running without model
 
 
 def reset():