Upload publicapi.py

public/publicapi.py

@@ -2,7 +2,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# GhostAI Music Generator — Release v1.3.0
+# GhostAI Music Generator — Release v1.3.1
 # 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.
 
@@ -40,7 +40,7 @@ import uvicorn
 
 from colorama import init as colorama_init, Fore, Style
 
-RELEASE = "v1.3.0"
+RELEASE = "v1.3.1"
 
 # ======================================================================================
 # PATCHES & RUNTIME
@@ -263,7 +263,7 @@ def balance_stereo(seg: AudioSegment, noise_threshold=-40, sample_rate=48000) ->
         stereo = stereo * mask
         left, right = stereo[:, 0], stereo[:, 1]
         l_rms = np.sqrt(np.mean(left[left != 0] ** 2)) if np.any(left != 0) else 0
-        r_rms = np.sqrt(np.mean(right[right != 0] ** 2)) if np.any(right != 0) else 0
+        r_rms = np.sqrt(np.mean(np.mean(right[right != 0] ** 2))) if np.any(right != 0) else 0
         if l_rms > 0 and r_rms > 0:
             avg = (l_rms + r_rms) / 2
             stereo[:, 0] *= (avg / l_rms)
@@ -316,13 +316,18 @@ def apply_fade(seg: AudioSegment, fade_in=500, fade_out=800) -> AudioSegment:
         return seg
 
 # ======================================================================================
-# PROMPTS (FROM INI)
+# PROMPTS (FROM INI) — SAFE FORMAT TO AVOID KeyError('mood') AND OTHER PLACEHOLDERS
 # ======================================================================================
 
+class SafeFormatDict(dict):
+    def __missing__(self, key):
+        # Gracefully handle missing placeholders in templates (e.g., {mood}, {genre})
+        return ""
+
 class StylesConfig:
     def __init__(self, path: Path):
         self.path = path
-        self.cfg = configparser.ConfigParser()
+        self.cfg = configparser.ConfigParser(interpolation=None)
         self.mtime = 0.0
         self.styles: Dict[str, Dict[str, Any]] = {}
         self._load()
@@ -330,17 +335,22 @@ class StylesConfig:
     def _load(self):
         if not self.path.exists():
             logger.error(f"prompts.ini not found: {self.path}")
-            self.cfg = configparser.ConfigParser()
+            self.cfg = configparser.ConfigParser(interpolation=None)
             self.styles = {}
             self.mtime = 0.0
             return
         self.cfg.read(self.path, encoding="utf-8")
         self.styles = {}
         for sec in self.cfg.sections():
-            d = {k: v for k, v in self.cfg.items(sec)}
-            # split csv fields
-            for key in ["drum_beat", "synthesizer", "rhythmic_steps", "bass_style", "guitar_style", "variations"]:
-                if key in d:
+            d: Dict[str, Any] = {k: v for k, v in self.cfg.items(sec)}
+            # Split known list-like fields
+            listish = {
+                "drum_beat", "synthesizer", "rhythmic_steps", "bass_style", "guitar_style",
+                "variations", "mood", "genre", "key", "scale", "feel", "instrument",
+                "lead", "pad", "arp", "drums", "bass", "guitar", "strings", "brass", "woodwinds"
+            }
+            for key in listish:
+                if key in d and isinstance(d[key], str):
                     d[key] = [s.strip() for s in d[key].split(",") if s.strip()]
             self.styles[sec] = d
         self.mtime = self.path.stat().st_mtime
@@ -356,48 +366,81 @@ class StylesConfig:
         self.maybe_reload()
         return list(self.styles.keys())
 
-    def build_prompt(self, style: str, bpm: int, chunk_num: int = 1,
-                     drum_beat="none", synthesizer="none", rhythmic_steps="none",
-                     bass_style="none", guitar_style="none") -> str:
+    def _pick(self, s: Dict[str, Any], field: str, incoming: Optional[str]) -> str:
+        if incoming and incoming != "none":
+            return str(incoming)
+        val = s.get(field, [])
+        if isinstance(val, list):
+            return random.choice(val) if val else "none"
+        return str(val) if val else "none"
+
+    def build_prompt(
+        self,
+        style: str,
+        bpm: int,
+        chunk_num: int = 1,
+        drum_beat: str = "none",
+        synthesizer: str = "none",
+        rhythmic_steps: str = "none",
+        bass_style: str = "none",
+        guitar_style: str = "none"
+    ) -> str:
         self.maybe_reload()
         if style not in self.styles:
             return ""
         s = self.styles[style]
+
+        # BPM handling
         bpm_min = int(s.get("bpm_min", "100"))
         bpm_max = int(s.get("bpm_max", "140"))
         final_bpm = bpm if bpm != 120 else random.randint(bpm_min, bpm_max)
 
-        def pick(field_name: str, incoming: str) -> str:
-            if incoming and incoming != "none":
-                return incoming
-            vals = s.get(field_name, [])
-            return random.choice(vals) if vals else "none"
-
-        d = pick("drum_beat", drum_beat)
-        syn = pick("synthesizer", synthesizer)
-        r = pick("rhythmic_steps", rhythmic_steps)
-        b = pick("bass_style", bass_style)
-        g = pick("guitar_style", guitar_style)
+        # Picks for band controls
+        d = self._pick(s, "drum_beat", drum_beat)
+        syn = self._pick(s, "synthesizer", synthesizer)
+        r = self._pick(s, "rhythmic_steps", rhythmic_steps)
+        b = self._pick(s, "bass_style", bass_style)
+        g = self._pick(s, "guitar_style", guitar_style)
+
+        # Variation logic per chunk
         var_list = s.get("variations", [])
-        var = ""
-        if var_list:
-            # Prefer different variations across chunks
+        variation = ""
+        if isinstance(var_list, list) and var_list:
             if chunk_num == 1:
-                var = random.choice(var_list[: max(1, len(var_list)//2)])
+                variation = random.choice(var_list[: max(1, len(var_list)//2)])
+            else:
+                variation = random.choice(var_list)
+
+        # Start with all keys from the style; choose a random item for list-type values
+        fields: Dict[str, Any] = {}
+        for k, v in s.items():
+            if isinstance(v, list):
+                fields[k] = random.choice(v) if v else ""
             else:
-                var = random.choice(var_list)
-        tpl = s.get("prompt_template",
-                    "Instrumental track at {bpm} BPM {variation}.")
-        prompt = tpl.format(
-            bpm=final_bpm,
-            drum=d,
-            synth=syn if syn != "none" else "",
-            rhythm=r if r != "none" else "",
-            bass=b if b != "none" else "",
-            guitar=g if g != "none" else "",
-            variation=var
+                fields[k] = v
+
+        # Overlay computed/required fields
+        fields.update({
+            "bpm": final_bpm,
+            "chunk": chunk_num,
+            "drum": d if d != "none" else "",
+            "synth": syn if syn != "none" else "",
+            "rhythm": r if r != "none" else "",
+            "bass": b if b != "none" else "",
+            "guitar": g if g != "none" else "",
+            "variation": variation
+        })
+
+        # Default template if none in INI
+        tpl = s.get(
+            "prompt_template",
+            "Instrumental track at {bpm} BPM {variation}. {mood} {genre} {drum} {bass} {guitar} {synth} {rhythm}"
         )
-        return re.sub(r"\s{2,}", " ", prompt).strip()
+
+        # Safe formatting (prevents KeyError for undefined placeholders like {mood})
+        prompt = tpl.format_map(SafeFormatDict(fields))
+        prompt = re.sub(r"\s{2,}", " ", prompt).strip()
+        return prompt
 
 STYLES = StylesConfig(PROMPTS_INI)
 
@@ -430,7 +473,7 @@ def load_model():
 musicgen_model = load_model()
 
 # ======================================================================================
-# GENERATION (30s CHUNKS, 60s READY)
+# GENERATION (30s CHUNKS, 60–120s READY)
 # ======================================================================================
 
 def _export_torch_to_segment(audio_tensor: torch.Tensor, sample_rate: int, bit_depth_int: int) -> Optional[AudioSegment]:
@@ -542,8 +585,6 @@ def generate_music(
     if not check_disk_space():
         return None, "⚠️ Low disk space (<1GB).", vram_status_text
 
-    # Preset (optional)
-    # (kept simple; user can override via UI)
     CHUNK_SEC = 30
     total_duration = max(30, min(int(total_duration), 120))
     num_chunks = math.ceil(total_duration / CHUNK_SEC)
@@ -777,12 +818,13 @@ def prompt(style: str, bpm: int = 120, chunk: int = 1,
     return {"style": style, "prompt": txt}
 
 # Back-compat endpoints declared in prompts.ini (e.g., /set_classical_star_wars_prompt)
-for sec, cfg in STYLES.styles.items():
+# Fix closure capture by binding route path explicitly.
+for sec, cfg in list(STYLES.styles.items()):
     api_name = cfg.get("api_name")
     if api_name:
-        route = api_name
-        def make_route(sname):
-            @fastapp.get(route)
+        route_path = api_name
+        def make_route(sname, route_path_):
+            @fastapp.get(route_path_)
             def _(bpm: int = 120, chunk: int = 1,
                   drum_beat: str = "none", synthesizer: str = "none", rhythmic_steps: str = "none",
                   bass_style: str = "none", guitar_style: str = "none"):
@@ -790,7 +832,7 @@ for sec, cfg in STYLES.styles.items():
                 if not txt:
                     raise HTTPException(status_code=404, detail="Style not found")
                 return {"style": sname, "prompt": txt}
-        make_route(sec)
+        make_route(sec, route_path)
 
 @fastapp.get("/config")
 def get_config():
@@ -859,7 +901,25 @@ logger.info(f"FastAPI server started on http://0.0.0.0:8555  [{RELEASE}]")
 
 def read_css() -> str:
     try:
-        return CSS_FILE.read_text(encoding="utf-8")
+        if CSS_FILE.exists():
+            return CSS_FILE.read_text(encoding="utf-8")
+        # High-contrast ADA-compliant fallback (white text, dark bg)
+        return """
+:root { color-scheme: dark; }
+body, .gradio-container {
+  background: #0E1014 !important;
+  color: #FFFFFF !important;
+}
+* { color: #FFFFFF !important; }
+input, textarea, select {
+  background: #151922 !important;
+  color: #FFFFFF !important;
+  border: 1px solid #2A3142 !important;
+  border-radius: 10px !important;
+}
+.ga-header { display:flex; gap:12px; align-items:center; }
+.ga-header .logo { font-size: 28px; }
+"""
     except Exception as e:
         logger.error(f"Failed to read CSS: {e}")
         return ""
@@ -879,7 +939,7 @@ with gr.Blocks(css=read_css(), analytics_enabled=False, title=f"GhostAI Music Ge
             <div class="ga-header" role="banner" aria-label="GhostAI Music Generator">
                 <div class="logo">👻</div>
                 <h1>GhostAI Music Generator</h1>
-                <p>Unified 30s chunking · 60s ready · API & status</p>
+                <p>Unified 30s chunking · 60–120s ready · API & status</p>
             </div>
             """)
 
@@ -928,7 +988,7 @@ with gr.Blocks(css=read_css(), analytics_enabled=False, title=f"GhostAI Music Ge
                     ("detroit_techno", "Detroit Techno 🎛️"),
                     ("deep_house", "Deep House 🏠"),
                     ("classical_star_wars", "Classical (Star Wars Suite) ✨"),
-                    ("foo_pad", "—")  # spacer to keep 4 columns
+                    ("foo_pad", "—")
                 ])
 
             # SETTINGS