Update core.py

run_makevideo optional outpath and basename. When is called from the api the user can specify the folder and the file name.

Author: davidmartinrius

src/core.py

@@ -209,10 +209,6 @@ def core_generation_funnel(outpath, inputimages, inputdepthmaps, inputnames, inp
                 inpaint_imgs.append(inputimages[count])
                 inpaint_depths.append(img_output)
 
-            if inp[go.RUN_MAKEVIDEO_API]:
-                inpaint_imgs.append(inputimages[count])
-                inpaint_depths.append(img_output)
-
             # applying background masks after depth
             if inp[go.GEN_REMBG]:
                 print('applying background masks')
@@ -342,15 +338,6 @@ def core_generation_funnel(outpath, inputimages, inputdepthmaps, inputnames, inp
         except Exception as e:
             print(f'{str(e)}, some issue with generating inpainted mesh')
 
-    if inp[go.RUN_MAKEVIDEO_API]:
-        try:
-            video = run_makevideo_api(device, inpaint_imgs, inpaint_depths, inputnames, outpath,
-                                    inp[go.RUN_MAKEVIDEO_API],
-                                    1, "mp4")
-            yield 0, 'video', None
-        except Exception as e:
-            print(f'{str(e)}, some issue with generating video')
-
     backbone.reload_sd_model()
     print("All done.\n")
 
@@ -591,12 +578,10 @@ def run_3dphoto_videos(mesh_fi, basename, outpath, num_frames, fps, crop_border,
                                                           fnExt=vid_format)
     return fn_saved
 
-
-# called from gen vid tab button
-def run_makevideo(fn_mesh, vid_numframes, vid_fps, vid_traj, vid_shift, vid_border, dolly, vid_format, vid_ssaa):
+def run_makevideo(fn_mesh, vid_numframes, vid_fps, vid_traj, vid_shift, vid_border, dolly, vid_format, vid_ssaa, outpath=None, basename=None):
     if len(fn_mesh) == 0 or not os.path.exists(fn_mesh):
         raise Exception("Could not open mesh.")
-
+    
     vid_ssaa = int(vid_ssaa)
 
     # traj type
@@ -621,20 +606,24 @@ def run_makevideo(fn_mesh, vid_numframes, vid_fps, vid_traj, vid_shift, vid_bord
         raise Exception("Crop Border requires 4 elements.")
     crop_border = [float(borders[0]), float(borders[1]), float(borders[2]), float(borders[3])]
 
-    # output path and filename mess ..
-    basename = Path(fn_mesh).stem
-    outpath = backbone.get_outpath()
-    # unique filename
-    basecount = backbone.get_next_sequence_number(outpath, basename)
-    if basecount > 0: basecount = basecount - 1
-    fullfn = None
-    for i in range(500):
-        fn = f"{basecount + i:05}" if basename == '' else f"{basename}-{basecount + i:04}"
-        fullfn = os.path.join(outpath, f"{fn}_." + vid_format)
-        if not os.path.exists(fullfn):
-            break
-    basename = Path(fullfn).stem
-    basename = basename[:-1]
+    if not outpath:
+        outpath = backbone.get_outpath()
+
+    if not basename:
+        # output path and filename mess ..
+        basename = Path(fn_mesh).stem
+        
+        # unique filename
+        basecount = backbone.get_next_sequence_number(outpath, basename)
+        if basecount > 0: basecount = basecount - 1
+        fullfn = None
+        for i in range(500):
+            fn = f"{basecount + i:05}" if basename == '' else f"{basename}-{basecount + i:04}"
+            fullfn = os.path.join(outpath, f"{fn}_." + vid_format)
+            if not os.path.exists(fullfn):
+                break
+        basename = Path(fullfn).stem
+        basename = basename[:-1]
 
     print("Loading mesh ..")
 
@@ -643,70 +632,6 @@ def run_makevideo(fn_mesh, vid_numframes, vid_fps, vid_traj, vid_shift, vid_bord
 
     return fn_saved[-1], fn_saved[-1], ''
 
-def run_makevideo_api(device, inpaint_imgs, inpaint_depths, inputnames, outpath, gen_video_params, vid_ssaa, vid_format):
-
-    required_params = ["vid_numframes", "vid_fps", "vid_traj", "vid_shift", "vid_border", "dolly", "vid_format", "vid_ssaa", "output_filename"]
-    
-    missing_params = [param for param in required_params if param not in gen_video_params]
-    
-    if missing_params:
-        raise ValueError(f"Missing required parameter(s): {', '.join(missing_params)}")
-    
-    mesh_fi_filename = gen_video_params.get('mesh_fi_filename', None)
-
-    if mesh_fi_filename and os.path.exists(mesh_fi_filename):
-        
-        mesh_fi = mesh_fi_filename
-        print("Loaded existing mesh from: ", mesh_fi)
-    else:
-        #If there is no mesh file generate it. 
-        mesh_fi = run_3dphoto(device, inpaint_imgs, inpaint_depths, inputnames, outpath, None, 1, "mp4")
-        print("Created mesh in: ", mesh_fi)
-    
-    vid_numframes = gen_video_params["vid_numframes"]
-    vid_fps = gen_video_params["vid_fps"]
-    vid_traj = gen_video_params["vid_traj"]
-    vid_shift = gen_video_params["vid_shift"]
-    vid_border = gen_video_params["vid_border"]
-    dolly = gen_video_params["dolly"]
-    vid_format = gen_video_params["vid_format"]
-    vid_ssaa = int(gen_video_params["vid_ssaa"])
-    
-    output_filename = gen_video_params["output_filename"]
-    output_path = os.path.dirname(output_filename)
-    basename, extension = os.path.splitext(os.path.basename(output_filename))
-
-    # Comparing video_format with the extension
-    if vid_format != extension[1:]:
-        raise ValueError(f"Video format '{vid_format}' does not match with the extension '{extension}'.")
-
-    # traj type
-    if vid_traj == 0:
-        vid_traj = ['straight-line']
-    elif vid_traj == 1:
-        vid_traj = ['double-straight-line']
-    elif vid_traj == 2:
-        vid_traj = ['circle']
-
-    num_fps = int(vid_fps)
-    num_frames = int(vid_numframes)
-    shifts = vid_shift.split(',')
-    if len(shifts) != 3:
-        raise Exception("Translate requires 3 elements.")
-    x_shift_range = [float(shifts[0])]
-    y_shift_range = [float(shifts[1])]
-    z_shift_range = [float(shifts[2])]
-
-    borders = vid_border.split(',')
-    if len(borders) != 4:
-        raise Exception("Crop Border requires 4 elements.")
-    crop_border = [float(borders[0]), float(borders[1]), float(borders[2]), float(borders[3])]
-
-    fn_saved = run_3dphoto_videos(mesh_fi, basename, output_path, num_frames, num_fps, crop_border, vid_traj, x_shift_range,
-                                  y_shift_range, z_shift_range, [''], dolly, vid_format, vid_ssaa)
-
-    return fn_saved[-1]
-
 def unload_models():
     model_holder.unload_models()