Update app.py

app.py

@@ -1,186 +1,97 @@
-import gradio as gr
+import subprocess
 import os
-from pathlib import Path
-from utils import setup_repository, run_inference
-
-# Ensure output directory exists
-OUTPUT_DIR = Path("output_minecraft_skins")
-OUTPUT_DIR.mkdir(parents=True, exist_ok=True)
-
-# Custom CSS for Minecraft pixelated look and checkered background
-CUSTOM_CSS = """
-.pixelated { image-rendering: pixelated; image-rendering: -moz-crisp-edges; image-rendering: crisp-edges; }
-.checkered { 
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><rect fill="%23ddd" width="8" height="8"/><rect fill="%23ddd" x="8" y="8" width="8" height="8"/><rect fill="%23bbb" x="8" width="8" height="8"/><rect fill="%23bbb" y="8" width="8" height="8"/></svg>'); 
-    background-size: 16px; 
-}
-#mc-skin { max-width: 400px; margin: auto; }
-#mc-model { height: 500px; }
-.sidebar { background: linear-gradient(135deg, #4CAF50 0%, #45a049 100%); }
-"""
-
-def random_seed():
-    """Generate a random seed."""
-    import numpy as np
-    return np.random.randint(0, np.iinfo(np.int32).max)
-
-def clear_all():
-    """Clear all outputs."""
-    return None, None, gr.Gallery(visible=False), []
-
-with gr.Blocks(
-    title="Minecraft Skin Generator",
-    theme=gr.themes.Soft(primary_hue="green", secondary_hue="emerald"),
-    css=CUSTOM_CSS,
-    fill_height=True
-) as demo:
-    gr.Markdown(
-        """
-        # 🚀 Minecraft Skin Generator
-        **Built with [anycoder](https://huggingface.co/spaces/akhaliq/anycoder)**
-        
-        Make AI generated Minecraft Skins using finetuned Stable Diffusion models! 🎨👨‍💼
-        
-        [GitHub Repo](https://github.com/BF667/Minecraft_Skin_Generator) | [Discord](https://discord.gg/AQsmBmgEPy)
-        """
-    )
-    
-    gr.Markdown(
-        """
-        Credits: [Monadical-SAS](https://github.com/Monadical-SAS/minecraft_skin_generator), [Nick088](https://linktr.ee/Nick088), and more!
-        """
-    )
-    
-    state = gr.State(value=[])  # For gallery history
-    
-    with gr.Row():
-        with gr.Column(scale=1):
-            with gr.Accordion("🎛️ Generation Settings", open=True):
-                prompt = gr.Textbox(
-                    label="Prompt",
-                    placeholder="e.g., steve with diamond armor, cyberpunk creeper",
-                    lines=2,
-                    scale=3
-                )
-                with gr.Row():
-                    model_dropdown = gr.Dropdown(
-                        choices=["xl", "2"],
-                        value="xl",
-                        label="Model",
-                        info="XL understands prompts better"
-                    )
-                    precision_dropdown = gr.Dropdown(
-                        choices=["fp16", "fp32"],
-                        value="fp16",
-                        label="Precision"
-                    )
-                with gr.Row():
-                    steps_slider = gr.Slider(1, 50, value=25, step=1, label="Inference Steps")
-                    guidance_slider = gr.Slider(0.0, 10.0, value=7.5, step=0.1, label="Guidance Scale")
-                with gr.Row():
-                    seed_slider = gr.Slider(0, 2147483647, value=42, step=1, label="Seed", interactive=True)
-                    random_btn = gr.Button("🎲 Random Seed", scale=0, min_width=120)
-                filename_tb = gr.Textbox("output-skin.png", label="Filename (.png)", interactive=True)
-                gen_btn = gr.Button("Generate Skin! 🚀", variant="primary", scale=2)
-                adv_cb = gr.CheckboxGroup(
-                    choices=["3D Model", "Verbose"],
-                    label="Advanced Options",
-                    value=["3D Model"]
-                )
-            
-            gr.Examples(
-                examples=[
-                    ["steve with diamond armor"],
-                    ["alex as cyberpunk hacker"],
-                    ["creeper with sunglasses"],
-                    ["enderman in space suit"],
-                    ["zombie knight armor"]
-                ],
-                inputs=prompt
-            )
-            
-            gr.Markdown("### 📱 Cool Features")
-            gr.Markdown("""
-            - **Pixelated Minecraft Style** preview
-            - **3D Model Viewer** with rotations
-            - **Random Seed** for variety
-            - **History Gallery** of generations
-            - **Batch Mode** coming soon!
-            """)
-        
-        with gr.Column(scale=2):
-            with gr.Group(elem_classes="checkered"):
-                skin_img = gr.Image(
-                    label="Generated Skin",
-                    elem_id="mc-skin",
-                    elem_classes="pixelated"
-                )
-            model_3d = gr.Model3D(
-                label="3D Preview",
-                clear_color=[0.1, 0.2, 0.3, 1.0],
-                elem_id="mc-model"
-            )
-            gallery = gr.Gallery(
-                label="Generation History",
-                columns=3,
-                height=300,
-                visible=True
-            )
-    
-    # Events
-    random_btn.click(random_seed, outputs=seed_slider)
-    
-    gen_btn.click(
-        fn=run_inference,
-        inputs=[
-            prompt,
-            model_dropdown,
-            steps_slider,
-            guidance_slider,
-            precision_dropdown,
-            seed_slider,
-            filename_tb,
-            gr.State(lambda x: "3D Model" in x)(adv_cb),
-            gr.State(lambda x: "Verbose" in x)(adv_cb)
-        ],
-        outputs=[skin_img, model_3d],
-        api_name="generate_skin",
-        api_visibility="public",
-        show_progress="full"
-    ).then(
-        fn=lambda img_path, history: (history + [img_path] if img_path else history)[:12],
-        inputs=[skin_img, state],
-        outputs=[gallery, state]
-    )
-    
-    # Clear button
-    gr.ClearButton([prompt, skin_img, model_3d, gallery, state], value="🗑️ Clear All")
+import sys
+import gradio as gr
+import torch
+import numpy as np
+from PIL import Image, ImageEnhance
+import spaces
+
+
+if torch.cuda.is_available():
+    device = "cuda"
+    print("Using GPU")
+else:
+    device = "cpu"
+    print("Using CPU")
+
+
+MAX_SEED = np.iinfo(np.int32).max
+
+
+subprocess.run(["git", "clone", "https://github.com/Nick088Official/Minecraft_Skin_Generator.git"])
+
+os.chdir("Minecraft_Skin_Generator")
+
+
+@spaces.GPU(duration=75)
+def run_inference(prompt, stable_diffusion_model, num_inference_steps, guidance_scale, model_precision_type, seed, filename, model_3d, verbose):
+
+    # Determine which Stable Diffusion model to use
+    if stable_diffusion_model == '2':
+        sd_model = "minecraft-skins"
+    elif stable_diffusion_model == 'xl':
+        sd_model = "minecraft-skins-sdxl"
+
+    # Build the command as a list of argumenta
+    inference_command_args = [
+        sys.executable,
+        f"Scripts/{sd_model}.py",
+        prompt,
+        str(num_inference_steps),
+        str(guidance_scale),
+        model_precision_type,
+        str(seed),
+        filename
+    ]
+
+    # Conditionally add flags if requested
+    if model_3d:
+        inference_command_args.append('--model_3d')
+    if verbose:
+        inference_command_args.append('--verbose')
     
-    # Examples click
-    gr.Examples(
-        examples=[
-            ["steve with diamond armor"],
-            ["alex as cyberpunk hacker"],
-            ["creeper with sunglasses"],
-            ["enderman in space suit"],
-            ["zombie knight armor"]
-        ],
-        inputs=[prompt],
-        examples_per_page=5,
-        run_on_click=True
-    )
-
-# Setup repo on load
-demo.load(setup_repository)
-
-if __name__ == "__main__":
-    demo.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        share=True,
-        footer_links=[
-            {"label": "Built with anycoder", "url": "https://huggingface.co/spaces/akhaliq/anycoder"},
-            "api",
-            "gradio"
-        ]
-    )
+    # Run the command using subprocess
+    subprocess.run(inference_command_args, check=True)
+
+    # Return paths to the output files
+    if model_3d:
+        return os.path.join(f"output_minecraft_skins/{filename}"), os.path.join(f"output_minecraft_skins/{filename}_3d_model.glb")
+    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.Slider(label="Number of Inference Steps", 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", minimum=1, maximum=50, value=25, step=1)
+guidance_scale = gr.Slider(label="Guidance Scale", info="Controls how much the image generation process follows the text prompt. Higher values make the image stick more closely to the input text.", minimum=0.0, maximum=10.0, value=7.5, step=0.1)
+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 is more precise but more resource consuming")
+seed = gr.Slider(value=42, minimum=0, maximum=MAX_SEED, step=1, label="Seed", info="A starting point to initiate the generation process, 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")
+model_3d = gr.Checkbox(label="See as 3D Model too", info="View the generated skin as a 3D Model too", value=True)
+verbose = gr.Checkbox(label="Verbose Output", info="Produce more detailed output while running", value=False)
+
+
+# Create the Gradio interface
+gr.Interface(
+    fn=run_inference,
+    inputs=[
+        prompt,
+        stable_diffusion_model,
+        num_inference_steps,
+        guidance_scale,
+        model_precision_type,
+        seed,
+        filename,
+        model_3d,
+        verbose
+    ],
+    outputs=[
+        gr.Image(label="Generated Minecraft Skin Image Asset", elem_classes="pixelated checkered"),
+        gr.Model3D(clear_color=[0.0, 0.0, 0.0, 0.0],  label="3D Model View of the Skin")
+    ],
+    title="Minecraft Skin Generator",
+    description="Make AI generated Minecraft Skins by a Finetuned Stable Diffusion Version!<br>Github Repository & Model used: https://github.com/Nick088Official/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), [not-holar](https://huggingface.co/not-holar) (made the rendering of the image asset in the web ui look pixelated like minecraft and have a checkered background),[meew](https://huggingface.co/spaces/meeww/Minecraft_Skin_Generator/blob/main/models/player_model.glb) (Minecraft Player 3d model) <br> [![Discord](https://img.shields.io/discord/1198701940511617164?color=%23738ADB&label=Discord&style=for-the-badge)](https://discord.gg/AQsmBmgEPy)",
+    css=".pixelated {image-rendering: pixelated} .checkered img {background-image: url(\'data:image/svg+xml,<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"2\" height=\"2\" fill-opacity=\".15\"><rect x=\"1\" width=\"1\" height=\"1\"/><rect y=\"1\" width=\"1\" height=\"1\"/></svg>\');background-size: 16px;}"
+).launch(show_api=False, share=True)