Update app.py

app.py

@@ -4,42 +4,46 @@ import gradio as gr
 import torch
 import numpy as np
 from PIL import Image, ImageEnhance
-
-        
-if os.environ.get("HF_TOKEN") or os.environ.get("HF_HOME") or os.environ.get("HUGGINGFACE_HUB_CACHE"):
-    import spaces
-
+from pathlib import Path
 
 # Constants
 DEVICE = "cuda" if torch.cuda.is_available() else "cpu"
 MAX_SEED = np.iinfo(np.int32).max
-OUTPUT_DIR = "output_minecraft_skins"
+OUTPUT_DIR = Path("output_minecraft_skins")
 
 print(f"Using: {DEVICE}")
 
 # Repo URL
 REPO_URL = "https://github.com/Nick088Official/Minecraft_Skin_Generator.git"
 REPO_NAME = "Minecraft_Skin_Generator"
+REPO_PATH = Path(REPO_NAME)
+
+def setup_repository():
+    """Clones or updates the Git repository."""
+    if not REPO_PATH.exists():
+        print(f"Cloning {REPO_NAME} repository...")
+        try:
+            subprocess.run(["git", "clone", REPO_URL], check=True)
+            print("Repository cloned successfully.")
+        except subprocess.CalledProcessError as e:
+            print(f"Error cloning repository: {e}")
+            raise
+    else:
+        print(f"{REPO_NAME} repository already exists. Checking for updates...")
+        try:
+            # Change to the repository directory to pull updates
+            os.chdir(REPO_PATH)
+            subprocess.run(["git", "pull"], check=True)
+            print("Repository updated successfully.")
+            os.chdir("..") # Change back to original directory
+        except subprocess.CalledProcessError as e:
+            print(f"Error updating repository: {e}")
+            raise
 
-if not os.path.exists(REPO_NAME):
-    print(f"Cloning {REPO_NAME} repository...")
-    try:
-        subprocess.run(["git", "clone", REPO_URL], check=True)
-        print("Repository cloned successfully.")
-    except subprocess.CalledProcessError as e:
-        print(f"Error cloning repository: {e}")
-        # Handle error, e.g., exit or raise an exception
-else:
-    print(f"{REPO_NAME} repository already exists. Skipping clone.")
-
-# Change to the repository directory for script execution
-os.chdir(REPO_NAME)
+    # Change to the repository directory for script execution
+    os.chdir(REPO_PATH)
 
 
-if os.environ.get("HF_TOKEN") or os.environ.get("HF_HOME") or os.environ.get("HUGGINGFACE_HUB_CACHE"):
-    @spaces.GPU(duration=75)
-    else:
-    
 def run_inference(
     prompt: str,
     stable_diffusion_model: str,
@@ -96,24 +100,27 @@ def run_inference(
         print(f"An unexpected error occurred: {e}")
         return None, None
 
-    # Construct output paths
-    image_path = os.path.join(OUTPUT_DIR, filename)
-    model_3d_path = os.path.join(OUTPUT_DIR, f"{filename}_3d_model.glb") if model_3d else None
+    # Ensure output directory exists
+    OUTPUT_DIR.mkdir(parents=True, exist_ok=True)
+
+    # Construct output paths using pathlib
+    image_path = OUTPUT_DIR / filename
+    model_3d_path = OUTPUT_DIR / f"{filename.split('.')[0]}_3d_model.glb" if model_3d else None
 
     # Basic check for file existence (can be more robust)
-    if not os.path.exists(image_path):
+    if not image_path.exists():
         print(f"Warning: Image file not found at {image_path}")
         image_path = None
-    if model_3d and not os.path.exists(model_3d_path):
+    if model_3d and model_3d_path and not model_3d_path.exists():
         print(f"Warning: 3D model file not found at {model_3d_path}")
         model_3d_path = None
 
-    return image_path, model_3d_path
+    return str(image_path) if image_path else None, str(model_3d_path) if model_3d_path else None
 
 
 def create_gradio_ui():
     """Defines and returns the Gradio UI components."""
-    with gr.Blocks(title="Minecraft Skin Generator", 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;}") as imsteve:
+    with gr.Blocks(title="Minecraft Skin Generator", 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;}") as imsteve:
         gr.Label("Minecraft Skin Generator")
         gr.Markdown("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)")
 
@@ -133,7 +140,7 @@ def create_gradio_ui():
             verbose = gr.Checkbox(label="Verbose Output", info="Produce more detailed output while running", value=False)
         
         generate_skn = gr.Button("Generate")
-        image_output = gr.Image(label="Generated Minecraft Skin Image Asset") # Removed trailing comma
+        image_output = gr.Image(label="Generated Minecraft Skin Image Asset")
         image3d_output = gr.Model3D(clear_color=[0.0, 0.0, 0.0, 0.0],  label="3D Model View of the Skin")
         
         generate_skn.click(
@@ -156,6 +163,19 @@ def create_gradio_ui():
         )
     return imsteve
 
-if __name__ == "__main__":
-    demo = create_gradio_ui()
+def main():
+    # Handle Hugging Face Spaces environment
+    if os.environ.get("HF_TOKEN") or os.environ.get("HF_HOME") or os.environ.get("HUGGINGFACE_HUB_CACHE"):
+        import spaces
+        @spaces.GPU(duration=75)
+        def wrapped_create_gradio_ui():
+            return create_gradio_ui()
+        demo = wrapped_create_gradio_ui()
+    else:
+        demo = create_gradio_ui()
+
+    setup_repository()
     demo.launch(show_api=False, share=True)
+
+if __name__ == "__main__":
+    main()