Update app.py

app.py

@@ -745,8 +745,7 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
             with gr.Row():
                 process_btn = gr.Button("Process Audio", variant="primary")
                 clear_btn = gr.Button("Clear All", variant="secondary")
-                open_viewer_btn = gr.Button("Open 360 Viewer in New Tab", variant="secondary")  # Add this line
-
+                open_viewer_btn = gr.Button("Open 360 Viewer in New Tab", variant="secondary")
     
     # Add a loading indicator
     loading_indicator = gr.HTML("""
@@ -771,47 +770,22 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
                 sentiment_output = gr.Label(label="Sentiment Analysis")
             with gr.Row():
                 image_output = gr.Image(label="Generated Equirectangular Image")
-                image_360_output = gr.File(label="Download 360 Image", type="filepath")  # Add this line
+                image_360_output = gr.File(label="Download 360 Image", type="filepath")
             with gr.Row():
                 audio_output = gr.Audio(label="Generated Music")
             gr.HTML("<hr style='margin: 20px 0; border: 1px solid #ccc;'>")
         
-        group_components.append(chunk_group)  # Store the group component
+        group_components.append(chunk_group)
         output_containers.append({
             'emotion': emotion_output,
             'transcription': transcription_output,
             'sentiment': sentiment_output,
             'image': image_output,
-            'image_360': image_360_output,  # Add this line
+            'image_360': image_360_output,
             'music': audio_output
         })
     
-    # Add components to display the fade animation
-    with gr.Row():
-        fade_preview_output = gr.Image(
-            label="Fade Animation Preview", 
-            interactive=False
-        )
-        fade_animation_output = gr.File(
-            label="Download Fade Animation", 
-            type="binary",
-            interactive=False
-        )
-    # In your output_containers, add the image_360 output
-    with gr.Group(visible=False) as chunk_group:
-        gr.Markdown(f"### Chunk {i+1} Results")
-        with gr.Row():
-            emotion_output = gr.Label(label="Acoustic Emotion Prediction")
-            transcription_output = gr.Label(label="Transcribed Text")
-            sentiment_output = gr.Label(label="Sentiment Analysis")
-        with gr.Row():
-            image_output = gr.Image(label="Generated Equirectangular Image")
-            image_360_output = gr.File(label="Download 360 Image", type="filepath")  # New component
-        with gr.Row():
-            audio_output = gr.Audio(label="Generated Music")
-        gr.HTML("<hr style='margin: 20px 0; border: 1px solid #ccc;'>")
-    
-    # Add the 360 viewer component
+    # Add components to display the fade animation and 360 viewer
     with gr.Row():
         fade_preview_output = gr.Image(
             label="Fade Animation Preview", 
@@ -822,29 +796,22 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
             type="binary",
             interactive=False
         )
-        viewer_html_output = gr.File(  # New component
+        viewer_html_output = gr.File(
             label="Download 360 Viewer", 
             type="filepath",
             interactive=False
         )
-    with gr.Row():
-    fade_preview_output = gr.Image(
-        label="Fade Animation Preview", 
-        interactive=False
-    )
-    fade_animation_output = gr.File(
-        label="Download Fade Animation", 
-        type="binary",
-        interactive=False
-    )
-    viewer_html_output = gr.File(  # New component
-        label="Download 360 Viewer", 
-        type="filepath",
-        interactive=False
-    )
-
-    # Add a button to open the HTML viewer in a new tab
-    open_viewer_btn = gr.Button("Open 360 Viewer in New Tab", variant="secondary")
+    
+    # Function to handle example selection
+    def load_example(example_name):
+        if not example_name:
+            return None, None
+        
+        # Get the path to the example audio file
+        example_path = load_example_audio(example_name)
+        
+        # Return the example path to update the audio component
+        return example_path, example_name
     
     # Function to open the HTML viewer in a new tab
     def open_viewer_in_new_tab(viewer_html_path):
@@ -862,25 +829,6 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
                 return tmp_file.name
         return None
     
-    # Set up the button click for opening the viewer
-    open_viewer_btn.click(
-        fn=open_viewer_in_new_tab,
-        inputs=[viewer_html_output],
-        outputs=[viewer_html_output]  # This will update the file download link
-    )
-    
-    # Function to handle example selection
-    def load_example(example_name):
-        if not example_name:
-            return None, None  # Return None for both audio and example selector
-        
-        # Get the path to the example audio file
-        example_path = load_example_audio(example_name)
-        
-        # Return the example path to update the audio component
-        # The waveform will be automatically displayed by Gradio's Audio component
-        return example_path, example_name
-    
     # Function to clear audio input and all outputs
     def clear_all():
         # Create a list with None for all outputs
@@ -890,7 +838,7 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
         outputs.extend([gr.Group(visible=False)] * len(group_components))
         
         # For all output containers (set to None)
-        outputs.extend([None] * (len(output_containers) * 5))
+        outputs.extend([None] * (len(output_containers) * 6))
         
         # For loading indicator (empty HTML)
         outputs.append(gr.HTML(""))
@@ -901,13 +849,14 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
         # For example selector (reset to None)
         outputs.append(None)
         
-        # For fade preview and animation (set to None)
+        # For fade preview, animation, and viewer (set to None)
+        outputs.append(None)
         outputs.append(None)
         outputs.append(None)
         
         return outputs
     
-    # Set up the button click
+    # Set up the button clicks
     process_btn.click(
         fn=process_and_display,
         inputs=[audio_input, generate_audio_checkbox, chunk_duration_input],
@@ -916,12 +865,11 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
             container['transcription'],
             container['sentiment'],
             container['image'],
-            container['image_360'],  # New output
+            container['image_360'],
             container['music']
-        ]] + [fade_preview_output, fade_animation_output, viewer_html_output]  # Added viewer_html_output
+        ]] + [fade_preview_output, fade_animation_output, viewer_html_output]
     )
     
-    # Set up the clear button
     clear_btn.click(
         fn=clear_all,
         inputs=[],
@@ -930,16 +878,21 @@ with gr.Blocks(title="Affective Virtual Environments - Chunked Processing") as i
             container['transcription'],
             container['sentiment'],
             container['image'],
-            container['image_360'],  # New output
+            container['image_360'],
             container['music']
-        ]] + [loading_indicator] + [chunk_duration_input] + [example_selector] + [fade_preview_output, fade_animation_output, viewer_html_output]  # Added viewer_html_output
+        ]] + [loading_indicator, chunk_duration_input, example_selector, fade_preview_output, fade_animation_output, viewer_html_output]
     )
     
-    # Set up the example loading button
     load_example_btn.click(
         fn=load_example,
         inputs=[example_selector],
         outputs=[audio_input, example_selector]
     )
+    
+    open_viewer_btn.click(
+        fn=open_viewer_in_new_tab,
+        inputs=[viewer_html_output],
+        outputs=[viewer_html_output]
+    )
 
 interface.launch()