ajust ui

app.py

@@ -9,7 +9,9 @@ import os
 import json
 import spaces
 from app.utils import generate_coturn_config
+
 from app.session_utils import (
+    TMP_DIR,
     generate_session_id,
     register_session,
     unregister_session,
@@ -20,7 +22,7 @@ from app.session_utils import (
     reset_active_sessions,
 )
 
-# Reset active sessions at startup
+# Reset sessions at startup
 reset_active_sessions()
 
 EXAMPLE_FILES = ["data/bonjour.wav", "data/bonjour2.wav"]
@@ -44,7 +46,7 @@ def read_and_stream_audio(filepath_to_stream: str, session_id: str):
 
     clear_stop_flag(session_id)
     register_session(session_id, filepath_to_stream)
-    progress_path = f"/tmp/progress_{session_id}.json"
+    progress_path = os.path.join(TMP_DIR, f"progress_{session_id}.json")
 
     try:
         segment = AudioSegment.from_file(filepath_to_stream)
@@ -61,10 +63,25 @@ def read_and_stream_audio(filepath_to_stream: str, session_id: str):
             iter_start = time.perf_counter()
             logging.debug(f"[{session_id}] Sending chunk {i}/{total_chunks}...")
 
-            progress_data = {"value": i / total_chunks, "text": f"Streaming... ({i}/{total_chunks})"}
+            # Compute elapsed time (hh:mm:ss)
+            elapsed_s = i * (chunk_ms / 1000)
+            hours, remainder = divmod(int(elapsed_s), 3600)
+            minutes, seconds = divmod(remainder, 60)
+            elapsed_str = f"{hours:02d}:{minutes:02d}:{seconds:02d}"
+
+            # Compute percentage
+            percent = round((i / total_chunks) * 100, 2)
+
+            # Save progress info
+            progress_data = {
+                "value": percent,
+                "elapsed": elapsed_str,
+                "text": f"Streaming... {elapsed_str} ({percent}%)"
+            }
             with open(progress_path, "w") as f:
                 json.dump(progress_data, f)
 
+            # Stream chunk
             output_chunk = (
                 chunk.frame_rate,
                 np.array(chunk.get_array_of_samples()).reshape(1, -1),
@@ -75,7 +92,7 @@ def read_and_stream_audio(filepath_to_stream: str, session_id: str):
             time.sleep(max((chunk_ms / 1000.0) - (process_ms / 1000.0) - 0.1, 0.01))
 
         with open(progress_path, "w") as f:
-            json.dump({"value": 1.0, "text": "Streaming completed ✅"}, f)
+            json.dump({"value": 100.0, "elapsed": elapsed_str, "text": "Streaming completed ✅"}, f)
 
         logging.info(f"[{session_id}] Stream completed successfully.")
 
@@ -100,21 +117,26 @@ def stop_streaming(session_id: str):
 
 
 def get_session_progress(session_id: str):
-    """Read progress data from /tmp/progress_<session_id>.json."""
-    progress_path = f"/tmp/progress_{session_id}.json"
+    """Read streaming progress and return slider position + elapsed time."""
+    progress_path = os.path.join(TMP_DIR, f"progress_{session_id}.json")
     if not os.path.exists(progress_path):
-        return 0.0, ""
+        return 0.0, "00:00:00"
     try:
         with open(progress_path, "r") as f:
             data = json.load(f)
-        return data.get("value", 0.0), data.get("text", "")
+        value = data.get("value", 0.0)
+        elapsed = data.get("elapsed", "00:00:00")
+        return value, elapsed
     except Exception as e:
         logging.error(f"[{session_id}] Progress read error: {e}")
-        return 0.0, ""
+        return 0.0, "00:00:00"
 
 
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("## 🎧 WebRTC Audio Streamer (Multi-user)\nEach user controls their own audio stream with live progress.")
+    gr.Markdown(
+        "## 🎧 WebRTC Audio Streamer (Multi-user)\n"
+        "Each user controls their own audio stream with elapsed time and percentage progress."
+    )
 
     session_id = gr.State(value=generate_session_id)
     active_filepath = gr.State(value=DEFAULT_FILE)
@@ -130,16 +152,21 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                 )
 
                 progress_bar = gr.Slider(
-                    label="Streaming Progress",
+                    label="Streaming Progress (%)",
                     minimum=0,
-                    maximum=1,
+                    maximum=100,
                     value=0,
-                    step=0.01,
+                    step=0.1,
                     interactive=False,
                     visible=False,
                 )
 
-                progress_text = gr.Textbox(label="Stream Status", interactive=False, visible=False)
+                progress_text = gr.Textbox(
+                    label="Elapsed Time (hh:mm:ss)",
+                    interactive=False,
+                    visible=False,
+                    show_label=False
+                )
 
                 with gr.Row():
                     with gr.Column(scale=1, min_width=0):
@@ -169,11 +196,11 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             stop_button: gr.Button(interactive=True),
             main_audio: gr.Audio(visible=False),
             progress_bar: gr.Slider(value=0, visible=True),
-            progress_text: gr.Textbox(value="Streaming started...", visible=False),
+            progress_text: gr.Textbox(value="00:00:00", visible=True),
         }
 
     def stop_streaming_ui(session_id):
-        logging.debug(f"[{session_id}] UI: Stop clicked → restoring controls.")
+        logging.debug(f"[{session_id}] UI: Stop clicked or finished → restoring controls.")
         return {
             start_button: gr.Button(interactive=True),
             stop_button: gr.Button(interactive=False),
@@ -185,7 +212,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                 visible=True,
             ),
             progress_bar: gr.Slider(value=0, visible=False),
-            progress_text: gr.Textbox(value="", visible=False),
+            progress_text: gr.Textbox(value="00:00:00", visible=False),
         }
 
     ui_components = [start_button, stop_button, main_audio, progress_bar, progress_text]
@@ -199,9 +226,20 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         concurrency_limit=20,
     )
 
-    start_button.click(fn=start_streaming_ui, inputs=[session_id], outputs=ui_components)
-    stop_button.click(fn=stop_streaming, inputs=[session_id], outputs=[webrtc_stream]).then(
-        fn=stop_streaming_ui, inputs=[session_id], outputs=ui_components
+    start_button.click(
+        fn=start_streaming_ui,
+        inputs=[session_id],
+        outputs=ui_components,
+    )
+
+    stop_button.click(
+        fn=stop_streaming,
+        inputs=[session_id],
+        outputs=[webrtc_stream],
+    ).then(
+        fn=stop_streaming_ui,
+        inputs=[session_id],
+        outputs=ui_components,
     )
 
     with gr.Accordion("📊 Active Sessions", open=False):

app/session_utils.py

@@ -4,17 +4,48 @@ import uuid
 from datetime import datetime
 from app.logger_config import logger as logging
 
-ACTIVE_SESSIONS_FILE = "/tmp/active_sessions.json"
+TMP_DIR = "/tmp/canary_aed_streaming"
+ACTIVE_SESSIONS_FILE = os.path.join(TMP_DIR, "active_sessions.json")
+
+
+def ensure_tmp_dir():
+    """Ensures the base temporary directory exists."""
+    try:
+        os.makedirs(TMP_DIR, exist_ok=True)
+    except Exception as e:
+        logging.error(f"Failed to create tmp directory {TMP_DIR}: {e}")
 
 
 def reset_active_sessions():
-    """Removes or clears the active sessions file at startup."""
+    """Removes all temporary session files at startup."""
+    ensure_tmp_dir()
+
     try:
+        # Remove active sessions file
         if os.path.exists(ACTIVE_SESSIONS_FILE):
             os.remove(ACTIVE_SESSIONS_FILE)
             logging.info("Active sessions file reset at startup.")
         else:
             logging.debug("No active sessions found to reset.")
+
+        # Clean up old progress files
+        for f in os.listdir(TMP_DIR):
+            if f.startswith("progress_") and f.endswith(".json"):
+                try:
+                    os.remove(os.path.join(TMP_DIR, f))
+                    logging.debug(f"Removed leftover progress file: {f}")
+                except Exception as e:
+                    logging.warning(f"Failed to remove progress file {f}: {e}")
+
+        # Clean up old stop flag files
+        for f in os.listdir(TMP_DIR):
+            if f.startswith("stream_stop_flag_") and f.endswith(".txt"):
+                try:
+                    os.remove(os.path.join(TMP_DIR, f))
+                    logging.debug(f"Removed leftover stop flag file: {f}")
+                except Exception as e:
+                    logging.warning(f"Failed to remove stop flag file {f}: {e}")
+
     except Exception as e:
         logging.error(f"Error resetting active sessions: {e}")
 
@@ -28,6 +59,7 @@ def generate_session_id() -> str:
 
 def register_session(session_id: str, filepath: str):
     """Registers a new session."""
+    ensure_tmp_dir()
     data = {}
     if os.path.exists(ACTIVE_SESSIONS_FILE):
         with open(ACTIVE_SESSIONS_FILE, "r") as f:
@@ -92,7 +124,8 @@ def get_active_sessions():
 
 def stop_file_path(session_id: str) -> str:
     """Returns the stop-flag file path for a given session."""
-    return f"/tmp/stream_stop_flag_{session_id}.txt"
+    ensure_tmp_dir()
+    return os.path.join(TMP_DIR, f"stream_stop_flag_{session_id}.txt")
 
 
 def create_stop_flag(session_id: str):