Update app.py

app.py

@@ -23,7 +23,7 @@ os.chdir("Stable_Diffusion_Finetuned_Minecraft_Skin_Generator")
 
 
 @spaces.GPU()
-def run_inference(prompt, stable_diffusion_model, num_inference_steps, guidance_scale, model_precision_type, seed, filename, verbose, see_in_3d):
+def run_inference(prompt, stable_diffusion_model, num_inference_steps, guidance_scale, model_precision_type, seed, filename, verbose):
     
     if stable_diffusion_model == '2':
         sd_model = "minecraft-skins"
@@ -35,57 +35,56 @@ def run_inference(prompt, stable_diffusion_model, num_inference_steps, guidance_
     os.system(inference_command)
 
     # view it in 3d
-    if see_in_3d:
-        os.chdir("Scripts")
-        command_3d_model = f"python to_3d_model.py '{filename}'"
-        os.system(command_3d_model)
-        os.chdir("..")
-        glb_path = os.path.join(f"output_minecraft_skins/{filename}_3d_model.glb")
-        return os.path.join(f"output_minecraft_skins/{filename}"), glb_path
-    else:
-        return os.path.join(f"output_minecraft_skins/{filename}"), None
-
-
-# Define Gradio UI components
-prompt = gr.Textbox(label="Your Prompt", info="What the Minecraft Skin should look like")
-stable_diffusion_model = gr.Dropdown(['2', 'xl'], value="xl", label="Stable Diffusion Model", info="Choose which Stable Diffusion Model to use, xl understands prompts better")
-num_inference_steps = gr.Number(label="Number of Inference Steps", precision=0, value=25)
-guidance_scale = gr.Number(minimum=0.1, value=7.5, label="Guidance Scale", info="The number of denoising steps of the image. More denoising steps usually lead to a higher quality image at the cost of slower inference")
-model_precision_type = gr.Dropdown(["fp16", "fp32"], value="fp16", label="Model Precision Type", info="The precision type to load the model, like fp16 which is faster, or fp32 which gives better results")
-seed = gr.Number(value=42, label="Seed", info="A starting point to initiate generation, put 0 for a random one")
-filename = gr.Textbox(label="Output Image Name", info="The name of the file of the output image skin, keep the .png", value="output-skin.png")
-verbose = gr.Checkbox(label="Verbose Output", info="Produce more detailed output while running", value=False)
-see_in_3d = gr.Checkbox(label="See in 3D", info="View the generated skin in 3D", value=True)
-
-
-# Create the Gradio interface
-interface = gr.Interface(
-    fn=run_inference,
-    inputs=[
-        prompt,
-        stable_diffusion_model,
-        num_inference_steps,
-        guidance_scale,
-        model_precision_type,
-        seed,
-       filename,
-        verbose,
-        see_in_3d
-    ],
-    outputs=[
-        gr.Image(label="Generated Minecraft Skin Image Asset")
-    ],
-    title="Minecraft Skin Generator",
-    description="Make AI generated Minecraft Skins by a Finetuned Stable Diffusion Version!<br>Model used: https://github.com/Nick088Official/Stable_Diffusion_Finetuned_Minecraft_Skin_Generator<br>Credits: [Monadical-SAS](https://github.com/Monadical-SAS/minecraft_skin_generator) (Creators of the model), [Nick088](https://linktr.ee/Nick088) (Improving usage of the model), daroche (helping me fix the 3d model texture isue), [Brottweiler](https://gist.github.com/Brottweiler/483d0856c6692ef70cf90bf1a85ce364)(script to fix the 3d model texture, [meew](https://huggingface.co/spaces/meeww/Minecraft_Skin_Generator/blob/main/models/player_model.glb) (Minecraft Player 3d model)"
-)
-
-# Add a custom output component that displays the 3D model if the "See in 3D" input is True
+    os.chdir("Scripts")
+    command_3d_model = f"python to_3d_model.py '{filename}'"
+    os.system(command_3d_model)
+    os.chdir("..")
+    glb_path = os.path.join(f"output_minecraft_skins/{filename}_3d_model.glb")
+    return os.path.join(f"output_minecraft_skins/{filename}"), glb_path
+
+
 def custom_output(image_path, glb_path):
     if glb_path is None:
         return image_path
     else:
         return [image_path, gr.Model3D(clear_color=[0.0, 0.0, 0.0, 0.0], label="3D Model", path=glb_path)]
 
-interface.add_output(custom_output, inputs=[interface.output[0], interface.input[8]])
 
-interface.launch(show_api=False, share=True)
+with gr.Blocks() as minecraft_skin_generator:
+    with gr.Row():
+        prompt = gr.Textbox(label="Your Prompt", info="What the Minecraft Skin should look like")
+        stable_diffusion_model = gr.Dropdown(['2', 'xl'], value="xl", label="Stable Diffusion Model", info="Choose which Stable Diffusion Model to use, xl understands prompts better")
+    num_inference_steps = gr.Number(label="Number of Inference Steps", precision=0, value=25)
+    guidance_scale = gr.Number(minimum=0.1, value=7.5, label="Guidance Scale", info="The number of denoising steps of the image. More denoising steps usually lead to a higher quality image at the cost of slower inference")
+    model_precision_type = gr.Dropdown(["fp16", "fp32"], value="fp16", label="Model Precision Type", info="The precision type to load the model, like fp16 which is faster, or fp32 which gives better results")
+    seed = gr.Number(value=42, label="Seed", info="A starting point to initiate generation, put 0 for a random one")
+    filename = gr.Textbox(label="Output Image Name", info="The name of the file of the output image skin, keep the .png", value="output-skin.png")
+    verbose = gr.Checkbox(label="Verbose Output", info="Produce more detailed output while running", value=False)
+    see_in_3d = gr.Checkbox(label="See in 3D", info="View the generated skin in 3D", value=False)
+
+    image_path, glb_path = run_inference(prompt, stable_diffusion_model, num_inference_steps, guidance_scale, model_precision_type, seed, filename, verbose)
+
+    with gr.Row():
+        output = gr.Image(label="Generated Minecraft Skin Image Asset")
+        if see_in_3d:
+            output.style(height=500)
+            output.style(width=500)
+            output.style(display="flex")
+            output.style(justify_content="center")
+            output.style(align_items="center")
+            output.style(flex_wrap="wrap")
+            output.style(grid_template_columns="repeat(auto-fill, minmax(250px, 1fr))")
+            output.style(grid_gap="10px")
+            output.style(overflow="auto")
+            output.style(padding="10px")
+            output.style(box_sizing="border-box")
+            output.style(border="1px solid #ccc")
+            output.style(border_radius="5px")
+            output.style(margin="10px 0")
+            output.style(background_color="#f9f9f9")
+
+            output.render(custom_output, inputs=[image_path, glb_path])
+        else:
+            output.render(image_path)
+
+minecraft_skin_generator.launch(show_api=False, share=True)