processforge 0.5.1__tar.gz → 0.6.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {processforge-0.5.1/src/processforge.egg-info → processforge-0.6.0}/PKG-INFO +1 -1
- {processforge-0.5.1 → processforge-0.6.0}/pyproject.toml +1 -1
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/__init__.py +1 -3
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/persist.py +3 -6
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/persistence/archive.py +34 -51
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/result.py +0 -28
- {processforge-0.5.1 → processforge-0.6.0/src/processforge.egg-info}/PKG-INFO +1 -1
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_runs_command.py +1 -34
- {processforge-0.5.1 → processforge-0.6.0}/LICENSE +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/MANIFEST.in +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/README.md +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/closed-loop-chain.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/coupled/msre_coupled.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/custom/crimson/MUWS_HB.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/custom/crimson/simple_water_system.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/custom/simple_hyrdaulic_scheme.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/festim/hydrogen_transport_1d.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/festim/tds_tungsten.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/hydraulic-chain.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/flowsheets/openmc/msre_eigenvalue.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/setup.cfg +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/__main__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/_schema.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/analysis/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/analysis/dof.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/api/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/api/serve.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/apply.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/common.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/diagram.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/display.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/export_fmu.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/export_modelica.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/init.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/plan.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/run.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/runs.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/cli/validate.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/compose.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/coupling.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/backends/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/backends/base.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/backends/casadi_backend.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/backends/pyomo_backend.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/backends/scipy_backend.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/flowsheet.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/jacobian.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/mixin.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/solver.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/stream_var.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/units/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/units/flash_eo.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/units/heater_eo.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/units/pipes_eo.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/units/pump_eo.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/units/strainer_eo.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/eo/units/valve_eo.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/flowsheet.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/fmu/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/fmu/_fmi_vars.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/fmu/builder.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/fmu/interface.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/fmu/slave_template.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/lock.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/modelica/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/modelica/mo_writer.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/modelica/omc_runner.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/modelica/transpiler.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/modelica/unit_equations.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/output_collector.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/pathsim/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/pathsim/adapter.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/pcl/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/pcl/compiler.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/pcl/namespace.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/persistence/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/persistence/artifact_store.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/provenance.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/_sim_strategy.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/base.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/base_jacobian_mixin.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/base_simulation_provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/cantera_jacobian.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/cantera_provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/container_client.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/coolprop_provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/errors.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/festim/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/festim/build_helpers.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/festim/provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/festim/result_extraction.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/festim/strategies.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/jacobian_contributor.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/manager.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/modelica_jacobian.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/modelica_provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/openmc/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/openmc/build_helpers.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/openmc/provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/openmc/result_extraction.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/openmc/strategies.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/reference_state_registry.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/registry.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/quantity.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/result_schema.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/schemas/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/schemas/festim/festim_model.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/schemas/flowsheet_schema.json +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/schemas/openmc/openmc_model.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/simulate.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/solver.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/state.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/thermo.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/types.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/base.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/cstr.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/flash.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/heater.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/pfr.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/pipes.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/pump.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/registry.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/solver_unit.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/strainer.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/tank.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/units/valve.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/__init__.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/flowsheet_diagram.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/mermaid_diagram.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/s3_upload.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/topology.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/unit_consistency.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/validate_flowsheet.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge/utils/validation.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge.egg-info/SOURCES.txt +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge.egg-info/dependency_links.txt +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge.egg-info/entry_points.txt +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge.egg-info/requires.txt +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/src/processforge.egg-info/top_level.txt +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_cli.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_container_client.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_coupling.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_display.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_festim_provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_festim_schema.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_fmu_solverunit.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_init.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_openmc_provider.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_pathsim_adapter.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_persist.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_provider_errors.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_providers.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_result_zarr.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_s3_upload.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_state.py +0 -0
- {processforge-0.5.1 → processforge-0.6.0}/tests/test_types.py +0 -0
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "processforge"
|
|
7
|
-
version = "0.
|
|
7
|
+
version = "0.6.0"
|
|
8
8
|
description = "A Python-based process simulation framework for chemical engineering applications."
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
license = "BSD-3-Clause"
|
|
@@ -18,7 +18,6 @@ from .utils.validate_flowsheet import validate_flowsheet
|
|
|
18
18
|
from .result import (
|
|
19
19
|
plot_results,
|
|
20
20
|
plot_timeseries,
|
|
21
|
-
relink_latest_results,
|
|
22
21
|
save_results_zarr,
|
|
23
22
|
)
|
|
24
23
|
from .units.pump import Pump
|
|
@@ -30,7 +29,7 @@ from .units.flash import Flash
|
|
|
30
29
|
from .units.heater import Heater
|
|
31
30
|
from .eo import EOFlowsheet, EOSolver
|
|
32
31
|
|
|
33
|
-
__version__ = "0.
|
|
32
|
+
__version__ = "0.6.0"
|
|
34
33
|
|
|
35
34
|
__all__ = [
|
|
36
35
|
"Flowsheet",
|
|
@@ -42,7 +41,6 @@ __all__ = [
|
|
|
42
41
|
"plot_results",
|
|
43
42
|
"plot_timeseries",
|
|
44
43
|
"save_results_zarr",
|
|
45
|
-
"relink_latest_results",
|
|
46
44
|
"build_run_info",
|
|
47
45
|
"Pump",
|
|
48
46
|
"Valve",
|
|
@@ -77,13 +77,11 @@ def persist_run(
|
|
|
77
77
|
if snapshot_id is not None:
|
|
78
78
|
manifest.snapshot_id = snapshot_id
|
|
79
79
|
|
|
80
|
-
|
|
81
|
-
archive.save_run(manifest, stream_results=stream_results)
|
|
80
|
+
archive.save_run(manifest)
|
|
82
81
|
|
|
83
|
-
#
|
|
84
|
-
# inside the archive, mirroring `pf run`.
|
|
82
|
+
# Persist Zarr store (single source of truth for stream timeseries).
|
|
85
83
|
try:
|
|
86
|
-
from ..result import
|
|
84
|
+
from ..result import save_results_zarr
|
|
87
85
|
|
|
88
86
|
run_results_dir = os.path.join(archive.path, "results", run_id)
|
|
89
87
|
save_results_zarr(
|
|
@@ -91,7 +89,6 @@ def persist_run(
|
|
|
91
89
|
os.path.join(run_results_dir, "results.zarr"),
|
|
92
90
|
run_info,
|
|
93
91
|
)
|
|
94
|
-
relink_latest_results(archive.path, run_id)
|
|
95
92
|
except Exception as e:
|
|
96
93
|
logger.warning(f"Failed to write results.zarr: {type(e).__name__}: {e}")
|
|
97
94
|
|
|
@@ -8,28 +8,20 @@ A ``<base>.pfarchive`` directory holds, in one place:
|
|
|
8
8
|
* ``runs/<run_id>.json`` — a :class:`~processforge.types.RunManifest` capturing
|
|
9
9
|
every engine output (OpenMC, FESTIM, CoolProp, Cantera) for one ``pf run`` /
|
|
10
10
|
``pf apply``.
|
|
11
|
-
* ``
|
|
12
|
-
|
|
13
|
-
:class:`~processforge.types.OutputArtifact` (local + remote URIs).
|
|
14
|
-
* ``index.json`` — ``field_name -> [occurrences]`` for fast cross-run
|
|
15
|
-
queries.
|
|
11
|
+
* ``results/<run_id>/results.zarr`` — stream timeseries and engine outputs
|
|
12
|
+
in a compressed Zarr store (the single source of truth for time-series data).
|
|
16
13
|
* ``latest_run`` — pointer to the most recent run.
|
|
17
|
-
|
|
18
|
-
This replaces the old split of ``.pfstate`` (state only) + ``_results.zarr``
|
|
19
|
-
(stream results) + loose ``run_dir`` files.
|
|
20
14
|
"""
|
|
21
15
|
from __future__ import annotations
|
|
22
16
|
|
|
23
17
|
import json
|
|
24
18
|
import os
|
|
25
|
-
from datetime import datetime, timezone
|
|
26
19
|
from typing import Optional
|
|
27
20
|
|
|
28
|
-
import zarr
|
|
29
21
|
from loguru import logger
|
|
30
22
|
|
|
31
23
|
from ..state import StateManager
|
|
32
|
-
from ..types import
|
|
24
|
+
from ..types import RunManifest, SnapshotState
|
|
33
25
|
|
|
34
26
|
|
|
35
27
|
def _read_json(path: str, default):
|
|
@@ -51,7 +43,6 @@ class ProcessStateArchive:
|
|
|
51
43
|
def __init__(self, path: str) -> None:
|
|
52
44
|
self.path = path
|
|
53
45
|
os.makedirs(self.path, exist_ok=True)
|
|
54
|
-
# Snapshots live inside the same archive, via the proven StateManager.
|
|
55
46
|
self._state = StateManager(self.path)
|
|
56
47
|
|
|
57
48
|
# ==================================================================
|
|
@@ -90,44 +81,12 @@ class ProcessStateArchive:
|
|
|
90
81
|
def _runs_dir(self) -> str:
|
|
91
82
|
return os.path.join(self.path, "runs")
|
|
92
83
|
|
|
93
|
-
def
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
def save_run(self, manifest: RunManifest, stream_results: Optional[dict] = None) -> str:
|
|
97
|
-
"""Persist a :class:`RunManifest` (and optional stream timeseries)."""
|
|
84
|
+
def save_run(self, manifest: RunManifest) -> str:
|
|
85
|
+
"""Persist a :class:`RunManifest` to disk."""
|
|
98
86
|
os.makedirs(self._runs_dir(), exist_ok=True)
|
|
99
87
|
run_path = os.path.join(self._runs_dir(), f"{manifest.run_id}.json")
|
|
100
88
|
_write_json(run_path, json.loads(manifest.model_dump_json()))
|
|
101
89
|
|
|
102
|
-
# Stream timeseries (kept for plotting / downstream consumers).
|
|
103
|
-
if stream_results:
|
|
104
|
-
for name, data in stream_results.items():
|
|
105
|
-
if isinstance(data, dict):
|
|
106
|
-
_write_json(os.path.join(self._outputs_dir(), f"{name}.json"), data)
|
|
107
|
-
|
|
108
|
-
# Artifact registry (append-only, keyed by artifact_id).
|
|
109
|
-
registry = _read_json(os.path.join(self.path, "artifacts.json"), {})
|
|
110
|
-
for out in list(manifest.units.values()) + list(manifest.streams.values()):
|
|
111
|
-
for art in getattr(out, "artifacts", []):
|
|
112
|
-
registry[art.artifact_id] = art.model_dump()
|
|
113
|
-
_write_json(os.path.join(self.path, "artifacts.json"), registry)
|
|
114
|
-
|
|
115
|
-
# Field index for fast lookup.
|
|
116
|
-
index = _read_json(os.path.join(self.path, "index.json"), {})
|
|
117
|
-
for unit_name, out in manifest.units.items():
|
|
118
|
-
for f in out.fields:
|
|
119
|
-
index.setdefault(f.name, []).append({
|
|
120
|
-
"run_id": manifest.run_id, "scope": "unit", "name": unit_name,
|
|
121
|
-
"engine": out.engine, "units": f.quantity.unit,
|
|
122
|
-
})
|
|
123
|
-
for stream_name, out in manifest.streams.items():
|
|
124
|
-
for f in out.fields:
|
|
125
|
-
index.setdefault(f.name, []).append({
|
|
126
|
-
"run_id": manifest.run_id, "scope": "stream", "name": stream_name,
|
|
127
|
-
"engine": out.engine, "units": f.quantity.unit,
|
|
128
|
-
})
|
|
129
|
-
_write_json(os.path.join(self.path, "index.json"), index)
|
|
130
|
-
|
|
131
90
|
with open(os.path.join(self.path, "latest_run"), "w", encoding="utf-8") as f:
|
|
132
91
|
f.write(manifest.run_id)
|
|
133
92
|
|
|
@@ -159,8 +118,32 @@ class ProcessStateArchive:
|
|
|
159
118
|
)
|
|
160
119
|
|
|
161
120
|
def field_occurrences(self, field_name: str) -> list[dict]:
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
121
|
+
"""Scan ``runs/*.json`` for fields matching *field_name*."""
|
|
122
|
+
results: list[dict] = []
|
|
123
|
+
runs_dir = self._runs_dir()
|
|
124
|
+
if not os.path.isdir(runs_dir):
|
|
125
|
+
return results
|
|
126
|
+
for fname in sorted(os.listdir(runs_dir)):
|
|
127
|
+
if not fname.endswith(".json"):
|
|
128
|
+
continue
|
|
129
|
+
run_id = fname.replace(".json", "")
|
|
130
|
+
manifest = self.load_run(run_id)
|
|
131
|
+
if manifest is None:
|
|
132
|
+
continue
|
|
133
|
+
for unit_name, out in manifest.units.items():
|
|
134
|
+
for f in out.fields:
|
|
135
|
+
if f.name == field_name:
|
|
136
|
+
results.append({
|
|
137
|
+
"run_id": run_id, "scope": "unit",
|
|
138
|
+
"name": unit_name, "engine": out.engine,
|
|
139
|
+
"units": f.quantity.unit,
|
|
140
|
+
})
|
|
141
|
+
for stream_name, out in manifest.streams.items():
|
|
142
|
+
for f in out.fields:
|
|
143
|
+
if f.name == field_name:
|
|
144
|
+
results.append({
|
|
145
|
+
"run_id": run_id, "scope": "stream",
|
|
146
|
+
"name": stream_name, "engine": out.engine,
|
|
147
|
+
"units": f.quantity.unit,
|
|
148
|
+
})
|
|
149
|
+
return results
|
|
@@ -291,34 +291,6 @@ def save_results_zarr(
|
|
|
291
291
|
return store_path
|
|
292
292
|
|
|
293
293
|
|
|
294
|
-
def relink_latest_results(archive_path: str, run_id: str) -> None:
|
|
295
|
-
"""Point ``<archive>/results.zarr`` at the latest per-run zarr.
|
|
296
|
-
|
|
297
|
-
Each run now writes its zarr to ``<archive>/results/<run_id>/results.zarr``
|
|
298
|
-
(see `save_results_zarr`). To keep backward compatibility with tooling that
|
|
299
|
-
reads a single ``results.zarr`` at the archive root, we make that path a
|
|
300
|
-
symlink to the newest run. Falls back to a copy on platforms/filesystems
|
|
301
|
-
without symlink support (or when the existing target is a real directory).
|
|
302
|
-
"""
|
|
303
|
-
latest = os.path.join(archive_path, "results", run_id, "results.zarr")
|
|
304
|
-
if not os.path.exists(latest):
|
|
305
|
-
return
|
|
306
|
-
link_path = os.path.join(archive_path, "results.zarr")
|
|
307
|
-
|
|
308
|
-
# Remove any existing target (real dir or stale/broken symlink) without
|
|
309
|
-
# following the link.
|
|
310
|
-
if os.path.islink(link_path):
|
|
311
|
-
os.unlink(link_path)
|
|
312
|
-
elif os.path.exists(link_path):
|
|
313
|
-
shutil.rmtree(link_path)
|
|
314
|
-
|
|
315
|
-
try:
|
|
316
|
-
os.symlink(latest, link_path)
|
|
317
|
-
except (OSError, NotImplementedError):
|
|
318
|
-
# Non-POSIX / restricted filesystem: keep a physical copy instead.
|
|
319
|
-
shutil.copytree(latest, link_path)
|
|
320
|
-
|
|
321
|
-
|
|
322
294
|
def save_results_zarr_s3(results, s3_uri: str, run_info: RunInfo | dict | None = None):
|
|
323
295
|
"""Write simulation results directly to an S3-backed Zarr store.
|
|
324
296
|
|
|
@@ -15,7 +15,7 @@ from processforge.output_collector import (
|
|
|
15
15
|
build_run_manifest,
|
|
16
16
|
collect_stream_outputs,
|
|
17
17
|
)
|
|
18
|
-
from processforge.result import
|
|
18
|
+
from processforge.result import save_results_zarr
|
|
19
19
|
from processforge.types import (
|
|
20
20
|
EngineOutput,
|
|
21
21
|
OutputArtifact,
|
|
@@ -50,39 +50,6 @@ def _eo(run_id_suffix: str, keff: float) -> EngineOutput:
|
|
|
50
50
|
)
|
|
51
51
|
|
|
52
52
|
|
|
53
|
-
def test_relink_latest_results_symlinks_to_latest(tmp_path):
|
|
54
|
-
d = str(tmp_path)
|
|
55
|
-
rid_a = "20260101T000000Z_aaaaaa"
|
|
56
|
-
rid_b = "20260102T000000Z_bbbbbb"
|
|
57
|
-
|
|
58
|
-
save_results_zarr(
|
|
59
|
-
{"openmc_solver": _eo("a", 1.04)},
|
|
60
|
-
os.path.join(d, "results", rid_a, "results.zarr"),
|
|
61
|
-
None,
|
|
62
|
-
)
|
|
63
|
-
relink_latest_results(d, rid_a)
|
|
64
|
-
link = os.path.join(d, "results.zarr")
|
|
65
|
-
assert os.path.islink(link)
|
|
66
|
-
assert os.path.realpath(link) == os.path.realpath(
|
|
67
|
-
os.path.join(d, "results", rid_a, "results.zarr")
|
|
68
|
-
)
|
|
69
|
-
|
|
70
|
-
# A second run re-points the symlink without clobbering run A's zarr.
|
|
71
|
-
save_results_zarr(
|
|
72
|
-
{"openmc_solver": _eo("b", 1.06)},
|
|
73
|
-
os.path.join(d, "results", rid_b, "results.zarr"),
|
|
74
|
-
None,
|
|
75
|
-
)
|
|
76
|
-
relink_latest_results(d, rid_b)
|
|
77
|
-
assert os.path.realpath(link) == os.path.realpath(
|
|
78
|
-
os.path.join(d, "results", rid_b, "results.zarr")
|
|
79
|
-
)
|
|
80
|
-
assert os.path.isdir(os.path.join(d, "results", rid_a, "results.zarr"))
|
|
81
|
-
|
|
82
|
-
root = zarr.open_group(link, mode="r")
|
|
83
|
-
assert abs(root["openmc_solver"]["k_eff"][0] - 1.06) < 1e-9
|
|
84
|
-
|
|
85
|
-
|
|
86
53
|
def test_pf_runs_lists_runs_with_summary(tmp_path, monkeypatch):
|
|
87
54
|
monkeypatch.setenv("PROCESSFORGE_OUTPUT_DIR", str(tmp_path))
|
|
88
55
|
base = "test_flowsheet"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/flowsheets/custom/crimson/simple_water_system.json
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/base_simulation_provider.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/festim/build_helpers.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/festim/result_extraction.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/jacobian_contributor.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/openmc/build_helpers.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/openmc/result_extraction.py
RENAMED
|
File without changes
|
|
File without changes
|
{processforge-0.5.1 → processforge-0.6.0}/src/processforge/providers/reference_state_registry.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|