🐛 fmu get_property values return float or strings not just strings

Author: BaptisteDE

corrai/base/model.py

@@ -141,10 +141,11 @@ def simulate_parameter(
             Simulation results as a DataFrame with a DateTimeIndex and one
             or more output columns.
         """
+        sim_kwargs = {} if simulation_kwargs is None else simulation_kwargs
         return self.simulate(
             self.get_property_from_param(parameter_value_pairs),
             simulation_options,
-            **{} if simulation_kwargs is None else simulation_kwargs,
+            **sim_kwargs,
         )
 
     def get_property_values(self, property_list: list[str]) -> list[str | int | float]:

corrai/base/simulate.py

@@ -108,7 +108,7 @@ def run_simulations(
     results = Parallel(n_jobs=n_cpu)(
         delayed(
             lambda param: model.simulate_parameter(
-                param, simulation_options, **simulation_kwargs
+                param, simulation_options, simulation_kwargs
             )
         )(param)
         for param in bar

corrai/sampling.py

@@ -1356,12 +1356,16 @@ def add_sample(
         num_levels: int = 4,
         simulate: bool = True,
         n_cpu: int = 1,
+        simulation_kwargs=None,
         **morris_kwargs,
     ):
         morris_sample = morris_sampler.sample(
             self.get_salib_problem(), N, num_levels, **morris_kwargs
         )
-        self._post_draw_sample(morris_sample, simulate, n_cpu)
+        simulation_kwargs = {} if simulation_kwargs is None else simulation_kwargs
+        self._post_draw_sample(
+            morris_sample, simulate, n_cpu, simulation_kwargs=simulation_kwargs
+        )
 
 
 class FASTSampler(RealSampler):
@@ -1468,12 +1472,12 @@ def __init__(
         super().__init__(parameters, model, simulation_options)
 
     def add_sample(
-        self, n: int, rng: int = None, simulate=True, n_cpu: int = 1, **lhs_kwargs
+        self, n: int, rng: int = None, simulate=True, n_cpu: int = 1, simulation_kwargs:dict=None, **lhs_kwargs
     ):
         lhs = LatinHypercube(d=len(self.parameters), rng=rng, **lhs_kwargs)
         new_dimless_sample = lhs.random(n=n)
         self._post_draw_sample(
-            new_dimless_sample, simulate, n_cpu, sample_is_dimless=True
+            new_dimless_sample, simulate, n_cpu, sample_is_dimless=True, simulation_kwargs=simulation_kwargs
         )
 
 

tests/test_fmu.py

@@ -146,13 +146,13 @@ def test_get_property_values(self):
         assert len(values) == 1
 
         vals = simu.get_property_values("x.k")
-        assert vals == ["2.0"]
+        assert vals == [2.0]
 
         vals = simu.get_property_values(("x.k",))
-        assert vals == ["2.0"]
+        assert vals == [2.0]
 
         vals = simu.get_property_values(["x.k", "y.k"])
-        assert vals == ["2.0", "2.0"]
+        assert vals == [2.0, 2.0]
 
     def test_simulate_parallel(self):
         simu = ModelicaFmuModel(