Update public/apibinararybuild.py

public/apibinararybuild.py

@@ -1,13 +1,10 @@
+# app.py
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # GhostAI Music Generator — Release v1.3.3
 # Gradio UI + FastAPI server, externalized styles (CSS), prompts (INI), and examples (MD).
 # Saves MP3s to ./mp3, single rotating log (max 5MB) in ./logs, colorized console.
-# CHANGES:
-# - /render returns MP3 binary (FileResponse) instead of JSON
-# - per-render metadata saved to ./json/<basename>.json
-# - hourly cleanup: delete files older than 48h from ./mp3, ./json, ./logs
 
 import os
 import sys
@@ -37,12 +34,11 @@ from logging.handlers import RotatingFileHandler
 
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse
+from fastapi.responses import FileResponse  # <-- added
 from pydantic import BaseModel
 import uvicorn
 
 from colorama import init as colorama_init, Fore
-from datetime import datetime, timedelta
 
 RELEASE = "v1.3.3"
 
@@ -64,13 +60,10 @@ torch.backends.cudnn.benchmark = False
 torch.backends.cudnn.deterministic = True
 
 BASE_DIR = Path(__file__).parent.resolve()
-LOG_DIR  = BASE_DIR / "logs"
-MP3_DIR  = BASE_DIR / "mp3"
-JSON_DIR = BASE_DIR / "json"   # NEW: metadata folder
-
+LOG_DIR = BASE_DIR / "logs"
+MP3_DIR = BASE_DIR / "mp3"
 LOG_DIR.mkdir(parents=True, exist_ok=True)
 MP3_DIR.mkdir(parents=True, exist_ok=True)
-JSON_DIR.mkdir(parents=True, exist_ok=True)
 
 LOG_FILE = LOG_DIR / "ghostai_musicgen.log"
 logger = logging.getLogger("ghostai-musicgen")
@@ -816,7 +809,7 @@ class RenderRequest(BaseModel):
     bitrate: Optional[str] = None
     output_sample_rate: Optional[str] = None
     bit_depth: Optional[str] = None
-    style: Optional[str] = None  # passed for filename tagging
+    style: Optional[str] = None  # NEW: pass style key for filename tagging
 
 fastapp = FastAPI(title=f"GhostAI Music Server {RELEASE}", version=RELEASE)
 fastapp.add_middleware(
@@ -875,25 +868,15 @@ def set_settings(payload: Dict[str, Any]):
     except Exception as e:
         raise HTTPException(status_code=400, detail=str(e))
 
-def _write_metadata(mp3_path: Path, job_id: str, status_msg: str, vram_msg: str, settings: Dict[str, Any]) -> Path:
-    meta = {
-        "ok": True,
-        "job_id": job_id,
-        "file": str(mp3_path),
-        "basename": mp3_path.name,
-        "created": datetime.utcnow().isoformat() + "Z",
-        "status": status_msg,
-        "vram": vram_msg,
-        "release": RELEASE,
-        "settings": settings
-    }
-    meta_path = JSON_DIR / (mp3_path.stem + ".json")
-    try:
-        meta_path.write_text(json.dumps(meta, indent=2), encoding="utf-8")
-    except Exception as e:
-        logger.error(f"Metadata write failed: {e}")
-    return meta_path
+# -----------------------------
+# ASCII-safe header sanitizer
+# -----------------------------
+def _ascii_header(s: str) -> str:
+    return re.sub(r'[^\x20-\x7E]', '', str(s or ''))
 
+# -----------------------------
+# BINARY MP3 RENDER ENDPOINT
+# -----------------------------
 @fastapp.post("/render")
 def render(req: RenderRequest):
     if is_busy():
@@ -901,13 +884,12 @@ def render(req: RenderRequest):
     job_id = f"render_{int(time.time())}"
     set_busy(True, job_id)
     try:
-        # merge settings (req overrides CURRENT_SETTINGS)
         s = CURRENT_SETTINGS.copy()
         for k, v in req.dict().items():
             if v is not None:
                 s[k] = v
 
-        mp3, msg, vram = generate_music(
+        mp3_path, msg, vram = generate_music(
             s.get("instrumental_prompt", req.instrumental_prompt),
             float(s.get("cfg_scale", DEFAULT_SETTINGS["cfg_scale"])),
             int(s.get("top_k", DEFAULT_SETTINGS["top_k"])),
@@ -929,60 +911,26 @@ def render(req: RenderRequest):
             str(s.get("bit_depth", DEFAULT_SETTINGS["bit_depth"])),
             str(s.get("style", "custom"))
         )
-        if not mp3:
-            raise HTTPException(status_code=500, detail=msg)
-
-        mp3_path = Path(mp3).resolve()
-        if not mp3_path.exists() or not mp3_path.is_file():
-            raise HTTPException(status_code=500, detail="MP3 path missing after render")
-
-        # Save metadata (server-side only)
-        _write_metadata(mp3_path, job_id, msg, vram, {
-            k: s.get(k) for k in [
-                "instrumental_prompt","cfg_scale","top_k","top_p","temperature",
-                "total_duration","bpm","drum_beat","synthesizer","rhythmic_steps",
-                "bass_style","guitar_style","target_volume","preset","max_steps",
-                "bitrate","output_sample_rate","bit_depth","style"
-            ]
-        })
 
-        # Return MP3 binary response
+        if not mp3_path or not os.path.exists(mp3_path):
+            raise HTTPException(status_code=500, detail=_ascii_header(msg or "No file produced"))
+
+        filename = os.path.basename(mp3_path)
+        headers = {
+            "X-Job-ID": _ascii_header(job_id),
+            "X-Status": _ascii_header(msg),
+            "X-VRAM": _ascii_header(vram),
+            "X-Release": _ascii_header(RELEASE),
+        }
         return FileResponse(
-            path=str(mp3_path),
+            path=mp3_path,
             media_type="audio/mpeg",
-            filename=mp3_path.name,
-            headers={
-                "X-Job-ID": job_id,
-                "X-Status": msg,
-                "X-VRAM": vram,
-                "X-Release": RELEASE
-            }
+            filename=_ascii_header(filename),
+            headers=headers,
         )
     finally:
         set_busy(False, None)
 
-# ---------------------------
-# Hourly cleanup (older > 48h)
-# ---------------------------
-def _cleanup_loop():
-    keep_hours = int(os.getenv("CLEANUP_HOURS", "48"))
-    while True:
-        cutoff = time.time() - keep_hours * 3600
-        for folder in (MP3_DIR, JSON_DIR, LOG_DIR):
-            try:
-                for p in folder.iterdir():
-                    try:
-                        if p.is_file() and p.stat().st_mtime < cutoff:
-                            p.unlink()
-                            logger.info(f"Cleanup: deleted old file {p}")
-                    except Exception as e:
-                        logger.error(f"Cleanup error for {p}: {e}")
-            except Exception as e:
-                logger.error(f"Cleanup listdir error in {folder}: {e}")
-        time.sleep(3600)
-
-threading.Thread(target=_cleanup_loop, daemon=True).start()
-
 def _start_fastapi():
     uvicorn.run(fastapp, host="0.0.0.0", port=8555, log_level="info")
 
@@ -1101,7 +1049,7 @@ with gr.Blocks(css=read_css(), analytics_enabled=False, title=f"GhostAI Music Ge
                     bitrate_state = gr.State(value=str(loaded.get("bitrate", "192k")))
                     sample_rate_state = gr.State(value=str(loaded.get("output_sample_rate", "48000")))
                     bit_depth_state = gr.State(value=str(loaded.get("bit_depth", "16")))
-                    selected_style = gr.State(value=str(loaded.get("style", "custom")))  # style for filename
+                    selected_style = gr.State(value=str(loaded.get("style", "custom")))  # NEW: style for filename
 
                     with gr.Row():
                         bitrate_128_btn = gr.Button("Bitrate 128k", variant="secondary")
@@ -1169,7 +1117,7 @@ with gr.Blocks(css=read_css(), analytics_enabled=False, title=f"GhostAI Music Ge
             new_steps,
             new_bass,
             new_guitar,
-            style_key
+            style_key  # update selected_style state for filename tagging
         )
 
     for key, btn in row1 + row2 + row3 + row4:
@@ -1191,7 +1139,7 @@ with gr.Blocks(css=read_css(), analytics_enabled=False, title=f"GhostAI Music Ge
     bit_depth_16_btn.click(lambda: "16", outputs=bit_depth_state)
     bit_depth_24_btn.click(lambda: "24", outputs=bit_depth_state)
 
-    # Generate (pass style)
+    # Generate (pass style for filename)
     gen_btn.click(
         generate_music_wrapper,
         inputs=[