loading should be nicer

app.py

@@ -28,7 +28,7 @@ def get_demo_call(video_name):
         ump_out = None
     return ump_out
 
-def call_pitch(pitch):
+def call_pitch(pitch,progress=gr.Progress()):
     start = time.time()
     std = (0.2104, 0.1986, 0.1829)
     mean = (0.3939, 0.3817, 0.3314)
@@ -42,14 +42,14 @@ def call_pitch(pitch):
     model = MobileNetSmall3D()
     model.load_state_dict(torch.load('weights/MobileNetSmall.pth',map_location=torch.device('cpu')))
     model.eval()
-
-    #run the model
     with torch.no_grad():
         output = model(pitch_tensor)
     output = F.softmax(output,dim=1)
     final_call = classify_pitch(output)
-    # time.sleep(video_length-1.5) #wait until the video is done to return the call
-    while time.time() - start < (video_length-5)/15: #wait until the video is done to return the call and go 2 frames early to seem speedy
+
+    differential = time.time() - start
+    wait_time = (int(video_length-(5+differential))//15)*10
+    for _ in progress.tqdm(range(wait_time)):  #wait until the video is done to return the call and go 5 frames early to seem speedy
         time.sleep(0.1)
 
     if ump_out is not None:
@@ -74,26 +74,25 @@ def generate_random_pitch():
     
     random_pitch = download_pitch(video_link,ump_out)
 
-    return random_pitch
+    return random_pitch,None,None #none and none to write none to ump out and pb out
 
 
 def download_pitch(video_link,ump_out=None):
-    # progress = gr.Progress()
-    # progress(1,"Downloading Video...")
     #download and process the video link using yt-dlp and ffmpeg
+    start = time.time()
     if ump_out is not None:
         video_out = f"demo_files/downloaded_videos/{ump_out}_demo_video.mp4"
-        os.system(f"yt-dlp -q --no-warnings --force-overwrites --progress -f mp4 {video_link} -o '{video_out}'")
-        # progress(None,"Processing Video...")
+        os.system(f"yt-dlp -q --no-warnings --force-overwrites -f mp4 {video_link} -o '{video_out}'")
         os.system(f'ffmpeg -y -nostats -loglevel 0 -i {video_out} -vf "crop=700:700:in_w/2-350:in_h/2-350,scale=224:224" -r 15 -c:v libx264 -crf 23 -c:a aac -an -strict experimental {video_out}_cropped_video.mp4')
     else:
         video_out = f"demo_files/downloaded_videos/own_demo_video.mp4"
         os.system(f"yt-dlp -q --no-warnings --force-overwrites -f mp4 {video_link} -o '{video_out}'")
-        # progress(None,"Processing Video...")
         os.system(f'ffmpeg -y -nostats -loglevel 0 -i {video_out} -vf "crop=700:700:in_w/2-350:in_h/2-350,scale=224:224" -r 15 -c:v libx264 -crf 23 -c:a aac -an -strict experimental {video_out}_cropped_video.mp4')
+    #if the process is taking too long, throw an error
+    if time.time() - start > 30:
+        raise gr.Error("Video download is taking too long. Please try again.")
     return f"{video_out}_cropped_video.mp4"
 
-
 demo_files = os.listdir("demo_files/")
 demo_files = [os.path.join("demo_files/", file) for file in demo_files if file.endswith(".mp4")]
 with gr.Blocks(title="Picklebot") as demo:
@@ -110,9 +109,10 @@ with gr.Blocks(title="Picklebot") as demo:
             with gr.Column(scale=2):
                 ump_out = gr.Label(label="Umpire's Original Call")
                 pb_out = gr.Label(label="Picklebot's Call")
+                #when random is clicked, we want to somehow have a loading something to show that it's working
                 random_button = gr.Button("🔀 Load a Random Pitch")
-                random_button.click(fn=generate_random_pitch,outputs=[inp],show_progress="minimal")
-                inp.play(fn=call_pitch,inputs=inp,outputs=[pb_out,ump_out],show_progress="minimal")
+                random_button.click(fn=generate_random_pitch,outputs=[inp,ump_out,pb_out])
+                inp.play(fn=call_pitch,inputs=inp,outputs=[pb_out,ump_out],trigger_mode="once")
                 gr.ClearButton([inp,pb_out,ump_out])
                 gr.Examples(demo_files,inputs=inp,outputs=[inp])
     with gr.Tab("Use Your Own Video!"):
@@ -133,11 +133,11 @@ with gr.Blocks(title="Picklebot") as demo:
             with gr.Column(scale=2):
                 #make a textbox to take in the user's video link
                 input_txt = gr.Textbox(placeholder="Paste your video link here",label="Video Link")
-                input_txt.submit(fn=download_pitch,inputs=input_txt,outputs=vid_inp,show_progress="minimal")
+                input_txt.submit(fn=download_pitch,inputs=input_txt,outputs=vid_inp)
                 submit_button = gr.Button("Go!")
-                submit_button.click(fn=download_pitch,inputs=input_txt,outputs=vid_inp,show_progress="minimal")
+                submit_button.click(fn=download_pitch,inputs=input_txt,outputs=vid_inp)
                 pb_out = gr.Label(label="Picklebot's Call")
-                vid_inp.play(fn=call_pitch,inputs=vid_inp,outputs=pb_out,show_progress="minimal")
+                vid_inp.play(fn=call_pitch,inputs=vid_inp,outputs=pb_out,trigger_mode="once")
                 gr.ClearButton([vid_inp,pb_out,input_txt])
 
     with gr.Tab("About"):