Update app.py

app.py

@@ -1,120 +1,93 @@
-from fastapi import FastAPI, HTTPException
-from fastapi.responses import JSONResponse
-from fastapi.staticfiles import StaticFiles
-from pydantic import BaseModel
-
+import os
 import gradio as gr
-
-from generate import generate_music, build_prompt, load_model
-
-# preload model (removes cold start)
-load_model()
-
-api = FastAPI(title="Basyx Music Generator")
-
-# serve local outputs
-api.mount("/outputs", StaticFiles(directory="outputs"), name="outputs")
-
-
-# ======================
-# API MODEL
-# ======================
-
-class GenerateRequest(BaseModel):
-    prompt: str
-    duration: int = 10
-    style: str | None = "nasheed"
-
-
-BASE_URL = "https://basyx-musicgen.hf.space"
-
-
-# ======================
-# HEALTH CHECK
-# ======================
-
-@api.get("/health")
-def health():
-    return {"status": "running"}
-
-
-# ======================
-# REST API (n8n Ready)
-# ======================
-
-@api.post("/generate-json")
-async def generate_json(req: GenerateRequest):
-
-    if req.duration > 30:
-        raise HTTPException(400, "Duration too long")
-
-    if len(req.prompt) > 200:
-        raise HTTPException(400, "Prompt too long")
-
-    final_prompt = build_prompt(req.prompt, req.style)
-
-    local_path, public_url = generate_music(
-        final_prompt,
-        req.duration
+from generate import generate_music, load_model
+
+# ------------------------------------------------
+# Load Model (Runs Once)
+# ------------------------------------------------
+print("Loading MusicGen model...")
+model = load_model()
+print("Model ready.")
+
+# ------------------------------------------------
+# Generate Handler
+# ------------------------------------------------
+def create_music(
+    prompt,
+    duration,
+    temperature
+):
+    """
+    Generates music from prompt.
+    Returns path to generated audio file.
+    """
+
+    if not prompt or prompt.strip() == "":
+        return None, "Prompt cannot be empty"
+
+    output_file = generate_music(
+        model=model,
+        prompt=prompt,
+        duration=int(duration),
+        temperature=float(temperature),
     )
 
-    filename = local_path.split("/")[-1]
-
-    return JSONResponse({
-        "status": "success",
-        "local_url": f"{BASE_URL}/outputs/{filename}",
-        "public_url": public_url
-    })
-
-
-# ======================
-# GRADIO UI
-# ======================
-
-def ui_generate(prompt, duration, style):
-
-    final_prompt = build_prompt(prompt, style)
-
-    local_path, _ = generate_music(
-        final_prompt,
-        duration
-    )
-
-    return local_path
-
-
-with gr.Blocks(title="AI Background Music Generator") as demo:
-
-    gr.Markdown("# 🎵 AI Background Music Generator")
-
-    prompt = gr.Textbox(
-        label="Describe your music"
-    )
-
-    style = gr.Dropdown(
-        choices=["nasheed", "cinematic", "lofi"],
-        value="nasheed",
-        label="Style"
-    )
-
-    duration = gr.Slider(
-        minimum=5,
-        maximum=30,
-        value=10,
-        step=1,
-        label="Duration"
+    return output_file, "Generation Complete ✅"
+
+
+# ------------------------------------------------
+# UI
+# ------------------------------------------------
+with gr.Blocks(title="Tier 3 AI Music Studio") as demo:
+
+    gr.Markdown("# 🎵 Tier 3 AI Music Generator")
+
+    with gr.Row():
+        prompt = gr.Textbox(
+            label="Music Prompt",
+            placeholder="Epic cinematic orchestra, emotional, cinematic buildup..."
+        )
+
+    with gr.Row():
+        duration = gr.Slider(
+            minimum=5,
+            maximum=30,
+            value=10,
+            step=1,
+            label="Duration (seconds)"
+        )
+
+        temperature = gr.Slider(
+            minimum=0.1,
+            maximum=1.5,
+            value=1.0,
+            step=0.1,
+            label="Creativity"
+        )
+
+    generate_btn = gr.Button("Generate Music")
+
+    audio_output = gr.Audio(label="Generated Audio")
+    status = gr.Textbox(label="Status")
+
+    generate_btn.click(
+        fn=create_music,
+        inputs=[
+            prompt,
+            duration,
+            temperature
+        ],
+        outputs=[
+            audio_output,
+            status
+        ],
     )
 
-    btn = gr.Button("Generate")
-
-    output = gr.Audio(type="filepath")
-
-    btn.click(
-        fn=ui_generate,
-        inputs=[prompt, duration, style],
-        outputs=output
-    )
-
-
-# mount UI at root
-app = gr.mount_gradio_app(api, demo, path="/")
+# ------------------------------------------------
+# Launch
+# ------------------------------------------------
+if __name__ == "__main__":
+    demo.launch(
+        server_name="0.0.0.0",
+        server_port=7860
+    )