Update app.py

app.py

@@ -133,18 +133,10 @@ def video_clip(program,fps,qual,model_name,denoise_strength,face_enhance,outscal
         mes="Writing Video"
         clip = ImageSequenceClip(fbox, fps = fps) 
     yield _,_,"Writing Video"    
-
-    ###################
     videoclip = VideoFileClip(new_video_in)
     audioclip=videoclip.audio
-    #clip = moviepy.video.io.ImageSequenceClip.ImageSequenceClip(images, fps)
     clip.audio=audioclip
     clip.write_videofile(f"{uid}/enhanced_vid.mp4")
-    ########################    
-    
-    
-    
-    #clip.speedx(2).to_gif(f"{uid}/clip_gif.gif",program=program)    
     yield _,_,"Saving Video"    
     out = f"{uid}/enhanced_vid.mp4"
     yield out,out,"Video Complete"   
@@ -157,13 +149,11 @@ def gif_clip(program,fps,qual,model_name,denoise_strength,face_enhance,outscale)
     frame_count = int(capture.get(cv2.CAP_PROP_FRAME_COUNT))
     fbox=[]
     out_box=[]
-
     cnt=0
     frame_count1= int(frame_count)
     for i in range(int(frame_count1)-1):
         capture.set(cv2.CAP_PROP_POS_FRAMES, i)
         ret, frame_f = capture.read(i)
-        #frame_ff = cv2.cvtColor(frame_f, cv2.COLOR_BGR2RGB)
         cv2.imwrite(f'{uid}-frames/{i+1}.png',frame_f)
         fbox.append(f'{uid}-frames/{i+1}.png')
         mes=f'Working on {i+1} of {frame_count1}'
@@ -174,27 +164,34 @@ def gif_clip(program,fps,qual,model_name,denoise_strength,face_enhance,outscale)
         yield _,_,mes
     if qual:
         for i,img in enumerate(fbox):
-            #print (img)
             out = os.path.abspath(img)
             out_url = f'{main_url}/file={out}'
             mes=f'Improving frame {i+1} of {frame_count}'
             yield _,_,mes
             out = esr(out_url, model_name, float(denoise_strength), face_enhance, int(outscale))
-            #yield _,_,mes
-            #cv2.imwrite(f'{img}',out)
             out_box.append(f'{out}')
             print (f'{main_url}/file={out}')
-            #print (f'out::{out}')
-        print (f'out_box::{out_box}')
         clip = ImageSequenceClip(out_box, fps = fps) 
     else:
         clip = ImageSequenceClip(fbox, fps = fps) 
     yield _,_,"Writing GIF" 
     clip.speedx(2).to_gif(f"{uid}/clip_gif.gif",program=program)    
     out = f"{uid}/clip_gif.gif"
-    yield out,out,"GIF Complete"    
-    
+    yield out,out,"GIF Complete"   
+
+def improve_img(inp,model_name,denoise_strength,face_enhance,outscale):
+    _=None    
+    yield _,"Reading image"
     
+    img=cv2.imread(inp)
+    cv2.imwrite(f'{uid}-frames/{i}.png',inp)
+    out = os.path.abspath(f'{uid}-frames/{i}.png')
+    out_url = f'{main_url}/file={out}'
+    yield _,"Improving image"
+    out = esr(out_url, model_name, float(denoise_strength), face_enhance, int(outscale))
+    yield out,"Complete"   
+
+
 
 def update_speed(inp,clip_speed,fps):
     if "-split.mp4" in inp:
@@ -207,7 +204,52 @@ def update_speed(inp,clip_speed,fps):
     final.write_videofile(f'{out_inp}', fps=mod_fps) 
     out = f'{out_inp}'
     return out,out,out
+def echo_fn(inp):
+    return inp 
+def check_load(inp_url,outp_vid,hid_box,start_f,end_f):
+    if outp_vid == None and inp_url !="":
+        out_trim,in_vid,trim_count=trim_vid(hid_box,start_f,end_f)
+    elif outp_vid !=None and inp_url == "":
+        out_trim = None
+        in_vid=outp_vid
+        trim_count = ""
+    return out_trim,in_vid,trim_count   
+def run_samp(program,fps,qual,model_name,denoise_strength,face_enhance,outscale,frame_targ):
+    _=None    
+    #fps=float(fps)
+    new_video_in = str(f"{uid}-clip.mp4")
+    capture = cv2.VideoCapture(new_video_in)
+    #frame_count1= int(frame_count)
+    i=int(frame_targ)
+    capture.set(cv2.CAP_PROP_POS_FRAMES, i)
+    ret, frame_f = capture.read(i)
+    #frame_ff = cv2.cvtColor(frame_f, cv2.COLOR_BGR2RGB)
+    cv2.imwrite(f'{uid}-frames/{i}.png',frame_f)
+    out = os.path.abspath(f'{uid}-frames/{i}.png')
+    out_url = f'{main_url}/file={out}'
+    yield _,"Creating Sample Frame","Creating Sample Frame"
+    out = esr(out_url, model_name, float(denoise_strength), face_enhance, int(outscale))
+    yield out,"Sample Frame Complete","Sample Frame Complete"         
 
+def new_media(inp):
+    if inp == "Image":
+        im_box = gr.update(visible=True)
+        vid_box = gr.update(visible=False)
+        gif_row = gr.update(visible=False)
+        vid_row = gr.update(visible=False)
+        return (im_box,vid_box,gif_row,vid_row)
+    if inp == "Video":
+        im_box = gr.update(visible=False)
+        vid_box = gr.update(visible=True)
+        gif_row = gr.update(visible=False)
+        vid_row = gr.update(visible=True)
+        return (im_box,vid_box,gif_row,vid_row)
+    if inp == "GIF":
+        im_box = gr.update(visible=False)
+        vid_box = gr.update(visible=True)
+        gif_row = gr.update(visible=True)
+        vid_row = gr.update(visible=False)            
+        return (im_box,vid_box,gif_row,vid_row)
 
 
 
@@ -243,10 +285,27 @@ with gr.Blocks(css=css) as app:
         gr.Column()
         with gr.Column():
             choose_media = gr.Radio(label="Media Type",choices=["Image","Video","GIF"],value="Image")
+            with gr.Accordion("Quality Options", open=False):
+                with gr.Row():
+                    model_name = gr.Dropdown(label="Real-ESRGAN Model",
+                                             choices=["RealESRGAN_x4plus", "RealESRNet_x4plus", "RealESRGAN_x4plus_anime_6B",
+                                                      "RealESRGAN_x2plus", "realesr-general-x4v3"],
+                                             value="realesr-general-x4v3", show_label=True)
+                    face_enhance = gr.Checkbox(label="Face Enhancement using GFPGAN",
+                                               value=False, show_label=True)
+                    denoise_strength = gr.Slider(label="Denoise Strength",
+                                                 minimum=0, maximum=1, step=0.1, value=0.5)
+                    outscale = gr.Slider(label="Image Upscaling Factor",
+                                         minimum=1, maximum=10, step=1, value=1, show_label=True)
+  
             with gr.Box(visible=True) as im_box:
                 with gr.Group():
                     inp_img_url=gr.Textbox(label="Image URL")
+                    load_im_btn=gr.Button("Load URL")
                     inp_img=gr.Image(label = "Input Image")
+                    with gr.Row():
+                        proc_im_btn=gr.Button("Improve")
+                        im_stat=gr.Textbox(label="Status")                    
                     outp_img=gr.Image(label="Enhanced Image")
             with gr.Box(visible=False) as vid_box:
                 with gr.Group():
@@ -270,23 +329,11 @@ with gr.Blocks(css=css) as app:
 
                     with gr.Row():
                         qual=gr.Checkbox(label="Improve Quality (slow)",value=False)
-                    with gr.Accordion("Quality Options", open=False):
+                    with gr.Accordion("Sample Frame",open=False):
                         with gr.Row():
-                            model_name = gr.Dropdown(label="Real-ESRGAN Model",
-                                                     choices=["RealESRGAN_x4plus", "RealESRNet_x4plus", "RealESRGAN_x4plus_anime_6B",
-                                                              "RealESRGAN_x2plus", "realesr-general-x4v3"],
-                                                     value="realesr-general-x4v3", show_label=True)
-                            face_enhance = gr.Checkbox(label="Face Enhancement using GFPGAN",
-                                                       value=False, show_label=True)
-                            denoise_strength = gr.Slider(label="Denoise Strength",
-                                                         minimum=0, maximum=1, step=0.1, value=0.5)
-                            outscale = gr.Slider(label="Image Upscaling Factor",
-                                                 minimum=1, maximum=10, step=1, value=1, show_label=True)
-                        with gr.Accordion("Sample",open=False):
-                            with gr.Row():
-                                frame_targ=gr.Number(label="Frame",value=1)
-                                samp_btn=gr.Button("Get Sample")
-                            samp_im = gr.Image(label="Sample Frame")    
+                            frame_targ=gr.Number(label="Frame",value=1)
+                            samp_btn=gr.Button("Get Sample")
+                        samp_im = gr.Image(label="Sample Frame")  
                         
 
                     with gr.Column(visible=False) as gif_row:
@@ -309,56 +356,10 @@ with gr.Blocks(css=css) as app:
         text_output=gr.Textbox()
         url_params=gr.JSON()
 
-    def echo_fn(inp):
-        return inp 
-
-    def check_load(inp_url,outp_vid,hid_box,start_f,end_f):
-        if outp_vid == None and inp_url !="":
-            out_trim,in_vid,trim_count=trim_vid(hid_box,start_f,end_f)
-        elif outp_vid !=None and inp_url == "":
-            out_trim = None
-            in_vid=outp_vid
-            trim_count = ""
-        return out_trim,in_vid,trim_count   
-    def run_samp(program,fps,qual,model_name,denoise_strength,face_enhance,outscale,frame_targ):
-        _=None    
-        #fps=float(fps)
-        new_video_in = str(f"{uid}-clip.mp4")
-        capture = cv2.VideoCapture(new_video_in)
-        #frame_count1= int(frame_count)
-        i=int(frame_targ)
-        capture.set(cv2.CAP_PROP_POS_FRAMES, i)
-        ret, frame_f = capture.read(i)
-        #frame_ff = cv2.cvtColor(frame_f, cv2.COLOR_BGR2RGB)
-        cv2.imwrite(f'{uid}-frames/{i}.png',frame_f)
-        out = os.path.abspath(f'{uid}-frames/{i}.png')
-        out_url = f'{main_url}/file={out}'
-        yield _,"Creating Sample Frame"
-        out = esr(out_url, model_name, float(denoise_strength), face_enhance, int(outscale))
-        yield out,"Sample Frame Complete"        
 
-    def new_media(inp):
-        if inp == "Image":
-            im_box = gr.update(visible=True)
-            vid_box = gr.update(visible=False)
-            gif_row = gr.update(visible=False)
-            vid_row = gr.update(visible=False)
-            return (im_box,vid_box,gif_row,vid_row)
-        if inp == "Video":
-            im_box = gr.update(visible=False)
-            vid_box = gr.update(visible=True)
-            gif_row = gr.update(visible=False)
-            vid_row = gr.update(visible=True)
-            return (im_box,vid_box,gif_row,vid_row)
-        if inp == "GIF":
-            im_box = gr.update(visible=False)
-            vid_box = gr.update(visible=True)
-            gif_row = gr.update(visible=True)
-            vid_row = gr.update(visible=False)            
-            return (im_box,vid_box,gif_row,vid_row)
-            
+    proc_im_btn.click(improve_img,[inp,model_name,denoise_strength,face_enhance,outscale],[outp_img,im_stat])
     choose_media.change(new_media,choose_media,[im_box,vid_box,gif_row,vid_row])
-    samp_btn.click(run_samp,[choose_prog,fps,qual,model_name,denoise_strength,face_enhance,outscale,frame_targ],[samp_im,gif_stat])    
+    samp_btn.click(run_samp,[choose_prog,fps,qual,model_name,denoise_strength,face_enhance,outscale,frame_targ],[samp_im,gif_stat,vid_stat])    
     speed_btn.click(update_speed,[hid_box,clip_speed,hid_fps],[outp_vid,hid_box,outp_file])
     gif_btn.click(gif_clip,[choose_prog,fps,qual,model_name,denoise_strength,face_enhance,outscale],[gif_show,gif_file,gif_stat])
     vid_btn.click(video_clip,[choose_prog,fps,qual,model_name,denoise_strength,face_enhance,outscale],[gif_show,gif_file,vid_stat])