Update app.py

app.py

@@ -9,42 +9,6 @@ import time
 import tempfile
 from concurrent.futures import ThreadPoolExecutor
 from typing import List, Tuple, Optional, Dict, Any
-from pathlib import Path
-
-def create_download_link(audio_path, label="Download"):
-    if audio_path is None:
-        return "" # Return empty string instead of None for HTML component
-        
-    filename = Path(audio_path).name
-    # IMPORTANT: For Hugging Face Spaces, ensure your file URLs are correctly formed
-    # This might need to point to /file= if Gradio serves static files that way
-    # Or, if deployed on Hugging Face Spaces, the file serving might be handled by the backend directly
-    # and not necessarily through gradio_api/file=. For now, keep as is, but be aware.
-    base_url = "hivecorp-insta-maker-3.hf.space"  # Replace with your actual deployment domain
-    file_url = f"https://{base_url}/gradio_api/file={audio_path}" # This path might be problematic on Spaces
-
-    return f"""
-    <a href="{file_url}"
-       download="{filename}"
-       target="_blank"
-       rel="noopener noreferrer"
-       style="display: inline-block; padding: 10px 20px; background: linear-gradient(135deg, #4776E6, #8E54E9); color: white; text-decoration: none; border-radius: 8px; font-weight: 600; transition: all 0.3s ease;"
-       onmouseover="this.style.transform='translateY(-2px)'; this.style.boxShadow='0 5px 15px rgba(71, 118, 230, 0.3)';"
-       onmouseout="this.style.transform='translateY(0)'; this.style.boxShadow='none';"
-       onclick="event.preventDefault(); fetch(this.href).then(resp => resp.blob()).then(blob => {{
-           const url = window.URL.createObjectURL(blob);
-           const a = document.createElement('a');
-           a.style.display = 'none';
-           a.href = url;
-           a.download = '{filename}';
-           document.body.appendChild(a);
-           a.click();
-           window.URL.revokeObjectURL(url);
-           document.body.removeChild(a);
-       }});">
-        ⬇️ {label}
-    </a>
-    """
 import math
 from dataclasses import dataclass
 
@@ -65,7 +29,7 @@ def get_audio_length(audio_file):
 
 def format_time_ms(milliseconds):
     seconds, ms = divmod(int(milliseconds), 1000)
-    mins, secs = divmod(mins, 60)
+    mins, secs = divmod(seconds, 60)
     hrs, mins = divmod(mins, 60)
     return f"{hrs:02}:{mins:02}:{secs:02},{ms:03}"
 
@@ -453,52 +417,32 @@ async def generate_accurate_srt(
     
     return srt_path, audio_path
 
+# IMPROVEMENT 4: Progress Reporting with proper error handling for older Gradio versions
 async def process_text_with_progress(
-    text,
-    pitch,
-    rate,
-    voice,
-    words_per_line,
-    lines_per_segment,
+    text, 
+    pitch, 
+    rate, 
+    voice, 
+    words_per_line, 
+    lines_per_segment, 
     parallel_processing,
     progress=gr.Progress()
 ):
-    # Initialize all outputs to their "cleared" state.
-    # We now control visibility of the *groups* not individual items directly.
-    srt_file_update = gr.File(value=None) # No visible here, controlled by group
-    audio_file_update = gr.File(value=None) # No visible here, controlled by group
-    audio_output_val = None
-    error_output_update = gr.Textbox(value="", visible=False)
-    srt_download_link_html = "" # HTML content, not a gr.HTML object
-    audio_download_link_html = "" # HTML content, not a gr.HTML object
-
-    # Group visibility controls
-    file_group_visible = gr.update(visible=False)
-    download_group_visible = gr.update(visible=False)
-
     # Input validation
     if not text or text.strip() == "":
-        error_output_update = gr.Textbox(value="Please enter some text to convert to speech.", visible=True)
-        return (
-            srt_file_update,
-            audio_file_update,
-            audio_output_val,
-            error_output_update,
-            file_group_visible, # Output for the file group visibility
-            download_group_visible, # Output for the download link group visibility
-            srt_download_link_html, # Output for srt_download (HTML string)
-            audio_download_link_html # Output for audio_download (HTML string)
-        )
-
+        return None, None, None, gr.update(value="", visible=True), gr.update(value="", visible=False), "Please enter some text to convert to speech."
+    
+    # Format pitch and rate strings
     pitch_str = f"{pitch:+d}Hz" if pitch != 0 else "+0Hz"
     rate_str = f"{rate:+d}%" if rate != 0 else "+0%"
-
+    
     try:
+        # Start progress tracking
         progress(0, "Preparing text...")
-
+        
         def update_progress(value, status):
             progress(value, status)
-
+        
         srt_path, audio_path = await generate_accurate_srt(
             text,
             voice_options[voice],
@@ -509,33 +453,25 @@ async def process_text_with_progress(
             progress_callback=update_progress,
             parallel=parallel_processing
         )
-
-        srt_file_update = gr.File(value=srt_path)
-        audio_file_update = gr.File(value=audio_path)
-        audio_output_val = audio_path
         
-        file_group_visible = gr.update(visible=True)
-        download_group_visible = gr.update(visible=True)
+        # Generate Markdown links for download that open in a new tab
+        srt_download_link = f'<a href="file={srt_path}" download="subtitles.srt" target="_blank">Download SRT</a>'
+        audio_download_link = f'<a href="file={audio_path}" download="audio.mp3" target="_blank">Download Audio</a>'
 
-        srt_download_link_html = create_download_link(srt_path, "Download Subtitles (.srt)")
-        audio_download_link_html = create_download_link(audio_path, "Download Audio (.mp3)")
-        
+        # Return the paths for gr.Audio and Markdown for download links
+        return (
+            audio_path,
+            gr.update(value=srt_download_link, visible=True), # Use gr.Markdown for SRT download
+            gr.update(value=audio_download_link, visible=True), # Use gr.Markdown for Audio download
+            gr.update(value="", visible=False), # Hide error message
+            "" # Clear error message
+        )
     except TTSError as e:
-        error_output_update = gr.Textbox(value=f"TTS Error: {str(e)}", visible=True)
+        # Return specific TTS error
+        return None, gr.update(value="", visible=False), gr.update(value="", visible=False), gr.update(value=f"TTS Error: {str(e)}", visible=True), f"TTS Error: {str(e)}"
     except Exception as e:
-        error_output_update = gr.Textbox(value=f"Unexpected error: {str(e)}", visible=True)
-    
-    # Always return the full tuple of updated components
-    return (
-        srt_file_update,
-        audio_file_update,
-        audio_output_val,
-        error_output_update,
-        file_group_visible,
-        download_group_visible,
-        srt_download_link_html,
-        audio_download_link_html
-    )
+        # Return any other error
+        return None, gr.update(value="", visible=False), gr.update(value="", visible=False), gr.update(value=f"Unexpected error: {str(e)}", visible=True), f"Unexpected error: {str(e)}"
 
 
 # Voice options dictionary
@@ -643,28 +579,18 @@ with gr.Blocks(title="Advanced TTS with Configurable SRT Generation") as app:
     
     submit_btn = gr.Button("Generate Audio & Subtitles")
     
-    # Initialize error message component
-    error_output = gr.Textbox(label="Status", value="", visible=False)
+    # Add error message component
+    error_output = gr.Textbox(label="Status", visible=False)
     
     with gr.Row():
         with gr.Column():
             audio_output = gr.Audio(label="Preview Audio")
-        
-        # --- NEW: Group for gr.File components ---
-        with gr.Column() as file_download_group:
-            # gr.File components initially visible within their group
-            srt_file = gr.File(label="Download SRT", value=None)
-            audio_file = gr.File(label="Download Audio", value=None)
-        file_download_group.visible = False # Control group visibility
-        
-        # --- NEW: Group for gr.HTML download links ---
-        with gr.Column() as html_download_group:
-            # gr.HTML components initialized with empty string
-            srt_download = gr.HTML(value="")
-            audio_download = gr.HTML(value="")
-        html_download_group.visible = False # Control group visibility
-
-    # Handle button click
+        with gr.Column():
+            # Change gr.File to gr.Markdown for download links
+            srt_download_link = gr.Markdown(value="", visible=False, label="Download SRT")
+            audio_download_link = gr.Markdown(value="", visible=False, label="Download Audio")
+    
+    # Handle button click with manual error handling instead of .catch()
     submit_btn.click(
         fn=process_text_with_progress,
         inputs=[
@@ -677,14 +603,11 @@ with gr.Blocks(title="Advanced TTS with Configurable SRT Generation") as app:
             parallel_processing
         ],
         outputs=[
-            srt_file,           # gr.File
-            audio_file,         # gr.File
-            audio_output,       # gr.Audio
-            error_output,       # gr.Textbox
-            file_download_group,# Control visibility of this group
-            html_download_group,# Control visibility of this group
-            srt_download,       # gr.HTML (will receive the HTML string directly)
-            audio_download      # gr.HTML (will receive the HTML string directly)
+            audio_output,
+            srt_download_link, # Output to Markdown component
+            audio_download_link, # Output to Markdown component
+            error_output,
+            error_output
         ],
         api_name="generate"
     )