S185: stop masking killed/bad-score jobs, force Itiqan aggressive everywhere, harden deep-filter

Dockerfile

@@ -5,5 +5,9 @@ COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
 RUN chmod +x /app/deep-filter || true
+# S184/S185: pre-warm DF3 model into image so runtime never downloads
+RUN ffmpeg -f lavfi -i "anullsrc=r=48000:cl=mono" -t 2 /tmp/df_warm.wav -y 2>/dev/null && \
+    /app/deep-filter -o /tmp /tmp/df_warm.wav 2>&1 || true && \
+    rm -f /tmp/df_warm.wav /tmp/in.wav
 EXPOSE 7860
 CMD ["python3", "app.py"]

app.py

@@ -49,7 +49,7 @@ DEFAULT_ENGINE     = "v11.0"
 REF_DIR            = BASE / "reference_audio"
 CHUNK_SIZE         = 4 * 1024 * 1024
 MAX_DOWNLOAD_CHUNK = 32 * 1024 * 1024
-ENGINE_TIMEOUT     = 300  # S173: hard-kill engine after 5 min
+ENGINE_TIMEOUT     = 600  # S185: 300s was killing ~7min recordings mid-pass
 
 _REF_CACHE      = None
 _REF_CACHE_TS   = 0.0
@@ -342,19 +342,24 @@ def _run_engine(job_id):
                        "-i", job["in_path"], "-o", _o_path,
                        "--iterations", "3"]
                 for rf in ref_files[:3]: cmd += ["--ref", str(rf)]
+                if "itiqan" in str(script).lower():
+                    cmd.append("--aggressive")  # S185: always aggressive, all spaces
             proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                     stderr=subprocess.STDOUT, text=True)
             engine_log = []
             # S176: communicate() drains stdout AND enforces timeout atomically.
             # The old `for line in proc.stdout:` blocked until process exit,
             # making proc.wait(timeout=…) unreachable — silent hangs ate semaphores.
+            _timed_out = False
             try:
                 _out, _ = proc.communicate(timeout=ENGINE_TIMEOUT)
             except subprocess.TimeoutExpired:
                 proc.kill(); proc.wait()
+                _timed_out = True
                 job["engine_error"] = (
                     f"engine killed after {ENGINE_TIMEOUT}s — possible hang")
                 _out = ""
+            job["engine_rc"] = proc.returncode  # S185: always recorded
             for line in _out.splitlines():
                 line = line.strip()
                 engine_log.append(line)
@@ -380,7 +385,7 @@ def _run_engine(job_id):
                     if m:
                         try:
                             s = float(m.group(1))
-                            if 50.0 <= s <= 100.0:
+                            if 0.0 <= s <= 100.0:  # S185: was 50-100, hid real bad scores
                                 job["score"] = s; job["progress"] = 95
                                 job["label"] = "حساب النتيجة..."
                         except Exception: pass
@@ -388,7 +393,8 @@ def _run_engine(job_id):
             job["engine_log"] = engine_log
             # S173 Bug2: engine wrote to _o_path (may be .wav for safaa)
             _out = Path(_o_path)
-            if _out.exists() and _out.stat().st_size > 0:
+            _clean = (not _timed_out) and proc.returncode == 0  # S185
+            if _clean and _out.exists() and _out.stat().st_size > 0:
                 if _is_safaa and _o_path != job["out_path"]:
                     subprocess.run(
                         ["ffmpeg", "-y", "-i", str(_out),
@@ -397,8 +403,10 @@ def _run_engine(job_id):
                     try: _out.unlink()
                     except Exception: pass
                 success = True
-            else:
-                job["engine_rc"] = proc.returncode
+            elif not _clean:
+                # S185: killed or non-zero rc — don't trust a partial file,
+                # force the real ffmpeg fallback instead of faking success
+                job["engine_error"] = job.get("engine_error") or f"engine exited rc={proc.returncode}"
         except Exception as exc:
             job["engine_error"] = str(exc)
     if not success:
@@ -418,7 +426,8 @@ def _run_engine(job_id):
             return
     with JOBS_LOCK:
         job["status"] = "done"; job["progress"] = 100; job["label"] = "اكتملت ✓"
-        if not job.get("score"): job["score"] = 90
+        if job.get("score") is None and not job.get("used_fallback"):
+            job["score"] = 90  # S185: only on a clean, non-fallback run
     _add_history(job)
     try: Path(job["in_path"]).unlink(missing_ok=True)
     except Exception: pass

engine_safaa_v4.py

@@ -573,8 +573,12 @@ def _df3(wav, samples, rt60, st):
             r2 = subprocess.run(cmd, capture_output=True, timeout=600)
             wp = os.path.join(od, 'in.wav')
             if r2.returncode or not os.path.exists(wp):
-                _L(st, f'  [S4-ADF] {cls} pass failed — using source')
-                return cls, mono.copy()
+                _stderr = r2.stderr.decode('utf-8', errors='replace')[:400] if r2.stderr else ''
+                _stdout = r2.stdout.decode('utf-8', errors='replace')[:200] if r2.stdout else ''
+                _L(st, f'  [S4-ADF] {cls} pass failed rc={r2.returncode} cmd={cmd}')
+                _L(st, f'  [S4-ADF] stderr: {_stderr!r}')
+                if _stdout: _L(st, f'  [S4-ADF] stdout: {_stdout!r}')
+                return cls, mono.copy()  # S183/S185: was silent
             arr = _df3_pipe_decode(wp, SR)
             if arr is None:
                 _L(st, f'  [S4-ADF] {cls} decode failed — using source')