Update app.py

app.py

@@ -51,7 +51,7 @@ def download_audio(url, method_choice):
         method_choice (str): The method to use for downloading audio.
 
     Returns:
-        tuple: (path to the downloaded audio file, is_temp_file), or (error message, False).
+        tuple: (path to the downloaded audio file, is_temp_file), or (None, False) if failed.
     """
     parsed_url = urlparse(url)
     logging.info(f"Downloading audio from URL: {url} using method: {method_choice}")
@@ -66,21 +66,21 @@ def download_audio(url, method_choice):
         if not audio_file or not os.path.exists(audio_file):
             error_msg = f"Failed to download audio from {url} using method {method_choice}"
             logging.error(error_msg)
-            return error_msg, False
+            return None, False
         return audio_file, True
     except Exception as e:
         error_msg = f"Error downloading audio from {url} using method {method_choice}: {str(e)}"
         logging.error(error_msg)
-        return error_msg, False
+        return None, False
 
 def download_youtube_audio(url, method_choice):
     """
     Downloads audio from a YouTube URL using the specified method.
-    
+
     Args:
         url (str): The YouTube URL.
         method_choice (str): The method to use for downloading.
-    
+
     Returns:
         str: Path to the downloaded audio file, or None if failed.
     """
@@ -104,7 +104,7 @@ def yt_dlp_method(url):
         url (str): The YouTube URL.
 
     Returns:
-        str: Path to the downloaded audio file.
+        str: Path to the downloaded audio file, or None if failed.
     """
     logging.info("Using yt-dlp method")
     temp_dir = tempfile.mkdtemp()
@@ -129,8 +129,8 @@ def yt_dlp_method(url):
             logging.info(f"Downloaded YouTube audio: {output_file}")
             return output_file
     except Exception as e:
-        logging.error(f"Error in yt_dlp_method: {str(e)}")
-        raise Exception(f"yt-dlp failed to download audio: {str(e)}")
+        logging.error(f"yt-dlp failed to download audio: {str(e)}")
+        return None
 
 def pytube_method(url):
     """
@@ -140,7 +140,7 @@ def pytube_method(url):
         url (str): The YouTube URL.
 
     Returns:
-        str: Path to the downloaded audio file.
+        str: Path to the downloaded audio file, or None if failed.
     """
     logging.info("Using pytube method")
     from pytube import YouTube
@@ -150,7 +150,7 @@ def pytube_method(url):
         if audio_stream is None:
             error_msg = "No audio streams available with pytube."
             logging.error(error_msg)
-            raise Exception(error_msg)
+            return None
         temp_dir = tempfile.mkdtemp()
         out_file = audio_stream.download(output_path=temp_dir)
         base, ext = os.path.splitext(out_file)
@@ -159,9 +159,9 @@ def pytube_method(url):
         logging.info(f"Downloaded and converted audio to: {new_file}")
         return new_file
     except Exception as e:
-        logging.error(f"Error in pytube_method: {str(e)}")
-        raise Exception(f"pytube failed to download audio: {str(e)}")
-
+        logging.error(f"pytube failed to download audio: {str(e)}")
+        return None
+        
 
 def download_rtsp_audio(url):
     """
@@ -459,10 +459,10 @@ def transcribe_audio(input_source, pipeline_type, model_id, dtype, batch_size, d
         if isinstance(input_source, str) and (input_source.startswith('http://') or input_source.startswith('https://')):
             # Input source is a URL
             audio_path, is_temp_file = download_audio(input_source, download_method)
-            if not audio_path or audio_path.startswith("Error"):
-                error_msg = f"Error downloading audio: {audio_path}"
+            if not audio_path:
+                error_msg = f"Error downloading audio from {input_source} using method {download_method}"
                 logging.error(error_msg)
-                yield error_msg, "", None
+                yield verbose_messages + error_msg, "", None
                 return
         elif isinstance(input_source, str) and os.path.exists(input_source):
             # Input source is a local file path
@@ -475,7 +475,7 @@ def transcribe_audio(input_source, pipeline_type, model_id, dtype, batch_size, d
         else:
             error_msg = "No valid audio source provided."
             logging.error(error_msg)
-            yield error_msg, "", None
+            yield verbose_messages + error_msg, "", None
             return
 
         # Convert start_time and end_time to float or None
@@ -526,9 +526,11 @@ def transcribe_audio(input_source, pipeline_type, model_id, dtype, batch_size, d
             else:
                 error_msg = "Invalid pipeline type"
                 logging.error(error_msg)
-                raise ValueError(error_msg)
+                yield verbose_messages + error_msg, "", None
+                return
             loaded_models[model_key] = model_or_pipeline  # Cache the model or pipeline
 
+        # Perform the transcription
         start_time_perf = time.time()
         if pipeline_type == "faster-batched":
             segments, info = model_or_pipeline.transcribe(audio_path, batch_size=batch_size)
@@ -539,6 +541,7 @@ def transcribe_audio(input_source, pipeline_type, model_id, dtype, batch_size, d
             segments = result["chunks"]
         end_time_perf = time.time()
 
+        # Calculate metrics
         transcription_time = end_time_perf - start_time_perf
         audio_file_size = os.path.getsize(audio_path) / (1024 * 1024)
 
@@ -550,6 +553,7 @@ def transcribe_audio(input_source, pipeline_type, model_id, dtype, batch_size, d
         if verbose:
             yield verbose_messages + metrics_output, "", None
 
+        # Compile the transcription text
         transcription = ""
 
         for segment in segments:
@@ -561,13 +565,14 @@ def transcribe_audio(input_source, pipeline_type, model_id, dtype, batch_size, d
             if verbose:
                 yield verbose_messages + metrics_output, transcription, None
 
+        # Save the transcription to a file
         transcription_file = save_transcription(transcription)
         yield verbose_messages + metrics_output, transcription, transcription_file
 
     except Exception as e:
         error_msg = f"An error occurred during transcription: {str(e)}"
         logging.error(error_msg)
-        yield error_msg, "", None
+        yield verbose_messages + error_msg, "", None
 
     finally:
         # Clean up temporary audio files