Update app.py

app.py

@@ -20,15 +20,11 @@ def submit_job(audio_file, preset, beat_sensitivity, fps, width, height):
     # Check file size
     file_size_mb = os.path.getsize(audio_file.name) / (1024 * 1024)
     if file_size_mb > 3.5:
-        error_message = f"Error: File size is {file_size_mb:.2f}MB, which exceeds the 3.5MB limit."
-        logging.error(error_message)
-        return error_message, None
+        raise gr.Error(f"File size is {file_size_mb:.2f}MB, which exceeds the 3.5MB limit. Please use a file that is 3.5MB or smaller.")
 
     api_key = os.getenv('DEFORUM_API_KEY')  # Ensure your environment variable is set
     if not api_key:
-        error_message = "Error: API key is not set in environment variables"
-        logging.error(error_message)
-        return error_message, None
+        raise gr.Error("API key is not set in environment variables")
 
     server = "https://deforum.studio"
     api_url = f'{server}/api/public/v1/audiovis1'
@@ -49,9 +45,7 @@ def submit_job(audio_file, preset, beat_sensitivity, fps, width, height):
 
     response = requests.post(api_url, headers=headers, json=payload)
     if response.status_code != 201:
-        error_message = f"Error submitting job: {response.status_code} - {response.text}"
-        logging.error(error_message)
-        return error_message, None
+        raise gr.Error(f"Error submitting job: {response.status_code} - {response.text}")
 
     data = response.json()
     tracking_url = f"{server}{data['links']['audiovis1']}"
@@ -60,9 +54,7 @@ def submit_job(audio_file, preset, beat_sensitivity, fps, width, height):
     while True:
         response = requests.get(tracking_url, headers=headers)
         if response.status_code != 200:
-            error_message = f"Error getting job status: {response.text}"
-            logging.error(error_message)
-            return error_message, None
+            raise gr.Error(f"Error getting job status: {response.text}")
 
         tracking_data = response.json()
         logging.info(f"Job status: {tracking_data['status']}")
@@ -71,13 +63,11 @@ def submit_job(audio_file, preset, beat_sensitivity, fps, width, height):
         sleep(10)
 
     if tracking_data['status'] != 'succeeded':
-        error_message = f"Job ended with status: {tracking_data['status']}"
-        logging.error(error_message)
-        return error_message, None
+        raise gr.Error(f"Job ended with status: {tracking_data['status']}")
     else:
         output_url = tracking_data['links']['outputUrls'][0]
         logging.info(f"Job succeeded. Output URL: {output_url}")
-        return output_url, None
+        return output_url
 
 description1 = """
 # Audio Visualizer Playground
@@ -167,10 +157,8 @@ video, .gr-video {
 """
 
 def main(audio_file, preset, beat_sensitivity, fps, width, height):
-    result, error = submit_job(audio_file, preset, beat_sensitivity, fps, width, height)
-    if error:
-        return None, error
-    return result, None
+    result = submit_job(audio_file, preset, beat_sensitivity, fps, width, height)
+    return result
 
 with gr.Blocks(css=custom_css) as demo:
     gr.Markdown(description1, elem_id="markdown-text")
@@ -191,15 +179,15 @@ with gr.Blocks(css=custom_css) as demo:
     output_video = gr.Video(label="Output MP4")
     output_error = gr.Textbox(label="Error", visible=False)
 
-    def update_output(video_url, error):
-        if error:
-            output_error.update(value=error, visible=True)
+    def update_output(video_url):
+        if isinstance(video_url, str) and video_url.startswith("Error"):
+            output_error.update(value=video_url, visible=True)
             output_video.update(value=None, visible=False)
         else:
             output_error.update(value="", visible=False)
             output_video.update(value=video_url, visible=True)
 
-    submit_button.click(main, inputs=[audio_file, preset, beat_sensitivity, fps, width, height], outputs=[output_video, output_error])
+    submit_button.click(main, inputs=[audio_file, preset, beat_sensitivity, fps, width, height], outputs=[output_video])
 
 if __name__ == "__main__":
     demo.launch()