eradiate 0.31.1.dev0__tar.gz → 1.0.0.dev0__tar.gz

{eradiate-0.31.1.dev0/src/eradiate.egg-info → eradiate-1.0.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eradiate
-Version: 0.31.1.dev0
+Version: 1.0.0.dev0
 Summary: A radiative transfer model for the Earth observation community
 Author: The Eradiate Team
 Maintainer: The Eradiate Team

{eradiate-0.31.1.dev0 → eradiate-1.0.0.dev0}/pyproject.toml

@@ -10,7 +10,7 @@ maintainers = [{ name = "The Eradiate Team" }]
 name = "eradiate"
 readme = "resources/README_PyPI.md"
 requires-python = ">=3.9,<3.13"
-version = "0.31.1-dev0"
+version = "1.0.0-dev0"
 dependencies = [
   "aenum",
   "attrs>=22.2",
@@ -97,7 +97,7 @@ platforms = ["linux-64", "win-64", "osx-64", "osx-arm64"]
 
 [tool.pixi.dependencies]
 numpy = "<2" # Be sure to sync with PyPI requirement
-pixi-pycharm = ">=0.0.8,<0.0.9"
+pixi-pycharm = ">=0.0.9,<0.0.10"
 
 [tool.pixi.pypi-dependencies]
 eradiate = { path = ".", editable = true }

{eradiate-0.31.1.dev0 → eradiate-1.0.0.dev0}/src/eradiate/experiments/_core.py

@@ -47,7 +47,7 @@ from ..spectral.ckd_quad import CKDQuadConfig
 from ..spectral.grid import CKDSpectralGrid, MonoSpectralGrid, SpectralGrid
 from ..spectral.index import CKDSpectralIndex, MonoSpectralIndex, SpectralIndex
 from ..units import unit_registry as ureg
-from ..util.misc import deduplicate_sorted, onedict_value
+from ..util.misc import deduplicate_sorted
 
 logger = logging.getLogger(__name__)
 
@@ -599,7 +599,7 @@ class EarthObservationExperiment(Experiment, ABC):
         )
 
         kwargs = self._context_kwargs()
-        return [KernelContext(si, kwargs=kwargs.copy()) for si in sis]
+        return [KernelContext(si, kwargs=kwargs) for si in sis]
 
     @property
     @abstractmethod
@@ -819,10 +819,28 @@ def run(
     Returns
     -------
     Dataset or dict[str, Dataset]
-        If a single measure is defined, a single xarray dataset is returned.
-        If several measures are defined, a dictionary mapping measure IDs to
+        If a single measure is processed, a single xarray dataset is returned.
+        If several measures are processed, a dictionary mapping measure IDs to
         the corresponding result dataset is returned.
+
+    Notes
+    -----
+    * Successive calls to this function with different measures will not reset
+      the :attr:`Experiment.results` dictionary.
+    * Successive calls with already processed measures will overwrite prior
+      results.
     """
+    if measures is None:
+        measures = list(range(len(exp.measures)))
+    if isinstance(measures, (int, str)):
+        measures = [measures]
+
     exp.process(spp=spp, measures=measures, seed_state=seed_state)
     exp.postprocess(measures=measures)
-    return exp.results if len(exp.results) > 1 else onedict_value(exp.results)
+
+    measure_ids = [exp.measures.get_id(m) for m in measures]
+    return (
+        {x: exp.results[x] for x in measure_ids}
+        if len(measure_ids) > 1
+        else exp.results[measure_ids[0]]
+    )

{eradiate-0.31.1.dev0 → eradiate-1.0.0.dev0/src/eradiate.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eradiate
-Version: 0.31.1.dev0
+Version: 1.0.0.dev0
 Summary: A radiative transfer model for the Earth observation community
 Author: The Eradiate Team
 Maintainer: The Eradiate Team