resqpy 4.16.1__py3-none-any.whl → 4.16.2__py3-none-any.whl

resqpy/__init__.py

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

resqpy/property/attribute_property_set.py

@@ -183,7 +183,14 @@ class ApsProperty:
 class AttributePropertySet(rqp.PropertyCollection):
     """Class for set of RESQML properties for any supporting representation, using attribute syntax."""
 
-    def __init__(self, model = None, support = None, property_set_uuid = None, realization = None, key_mode = 'pk'):
+    def __init__(self,
+                 model = None,
+                 support = None,
+                 property_set_uuid = None,
+                 realization = None,
+                 key_mode = 'pk',
+                 indexable = None,
+                 multiple_handling = 'warn'):
         """Initialise an empty property set, optionally populate properties from a supporting representation.
 
         arguments:
@@ -198,6 +205,11 @@ class AttributePropertySet(rqp.PropertyCollection):
               if None, then the collection is either covering a whole ensemble (individual properties can each be flagged with a
               realisation number), or is for properties that do not have multiple realizations
            key_mode (str, default 'pk'): either 'pk' (for property kind) or 'title', identifying the basis of property attribute keys
+           indexable (str, optional): if present and key_mode is 'pk', properties with indexable element other than this will
+              have their indexable element included in their key
+           multiple_handling (str, default 'warn'): either 'ignore', 'warn' ,or 'exception'; if 'warn' or 'ignore', and properties
+              exist that generate the same key, then only the first is visible in the attribute property set (and a warning is given
+              for each of the others in the case of 'warn'); if 'exception', a KeyError is raised if there are any duplicate keys
 
         note:
            at present, if the collection is being initialised from a property set, the support argument must also be specified;
@@ -214,9 +226,12 @@ class AttributePropertySet(rqp.PropertyCollection):
             property_set_root = None
         else:
             property_set_root = model.root_for_uuid(property_set_uuid)
+        assert multiple_handling in ['ignore', 'warn', 'exception']
 
         super().__init__(support = support, property_set_root = property_set_root, realization = realization)
         self.key_mode = key_mode
+        self.indexable_mode = indexable
+        self.multiple_handling = multiple_handling
         self._make_attributes()
 
     def keys(self):
@@ -241,12 +256,21 @@ class AttributePropertySet(rqp.PropertyCollection):
                             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))
+                            realization = self.realization_for_part(part),
+                            indexable_mode = self.indexable_mode,
+                            indexable = self.indexable_for_part(part))
 
     def _make_attributes(self):
         """Setup individual properties with attribute style read access to metadata."""
         for part in self.parts():
             key = self._key(part)
+            if getattr(self, key, None) is not None:
+                if self.multiple_handling == 'warn':
+                    log.warning(f'duplicate key in AttributePropertySet; only first instance included: {key}')
+                    continue
+                if self.multiple_handling == 'ignore':
+                    continue
+                raise KeyError(f'duplicate key in attribute property set: {key}')
             aps_property = ApsProperty(self, part)
             setattr(self, key, aps_property)
 
@@ -255,11 +279,20 @@ class AttributePropertySet(rqp.PropertyCollection):
         return self.number_of_parts()
 
 
-def make_aps_key(key_mode, property_kind = None, title = None, facet = None, time_index = None, realization = None):
+def make_aps_key(key_mode,
+                 property_kind = None,
+                 title = None,
+                 facet = None,
+                 time_index = None,
+                 realization = None,
+                 indexable_mode = None,
+                 indexable = 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 indexable_mode is not None and indexable is not None and indexable != indexable_mode:
+            key += f'_{indexable}'
         if facet is not None:
             key += f'_{facet}'
     else:

{resqpy-4.16.1.dist-info → resqpy-4.16.2.dist-info}/METADATA

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

{resqpy-4.16.1.dist-info → resqpy-4.16.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=s8X29j5yjymWu0LX1xekbvv3BRjtZmHrgG1D8NnhWlk,556
+resqpy/__init__.py,sha256=V_KEFWKpjsovnzmh69UtTXTHOi6WVOZzJJZCMhJBFxs,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
@@ -133,7 +133,7 @@ resqpy/property/_collection_create_xml.py,sha256=E48fu8h64T_bz5k3OEqIzPvZAOYRTBg
 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=YveiTAIeNUXZRJ8m1-SZEvtae83SOW-D0E3Wz4GNqSs,10382
+resqpy/property/attribute_property_set.py,sha256=AI0rS3bn38DJLQ_5XLdkeol8Oa9tGpTrX57d3435byQ,12132
 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=wf429weNtgf6J4gCNNoRwj64elQvUPI_ZWzg4qI7l6c,35993
@@ -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.16.1.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.16.1.dist-info/METADATA,sha256=cl03gvhu2IjmNOo4rikmBVUyuq6jrT36bep3WUiyrmY,4028
-resqpy-4.16.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-resqpy-4.16.1.dist-info/RECORD,,
+resqpy-4.16.2.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.16.2.dist-info/METADATA,sha256=I-u5Mm5YX9_vhfM4XERgozLlbtan3_91gKZkE9jpFiw,4028
+resqpy-4.16.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+resqpy-4.16.2.dist-info/RECORD,,