resqpy 4.15.0__py3-none-any.whl → 4.15.1__py3-none-any.whl

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/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/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

{resqpy-4.15.0.dist-info → resqpy-4.15.1.dist-info}/METADATA

@@ -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.dist-info → resqpy-4.15.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=4_STgTMszfNG-6HxXu8dDn-thh_E2N4ws5-VjSnDWEA,556
+resqpy/__init__.py,sha256=3zUImwY1meqG4Lanh-KoHsjCskJxdS0ohH8wjE0jtEU,556
 resqpy/crs.py,sha256=R7DfcTP5xGv5pu9Y8RHA2WVM9DjBCSVMoHcz4RmQ7Yw,27646
 resqpy/derived_model/__init__.py,sha256=NFvMSOKI3cxmH7lAbddV43JjoUj-r2G7ExEfOqinD1I,1982
 resqpy/derived_model/_add_edges_per_column_property_array.py,sha256=cpW3gwp6MSYIrtvFmCjoJXcyUsgGuCDbgmwlJCJebUs,6410
@@ -127,13 +127,13 @@ resqpy/organize/structural_organization_interpretation.py,sha256=xEpm1KKiP9dKktW
 resqpy/organize/tectonic_boundary_feature.py,sha256=mMSsIW8YJ6qpeOe-6gRFaQbK39-WIiGunxPSnwxFyqY,2675
 resqpy/organize/wellbore_feature.py,sha256=E2gFwgPZGr8nkhRHAIR0wTZ8uwcze7y2WBIV7AXeW2A,1843
 resqpy/organize/wellbore_interpretation.py,sha256=jRAHq90tR2dCQSXsZicujXhSVHOEPoGjFgh5S87SMAI,6973
-resqpy/property/__init__.py,sha256=jrkf6Ul4iO5uBqPVuEla30ewYi9SWHE8W34UVE9-Ess,2264
+resqpy/property/__init__.py,sha256=KegXDizklsMB-EnGFrzhCSszrXAHXEIoStdC5XmyifQ,2294
 resqpy/property/_collection_add_part.py,sha256=s0xXU5aLRqvZoHxbRUNY-ItiNPqmUoEMcnWqQh011jk,17076
 resqpy/property/_collection_create_xml.py,sha256=x6F7cjdC2y3JmPHi88hkpy3nf1wnWGwEexTj_Dmsf6E,12923
 resqpy/property/_collection_get_attributes.py,sha256=MlontPfGo00lxt0SpB49YG9PRsi5oXPqduDgCSOSmzs,32441
 resqpy/property/_collection_support.py,sha256=77_DG-0pzhMWdG_mNDiGfihXD7Pp-CvDSGCV8ZlDjj4,5889
 resqpy/property/_property.py,sha256=JcG7h6k4cJ4l3WC_VCsvoqHM3FBxrnUuxbIK2Ono1M0,24426
-resqpy/property/attribute_property_set.py,sha256=HaOK2g2tzsFlLAzxKhG4hcR9ss8f8LBjAPbMCEE4X2Q,9899
+resqpy/property/attribute_property_set.py,sha256=YveiTAIeNUXZRJ8m1-SZEvtae83SOW-D0E3Wz4GNqSs,10382
 resqpy/property/grid_property_collection.py,sha256=bLWCTfhmpDsagBaXXb8XXHL46Cy78HL_NGWpPFZAgdw,66946
 resqpy/property/property_collection.py,sha256=b4J_bzigN-P5nag49Y6IG4mq3s1KbelsQC5frYg2ij8,151911
 resqpy/property/property_common.py,sha256=pItepusFU94YTNlWJyMj7LRMyRQviBQa0y7ouEs6AHo,36422
@@ -194,7 +194,7 @@ resqpy/well/_wellbore_marker_frame.py,sha256=xvYH2_2Ie3a18LReFymbUrZboOx7Rhv5DOD
 resqpy/well/blocked_well_frame.py,sha256=Lg7TgynfPv9WkklXTLt9VN6uBXWUqX1LI-Xmv_FBqYk,22555
 resqpy/well/well_object_funcs.py,sha256=LYTcC07ezlBxClfrug_B4iXXZUkXDPgsVufNzp361Wo,24703
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.15.0.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.15.0.dist-info/METADATA,sha256=A2oz2Pd_oTElPuvZbkLDJx4aAseJOM4Q92fSWPX0hK8,4028
-resqpy-4.15.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-resqpy-4.15.0.dist-info/RECORD,,
+resqpy-4.15.1.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.15.1.dist-info/METADATA,sha256=_ySjZQbSpl5cy_dg9F4yUU4MaLQrMsT5dHbmVvwrhT8,4028
+resqpy-4.15.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+resqpy-4.15.1.dist-info/RECORD,,