Account for ert and ert3 discrepancy when uploading parameter data to…

… storage.
equinor · Nov 23, 2021 · 1a22ee8 · 1a22ee8
1 parent 906aaa0
commit 1a22ee8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/webviz_ert/data_loader/__init__.py b/webviz_ert/data_loader/__init__.py
@@ -197,15 +197,27 @@ def get_experiment_priors(self, experiment_id: str) -> dict:
         )
 
     def get_ensemble_parameter_data(
-        self, ensemble_id: str, parameter_name: str
+        self,
+        ensemble_id: str,
+        parameter_name: str,
+        realizations: list,
     ) -> pd.DataFrame:
-        resp = self._get(
-            url=f"ensembles/{ensemble_id}/records/{parameter_name}",
-            headers={"accept": "application/x-parquet"},
-        )
-        stream = io.BytesIO(resp.content)
-        df = pd.read_parquet(stream)
-        return df
+
+        try:
+            resp = self._get(
+                url=f"ensembles/{ensemble_id}/records/{parameter_name}",
+                headers={"accept": "application/x-parquet"},
+            )
+            stream = io.BytesIO(resp.content)
+            df = pd.read_parquet(stream)
+            return df
+        except DataLoaderException as e:
+            logger.error(e)
+            return self.get_ensemble_record_data(
+                ensemble_id=ensemble_id,
+                record_name=parameter_name,
+                active_realizations=realizations,
+            )
 
     def get_ensemble_record_data(
         self, ensemble_id: str, record_name: str, active_realizations: List[int]

diff --git a/webviz_ert/models/ensemble_model.py b/webviz_ert/models/ensemble_model.py
@@ -9,7 +9,11 @@
 
 
 def _create_parameter_models(
-    parameters_names: list, priors: dict, ensemble_id: str, project_id: str
+    parameters_names: list,
+    priors: dict,
+    ensemble_id: str,
+    project_id: str,
+    realizations: list,
 ) -> Optional[Mapping[str, ParametersModel]]:
     parameters = {}
     for param in parameters_names:
@@ -30,6 +34,7 @@ def _create_parameter_models(
             param_id="",  # TODO?
             project_id=project_id,
             ensemble_id=ensemble_id,
+            realizations=realizations,
         )
     return parameters
 
@@ -109,6 +114,7 @@ def parameters(
                 parameter_priors,
                 ensemble_id=self._id,
                 project_id=self._project_id,
+                realizations=self._active_realizations,
             )
         return self._parameters
 

diff --git a/webviz_ert/models/parameter_model.py b/webviz_ert/models/parameter_model.py
@@ -28,9 +28,12 @@ def __init__(self, **kwargs: Any):
         self._data_loader = get_data_loader(self._project_id)
 
     def data_df(self) -> pd.DataFrame:
+        realization = [] if self._realizations is None else self._realizations
         if self._data_df.empty:
             _data_df = self._data_loader.get_ensemble_parameter_data(
-                ensemble_id=self._ensemble_id, parameter_name=self.key
+                ensemble_id=self._ensemble_id,
+                parameter_name=self.key,
+                realizations=realization,
             )
             if _data_df is not None:
                 _data_df = _data_df.transpose()