diff --git a/corrlib/cli.py b/corrlib/cli.py index a28c837..ad1024d 100644 --- a/corrlib/cli.py +++ b/corrlib/cli.py @@ -4,13 +4,15 @@ from corrlib import __app_name__ from .initialization import create from .toml import import_tomls, update_project, reimport_project -from .find import find_record, list_projects, list_ensembles, get_stat +from .find import find_record, list_projects, list_ensembles from .tools import str2list from .main import update_aliases from .meas_io import drop_cache as mio_drop_cache +from .meas_io import load_record as mio_load_record from .integrity import full_integrity_check import os +from pyerrors import Corr from importlib.metadata import version from pathlib import Path @@ -114,11 +116,6 @@ def find( if arg == 'all': print(results) else: - if arg == 'stat': - for r in results['path'].values: - stat = get_stat(path, r) - print(stat) - return for r in results[arg].values: print(r) @@ -135,7 +132,10 @@ def stat( """ Show the statistics of a given record. """ - statistics = get_stat(path, record_id) + record = mio_load_record(path, record_id) + if isinstance(record, (list, Corr)): + record = record[0] + statistics = record.idl print(statistics) return @@ -173,7 +173,6 @@ def importer( """ file_list = files.split(",") import_tomls(path, file_list, copy_file) - mio_drop_cache(path) return @@ -198,7 +197,6 @@ def reimporter( raise Exception("This file is not known for this project.") else: reimport_project(path, uuid) - mio_drop_cache(path) return diff --git a/corrlib/find.py b/corrlib/find.py index af21a4d..fbdd801 100644 --- a/corrlib/find.py +++ b/corrlib/find.py @@ -13,8 +13,6 @@ from pathlib import Path import datetime as dt from collections.abc import Callable import warnings -from .meas_io import load_record -from pyerrors import Corr, Obs def _project_lookup_by_alias(path: Path, alias: str) -> str: @@ -391,12 +389,3 @@ def list_ensembles(path: Path) -> list[str]: if os.path.isdir(path / "archive" / item): res.append(item) return res - - -def get_stat(path: Path, record_id: str) -> Any: - loaded_record: Obs = load_record(path, record_id) - if isinstance(loaded_record, (list, Corr)): - record: Obs = loaded_record[0] - else: - record = loaded_record - return record.idl