hotfix: patch _sf() kwarg bug at import time"

app.py

@@ -3,14 +3,25 @@ Gradio UI — Sample Extractor v9.
 SuperFlux onsets, transient NCC, mel pre-filter, MIDI quantization, param locking.
 """
 
+import os, sys
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+
+# ─── HOTFIX: patch _sf() keyword argument bug ────────────────────────────────
+_src = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sample_extractor.py')
+with open(_src, 'r') as _f: _content = _f.read()
+if '_sf(yh,lag=2,ms=5)' in _content:
+    _content = _content.replace('_sf(yh,lag=2,ms=5)', '_sf(yh,l=2,ms=5)')
+    with open(_src, 'w') as _f: _f.write(_content)
+    print("[HOTFIX] Fixed _sf() kwarg: lag=2 → l=2")
+del _src, _content
+# ──────────────────────────────────────────────────────────────────────────────
+
 import gradio as gr
-import numpy as np, pandas as pd, json, sys, os, tempfile
+import numpy as np, pandas as pd, json, tempfile
 import soundfile as sf, librosa
 import matplotlib; matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
 from sample_extractor import (
     extract_stem, detect_onsets, classify_hits,
     cluster_hits, select_best, synthesize_from_cluster,
@@ -78,14 +89,14 @@ def run_extraction(audio_in, stem_choice, demucs_model, demucs_shifts, demucs_ov
         sa,ssr=extract_stem(tmp,stem=stem_choice,device="cpu",
             model_name=demucs_model,shifts=int(demucs_shifts),overlap=float(demucs_overlap))
         progress(0.15,desc="BPM..."); bpm=detect_bpm(sa,ssr)
-        progress(0.25,desc="Onsets (SuperFlux)...")
+        progress(0.25,desc="Onsets...")
         hits=detect_onsets(sa,ssr,mode=onset_mode,onset_delta=float(onset_delta),
             energy_threshold_db=float(energy_db),pre_pad=float(pre_pad),
             min_dur=float(min_dur),max_dur=float(max_dur),min_gap=float(min_gap))
         if not hits:
             return (audio_tuple(sa,ssr),f"**BPM: {bpm}** — No hits.",None,None,None,None,"",pd.DataFrame())
         progress(0.35,desc="Classify..."); hits=classify_hits(hits)
-        progress(0.45,desc="Cluster (transient NCC)...")
+        progress(0.45,desc="Cluster...")
         cl=cluster_hits(hits,audio=sa,sr=ssr,ncc_threshold=float(ncc_threshold),
             attack_ms=float(attack_ms),target_min=int(target_min),target_max=int(target_max),linkage=str(linkage))
         progress(0.65,desc="Select..."); select_best(cl)
@@ -112,7 +123,7 @@ def run_extraction(audio_in, stem_choice, demucs_model, demucs_shifts, demucs_ov
         sm=f"**BPM: {bpm}** · **{len(cl)} samples** from {len(hits)} hits\n\n"
         sm+=f"`{demucs_model}` · δ=`{onset_delta}` · E=`{energy_db}dB` · attack=`{attack_ms}ms`"
         if int(target_min)>0 and int(target_max)>0: sm+=f" · clusters `{int(target_min)}–{int(target_max)}`"
-        if quantize_midi: sm+=f" · MIDI quantized to 1/{int(subdivision)}"
+        if quantize_midi: sm+=f" · MIDI 1/{int(subdivision)}"
         sm+="\n\n| Sample | Hits | MIDI |\n|---|---|---|\n"
         for c in sorted(cl,key=lambda x:x.count,reverse=True): sm+=f"| {c.label} | {c.count} | {c.midi_note} |\n"
         progress(1.0)
@@ -162,57 +173,47 @@ def build_app():
     with gr.Blocks(title="🎵 Sample Extractor",theme=gr.themes.Soft(),
                    css=".gradio-container{max-width:1300px!important}") as app:
         gr.Markdown("# 🎵 Sample Extractor v9\n"
-                    "**SuperFlux** onset detection · **Transient NCC** clustering (25ms attack matching) · "
+                    "**SuperFlux** onsets · **Transient NCC** (25ms attack) · "
                     "**Mel pre-filter** · **MIDI quantization** · **Auto-Tune** with 🔒 locks")
-
         with gr.Tabs():
             with gr.Tab("🎵 Extract"):
                 audio_in=gr.Audio(sources=['upload'],type='numpy',label='Upload Audio')
-
                 with gr.Accordion("🔧 Stem Separation",open=False):
                     with gr.Row():
                         dm=gr.Dropdown(DEMUCS_MODELS,value="htdemucs_ft",label="Model")
                         st=gr.Dropdown(['drums','bass','other','vocals','all'],value='drums',label='Stem')
                         dsh=gr.Slider(0,5,value=1,step=1,label='Shifts')
                         dov=gr.Slider(0.0,0.5,value=0.25,step=0.05,label='Overlap')
-
-                with gr.Accordion("🎯 Onset Detection (SuperFlux)",open=False):
+                with gr.Accordion("🎯 Onset Detection",open=False):
                     with gr.Row(): om=gr.Dropdown(['auto','percussive','harmonic','broadband'],value='auto',label='Mode')
                     with gr.Row():
-                        od=gr.Slider(0.01,0.5,value=0.12,step=0.01,label='Delta')
-                        lock_od=gr.Checkbox(value=False,label='🔒',scale=0)
+                        od=gr.Slider(0.01,0.5,value=0.12,step=0.01,label='Delta'); lock_od=gr.Checkbox(value=False,label='🔒',scale=0)
                     with gr.Row():
-                        ed=gr.Slider(-70,-10,value=-35,step=1,label='Energy (dB)')
-                        lock_ed=gr.Checkbox(value=False,label='🔒',scale=0)
+                        ed=gr.Slider(-70,-10,value=-35,step=1,label='Energy (dB)'); lock_ed=gr.Checkbox(value=False,label='🔒',scale=0)
                     with gr.Row():
-                        mg=gr.Slider(0.005,0.2,value=0.03,step=0.005,label='Min gap (s)')
-                        lock_mg=gr.Checkbox(value=False,label='🔒',scale=0)
+                        mg=gr.Slider(0.005,0.2,value=0.03,step=0.005,label='Min gap'); lock_mg=gr.Checkbox(value=False,label='🔒',scale=0)
                     with gr.Row():
-                        pp=gr.Slider(0.0,0.05,value=0.003,step=0.001,label='Pre-pad (s)')
-                        mnd=gr.Slider(0.005,0.2,value=0.02,step=0.005,label='Min dur (s)')
-                        mxd=gr.Slider(0.1,5.0,value=1.5,step=0.1,label='Max dur (s)')
-
-                with gr.Accordion("🔗 Clustering (Transient NCC + Mel pre-filter)",open=True):
+                        pp=gr.Slider(0.0,0.05,value=0.003,step=0.001,label='Pre-pad')
+                        mnd=gr.Slider(0.005,0.2,value=0.02,step=0.005,label='Min dur')
+                        mxd=gr.Slider(0.1,5.0,value=1.5,step=0.1,label='Max dur')
+                with gr.Accordion("🔗 Clustering",open=True):
                     with gr.Row():
                         tmin=gr.Number(value=5,label='Target min',precision=0)
                         tmax=gr.Number(value=20,label='Target max',precision=0)
                         lock_tgt=gr.Checkbox(value=True,label='🔒 Lock range',scale=0)
-                    gr.Markdown("*🔒 = auto-tune respects this value*")
+                    gr.Markdown("*🔒 = auto-tune keeps this value fixed*")
                     with gr.Row():
                         nt=gr.Slider(0.3,0.99,value=0.80,step=0.01,label='NCC threshold')
-                        atk=gr.Slider(10,100,value=25,step=5,label='Attack window (ms)')
+                        atk=gr.Slider(10,100,value=25,step=5,label='Attack (ms)')
                         lnk=gr.Dropdown(['average','complete','single'],value='average',label='Linkage')
-
-                with gr.Accordion("🎹 MIDI & Post-processing",open=False):
+                with gr.Accordion("🎹 MIDI & Post",open=False):
                     with gr.Row():
-                        syn=gr.Checkbox(value=True,label='Synthesize samples')
+                        syn=gr.Checkbox(value=True,label='Synthesize')
                         qmidi=gr.Checkbox(value=True,label='Quantize MIDI')
                         subdiv=gr.Dropdown([('8th',8),('16th',16),('32nd',32)],value=16,label='Grid')
-
                 with gr.Row():
                     tune_btn=gr.Button("🎛️ Auto-Tune",variant="secondary",size="lg")
                     extract_btn=gr.Button("🔬 Extract",variant="primary",size="lg")
-
                 tune_summary=gr.Markdown(""); tune_log=gr.Textbox(label="Log",lines=8,max_lines=15,visible=False)
                 summary_md=gr.Markdown("*Upload → Auto-Tune or Extract*")
                 with gr.Row():
@@ -220,24 +221,18 @@ def build_app():
                     rend_out=gr.Audio(type='numpy',label='🔊 Reconstruction',interactive=False)
                 gr.Markdown("### Downloads")
                 with gr.Row():
-                    arc=gr.File(label="📦 ZIP",interactive=False)
-                    mid=gr.File(label="🎹 MIDI",interactive=False)
+                    arc=gr.File(label="📦 ZIP",interactive=False); mid=gr.File(label="🎹 MIDI",interactive=False)
                 smp=gr.File(label="WAVs",file_count="multiple",interactive=False)
                 met=gr.Dataframe(label="Samples"); stx=gr.Textbox(visible=False)
-
-                dm.change(fn=lambda m:gr.update(choices=DEMUCS_STEMS.get(m,["drums","bass","other","vocals"])+["all"]),
-                          inputs=[dm],outputs=[st])
+                dm.change(fn=lambda m:gr.update(choices=DEMUCS_STEMS.get(m,["drums","bass","other","vocals"])+["all"]),inputs=[dm],outputs=[st])
                 tune_btn.click(run_auto_tune,[audio_in,st,dm,dsh,dov,om,od,ed,mg,tmin,tmax,lock_od,lock_ed,lock_mg,lock_tgt],
                     [od,ed,mg,tmin,tmax,tune_summary,tune_log])
-                extract_btn.click(run_extraction,
-                    [audio_in,st,dm,dsh,dov,om,od,ed,pp,mnd,mxd,mg,nt,atk,lnk,tmin,tmax,syn,qmidi,subdiv],
+                extract_btn.click(run_extraction,[audio_in,st,dm,dsh,dov,om,od,ed,pp,mnd,mxd,mg,nt,atk,lnk,tmin,tmax,syn,qmidi,subdiv],
                     [stem_out,summary_md,rend_out,smp,mid,arc,stx,met])
-
             with gr.Tab("📊 Evaluate"):
                 with gr.Row():
                     ep=gr.Dropdown(['rock','funk','halftime'],value='rock',label='Pattern')
-                    eb=gr.Slider(80,200,value=120,step=2,label='BPM')
-                    ebs=gr.Slider(2,8,value=4,step=1,label='Bars')
+                    eb=gr.Slider(80,200,value=120,step=2,label='BPM'); ebs=gr.Slider(2,8,value=4,step=1,label='Bars')
                 with gr.Row():
                     en=gr.Slider(0.3,0.99,value=0.80,step=0.01,label='NCC')
                     etm=gr.Number(value=0,label='Min',precision=0); etx=gr.Number(value=0,label='Max',precision=0)
@@ -248,17 +243,14 @@ def build_app():
                 evs=gr.Dataframe(); evm2=gr.Dataframe()
                 es1=gr.Textbox(visible=False); es2=gr.Textbox(visible=False)
                 evb.click(run_eval,[ep,eb,ebs,en,etm,etx],[evm,evr,evs,evm2,es1,es2])
-
             with gr.Tab("🔄 Optimize"):
                 with gr.Row():
-                    on=gr.Slider(2,30,value=5,step=1,label='Iters')
-                    ocn=gr.Textbox(value="opt",label='Name'); oa=gr.Textbox(value="",label='Author')
-                    osv=gr.Checkbox(value=True,label='Save')
+                    on=gr.Slider(2,30,value=5,step=1,label='Iters'); ocn=gr.Textbox(value="opt",label='Name')
+                    oa=gr.Textbox(value="",label='Author'); osv=gr.Checkbox(value=True,label='Save')
                 ob=gr.Button("🚀 Run",variant="primary",size="lg")
-                ol=gr.Textbox(label="Log",lines=20,max_lines=40)
-                oh=gr.Dataframe(); op=gr.Plot(); oc=gr.Code(label="Config",language="json")
+                ol=gr.Textbox(label="Log",lines=20,max_lines=40); oh=gr.Dataframe(); op=gr.Plot()
+                oc=gr.Code(label="Config",language="json")
                 ob.click(run_optimize,[on,ocn,oa,osv],[ol,oh,op,oc])
-
             with gr.Tab("🏆 Leaderboard"):
                 lbb=gr.Button("🔄 Refresh"); lt=gr.Dataframe(); ls=gr.Textbox(visible=False)
                 lbb.click(refresh_lb,[],[lt,ls])