Update app.py

app.py

@@ -78,7 +78,7 @@ def _to_np_audio(x) -> np.ndarray:
     if isinstance(x, torch.Tensor):
         if x.dtype != torch.float32: x = x.float()
         return x.detach().cpu().contiguous().view(-1).numpy()
-    x = np.asarray(x); 
+    x = np.asarray(x)
     if x.ndim > 1: x = x.reshape(-1)
     return x.astype(np.float32, copy=False) if x.dtype != np.float32 else x
 
@@ -174,7 +174,7 @@ def _latents_disk_path(key: str) -> pathlib.Path: return PERSIST_LATENTS_DIR / f
 
 def _save_latents_to_disk(key: str, gpt, spk): torch.save({"gpt_cond_latent": gpt.cpu(), "speaker_embedding": spk.cpu()}, _latents_disk_path(key))
 
-def _load_latents_from_disk(key: str): 
+def _load_latents_from_disk(key: str):
     p = _latents_disk_path(key)
     if not p.exists(): return None
     obj = torch.load(p, map_location="cpu"); return obj["gpt_cond_latent"], obj["speaker_embedding"]
@@ -227,7 +227,7 @@ def _pcm_f32_to_b64(x: np.ndarray) -> str:
 _SENT_END = re.compile(r"([\.!\?…]+[»\")\]]*\s+)")
 _WS = re.compile(r"\s+")
 def _fast_split(text: str, limit: int) -> List[str]:
-    text = text.strip(); 
+    text = text.strip()
     if not text: return []
     parts=[]; start=0
     for m in _SENT_END.finditer(text): parts.append(text[start:m.end()].strip()); start=m.end()
@@ -242,16 +242,16 @@ def _fast_split(text: str, limit: int) -> List[str]:
                 w=_WS.split(s); acc=""
                 for tok in w:
                     if len(acc)+1+len(tok)<=limit: acc=(acc+" "+tok).strip() if acc else tok
-                    else: 
+                    else:
                         if acc: chunks.append(acc); acc=tok
                 cur=acc
     if cur: chunks.append(cur)
     return [c for c in chunks if c]
 
 def _split_text_smart(text_in: str, lang_short: str, chunk_limit: int, first_segment_limit: int) -> List[str]:
-    text_in = text_in.strip(); 
+    text_in = text_in.strip()
     if not text_in: return []
-    parts=[]; 
+    parts=[]
     if len(text_in)>first_segment_limit:
         head=text_in[:first_segment_limit]; m=re.search(r".*[\.!\?…»)]", head)
         if m and len(m.group(0))>30: head=m.group(0)
@@ -420,7 +420,6 @@ class StreamBufferProcessor extends AudioWorkletProcessor {
       } else if (msg.type === 'set_thresholds') {
         this.thresholdSamples = msg.thresholdSamples|0;
         this.lowWatermarkSamples = msg.lowWatermarkSamples|0;
-        // handshake back to main
         this.port.postMessage({ type: 'thresholds_ready',
                                 thresholdSamples: this.thresholdSamples,
                                 lowWatermarkSamples: this.lowWatermarkSamples,
@@ -468,54 +467,54 @@ class StreamBufferProcessor extends AudioWorkletProcessor {
 registerProcessor('stream-buffer', StreamBufferProcessor);
 """
 
-    # ---------- INIT + player (wait-for-thresholds) ----------
-    INIT_RESET_AND_PLAY_JS = f"""
-() => {{
+    # ---------- INIT + player (no f-string; placeholders replaced) ----------
+    INIT_RESET_AND_PLAY_JS = """
+() => {
   const AC = window.AudioContext || window.webkitAudioContext;
   if (!AC) return;
 
-  function getLocalFloat(key, defVal) {{
-    try {{ const v = parseFloat(localStorage.getItem(key)); if (isFinite(v) && v > 0) return v; }} catch(e) {{}}
+  function getLocalFloat(key, defVal) {
+    try { const v = parseFloat(localStorage.getItem(key)); if (isFinite(v) && v > 0) return v; } catch(e) {}
     return defVal;
-  }}
+  }
 
-  const DEFAULT_PREROLL = {DEF_CLIENT_PREROLL};
-  const MAX_PREROLL     = {MAX_CLIENT_PREROLL};
-  const STEP_PREROLL    = {STEP_CLIENT_PREROLL};
-  const DEFAULT_LOWWM   = {DEF_CLIENT_LOWWM};
+  const DEFAULT_PREROLL = __DEF_PR__;
+  const MAX_PREROLL     = __MAX_PR__;
+  const STEP_PREROLL    = __STEP_PR__;
+  const DEFAULT_LOWWM   = __DEF_LW__;
 
   let PREROLL_S = getLocalFloat("tts_preroll_s", DEFAULT_PREROLL);
   let LOW_WM_S  = getLocalFloat("tts_lowwm_s", DEFAULT_LOWWM);
 
-  const blob = new Blob([`{AUDIO_WORKLET_PROCESSOR}`], {{ type: 'application/javascript' }});
+  const blob = new Blob([`__AW_CODE__`], { type: 'application/javascript' });
   const url  = URL.createObjectURL(blob);
 
-  const ctx = new AC({{ sampleRate: {sampling_rate} }});
-  const meta = {{
+  const ctx = new AC({ sampleRate: __SR__ });
+  const meta = {
     t_click_ms: performance.now(), t_first_push_ms: null, t_first_audio_ms: null,
     server: null, click_to_first_chunk_s: null, ctx_sr: ctx.sampleRate,
     thresholds: null
-  }};
+  };
 
   let workletNode = null, gate = null, connected = false;
   let ready = false;                 // WAIT for thresholds_ready
   const pending = [];               // queue chunks before ready
   let underrunSeen = false;
 
-  function toSec(ms) {{ return (ms/1000); }}
-  function p3(x) {{ return (x==null)?'n/a':x.toFixed(3)+' s'; }}
-  function logUpdate() {{
+  function toSec(ms) { return (ms/1000); }
+  function p3(x) { return (x==null)?'n/a':x.toFixed(3)+' s'; }
+  function logUpdate() {
     const el = document.getElementById('wa-log'); if (!el) return;
-    const s = meta.server || {{}};
+    const s = meta.server || {};
     const lines = [];
     lines.push("Клік (Згенераваць): 0.000 s");
-    if (meta.t_first_push_ms) {{
+    if (meta.t_first_push_ms) {
       lines.push("Першы чанк прыйшоў:   " + (toSec(meta.t_first_push_ms - meta.t_click_ms)).toFixed(3) + " s");
-      if (meta.t_first_audio_ms) {{
+      if (meta.t_first_audio_ms) {
         lines.push("Пачатак прайгравання: " + (toSec(meta.t_first_audio_ms - meta.t_click_ms)).toFixed(3) + " s");
         lines.push("Затрымка (чанк→аўдыя): " + (toSec(meta.t_first_audio_ms - meta.t_first_push_ms)).toFixed(3) + " s");
-      }}
-    }}
+      }
+    }
     lines.push("");
     lines.push("— Серверныя метрыкі —");
     lines.push("Latents (умоўны голас):  " + p3(s.latents_s));
@@ -524,101 +523,97 @@ registerProcessor('stream-buffer', StreamBufferProcessor);
     lines.push("Усё да 1-га чанка:       " + p3(s.until_first_chunk_total_s));
     lines.push("Іншая серверная апрац.:  " + p3(s.server_unaccounted_before_first_chunk_s));
     lines.push("Запіс WAV:               " + p3(s.file_write_s));
-    if (meta.click_to_first_chunk_s !== null && s.until_first_chunk_total_s !== null) {{
+    if (meta.click_to_first_chunk_s !== null && s.until_first_chunk_total_s !== null) {
       const est = Math.max(0, meta.click_to_first_chunk_s - s.until_first_chunk_total_s);
       lines.push(""); lines.push("Ацэнка чаргі ZeroGPU + сеткі: " + est.toFixed(3) + " s");
-    }}
+    }
     lines.push("");
     lines.push("Статус стриму: " + (connected ? "playing" : "stopped"));
     lines.push("PREROLL: " + PREROLL_S.toFixed(3) + " s | LOW WM: " + LOW_WM_S.toFixed(3) + " s");
     lines.push("ctx.sampleRate: " + meta.ctx_sr + " Hz");
-    if (meta.thresholds) {{
+    if (meta.thresholds) {
       lines.push("thresholdSamples: " + meta.thresholds.thresholdSamples + " | lowWM: " + meta.thresholds.lowWatermarkSamples);
-    }}
+    }
     el.textContent = lines.join("\\n");
-  }}
+  }
 
-  (async () => {{
+  (async () => {
     await ctx.audioWorklet.addModule(url);
     workletNode = new AudioWorkletNode(ctx, 'stream-buffer');
     gate = ctx.createGain(); gate.gain.value = 1.0;
     workletNode.connect(gate);
 
-    workletNode.port.onmessage = (e) => {{
-      const msg = e.data || {{}};
-      if (msg.type === 'thresholds_ready') {{
-        ready = true; meta.thresholds = {{ thresholdSamples: msg.thresholdSamples, lowWatermarkSamples: msg.lowWatermarkSamples }};
-        // flush pending
-        for (const f32 of pending) {{
-          workletNode.port.postMessage({{ type:'push', buffer:f32.buffer }}, [f32.buffer]);
-        }}
+    workletNode.port.onmessage = (e) => {
+      const msg = e.data || {};
+      if (msg.type === 'thresholds_ready') {
+        ready = true; meta.thresholds = { thresholdSamples: msg.thresholdSamples, lowWatermarkSamples: msg.lowWatermarkSamples };
+        for (const f32 of pending) { workletNode.port.postMessage({ type:'push', buffer:f32.buffer }, [f32.buffer]); }
         pending.length = 0;
         logUpdate();
-      }} else if (msg.type === 'first_audio') {{
-        if (meta.t_first_audio_ms === null) {{ meta.t_first_audio_ms = performance.now(); logUpdate(); }}
-      }} else if (msg.type === 'underrun') {{
+      } else if (msg.type === 'first_audio') {
+        if (meta.t_first_audio_ms === null) { meta.t_first_audio_ms = performance.now(); logUpdate(); }
+      } else if (msg.type === 'underrun') {
         underrunSeen = true;
-      }}
-    }};
+      }
+    };
 
-    // send thresholds using **ctx.sampleRate**
-    workletNode.port.postMessage({{
+    // send thresholds using ctx.sampleRate
+    workletNode.port.postMessage({
       type: 'set_thresholds',
       thresholdSamples: Math.floor(PREROLL_S * ctx.sampleRate),
       lowWatermarkSamples: Math.floor(LOW_WM_S * ctx.sampleRate),
-    }});
+    });
 
-    window.__wa = {{
+    window.__wa = {
       ctx, workletNode, gate,
-      get playing() {{ return connected; }},
+      get playing() { return connected; },
       meta,
-      push: async (f32) => {{
-        try {{ await ctx.resume(); }} catch(e) {{}}
-        if (!meta.t_first_push_ms) {{ meta.t_first_push_ms = performance.now(); meta.click_to_first_chunk_s = (meta.t_first_push_ms - meta.t_click_ms)/1000; }}
-        // if thresholds not ready yet — buffer locally
-        if (!ready) {{ pending.push(f32); }}
-        else        {{ workletNode.port.postMessage({{ type:'push', buffer:f32.buffer }}, [f32.buffer]); }}
-        if (!connected) {{ try {{ gate.connect(ctx.destination); connected = true; }} catch(e) {{}} }}
+      push: async (f32) => {
+        try { await ctx.resume(); } catch(e) {}
+        if (!meta.t_first_push_ms) { meta.t_first_push_ms = performance.now(); meta.click_to_first_chunk_s = (meta.t_first_push_ms - meta.t_click_ms)/1000; }
+        if (!ready) { pending.push(f32); }
+        else        { workletNode.port.postMessage({ type:'push', buffer:f32.buffer }, [f32.buffer]); }
+        if (!connected) { try { gate.connect(ctx.destination); connected = true; } catch(e) {} }
         logUpdate();
-      }},
-      stop: () => {{ if (connected) {{ try {{ gate.disconnect(); }} catch(e) {{}} connected=false; logUpdate(); }} }},
-      reset: () => {{
-        try {{
-          if (underrunSeen) {{
-            const cur = Math.min({MAX_CLIENT_PREROLL}, PREROLL_S + {STEP_CLIENT_PREROLL});
+      },
+      stop: () => { if (connected) { try { gate.disconnect(); } catch(e) {} connected=false; logUpdate(); } },
+      reset: () => {
+        try {
+          if (underrunSeen) {
+            const cur = Math.min(MAX_PREROLL, PREROLL_S + STEP_PREROLL);
             localStorage.setItem("tts_preroll_s", String(cur));
-          }}
-        }} catch(e) {{}}
-        if (workletNode) {{
-          workletNode.port.postMessage({{ type:'reset' }});
+          }
+        } catch(e) {}
+        if (workletNode) {
+          workletNode.port.postMessage({ type:'reset' });
           ready = false; pending.length = 0;
-          workletNode.port.postMessage({{
+          workletNode.port.postMessage({
             type:'set_thresholds',
             thresholdSamples: Math.floor(PREROLL_S * ctx.sampleRate),
             lowWatermarkSamples: Math.floor(LOW_WM_S * ctx.sampleRate),
-          }});
-        }}
-        if (connected) {{ try {{ gate.disconnect(); }} catch(e) {{}} connected=false; }}
+          });
+        }
+        if (connected) { try { gate.disconnect(); } catch(e) {} connected=false; }
         meta.t_first_push_ms = null; meta.t_first_audio_ms = null; meta.click_to_first_chunk_s = null; logUpdate();
-      }},
+      },
       updateLog: logUpdate,
-      applyClient: (pr, lw) => {{
+      applyClient: (pr, lw) => {
         PREROLL_S = pr; LOW_WM_S = lw;
-        try {{ localStorage.setItem("tts_preroll_s", String(pr)); localStorage.setItem("tts_lowwm_s", String(lw)); }} catch(e) {{}}
-        if (workletNode) {{
-          workletNode.port.postMessage({{
+        try { localStorage.setItem("tts_preroll_s", String(pr)); localStorage.setItem("tts_lowwm_s", String(lw)); } catch(e) {}
+        if (workletNode) {
+          workletNode.port.postMessage({
             type:'set_thresholds',
             thresholdSamples: Math.floor(PREROLL_S * ctx.sampleRate),
             lowWatermarkSamples: Math.floor(LOW_WM_S * ctx.sampleRate),
-          }});
-        }}
+          });
+        }
         logUpdate();
-      }}
-    }};
+      }
+    };
     logUpdate();
-  } )();
-}}
-""".replace("{AUDIO_WORKLET_PROCESSOR}", AUDIO_WORKLET_PROCESSOR)
+  })();
+}
+"""
 
     STOP_JS = "() => { if (window.__wa) window.__wa.stop(); }"
     PLAY_JS = "() => { if (window.__wa) { try { window.__wa.ctx.resume(); } catch(e){}; if (!window.__wa.playing) { try { window.__wa.gate.connect(window.__wa.ctx.destination); } catch(e){} } window.__wa.updateLog && window.__wa.updateLog(); } }"
@@ -655,6 +650,17 @@ registerProcessor('stream-buffer', StreamBufferProcessor);
 """
     PLAY_FINAL_JS = "(() => { const el=document.getElementById('final-audio'); const a=el?.querySelector('audio'); if (a) { try{a.play();}catch(e){} } })()"
 
+    # ---- replace placeholders to avoid f-strings ----
+    INIT_RESET_AND_PLAY_JS = (
+        INIT_RESET_AND_PLAY_JS
+        .replace("__AW_CODE__", AUDIO_WORKLET_PROCESSOR)
+        .replace("__SR__", str(sampling_rate))
+        .replace("__DEF_PR__", str(DEF_CLIENT_PREROLL))
+        .replace("__MAX_PR__", str(MAX_CLIENT_PREROLL))
+        .replace("__STEP_PR__", str(STEP_CLIENT_PREROLL))
+        .replace("__DEF_LW__", str(DEF_CLIENT_LOWWM))
+    )
+
     # wiring
     apply_btn.click(fn=None, inputs=[], outputs=[], js=APPLY_JS)
     reset_btn.click(fn=None, inputs=[], outputs=[], js=RESET_JS)