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

ert/substitutions.py

@@ -4,6 +4,7 @@ import logging
 import re
 from collections import UserDict
 from collections.abc import Mapping
+from typing import Self
 
 logger = logging.getLogger(__name__)
 _PATTERN = re.compile(r"<[^<>]+>")
@@ -25,44 +26,27 @@ class Substitutions(UserDict[str, str]):
         """
         return _substitute(self, to_substitute, context, max_iterations, warn_max_iter)
 
-    @staticmethod
-    def substitute_parameters(
-        to_substitute: str, parameter_values: Mapping[str, Mapping[str, str | float]]
-    ) -> str:
-        """Applies the substitution '<param_name>' to parameter value
-        Args:
-            parameter_values: Mapping from parameter name to parameter value
-            to_substitute: string to substitute magic strings in
-        Returns:
-            substituted string
-        """
-        for values in parameter_values.values():
-            for param_name, value in values.items():
-                if isinstance(value, (int, float)):
-                    formatted_value = f"{value:.6g}"
-                else:
-                    formatted_value = str(value)
-                to_substitute = to_substitute.replace(
-                    f"<{param_name}>", formatted_value
-                )
-        return to_substitute
-
-    def substitute_real_iter(
-        self, to_substitute: str, realization: int, iteration: int
-    ) -> str:
+    def real_iter_substituter(self, realization: int, iteration: int) -> Self:
         extra_data = {
             "<IENS>": str(realization),
             "<ITER>": str(iteration),
         }
 
-        model_id_key = f"<GEO_ID_{realization}_{iteration}>"
+        model_id_key = f"<REALIZATION_ID_{realization}_{iteration}>"
         if model_id_key in self:
-            extra_data["<GEO_ID>"] = self[model_id_key]
+            extra_data["<REALIZATION_ID>"] = self[model_id_key]
         sim_id_key = f"<SIM_DIR_{realization}_{iteration}>"
         if sim_id_key in self:
             extra_data["<SIM_DIR>"] = self[sim_id_key]
 
-        return Substitutions({**self, **extra_data}).substitute(to_substitute)
+        return type(self)({**self, **extra_data})
+
+    def substitute_real_iter(
+        self, to_substitute: str, realization: int, iteration: int
+    ) -> str:
+        return self.real_iter_substituter(realization, iteration).substitute(
+            to_substitute
+        )
 
     def _concise_representation(self) -> str:
         return (

ert/validation/active_range.py

@@ -47,19 +47,19 @@ class ActiveRange:
             raise ValueError(
                 f"Only digits, commas, dashes and spaces are allowed, got {rangestring}"
             )
-        for _range in rangestring.split(","):
-            if "-" in _range:
-                if len(_range.split("-")) != 2:
-                    raise ValueError(f"Invalid range specified, got {_range}")
-                realization_bounds = _range.split("-")
+        for range_ in rangestring.split(","):
+            if "-" in range_:
+                if len(range_.split("-")) != 2:
+                    raise ValueError(f"Invalid range specified, got {range_}")
+                realization_bounds = range_.split("-")
                 start = int(realization_bounds[0])
                 end = int(realization_bounds[1])
                 if end < start:
                     raise ValueError(
-                        f"Invalid direction in range specified, got {_range}"
+                        f"Invalid direction in range specified, got {range_}"
                     )
             else:
-                int(_range)
+                int(range_)
         return rangestring
 
     @classmethod

ert/validation/rangestring.py

@@ -66,11 +66,11 @@ def rangestring_to_mask(rangestring: str, length: int) -> list[bool]:
         # An empty string means no active indecies. Note that an
         # IndexRange-typed instance being None means the opposite
         return mask
-    for _range in rangestring.split(","):
-        if "-" in _range:
-            if len(_range.strip().split("-")) != 2:
-                raise ValueError(f"Wrong range syntax {_range}")
-            start, end = map(int, _range.strip().split("-"))
+    for range_ in rangestring.split(","):
+        if "-" in range_:
+            if len(range_.strip().split("-")) != 2:
+                raise ValueError(f"Wrong range syntax {range_}")
+            start, end = map(int, range_.strip().split("-"))
             if end < start:
                 raise ValueError(f"Range {start}-{end} has invalid direction")
             if end + 1 > length:
@@ -78,12 +78,12 @@ def rangestring_to_mask(rangestring: str, length: int) -> list[bool]:
                     f"Range endpoint {end} is beyond the mask length {length}"
                 )
             mask[start : end + 1] = [True] * (end + 1 - start)
-        elif _range:
-            if int(_range) + 1 > length:
+        elif range_:
+            if int(range_) + 1 > length:
                 raise ValueError(
-                    f"Realization index {_range} is beyond the mask length {length}"
+                    f"Realization index {range_} is beyond the mask length {length}"
                 )
-            mask[int(_range)] = True
+            mask[int(range_)] = True
     return mask
 
 
@@ -102,14 +102,14 @@ def rangestring_to_list(rangestring: str) -> list[int]:
     result: set[int] = set()
     if not rangestring:
         return []
-    for _range in rangestring.split(","):
-        if "-" in _range:
-            if len(_range.strip().split("-")) != 2:
-                raise ValueError(f"Wrong range syntax {_range}")
-            start, end = map(int, _range.strip().split("-"))
+    for range_ in rangestring.split(","):
+        if "-" in range_:
+            if len(range_.strip().split("-")) != 2:
+                raise ValueError(f"Wrong range syntax {range_}")
+            start, end = map(int, range_.strip().split("-"))
             if end < start:
                 raise ValueError(f"Range {start}-{end} has invalid direction")
             result.update(range(start, end + 1))
-        elif _range:
-            result.add(int(_range))
+        elif range_:
+            result.add(int(range_))
     return list(result)

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

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: ert
-Version: 17.1.9
+Version: 18.0.0
 Summary: Ensemble based Reservoir Tool (ERT)
 Author-email: Equinor ASA <fg_sib-scout@equinor.com>
-License: GPL-3.0
+License-Expression: GPL-3.0-only
 Project-URL: Repository, https://github.com/equinor/ert
 Platform: all
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Other Environment
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.11
@@ -21,6 +20,7 @@ Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: COPYING
 Requires-Dist: aiohttp
+Requires-Dist: anyio
 Requires-Dist: colorama
 Requires-Dist: cryptography
 Requires-Dist: decorator
@@ -59,8 +59,8 @@ Requires-Dist: pyyaml
 Requires-Dist: pyzmq
 Requires-Dist: requests
 Requires-Dist: resfo>=5.0.0
-Requires-Dist: ropt-dakota<0.25,>=0.24
-Requires-Dist: ropt[pandas]<0.25,>=0.24
+Requires-Dist: ropt-dakota<0.26,>=0.25
+Requires-Dist: ropt[pandas]<0.26,>=0.25
 Requires-Dist: ruamel.yaml
 Requires-Dist: scipy>=1.10.1
 Requires-Dist: seaborn
@@ -73,7 +73,7 @@ Requires-Dist: uvicorn>=0.17.0
 Requires-Dist: websockets
 Requires-Dist: xarray
 Requires-Dist: xtgeo>=3.3.0
-Requires-Dist: resfo-utilities>=0.3.0
+Requires-Dist: resfo-utilities>=0.5.0
 Provides-Extra: dev
 Requires-Dist: furo; extra == "dev"
 Requires-Dist: hypothesis!=6.102.0,!=6.112.3,>=6.85; extra == "dev"
@@ -94,6 +94,7 @@ Requires-Dist: pytest-rerunfailures!=16.0; extra == "dev"
 Requires-Dist: pytest-snapshot; extra == "dev"
 Requires-Dist: pytest-timeout; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"
+Requires-Dist: pytest-durations; extra == "dev"
 Requires-Dist: pytest>6; extra == "dev"
 Requires-Dist: resdata; extra == "dev"
 Requires-Dist: rust-just; extra == "dev"
@@ -105,7 +106,7 @@ Requires-Dist: sphinx-copybutton; extra == "dev"
 Requires-Dist: sphinxcontrib.datatemplates; extra == "dev"
 Requires-Dist: json-schema-for-humans; extra == "dev"
 Requires-Dist: xlsxwriter>=3.2.3; extra == "dev"
-Requires-Dist: resfo-utilities[testing]>=0.3.0; extra == "dev"
+Requires-Dist: resfo-utilities[testing]>=0.5.0; extra == "dev"
 Provides-Extra: style
 Requires-Dist: pre-commit; extra == "style"
 Provides-Extra: types