ert 18.0.0__py3-none-any.whl → 18.0.3__py3-none-any.whl

ert/config/parsing/config_schema.py

@@ -4,8 +4,8 @@ from .config_schema_deprecations import deprecated_keywords_list
 from .config_schema_item import (
     SchemaItem,
     Varies,
+    existing_file_keyword,
     existing_path_inline_keyword,
-    existing_path_keyword,
     float_keyword,
     int_keyword,
     path_keyword,
@@ -318,8 +318,8 @@ def init_user_config_schema() -> ConfigSchemaDict:
         surface_keyword(),
         field_keyword(),
         single_arg_keyword(ConfigKeys.ECLBASE),
-        existing_path_keyword(ConfigKeys.DATA_FILE),
-        existing_path_keyword(ConfigKeys.GRID),
+        existing_file_keyword(ConfigKeys.DATA_FILE),
+        existing_file_keyword(ConfigKeys.GRID),
         path_keyword(ConfigKeys.REFCASE),
         int_keyword(ConfigKeys.RANDOM_SEED),
         num_realizations_keyword(),

ert/config/parsing/config_schema_item.py

@@ -155,9 +155,9 @@ class SchemaItem:
                         f"value as argument {index + 1!r}",
                         token,
                     )
-
             case (
                 SchemaItemType.PATH
+                | SchemaItemType.EXISTING_FILE
                 | SchemaItemType.EXISTING_PATH
                 | SchemaItemType.EXISTING_PATH_INLINE
             ):
@@ -166,10 +166,14 @@ class SchemaItem:
                     path = os.path.normpath(
                         os.path.join(os.path.dirname(token.filename), token)
                     )
-                if val_type in {
-                    SchemaItemType.EXISTING_PATH,
-                    SchemaItemType.EXISTING_PATH_INLINE,
-                }:
+                if val_type != SchemaItemType.PATH:
+                    if val_type == SchemaItemType.EXISTING_FILE and not os.path.isfile(
+                        str(path)
+                    ):
+                        raise ConfigValidationError.with_context(
+                            f"{self.kw} {token} is not a file.",
+                            token,
+                        )
                     if not os.path.exists(str(path)):
                         err = f'Cannot find file or directory "{token.value}". '
                         if path != token:
@@ -343,8 +347,8 @@ def path_keyword(keyword: str) -> SchemaItem:
     return SchemaItem(kw=keyword, type_map=[SchemaItemType.PATH])
 
 
-def existing_path_keyword(keyword: str) -> SchemaItem:
-    return SchemaItem(kw=keyword, type_map=[SchemaItemType.EXISTING_PATH])
+def existing_file_keyword(keyword: str) -> SchemaItem:
+    return SchemaItem(kw=keyword, type_map=[SchemaItemType.EXISTING_FILE])
 
 
 def existing_path_inline_keyword(

ert/config/parsing/schema_item_type.py

@@ -9,6 +9,7 @@ class SchemaItemType(StrEnum):
     POSITIVE_FLOAT = "POSITIVE_FLOAT"
     PATH = "PATH"
     EXISTING_PATH = "EXISTING_PATH"
+    EXISTING_FILE = "EXISTING_FILE"
     # EXISTING_PATH_INLINE is a directive to the
     # schema validation to inline the contents of
     # the file.

ert/gui/main.py

@@ -29,7 +29,12 @@ from ert.gui.tools.event_viewer import (
 from ert.namespace import Namespace
 from ert.plugins import ErtRuntimePlugins, get_site_plugins
 from ert.services import ErtServer
-from ert.storage import ErtStorageException, local_storage_set_ert_config, open_storage
+from ert.storage import (
+    ErtStorageException,
+    LocalStorage,
+    local_storage_set_ert_config,
+    open_storage,
+)
 from ert.trace import trace, tracer
 
 from .ertwidgets import Suggestor
@@ -158,10 +163,7 @@ def _start_initial_gui_window(
     storage_path = None
     if ert_config is not None:
         try:
-            with open_storage(ert_config.ens_path) as read_storage:
-                should_migrate = read_storage.check_migration_needed()
-
-            if should_migrate:
+            if LocalStorage.check_migration_needed(Path(ert_config.ens_path)):
                 # Open in write mode to initialize the storage, so that
                 # dark storage can be mounted onto it
                 open_storage(ert_config.ens_path, mode="w").close()

ert/shared/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '18.0.0'
-__version_tuple__ = version_tuple = (18, 0, 0)
+__version__ = version = '18.0.3'
+__version_tuple__ = version_tuple = (18, 0, 3)
 
-__commit_id__ = commit_id = 'g8fc6e0edc'
+__commit_id__ = commit_id = 'g211bdcd43'

ert/storage/local_storage.py

@@ -101,34 +101,35 @@ class LocalStorage(BaseMode):
                 raise ValueError(f"No index.json, but found: {errors}") from err
             self.version = _LOCAL_STORAGE_VERSION
 
-        if self.check_migration_needed():
-            self.perform_migration()
+        if self.check_migration_needed(Path(self.path)):
+            if not self.can_write:
+                raise RuntimeError(
+                    f"Cannot open storage '{self.path}' in read-only mode: "
+                    f"Storage version {self.version} is too old. "
+                    f"Run ert to initiate migration."
+                )
+            else:
+                self._migrate(self.version)
 
         self.refresh()
         if mode.can_write:
             self._save_index()
 
-    def check_migration_needed(self) -> bool:
-        if self.version > _LOCAL_STORAGE_VERSION:
+    @staticmethod
+    def check_migration_needed(storage_dir: Path) -> bool:
+        try:
+            version = _storage_version(storage_dir)
+        except FileNotFoundError:
+            version = _LOCAL_STORAGE_VERSION
+
+        if version > _LOCAL_STORAGE_VERSION:
             raise RuntimeError(
-                f"Cannot open storage '{self.path}': Storage version {self.version} "
-                f"is newer than the current version {_LOCAL_STORAGE_VERSION}, "
-                "upgrade ert to continue, or run with a different ENSPATH"
+                f"Cannot open storage '{storage_dir.absolute()}': Storage version "
+                f"{version} is newer than the current version {_LOCAL_STORAGE_VERSION}"
+                f", upgrade ert to continue, or run with a different ENSPATH"
             )
 
-        return self.version < _LOCAL_STORAGE_VERSION
-
-    def perform_migration(self) -> None:
-        if self.check_migration_needed():
-            if self.can_write:
-                self._migrate(self.version)
-                self._save_index()
-            else:
-                raise RuntimeError(
-                    f"Cannot open storage '{self.path}' in read-only mode: "
-                    f"Storage version {self.version} is too old. "
-                    f"Run ert to initiate migration."
-                )
+        return version < _LOCAL_STORAGE_VERSION
 
     def refresh(self) -> None:
         """

{ert-18.0.0.dist-info → ert-18.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ert
-Version: 18.0.0
+Version: 18.0.3
 Summary: Ensemble based Reservoir Tool (ERT)
 Author-email: Equinor ASA <fg_sib-scout@equinor.com>
 License-Expression: GPL-3.0-only

{ert-18.0.0.dist-info → ert-18.0.3.dist-info}/RECORD

@@ -88,9 +88,9 @@ ert/config/parsing/_read_file.py,sha256=QKMQSNG5J05AdTzy_VQiK5AQ26g0bDHyxlSSPqIh
 ert/config/parsing/config_dict.py,sha256=yyBb-NeaFnIjENrcziVA11Bq43uGguUiPECcKWLDg8w,52
 ert/config/parsing/config_errors.py,sha256=p3lAcRPXTm4okupdVyLwRCVWJ_86a7rgCohkDaLRM10,4806
 ert/config/parsing/config_keywords.py,sha256=J8kgzDVhuM8jvCwzO1kfOxvOH_DnDASOZPaJZujcIgQ,1860
-ert/config/parsing/config_schema.py,sha256=sUkjjhso6xNChfyFWE1srhD3DMLNvg3eHyALzZ5s6FQ,9614
+ert/config/parsing/config_schema.py,sha256=9ws2C3Oc-eT5uB_Xy2IEvPWON7b9rZnIc2FpID7hhWc,9614
 ert/config/parsing/config_schema_deprecations.py,sha256=fmzyxUBxR9GtDNIkP0ozHWU2SH1TvyhBFFyFhG8vZjA,9125
-ert/config/parsing/config_schema_item.py,sha256=G5TQNuywQu55yglR3Ef_DnkYBRm5YzqAfyL1XwMt-m0,14172
+ert/config/parsing/config_schema_item.py,sha256=jjHT1KqobQvpLxh9gZ0rR8x_YylV29pvvP7oUASFwtA,14448
 ert/config/parsing/context_values.py,sha256=S_j_BKuwqSm8RZNnw6Ki2ZQ4jz0VFXXmh0MZA2OstmQ,2288
 ert/config/parsing/deprecation_info.py,sha256=E31LBTiG1qNeqACU8lTxp54bESIeuuVHgFim8j8uVjg,663
 ert/config/parsing/error_info.py,sha256=AMOS0v-_ECHESj4aoy0m2fUPPlw9SE1DN_8MsaHeilY,2906
@@ -103,7 +103,7 @@ ert/config/parsing/lark_parser.py,sha256=SS0yXTI5w_qmpFvePMO-r0g9NPqOOrlCFF3amPe
 ert/config/parsing/observations_parser.py,sha256=3hmDjQYjSgrumrb8592X2AbJFp-J72Sq_VLQpOwMaWw,6707
 ert/config/parsing/queue_system.py,sha256=P4-oHftl7piNwCNjnelJAA3WePlBmgXGPhnbHhSb4Eo,570
 ert/config/parsing/schema_dict.py,sha256=MWKhtLhdRvqfWm8oZatWFnAhiIU03DdQCOaX6A71068,4313
-ert/config/parsing/schema_item_type.py,sha256=mruMC2Gb7XzK6blg-tDuAJLy0aHct6xkg7p8xLkYrko,617
+ert/config/parsing/schema_item_type.py,sha256=LP6lXE7YihnAEVP3kCJ80kdpgH6Veu--xcPfgaqJhdc,653
 ert/config/parsing/types.py,sha256=NXV5odfbVL_opQgPTaSlpgkilY4qaB3pal4TaV6pL80,315
 ert/config/parsing/workflow_job_keywords.py,sha256=4SSy2dwLS3G2B1-HPw3b6dMEpIc5-2218ERL_PT_R1k,269
 ert/config/parsing/workflow_job_schema.py,sha256=lkL7CAOFeNcWNRGfBuu1FdbcSqwPXM__8dCC8b3hkTg,2905
@@ -158,7 +158,7 @@ ert/gui/__init__.py,sha256=AULn_ohaSWhaM-7oZuGYbagLfZ8PGL03vyiPTtSR0vk,625
 ert/gui/about_dialog.py,sha256=H0Jfso2v9s1eONTVgghH84UcaUlwVs0Cqqbv17Hvw4g,3127
 ert/gui/ertnotifier.py,sha256=u3jWGjuS75Ml7hAOT6FjBIksB3NLrWNIoH0_WLT3gCE,3031
 ert/gui/find_ert_info.py,sha256=hwqiCa5rDZEL_25QVsx920d9NOaVM2PyUor89_-70-Q,301
-ert/gui/main.py,sha256=XeDD8nFi4xFoAlbZgKslcAj6L0A_5COQFlCbhIQgfyU,9037
+ert/gui/main.py,sha256=h27FWct4C7R6uYRPa3b5stZbF1QuDr_2zXGCNjJEh4E,8980
 ert/gui/main_window.py,sha256=ukP7OFIB23luoNIsKNTEts_yMaIlY0Qamcvn-Rfeu4E,14995
 ert/gui/summarypanel.py,sha256=t12-A7Xx9ASoHa90VBZAISpSOVWvOYFb4GDTUpXkeSc,4235
 ert/gui/ertwidgets/__init__.py,sha256=LtwHe4wpA0YpbealTrukMb7rDSSTxSyGkVaM8IvlI8A,1878
@@ -400,7 +400,7 @@ ert/services/ert_server.py,sha256=geh5mkdAKqNKgG56DcwSnEpvf0wcUc7vuw4feG1ykEI,10
 ert/services/webviz_ert_service.py,sha256=J5vznqb_-DjlDMOze7tdvuBE4GWEPgJ5dIIXvRLKd0Y,650
 ert/shared/__init__.py,sha256=OwgL-31MxA0fabETJ5Svw0tqJpHi569CZDRFHdHiqA0,644
 ert/shared/net_utils.py,sha256=DDHIZLHdBnh7ZZ--1s-FUlsoNTSJJsfHmLQE44E2JqU,5324
-ert/shared/version.py,sha256=oyzl5kHWK_-EWEpzggJ2fGpdOpgYYi5z7ioadW-aeGM,714
+ert/shared/version.py,sha256=llZW1syJ0X_XI90_uTsjvEQ5V9UY3Fxv-4JUtLFBSRc,714
 ert/shared/_doc_utils/__init__.py,sha256=zSl-NUpWLF167PVTvfjn0T50gExjvyWPw5OGq5Bt2Dc,983
 ert/shared/_doc_utils/ert_jobs.py,sha256=uHP8ozhKwCHG6BkyhAgCGoy59JEFb102pHKot-5ZEys,8054
 ert/shared/_doc_utils/everest_jobs.py,sha256=uBDN7tIwlBJIZVZ6ZFL1tkewEJJGDLoeVrFIIrJznvM,2081
@@ -419,7 +419,7 @@ ert/storage/__init__.py,sha256=W3sSffFeh60a3T3rGlylucgR1sYRQb2OEkAiqO0r1Y0,2053
 ert/storage/load_status.py,sha256=7h_GdA2qYGgQ-M5AOIo7xG43ljwzEEgbRb7vg0xSYEE,304
 ert/storage/local_ensemble.py,sha256=uJvqO1ywzv2VsjNnVvDaWHXlXp8Q9Jod2I4nl4iJyTk,50626
 ert/storage/local_experiment.py,sha256=7I-SPoqrAv9esVjVRFH_xpS3smlf06pSo6jQRdRVoJE,16871
-ert/storage/local_storage.py,sha256=Orphws66FAPI5oSNmpWIfHuz91_onkY5HYsEOGVJ3vg,23391
+ert/storage/local_storage.py,sha256=WxGFYsVZOoal2Zjzz2bgBVCl5jtcnwNEJXbZxW8UVPw,23429
 ert/storage/mode.py,sha256=GJBlRSqS0Q06qDvaAztdcG-oV2MLsVID2Mo3OgQKjUw,2470
 ert/storage/realization_storage_state.py,sha256=JdiBr__Ce5e1MzmRsRdMuwgCtiuHZRjsQ-as8ivTX7Q,220
 ert/storage/migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -453,13 +453,13 @@ ert/validation/validation_status.py,sha256=f47_B7aS-9DEh6uaVzKxD97pXienkyTVVCqTy
 ert/warnings/__init__.py,sha256=IBwQVkdD7Njaad9PAB-9K-kr15wnA4EBKboxyqgu9NA,214
 ert/warnings/_warnings.py,sha256=7qhNZ0W4nnljzoOx6AXX7VlMv5pa34Ek5M5n1Ep0Kak,189
 ert/warnings/specific_warning_handler.py,sha256=5dVXtOhzcMmtPBGx4AOddXNPfzTFOPA7RVtdH8hLv68,932
-ert-18.0.0.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+ert-18.0.3.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
 everest/__init__.py,sha256=8_f50f6H3-onqaiuNCwC0Eiotdl9JuTxhwyF_54MVvU,306
 everest/config_file_loader.py,sha256=q_rmxk778uDrNxdQQW0tBs9R3hU4az6yGCJwuY_5xww,5698
 everest/everest_storage.py,sha256=Xg2CuRdhZOqljm0i6H5o-pejcMeCwncSGw7Q6beZRgY,42173
 everest/strings.py,sha256=KzWCBllsDmuphSsjbIN9kL_CTPvRcaTAxixDH3YA3ig,908
 everest/api/__init__.py,sha256=_me3w2C92NQpPX2RrJ28IfQiXNif5-f2dN9Qg4HzbgY,86
-everest/api/everest_data_api.py,sha256=HHXx7oFpXLsRwqFdoyHJ_rkvbNmmXDYMrOBhZisBeTQ,9881
+everest/api/everest_data_api.py,sha256=-W_Qot75zJ6xl2M7S3SyL1SXGLcgpeopmMUSS8jSmHg,10333
 everest/assets/everest_logo.svg,sha256=1GDy-tJYQSean8f_WWTlcKPhv1Wsb_xhFzXe3Gguke4,12048
 everest/bin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 everest/bin/config_branch_script.py,sha256=-xMKskcDf5hxlzTtcyNG55yvnUKPQTtoUetlEGss6KM,5063
@@ -517,8 +517,8 @@ everest/templates/well_drill.tmpl,sha256=9iLexmBHMsMQNXyyRK4GlmVuVpVIxRcCHpy1av5
 everest/templates/well_order.tmpl,sha256=XJ1eVRkeyTdLu5sLsltJSSK6BDLN7rFOAqLdM3ZZy3w,75
 everest/util/__init__.py,sha256=xEYLz6pUtgkH8VHer1RfoCwKiO70dBnuhHonsOPaOx0,1359
 everest/util/forward_models.py,sha256=JPxHhLI6TrmQJwW50wwGBmw57TfRd8SG2svYhXFHrc8,1617
-ert-18.0.0.dist-info/METADATA,sha256=vrMCNuRyl73IApaomNK1uC3guFtgb97zbgWMjYHzfxQ,10013
-ert-18.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ert-18.0.0.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
-ert-18.0.0.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
-ert-18.0.0.dist-info/RECORD,,
+ert-18.0.3.dist-info/METADATA,sha256=6VtOgk7bU0tXesTYDU64W3uB5doNHepwgh2Zsc31cMQ,10013
+ert-18.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ert-18.0.3.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
+ert-18.0.3.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
+ert-18.0.3.dist-info/RECORD,,

everest/api/everest_data_api.py

@@ -224,6 +224,8 @@ class EverestDataAPI:
         assert self._config.storage_dir
         storage = open_storage(self._config.storage_dir, "r")
         experiment = next(storage.experiments)
+        identical_columns_in_all_batches: bool = True
+        summary_columns: list[str] | None = None
         for batch_id in batches:
             try:
                 ensemble = experiment.get_ensemble_by_name(f"batch_{batch_id}")
@@ -238,6 +240,10 @@ class EverestDataAPI:
                 summary = summary.pivot(
                     on="response_key", index=["realization", "time"], sort_columns=True
                 )
+                if summary_columns is None:
+                    summary_columns = summary.columns
+                identical_columns_in_all_batches &= summary_columns == summary.columns
+
                 # The 'Realization' column exported by ert are
                 # the 'simulations' of everest.
                 summary = summary.rename({"time": "date", "realization": "simulation"})
@@ -265,7 +271,14 @@ class EverestDataAPI:
 
                 data_frames.append(summary)
         storage.close()
-        return pl.concat(data_frames) if data_frames else pl.DataFrame()
+        return (
+            pl.concat(
+                data_frames,
+                how="vertical" if identical_columns_in_all_batches else "diagonal",
+            )
+            if data_frames
+            else pl.DataFrame()
+        )
 
     @property
     def output_folder(self) -> str: