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
34 changes: 28 additions & 6 deletions src/quant/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
Streamlit-free.
"""

import copy
import hashlib
import json

Expand Down Expand Up @@ -86,13 +87,34 @@ class QuantSession:
def __init__(self, file_manager, dataset_id):
self.file_manager = file_manager
self.dataset_id = dataset_id
# What this session read from the cache. The Viewer makes one session
# per rerun and every component asks it for the same few results
# (settings, design, stamp, tables), so each is read once per rerun
# instead of once per component: on network storage every read is a
# round trip. A write through the session forgets what it read.
self._read = {}
self._found = {}
self.manifest = self._get('quant_manifest')

def _get(self, name, polars=False):
return self.file_manager.get_results(self.dataset_id, [name], use_polars=polars)[name]
key = (name, polars)
if key not in self._read:
self._read[key] = self.file_manager.get_results(self.dataset_id, [name], use_polars=polars)[name]
value = self._read[key]
# A polars frame (or lazy frame) is never changed in place; anything
# else (dicts of settings) is copied, so a caller cannot change what
# the next one reads.
return value if isinstance(value, (pl.LazyFrame, pl.DataFrame)) else copy.deepcopy(value)

def exists(self, name):
return self.file_manager.result_exists(self.dataset_id, name)
if name not in self._found:
self._found[name] = self.file_manager.result_exists(self.dataset_id, name)
return self._found[name]

def _store(self, name, data):
self.file_manager.store_data(self.dataset_id, name, data)
self._read.clear()
self._found.clear()

# -- what is stored -------------------------------------------------
@property
Expand Down Expand Up @@ -165,10 +187,10 @@ def annotations(self, level=None):
return self._get(f'quant_{level or self.level}_annotations', polars=True)

def save_design(self, design):
self.file_manager.store_data(self.dataset_id, 'quant_design', design)
self._store('quant_design', design)

def save_settings(self, settings):
self.file_manager.store_data(self.dataset_id, 'quant_settings', settings)
self._store('quant_settings', settings)

# -- the comparison chain --------------------------------------------
def problem(self):
Expand Down Expand Up @@ -231,8 +253,8 @@ def analyse(self, level=None):
'zscores': quant_compare.zscores(statistics, samples),
}
for result, frame in results.items():
self.file_manager.store_data(self.dataset_id, self.result_name(result, level), frame)
self.file_manager.store_data(self.dataset_id, name, stamp)
self._store(self.result_name(result, level), frame)
self._store(name, stamp)
return None

def result(self, name, level=None):
Expand Down
23 changes: 23 additions & 0 deletions tests/test_quant_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,26 @@ def test_a_proteoform_is_named_by_protein_residues_and_mass_shifts(tmp_path):
assert contract.describe_proteoform('sp|P1|PROT_ECOLI', None, 1234.56, sequences)['label'] == 'PROT_ECOLI 1234.6 Da'
assert contract.describe_proteoform('sp|P1|PROT_ECOLI', None, -1.0, sequences)['label'] == \
'PROT_ECOLI mass not determined'


def test_session_reads_each_stored_table_once(stored, monkeypatch):
"""One session is made per rerun: each result is read from the cache
once, however many components ask for it, and a write forgets the reads."""
reads = []
original = stored.get_results

def counting(dataset_id, names, **kwargs):
reads.extend(names)
return original(dataset_id, names, **kwargs)

monkeypatch.setattr(stored, 'get_results', counting)
quant = session.QuantSession(stored, 'comparison_20260101-120000')
for _ in range(3):
quant.conditions()
quant.problem()
assert len(reads) == len(set(reads))
# A value handed out cannot change what the next caller gets
quant.conditions().clear()
assert quant.conditions()
quant.set_hidden([quant.all_runs[1]])
assert quant.runs == [quant.all_runs[0]]
Loading