resqpy 4.15.0__tar.gz → 4.15.1__tar.gz

{resqpy-4.15.0 → resqpy-4.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: resqpy
-Version: 4.15.0
+Version: 4.15.1
 Summary: Python API for working with RESQML models
 Home-page: https://github.com/bp/resqpy
 License: MIT

{resqpy-4.15.0 → resqpy-4.15.1}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "resqpy"
-version = "4.15.0" # Set at build time
+version = "4.15.1" # Set at build time
 description = "Python API for working with RESQML models"
 authors = ["BP"]
 license = "MIT"

{resqpy-4.15.0 → resqpy-4.15.1}/resqpy/__init__.py

@@ -28,6 +28,6 @@
 
 import logging
 
-__version__ = "4.15.0"  # Set at build time
+__version__ = "4.15.1"  # Set at build time
 log = logging.getLogger(__name__)
 log.info(f"Imported resqpy version {__version__}")

{resqpy-4.15.0 → resqpy-4.15.1}/resqpy/property/__init__.py

@@ -8,7 +8,7 @@ __all__ = [
     'reformat_column_edges_from_resqml_format', 'same_property_kind', 'selective_version_of_collection',
     'supported_local_property_kind_list', 'supported_property_kind_list', 'supported_facet_type_list',
     'expected_facet_type_dict', 'create_transmisibility_multiplier_property_kind',
-    'property_kind_and_facet_from_keyword', 'guess_uom', 'property_parts', 'property_part'
+    'property_kind_and_facet_from_keyword', 'guess_uom', 'property_parts', 'property_part', 'make_aps_key'
 ]
 
 from .property_common import property_collection_for_keyword,  \
@@ -30,7 +30,7 @@ from .property_common import property_collection_for_keyword,  \
 from .property_kind import PropertyKind, create_transmisibility_multiplier_property_kind
 from .string_lookup import StringLookup
 from .property_collection import PropertyCollection
-from .attribute_property_set import AttributePropertySet, ApsProperty
+from .attribute_property_set import AttributePropertySet, ApsProperty, make_aps_key
 from .grid_property_collection import GridPropertyCollection
 from ._property import Property
 from .well_interval_property import WellIntervalProperty

{resqpy-4.15.0 → resqpy-4.15.1}/resqpy/property/attribute_property_set.py

@@ -236,21 +236,12 @@ class AttributePropertySet(rqp.PropertyCollection):
 
     def _key(self, part):
         """Returns the key (attribute name) for a given part."""
-        if self.key_mode == 'pk':
-            key = self.property_kind_for_part(part)
-            facet = self.facet_for_part(part)
-            if facet is not None:
-                key += f'_{facet}'
-        else:
-            key = self.citation_title_for_part(part)
-        key = key.replace(' ', '_')
-        ti = self.time_index_for_part(part)
-        if ti is not None:
-            key += f'_t{ti}'
-        r = self.realization_for_part(part)
-        if r is not None:
-            key += f'_r{r}'
-        return key
+        return make_aps_key(self.key_mode,
+                            property_kind = self.property_kind_for_part(part),
+                            title = self.citation_title_for_part(part),
+                            facet = self.facet_for_part(part),
+                            time_index = self.time_index_for_part(part),
+                            realization = self.realization_for_part(part))
 
     def _make_attributes(self):
         """Setup individual properties with attribute style read access to metadata."""
@@ -262,3 +253,21 @@ class AttributePropertySet(rqp.PropertyCollection):
     def __len__(self):
         """Returns the number of properties in the set."""
         return self.number_of_parts()
+
+
+def make_aps_key(key_mode, property_kind = None, title = None, facet = None, time_index = None, realization = None):
+    """Contructs the key (attribute name) for a property based on metadata items."""
+    if key_mode == 'pk':
+        assert property_kind is not None
+        key = property_kind
+        if facet is not None:
+            key += f'_{facet}'
+    else:
+        assert title is not None
+        key = title
+    key = key.replace(' ', '_')
+    if time_index is not None:
+        key += f'_t{time_index}'
+    if realization is not None:
+        key += f'_r{realization}'
+    return key