Upload app_hg.py with huggingface_hub

app_hg.py

@@ -207,16 +207,18 @@ def gen_save_folder(max_size=30):
     return save_folder
 
 
-# @spaces.GPU
-def textgen_pipe(text, seed=0, step=0, SEED=0, STEP=0, color='face', bake=False, render=True, max_faces=12000,
-                 force=False, front='auto', others=[180], align_times=3):
+# @spaces.GPU(duration=150)
+def gen_pipe(text, image=None, do_removebg=True, sseed=0, sstep=0, SSEED=0, SSTEP=0, color='face', 
+        bake=False, render=True, max_faces=12000, force=False, front='auto', others=[180], align_times=3):
     save_folder = gen_save_folder()
-    image = worker_t2i(text, seed, step)
-    image.save(save_folder + '/img.png')
-    img_nobg = worker_xbg(image, force=True)
+    image_gen = image is not None
+    if not image_gen:
+        image = worker_t2i(text, sseed, sstep)
+        image.save(save_folder + '/img.png')
+    img_nobg = worker_xbg(image, force=do_removebg if image_gen else True)
     img_nobg.save(save_folder + '/img_nobg.png')
     yield img_nobg, None, None, None, None, None
-    res_img, pils = worker_i2v(img_nobg, SEED, STEP)
+    res_img, pils = worker_i2v(img_nobg, seed=SSEED, steps=SSTEP)
     save_gif(pils,  save_folder + '/views.gif')
     views_img, cond_img = res_img[0], res_img[1]
     img_array = np.asarray(views_img, dtype=np.uint8)
@@ -226,7 +228,7 @@ def textgen_pipe(text, seed=0, step=0, SEED=0, STEP=0, color='face', bake=False,
     yield img_nobg, show_img, None, None, None, None
     do_texture_mapping = color == 'face'
     worker_v23(
-        views_img, cond_img, seed = SEED,
+        views_img, cond_img, seed = SSEED,
         save_folder = save_folder,
         target_face_count = max_faces,
         do_texture_mapping = do_texture_mapping
@@ -240,9 +242,7 @@ def textgen_pipe(text, seed=0, step=0, SEED=0, STEP=0, color='face', bake=False,
         obj_dst = worker_baker(save_folder, force, front, others, align_times)
         glb_dst = obj_dst.replace(".obj", ".glb")
     yield img_nobg, show_img, obj_v23, glb_v23, glb_dst, None
-    if not render: 
-        yield img_nobg, show_img, obj_v23, glb_v23, glb_dst, None
-    else:
+    if do_texture_mapping and render: 
         baked_obj_list = sorted(glob(save_folder + '/view_*/bake/mesh.obj'))
         obj_dst = baked_obj_list[-1] if len(baked_obj_list)>=1 else save_folder+'/mesh.obj'
         assert os.path.exists(obj_dst), f"{obj_dst} file not found"
@@ -250,49 +250,6 @@ def textgen_pipe(text, seed=0, step=0, SEED=0, STEP=0, color='face', bake=False,
         worker_gif(obj_dst, gif_dst_path=gif_dst)
         yield img_nobg, show_img, obj_v23, glb_v23, glb_dst, gif_dst
         
-# @spaces.GPU
-def imggen_pipe(image, do_removebg=True, SEED=0, STEP=0, color='face', bake=False, render=True, max_faces=12000,
-                  force=False, front='auto', others=[180], align_times=3):
-    save_folder = gen_save_folder()
-    if isinstance(image, str):image = Image.open(image)
-    img_nobg = worker_xbg(image, force=do_removebg)
-    img_nobg.save(save_folder + '/img_nobg.png')
-    yield img_nobg, None, None, None, None, None
-    res_img, pils = worker_i2v(img_nobg, SEED, STEP)
-    save_gif(pils,  save_folder + '/views.gif')
-    views_img, cond_img = res_img[0], res_img[1]
-    img_array = np.asarray(views_img, dtype=np.uint8)
-    show_img = rearrange(img_array, '(n h) (m w) c -> (n m) h w c', n=3, m=2)
-    show_img = rearrange(show_img[worker_i2v.order, ...], '(n m) h w c -> (n h) (m w) c', n=2, m=3)
-    show_img = Image.fromarray(show_img)
-    yield img_nobg, show_img, None, None, None, None
-    do_texture_mapping = color == 'face'
-    worker_v23(
-        views_img, cond_img, seed = SEED,
-        save_folder = save_folder,
-        target_face_count = max_faces,
-        do_texture_mapping = do_texture_mapping
-    )
-    glb_v23 = save_folder + '/mesh.glb' if do_texture_mapping else None
-    obj_v23 = save_folder + '/mesh.obj'
-    obj_v23 = save_folder + '/mesh_vertex_colors.obj'
-    yield img_nobg, show_img, obj_v23, glb_v23, None, None
-    glb_dst = None
-    if do_texture_mapping and bake:
-        obj_dst = worker_baker(save_folder, force, front, others, align_times)
-        glb_dst = obj_dst.replace(".obj", ".glb")
-    yield img_nobg, show_img, obj_v23, glb_v23, glb_dst, None
-    if not render: 
-        yield img_nobg, show_img, obj_v23, glb_v23, glb_dst, None
-    else:
-        baked_obj_list = sorted(glob(save_folder + '/view_*/bake/mesh.obj'))
-        obj_dst = baked_obj_list[-1] if len(baked_obj_list)>=1 else save_folder+'/mesh.obj'
-        assert os.path.exists(obj_dst), f"{obj_dst} file not found"
-        gif_dst = obj_dst.replace(".obj", ".gif")
-        worker_gif(obj_dst, gif_dst_path=gif_dst)
-        yield img_nobg, show_img, obj_v23, glb_v23, glb_dst, gif_dst
-    
- 
 def check_image_available(image):
     if image is None:
         return "Please upload image", gr.update()
@@ -350,11 +307,11 @@ with gr.Blocks() as demo:
                 with gr.Column():
                     text = gr.TextArea('一只黑白相间的熊猫在白色背景上居中坐着，呈现出卡通风格和可爱氛围。', 
                                        lines=3, max_lines=20, label='Input text (within 70 words)')
-                with gr.Row():
-                    textgen_submit = gr.Button("Generate", variant="primary")      
                 with gr.Row():
                     gr.Examples(examples=example_ts, inputs=[text], label="Text examples", examples_per_page=10)
-            
+                with gr.Row():
+                    textgen_submit = gr.Button("Generate", variant="primary") 
+
             with gr.Tab("Image to 3D"):
                 with gr.Row():
                     input_image = gr.Image(label="Input image", width=256, height=256, type="pil",
@@ -371,18 +328,18 @@ with gr.Blocks() as demo:
                         interactive=True
                     )
                     imggen_submit = gr.Button("Generate", variant="primary")
-                    
+
             mode = gr.Radio(
                 choices=['Vertex color', 'Face color', 'Baking'], 
                 label="Texture mode",
                 value='Baking',
                 interactive=True
             )
-                
+
             with gr.Accordion("Custom settings", open=False):
                 color = gr.Radio(choices=["vertex", "face"], label="Color", value="face")
                 with gr.Row():
-                    
+
                     render = gr.Checkbox(
                         label="Do Rendering", 
                         value=True, 
@@ -393,11 +350,11 @@ with gr.Blocks() as demo:
                         value=True if BAKE_AVAILEBLE else False, 
                         interactive=True if BAKE_AVAILEBLE else False
                     )
-                    
+
                 with gr.Row():
                     seed = gr.Number(value=0, label="T2I seed", precision=0, interactive=True)
                     SEED = gr.Number(value=0, label="Gen seed", precision=0, interactive=True)
-              
+
                 step = gr.Slider(
                     value=25,
                     minimum=15,
@@ -465,7 +422,7 @@ with gr.Blocks() as demo:
             )
 
             gr.Markdown(CONST_NOTE)
-                    
+
         ###### Output region
 
         with gr.Column(scale=3):
@@ -483,7 +440,7 @@ with gr.Blocks() as demo:
                         type="pil", 
                         interactive=False
                     )
-            
+
             result_3dobj = gr.Model3D(
                 clear_color=[0.0, 0.0, 0.0, 0.0],
                 label="OBJ vertex color",
@@ -492,7 +449,7 @@ with gr.Blocks() as demo:
                 camera_position=[90, 90, None],
                 interactive=False
             )
-                
+
             result_3dglb_texture = gr.Model3D(
                 clear_color=[0.0, 0.0, 0.0, 0.0],
                 label="GLB face color",
@@ -508,9 +465,9 @@ with gr.Blocks() as demo:
                 visible=True,
                 camera_position=[90, 90, None],
                 interactive=False)
-            
+
             result_gif = gr.Image(label="GIF", interactive=False)
-                
+
             with gr.Row():
                 gr.Markdown(
                     "Due to Gradio limitations, OBJ files are displayed with vertex shading only, "
@@ -522,29 +479,23 @@ with gr.Blocks() as demo:
     #===============================================================
     # gradio running code
     #===============================================================
-    
+
+    none = gr.State(None)
+
     textgen_submit.click(
-        fn=textgen_pipe,
-        inputs=[text, seed, step, SEED, STEP, color, bake, render, max_faces, force_bake,
+        fn=gen_pipe,
+        inputs=[text, none, removebg, seed, step, SEED, STEP, color, bake, render, max_faces, force_bake,
                 front_baking, other_views, align_times],
         outputs=[rembg_image, result_image, result_3dobj, result_3dglb_texture, result_3dglb_baked, result_gif],
     )
-    
+
     imggen_submit.click(
-        fn=imggen_pipe,
-        inputs=[input_image, removebg, SEED, STEP, color, bake, render, max_faces, force_bake,
+        fn=gen_pipe,
+        inputs=[none, input_image, removebg, seed, step, SEED, STEP, color, bake, render, max_faces, force_bake,
                 front_baking, other_views, align_times],
         outputs=[rembg_image, result_image, result_3dobj, result_3dglb_texture, result_3dglb_baked, result_gif],
     )
 
-    #===============================================================
-    # start gradio server
-    #===============================================================
-    CONST_PORT = 8080
-    CONST_MAX_QUEUE = 1
-    CONST_SERVER = '0.0.0.0'
-
-    demo.queue(max_size=CONST_MAX_QUEUE)
-    # demo.launch(server_name=CONST_SERVER, server_port=CONST_PORT)
+    demo.queue(max_size=0)    
+    # demo.launch(server_name='0.0.0.0', server_port=8080)
     demo.launch()
-