fix future

Dockerfile

@@ -22,86 +22,10 @@ RUN pip install --no-cache-dir -r /app/requirements.txt
 RUN pip install --no-cache-dir --no-build-isolation madmom
 
 # madmom patch
-RUN python - <<'PY'
-import site, pathlib, re
-
-# locate madmom package
-pkg_root = None
-for p in site.getsitepackages():
-    cand = pathlib.Path(p) / "madmom"
-    if cand.exists():
-        pkg_root = cand
-        break
-if pkg_root is None:
-    raise SystemExit("madmom package not found")
-
-# 1) Fix processors.py: MutableSequence import for py3.10+
-proc = pkg_root / "processors.py"
-if proc.exists():
-    s = proc.read_text(encoding="utf-8")
-    s2 = s.replace("from collections import MutableSequence",
-                   "from collections.abc import MutableSequence")
-    if s2 != s:
-        proc.write_text(s2, encoding="utf-8")
-        print("Patched", proc)
-
-# 2) Fix numpy aliases if present (np.float etc.)
-for f in [pkg_root / "io" / "__init__.py"]:
-    if f.exists():
-        s = f.read_text(encoding="utf-8")
-        s2 = (s.replace("np.float", "float")
-               .replace("np.int", "int")
-               .replace("np.bool", "bool")
-               .replace("np.object", "object"))
-        if s2 != s:
-            f.write_text(s2, encoding="utf-8")
-            print("Patched", f)
-
-# 3) Fix Python2 type names in madmom/utils/__init__.py
-u = pkg_root / "utils" / "__init__.py"
-if not u.exists():
-    raise SystemExit("madmom/utils/__init__.py not found")
-
-s = u.read_text(encoding="utf-8")
-
-# Inject compatibility definitions near the top (after imports)
-# We'll add them right after the first import block.
-lines = s.splitlines(True)
-insert_at = 0
-for i, line in enumerate(lines):
-    # after the last consecutive import line at the top
-    if line.startswith("import ") or line.startswith("from "):
-        insert_at = i + 1
-    elif i > 0:
-        break
-
-compat = """
-# --- Compatibility for Python 3 ---
-try:
-    basestring
-except NameError:
-    basestring = str
-
-try:
-    integer
-except NameError:
-    integer = int
-# ---------------------------------
-"""
-
-# Only insert if not already present
-if "basestring = str" not in s:
-    lines.insert(insert_at, compat)
-    s = "".join(lines)
-
-# Ensure string_types / integer_types are well-defined even if old code is weird
-s = re.sub(r"string_types\s*=\s*basestring", "string_types = (str,)", s)
-s = re.sub(r"integer_types\s*=\s*\(int,\s*integer\)", "integer_types = (int,)", s)
-
-u.write_text(s, encoding="utf-8")
-print("Patched", u)
-PY
+COPY patch_madmom.py /app/scripts/patch_madmom.py
 
+# ... after installing madmom ...
+RUN python /app/scripts/patch_madmom.py
 
 RUN python -c "import madmom; print('madmom import OK')"
 

patch_madmom.py

@@ -0,0 +1,106 @@
+# scripts/patch_madmom.py
+import re
+import site
+from pathlib import Path
+
+FUTURE_LINE = "from __future__ import absolute_import, division, print_function"
+
+def find_madmom_root() -> Path:
+    for p in site.getsitepackages():
+        cand = Path(p) / "madmom"
+        if cand.exists():
+            return cand
+    raise RuntimeError("madmom package not found in site-packages")
+
+def patch_processors(madmom_root: Path) -> None:
+    proc = madmom_root / "processors.py"
+    if not proc.exists():
+        return
+    s = proc.read_text(encoding="utf-8")
+    s2 = s.replace(
+        "from collections import MutableSequence",
+        "from collections.abc import MutableSequence",
+    )
+    if s2 != s:
+        proc.write_text(s2, encoding="utf-8")
+
+def patch_numpy_aliases(madmom_root: Path) -> None:
+    # Patch the known failing location; you can broaden to rglob if needed.
+    f = madmom_root / "io" / "__init__.py"
+    if not f.exists():
+        return
+    s = f.read_text(encoding="utf-8")
+    s2 = (
+        s.replace("np.float", "float")
+         .replace("np.int", "int")
+         .replace("np.bool", "bool")
+         .replace("np.object", "object")
+    )
+    if s2 != s:
+        f.write_text(s2, encoding="utf-8")
+
+def patch_utils_future_safe(madmom_root: Path) -> None:
+    u = madmom_root / "utils" / "__init__.py"
+    if not u.exists():
+        raise RuntimeError("madmom/utils/__init__.py not found")
+
+    s = u.read_text(encoding="utf-8")
+
+    # Remove any existing future import (we'll reinsert correctly)
+    s = re.sub(
+        r"^\s*from __future__ import absolute_import,\s*division,\s*print_function\s*\n",
+        "",
+        s,
+        flags=re.M,
+    )
+
+    lines = s.splitlines(True)
+
+    # Find insertion point after shebang/encoding/docstring
+    i = 0
+    if i < len(lines) and lines[i].startswith("#!"):
+        i += 1
+    if i < len(lines) and re.match(r"^#.*coding[:=]\s*[-\w.]+", lines[i]):
+        i += 1
+    if i < len(lines) and re.match(r'^\s*[ruRU]?[\'"]{3}', lines[i]):
+        quote = lines[i].lstrip()[0:3]  # ''' or """
+        i += 1
+        while i < len(lines) and quote not in lines[i]:
+            i += 1
+        if i < len(lines):
+            i += 1
+
+    # Insert future import at the right place
+    lines.insert(i, FUTURE_LINE + "\n")
+    s = "".join(lines)
+
+    compat = """
+# --- Compatibility for Python 3 ---
+try:
+    basestring
+except NameError:
+    basestring = str
+
+try:
+    integer
+except NameError:
+    integer = int
+# ---------------------------------
+"""
+    if "basestring = str" not in s:
+        s = s.replace(FUTURE_LINE + "\n", FUTURE_LINE + "\n" + compat)
+
+    s = re.sub(r"string_types\s*=\s*basestring", "string_types = (str,)", s)
+    s = re.sub(r"integer_types\s*=\s*\(int,\s*integer\)", "integer_types = (int,)", s)
+
+    u.write_text(s, encoding="utf-8")
+
+def main() -> None:
+    madmom_root = find_madmom_root()
+    patch_processors(madmom_root)
+    patch_numpy_aliases(madmom_root)
+    patch_utils_future_safe(madmom_root)
+    print("madmom patched OK:", madmom_root)
+
+if __name__ == "__main__":
+    main()