Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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/
Expand Down
3 changes: 3 additions & 0 deletions gui/tests/protocol.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
9 changes: 8 additions & 1 deletion scripts/wasm/smoke-protocol.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,21 @@ 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');
assert.ok((await run({ task: 'evaluation', rri: EVALUATION_EXAMPLE }, 'D')).text.includes('-21.4'));
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('<svg'));
const accessibility = await run({ parameters: { outNumber: 0 }, outputs: ['qPu'] });
const imported = await run({ parameters: { qAcc: 'P', qAccFile: accessibility.fs.readFile('/output/qPu.csv', { encoding: 'utf8' }) } });
Expand Down
7 changes: 6 additions & 1 deletion scripts/wasm/test-browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
parser.add_argument('--browser', choices=['chromium', 'firefox'], default='chromium')
parser.add_argument('--screenshot')
args = parser.parse_args()
intarna_version = re.search(
r'AC_INIT\(\[IntaRNA\],\s*\[([^\]]+)\]',
(Path(__file__).resolve().parents[2] / 'configure.ac').read_text(),
).group(1)

with sync_playwright() as playwright:
browser = getattr(playwright, args.browser).launch(headless=True)
Expand Down Expand Up @@ -89,6 +93,7 @@ def predict():
compute.click()
expect(page.locator('#input-error')).to_contain_text('enter a sequence')
metadata = page.request.get(urljoin(args.url, 'build-info.json')).json()
assert metadata['intarna'] == intarna_version
vienna_version = metadata['viennarna']
assert re.fullmatch(r'2\.\d+\.\d+', vienna_version)
assert metadata['viennarnaArchive']['version'] == vienna_version
Expand Down Expand Up @@ -395,7 +400,7 @@ def predict():
saved = json.loads(archive['parameter.json'])
assert set(archive) == {'parameter.json', 'intarna-interactions.csv'}
assert saved['parameters']['query']['text'] == '>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']
Expand Down
15 changes: 14 additions & 1 deletion scripts/wasm/test-vienna-release.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from io import BytesIO
import json
from pathlib import Path
import re
import subprocess
from tempfile import TemporaryDirectory
import unittest
Expand All @@ -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):
Expand Down Expand Up @@ -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([
Expand All @@ -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)
Expand Down
Loading