Update app.py

app.py

@@ -93,7 +93,15 @@ def get_sampler(model_name, txt2obj, guidance_scale):
             model_kwargs_key_filter=('texts', '') if txt2obj else ("*",)
         )
 
-def generate(input, model_name='base40M', guidance_scale=3.0, grid_size=32):
+def generate_txt2sd(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]
+
+    return image, gr.update(visible=True)
+
+
+def generate_3D(input, model_name='base40M', guidance_scale=3.0, grid_size=32):
 
     set_state('Entered generate function...')
 
@@ -186,6 +194,12 @@ with gr.Blocks() as app:
                 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"):
+                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)
+                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"])
@@ -198,15 +212,20 @@ with gr.Blocks() as app:
             model_3d = gr.Model3D(value=None)
             file_out = gr.File(label="Obj file", visible=False)
             
-            state_info = state_info = gr.Textbox(label="State", show_label=False).style(container=False)
+            # state_info = state_info = gr.Textbox(label="State", show_label=False).style(container=False)
 
 
         # inputs = [dropdown_models, prompt, img, guidance_scale, grid_size]
         outputs = [plot, model_3d, file_out]
 
-        prompt.submit(generate, inputs=[prompt, dropdown_models, guidance_scale, grid_size], outputs=outputs)
-        btn_generate_txt2obj.click(generate, inputs=[prompt, dropdown_models, guidance_scale, grid_size], outputs=outputs)
-        btn_generate_img2obj.click(generate, inputs=[img, dropdown_models, guidance_scale, grid_size], outputs=outputs)
+        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])
+        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])
 
     gr.HTML("""
@@ -231,8 +250,8 @@ with gr.Blocks() as app:
             ["a man"],
         ],
         inputs=[prompt],
-        fn=generate,
-        cache_examples=True
+        fn=generate_3D,
+        cache_examples=False
     )
 
     gr.Examples(
@@ -242,8 +261,8 @@ with gr.Blocks() as app:
             ["chair.png"],
         ],
         inputs=[img],
-        fn=generate,
-        cache_examples=True
+        fn=generate_3D,
+        cache_examples=False
     )
 
     # app.load(get_state, inputs=[], outputs=state_info, every=0.5, show_progress=False)