From 2e12427bdfeb1147908616882d58a039c3018d7a Mon Sep 17 00:00:00 2001 From: AlexanderMitrofanov Date: Wed, 11 Nov 2026 18:47:04 +0100 Subject: [PATCH] Fix WASM smoke coverage and derive test versions --- ChangeLog | 13 +++++++++++++ gui/tests/protocol.test.mjs | 3 +++ scripts/wasm/smoke-protocol.mjs | 9 ++++++++- scripts/wasm/test-browser.py | 7 ++++++- scripts/wasm/test-vienna-release.py | 15 ++++++++++++++- 5 files changed, 44 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29154675..b85b7a81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,6 +155,9 @@ ## Technical changes and Optimizations +- fix WASM evaluation smoke coverage after the Eens addition and derive test + version expectations from configure.ac and the selected Boost archive (#321) + - run the existing CopomuS Python workflow in checksum-pinned, self-hosted Pyodide and replace subprocesses with validated JSON calls to IntaRNA WASM (#307) @@ -352,6 +355,16 @@ energies, restricted partition sums, and trackers. ################################################################################ ################################################################################ +261111 Alexander Mitrofanov + * scripts/wasm/smoke-protocol.mjs, gui/tests/protocol.test.mjs + * Exclude prediction-only Eens from evaluation's all-column request while + retaining full model-P coverage and checking finite ensemble energies. + + Check evaluation/model-P CSV headers and rejection of Eens for evaluation. + * scripts/wasm/{test-vienna-release.py,test-browser.py} + * Parse the IntaRNA version from configure.ac and the selected Boost version + from the WASM build recipe instead of duplicating fixed release strings; + assert the corresponding generated provenance fields (issue #321). + 261104 Alexander Mitrofanov * src/IntaRNA/{Interaction,OutputConstraint,OutputHandlerMfe,OutputHandlerCsv, OutputHandlerText,OutputHandlerSeedCandidates}.{h,cpp}, src/bin/ diff --git a/gui/tests/protocol.test.mjs b/gui/tests/protocol.test.mjs index 504639fa..0fe7c6d5 100644 --- a/gui/tests/protocol.test.mjs +++ b/gui/tests/protocol.test.mjs @@ -51,6 +51,9 @@ test('evaluation validates antiparallel supplied structures in signed coordinate for (const rri of ['', '1|||&1||', '1|||||||||||&1|||||||||||', '0|||&1|||', '1|||&1|||:', '1|||&1...']) assert.throws(() => prepareRequest({ ...evalRequest, rri })); assert.doesNotThrow(() => prepareRequest({ ...evalRequest, qIdxPos0: -3, tIdxPos0: -5, rri: '-5||||||||||&-3||||||||||' })); assert.throws(() => prepareRequest({ ...evalRequest, outputs: ['bpsvg'] }), /available/); + const evaluationColumns = CSV_CATALOG.map((c) => c.key).filter((key) => key !== 'Eens'); + assert.deepEqual(prepareRequest({ ...evalRequest, csvColumns: evaluationColumns }).csvColumns, evaluationColumns); + assert.throws(() => prepareRequest({ ...evalRequest, csvColumns: [...evaluationColumns, 'Eens'] }), /ensemble model P predictions/); }); test('Mutation Design accepts one unambiguous pair and validates CopomuS settings', () => { diff --git a/scripts/wasm/smoke-protocol.mjs b/scripts/wasm/smoke-protocol.mjs index 09c8b400..c15e22ce 100644 --- a/scripts/wasm/smoke-protocol.mjs +++ b/scripts/wasm/smoke-protocol.mjs @@ -32,7 +32,10 @@ assert.ok(multi.rows.every((row) => row.deltaE === 0)); assert.equal(multi.fs.readdir('/output').filter((name) => name.endsWith('.csv')).length, 8); const pairwise = await run({ query: '>q1\nGGGAGGAGGG\n>q2\nGGGAGGAGGG', target: '>t1\nCCCUCCUCCC\n>t2\nCCCUCCUCCC', parameters: { outPairwise: true } }); assert.equal(pairwise.rows.length, 2); -const evaluation = await run({ task: 'evaluation', rri: EVALUATION_EXAMPLE + ':1|||||||||&2|||||||||', outputs: ['qAcc', 'tPu'], csvColumns: CSV_CATALOG.map((c) => c.key) }); +// Eens describes a predicted site ensemble, not an evaluated structure. +const evaluationColumns = CSV_CATALOG.map((c) => c.key).filter((key) => key !== 'Eens'); +const evaluation = await run({ task: 'evaluation', rri: EVALUATION_EXAMPLE + ':1|||||||||&2|||||||||', outputs: ['qAcc', 'tPu'], csvColumns: evaluationColumns }); +assert.deepEqual(evaluation.text.split('\n')[0].split(';'), evaluationColumns); assert.equal(evaluation.rows.length, 2); assert.equal(evaluation.rows[0].E, -21.4); assert.equal(evaluation.rows[0].seedE, 'NAN'); @@ -40,6 +43,10 @@ assert.ok((await run({ task: 'evaluation', rri: EVALUATION_EXAMPLE }, 'D')).text assert.ok((await run({ task: 'evaluation', rri: EVALUATION_EXAMPLE }, 'E')).text.length > 0); const probabilities = await run({ parameters: { model: 'P' }, csvColumns: CSV_CATALOG.map((c) => c.key), outputs: ['bpProb', 'bpsvg', 'qSpotProb', 'tSpotProb', 'spotProb', 'pMinE'] }); assert.equal(probabilities.rows.length, 1); +assert.deepEqual(probabilities.text.split('\n')[0].split(';'), CSV_CATALOG.map((c) => c.key)); +const ensembleEnergy = Number(probabilities.rows[0].Eens); +assert.ok(Number.isFinite(ensembleEnergy)); +assert.ok(ensembleEnergy <= probabilities.rows[0].E); assert.ok(probabilities.fs.readFile('/output/bpsvg.svg', { encoding: 'utf8' }).includes('query\nGGGAGGAGGG\n' - assert 'IntaRNA 3.4.1' in archive['parameter.json'] + assert f'IntaRNA {intarna_version}' in archive['parameter.json'] assert f'Vienna RNA package {vienna_version}' in archive['parameter.json'] assert saved['parameters']['outNumber'] == 10 assert 'IntaRNA --parameterFile=parameter.json' in archive['parameter.json'] diff --git a/scripts/wasm/test-vienna-release.py b/scripts/wasm/test-vienna-release.py index 0c180a55..60dd624a 100644 --- a/scripts/wasm/test-vienna-release.py +++ b/scripts/wasm/test-vienna-release.py @@ -5,6 +5,7 @@ from io import BytesIO import json from pathlib import Path +import re import subprocess from tempfile import TemporaryDirectory import unittest @@ -20,6 +21,16 @@ PYODIDE_VERSION = "314.0.7" PYODIDE_FILES = ["pyodide.mjs", "pyodide.asm.mjs", "pyodide.asm.wasm", "pyodide-lock.json", "python_stdlib.zip"] +# These offline tests run before dependencies are installed. Read the selected +# Boost archive version from the build recipe, not an unrelated native install. +INTARNA_VERSION = re.search( + r"AC_INIT\(\[IntaRNA\],\s*\[([^\]]+)\]", + (SCRIPT.parents[2] / "configure.ac").read_text(), +).group(1) +BOOST_VERSION = re.search( + r"^fetch https://archives\.boost\.io/release/([^/]+)/source/", + SCRIPT.with_name("build.sh").read_text(), re.MULTILINE, +).group(1) def release(version, **fields): @@ -103,7 +114,7 @@ def test_provenance_rejects_stale_engine_and_records_selected_archive(self): for version in ["2.7.0", manifest["version"]]: (assets / "intarna.js").write_text( "export default async ({print}) => ({callMain() {" - f"print('IntaRNA 3.4.1 using Vienna RNA package {version} and boost 1.87.0');" + f"print('IntaRNA {INTARNA_VERSION} using Vienna RNA package {version} and boost {BOOST_VERSION}');" "return 0;}});" ) result = subprocess.run([ @@ -119,6 +130,8 @@ def test_provenance_rejects_stale_engine_and_records_selected_archive(self): else: self.assertEqual(result.returncode, 0, result.stderr) metadata = json.loads((site / "build-info.json").read_text()) + self.assertEqual(metadata["intarna"], INTARNA_VERSION) + self.assertEqual(metadata["boost"], BOOST_VERSION) self.assertEqual(metadata["viennarna"], version) self.assertEqual(metadata["viennarnaArchive"], manifest) self.assertEqual(metadata["pyodide"], PYODIDE_VERSION)