Update app.py

app.py

@@ -93,7 +93,7 @@ def get_sampler(model_name, txt2obj, guidance_scale):
             model_kwargs_key_filter=('texts', '') if txt2obj else ("*",)
         )
 
-def generate_txt2sd(prompt):
+def generate_txt2img(prompt):
     prompt = f"“a 3d rendering of {prompt}, chair imitating an avocado, full view, white background"
     stable_diffusion = gr.Blocks.load(name="spaces/runwayml/stable-diffusion-v1-5")
     image = stable_diffusion(prompt, fn_index=2)[0]
@@ -190,19 +190,21 @@ with gr.Blocks() as app:
             with gr.Tab("Text to 3D"):
                 prompt = gr.Textbox(label="Prompt", placeholder="A cactus in a pot")
                 btn_generate_txt2obj = gr.Button(value="Generate")
+            
             with gr.Tab("Image to 3D"):
                 img = gr.Image(label="Image")
                 gr.Markdown("Best results with images of 3D objects with no shadows on a white background.")
                 btn_generate_img2obj = gr.Button(value="Generate")
-            with gr.Tab("Text to SD to 3D"):
+
+            with gr.Tab("Text to Image to 3D"):
                 gr.Markdown("Generate an image with Stable Diffusion, then convert to 3D. Just enter the object you want to generate.")
                 prompt_sd = gr.Textbox(label="Prompt", placeholder="a 3d rendering of [your prompt], full view, white background")
                 btn_generate_txt2sd = gr.Button(value="Generate")
-                img_sd = gr.Image(label="Image", visible=False)
+                img_sd = gr.Image(label="Image")
                 btn_generate_sd2obj = gr.Button(value="Convert to 3D", visible=False)
 
             with gr.Accordion("Advanced settings", open=False):
-                dropdown_models = gr.Dropdown(label="Model", value="base40M", choices=["base40M"]) #, "base300M", "base1B"])
+                dropdown_models = gr.Dropdown(label="Model", value="base40M", choices=["base40M", "base300M"]) #, "base1B"])
                 guidance_scale = gr.Slider(label="Guidance scale", value=3.0, minimum=3.0, maximum=10.0, step=0.1)
                 grid_size = gr.Slider(label="Grid size (for .obj 3D model)", value=32, minimum=16, maximum=128, step=16)
 
@@ -219,11 +221,12 @@ with gr.Blocks() as app:
         outputs = [plot, model_3d, file_out]
 
         prompt.submit(generate_3D, inputs=[prompt, dropdown_models, guidance_scale, grid_size], outputs=outputs)
-        
         btn_generate_txt2obj.click(generate_3D, inputs=[prompt, dropdown_models, guidance_scale, grid_size], outputs=outputs)
+        
         btn_generate_img2obj.click(generate_3D, inputs=[img, dropdown_models, guidance_scale, grid_size], outputs=outputs)
 
-        btn_generate_txt2sd.click(generate_txt2sd, inputs=prompt_sd, outputs=[img_sd, btn_generate_sd2obj])
+        prompt_sd.submit(generate_txt2img, inputs=prompt_sd, outputs=[img_sd, btn_generate_sd2obj])
+        btn_generate_txt2sd.click(generate_txt2img, inputs=prompt_sd, outputs=[img_sd, btn_generate_sd2obj])
         btn_generate_sd2obj.click(generate_3D, inputs=[img, dropdown_models, guidance_scale, grid_size], outputs=outputs)
 
         # btn_pc_to_obj.click(ply_to_obj, inputs=plot, outputs=[model_3d, file_out])
@@ -252,7 +255,7 @@ with gr.Blocks() as app:
         inputs=[prompt],
         outputs=outputs,
         fn=generate_3D,
-        cache_examples=True
+        cache_examples=False
     )
 
     gr.Examples(
@@ -264,7 +267,7 @@ with gr.Blocks() as app:
         inputs=[img],
         outputs=outputs,
         fn=generate_3D,
-        cache_examples=True
+        cache_examples=False
     )
 
     # app.load(get_state, inputs=[], outputs=state_info, every=0.5, show_progress=False)