fix(ai-bundles): lock the numpy-1.x ABI closure so the OCR bundle can't strand scipy

The OCR bundle installs paddleocr[doc-parser] 3.4, whose dependency closure drags
numpy 1.26.4 up to 2.5.1 and pulls scipy/scikit-learn/pandas wheels built against
the numpy 2.x ABI. build-bundle.sh re-pinned only numpy (basePackages), so those
numpy-2.x wheels stayed behind; the by-dir-name site-packages diff then shipped
them, and once merged onto the numpy==1.26.4 base they raise "numpy.dtype size
changed" on import.

Because the dispatcher pre-imports every ML library at startup and disables all AI
after 5 crashes in 60s, one stranded scipy takes down every AI tool, not just OCR
(observed on a CPU host: remove-background worked before the OCR bundle and broke
after). All-7 installs escaped it through last-writer-wins ordering; a subset
install did not, which is why it surfaced only intermittently.

Fix: add a manifest "constraints" list (numpy, scipy, scikit-learn, scikit-image,
pandas pinned to numpy-1.x-ABI versions) and apply it via PIP_CONSTRAINT to every
bundle pip install, so no bundle can pull a numpy-2.x wheel. paddleocr 3.4.1 still
resolves cleanly under the lock and the pinned stack imports without ABI error on
numpy 1.26.4 (validated on py3.12). Also import scipy/sklearn in the OCR path of
verify-bundle.sh so CI catches this class in isolation, and add a manifest
regression test.

Note: the published bundles must be rebuilt and republished (ai-bundles.yml) for
this to reach already-installed bases.

Claude-Session: https://claude.ai/code/session_01UvVCMNUBrgpghk8gye5gav
This commit is contained in:
SnapOtter
2026-07-05 18:31:30 +08:00
parent 47a60e7fad
commit 67c55669d6
4 changed files with 74 additions and 1 deletions
+26
View File
@@ -65,6 +65,32 @@ if '${BUNDLE_ID}' not in m['bundles']:
sys.exit(1)
"
# ── Step 0: Write pip constraints (numpy-1.x-ABI closure lock) ────────────
# Bundle installs below can otherwise pull the latest transitive scientific
# stack: numpy 2.x plus scipy/scikit-learn/scikit-image/pandas wheels built
# against the numpy 2.x ABI (e.g. paddleocr[doc-parser] drags numpy 1.26.4 ->
# 2.5.1 + scipy 1.18). The Step 4 re-pin snaps numpy back to 1.26.4 but leaves
# those numpy-2.x wheels behind; the Step 6 diff (by dir name, not version)
# then ships them, and once installed they strand on the numpy==1.26.4 base and
# raise "numpy.dtype size changed" on import, crashing the dispatcher for
# EVERY AI tool (e.g. rembg's scipy), not just this bundle. Applying the
# manifest's constraints to every pip install keeps the whole closure on
# numpy-1.x-ABI versions so no bundle can strand a numpy-2.x wheel.
CONSTRAINTS_FILE="/tmp/bundle-constraints.txt"
python3 -c "
import json
with open('${MANIFEST}') as f:
m = json.load(f)
with open('${CONSTRAINTS_FILE}', 'w') as f:
f.write('\n'.join(m.get('constraints', [])) + '\n')
"
if [[ -s "${CONSTRAINTS_FILE}" ]] && [[ -n "$(tr -d '[:space:]' < "${CONSTRAINTS_FILE}")" ]]; then
export PIP_CONSTRAINT="${CONSTRAINTS_FILE}"
echo " Build constraints: $(tr '\n' ' ' < "${CONSTRAINTS_FILE}")"
else
echo " No build constraints in manifest"
fi
# Clean previous build artifacts
rm -rf "${MODELS_DIR}" "${BUILD_DIR}"
mkdir -p "${MODELS_DIR}" "${BUILD_DIR}/site-packages" "${BUILD_DIR}/models" "${OUTPUT_DIR}"
+7
View File
@@ -3,6 +3,13 @@
"imageVersion": "2.0.0",
"pythonVersion": { "amd64": "3.12", "arm64": "3.11" },
"basePackages": ["numpy==1.26.4", "Pillow==12.2.0", "opencv-python-headless==4.10.0.84"],
"constraints": [
"numpy==1.26.4",
"scipy==1.12.0",
"scikit-learn==1.4.2",
"scikit-image==0.24.0",
"pandas==2.2.2"
],
"bundleRepo": "deepsafe/feature-bundles",
"bundles": {
"background-removal": {
+5 -1
View File
@@ -171,7 +171,11 @@ case "${BUNDLE_ID}" in
check_imports "torch onnxruntime mediapipe"
;;
ocr)
check_imports "paddleocr paddle"
# scipy/scikit-learn ship inside this bundle via paddleocr's dependency
# closure. Importing them here (not just paddleocr) catches a numpy-2.x-ABI
# strand on the numpy==1.26.4 base; the "numpy.dtype size changed" class
# that a paddleocr-only import misses because paddle lazy-loads them.
check_imports "paddleocr paddle scipy sklearn"
;;
transcription)
check_imports "faster_whisper"
@@ -70,6 +70,42 @@ describe("Feature manifest structure", () => {
});
});
describe("Feature manifest: numpy-2.x-ABI closure lock (regression for OCR bundle strand)", () => {
// paddleocr[doc-parser] (OCR bundle) drags numpy 1.26.4 -> 2.5.1 and pulls
// scipy/scikit-learn/pandas wheels built against the numpy 2.x ABI. Re-pinning
// numpy alone leaves those stranded on the numpy==1.26.4 base, which the bundle
// diff ships, breaking rembg's scipy import (a dispatcher-wide AI outage) after
// a last-writer-wins merge. build-bundle.sh applies `constraints` to every pip
// install to keep the whole closure on numpy-1.x-ABI versions.
const constraints = (manifest.constraints ?? []) as string[];
it("manifest declares a non-empty constraints array", () => {
expect(manifest.constraints).toBeInstanceOf(Array);
expect(constraints.length).toBeGreaterThan(0);
});
it("constraints pin every numpy-2.x-closure package to an exact version", () => {
const pinned = new Map<string, string>();
for (const c of constraints) {
const m = c.match(/^([A-Za-z0-9_.-]+)==(.+)$/);
expect(m, `constraint "${c}" must be an exact ==pin`).not.toBeNull();
if (m) pinned.set(m[1].toLowerCase(), m[2]);
}
for (const pkg of ["numpy", "scipy", "scikit-learn", "scikit-image", "pandas"]) {
expect(pinned.has(pkg), `constraints must pin ${pkg} to a numpy-1.x-ABI version`).toBe(true);
}
});
it("constraints numpy matches basePackages numpy (single source of truth)", () => {
const cNumpy = constraints.find((c) => c.toLowerCase().startsWith("numpy=="));
const bNumpy = (manifest.basePackages as string[]).find((c) =>
c.toLowerCase().startsWith("numpy=="),
);
expect(cNumpy).toBeDefined();
expect(cNumpy).toBe(bNumpy);
});
});
describe("Feature manifest: mediapipe dependency (regression for #129)", () => {
it("upscale-enhance bundle includes mediapipe for amd64", () => {
expect(archPackagesInclude("upscale-enhance", "amd64", "mediapipe")).toBe(true);