add support for track_order

Author: jreadey

h5pyd/_hl/attrs.py

@@ -304,7 +304,7 @@ def _get_created(name):
             attr_json = self._parent.id.db.getAttribute(obj_id, name, includeData=False)
             return attr_json["created"]
 
-        if self._parent.track_order:
+        if self._parent.id.create_order:
             attrs = sorted(attrs, key=lambda x: _get_created(x))
         else:
             attrs = sorted(attrs)

h5pyd/_hl/base.py

@@ -331,25 +331,13 @@ def created(self):
 
         return dt
 
-    @property
-    def track_order(self):
-        return self._track_order
-
     @property
     def read_only(self):
         if isinstance(self.id.db.writer, H5NullWriter):
             return True
         else:
             return False
 
-    @property
-    def creation_properties(self):
-        db = self.id.db
-        obj_json = db.getObjectById(self.id.uuid)
-        if "creationProperties" in obj_json:
-            return obj_json["creationProperties"]
-        return {}
-
     def verifyCert(self):
         # default to validate CERT for https requests, unless
         # the H5PYD_VERIFY_CERT environment variable is set and True
@@ -393,24 +381,7 @@ def __init__(self, oid, file=None, track_order=None):
             self.log.addHandler(fh)
         else:
             pass
-
-        if track_order is None:
-            # set order based on creation props
-            obj_json = self.id.obj_json
-            if "creationProperties" in obj_json:
-                cpl = obj_json["creationProperties"]
-            else:
-                cpl = {}
-            if "CreateOrder" in cpl:
-                createOrder = cpl["CreateOrder"]
-                if not createOrder or createOrder == "0":
-                    self._track_order = False
-                else:
-                    self._track_order = True
-            else:
-                self._track_order = False
-        else:
-            self._track_order = track_order
+        self._track_order = None  # TBD: set by track_order?
 
     def __hash__(self):
         return hash(self.id.id)

h5pyd/_hl/dataset.py

@@ -662,7 +662,7 @@ def maxshape(self):
     @property
     def fillvalue(self):
         """Fill value for this dataset (0 by default)"""
-        dcpl = self.id.dcpl_json
+        dcpl = self.id.cpl_json
         if "fillValue" in dcpl:
             fill_value = dcpl["fillValue"]
             if isinstance(fill_value, list):

h5pyd/_hl/files.py

@@ -219,10 +219,11 @@ def filename(self):
     def _getStats(self):
         """ return info on storage usage """
         self._verifyOpen()
-        if self.id.db.writer:
-            stats = self.id.db.writer.getStats()
-        elif self.id.db.reader:
+
+        if self.id.db.reader:
             stats = self.id.db.reader.getStats()
+        elif self.id.db.writer:
+            stats = self.id.db.writer.getStats()
         else:
             stats = {"created": 0, "lastModified": 0, "owner": 0}
         return stats
@@ -272,13 +273,13 @@ def created(self):
         """Creation time of the domain"""
         self._verifyOpen()
         stats = self._getStats()
-        return stats["created"]
+        return stats.get("created")
 
     @property
     def owner(self):
         """Username of the owner of the domain"""
         stats = self._getStats()
-        return stats["owner"]
+        return stats.get("owner")
 
     @property
     def limits(self):
@@ -315,15 +316,14 @@ def _init_db(self,
                  bucket=None,
                  api_key=None,
                  swmr=False,
+                 track_order=None,
                  getobjs=True,
                  retries=10,
                  timeout=180,
                  **kwds,
                  ):
         # initialize h5db using domain path
 
-        cfg = config.get_config()  # pulls in state from a .hscfg file (if found).
-
         # accept domain values in the form:
         #   http://server:port/home/user/myfile.h5
         #    or
@@ -359,31 +359,10 @@ def _init_db(self,
         if domain[0] != "/":
             raise IOError(400, "relative paths are not valid")
 
-        if endpoint is None:
-            if "hs_endpoint" in cfg:
-                endpoint = cfg["hs_endpoint"]
-
         # remove the trailing slash on endpoint if it exists
         if endpoint and endpoint.endswith('/'):
             endpoint = endpoint.strip('/')
 
-        if username is None:
-            if "hs_username" in cfg:
-                username = cfg["hs_username"]
-
-        if password is None:
-            if "hs_password" in cfg:
-                password = cfg["hs_password"]
-
-        if api_key is None and "hs_api_key" in cfg:
-            api_key = cfg["hs_api_key"]
-
-        if bucket is None:
-            if "HS_BUCKET" in os.environ:
-                bucket = os.environ["HS_BUCKET"]
-            elif "hs_bucket" in cfg:
-                bucket = cfg["hs_bucket"]
-
         db = Hdf5db(app_logger=self.log)  # initialize hdf5 db
 
         kwargs = {"app_logger": self.log}
@@ -403,6 +382,8 @@ def _init_db(self,
             kwargs["retries"] = retries
         if timeout:
             kwargs["timeout"] = timeout
+        if track_order:
+            kwargs["track_order"] = track_order
 
         root_id = None
 
@@ -503,8 +484,11 @@ def __init__(
         """
 
         self.log = logging.getLogger()
+        cfg = config.get_config()  # pulls in state from a .hscfg file (if found).
 
         self.log.setLevel(logging.ERROR)
+        if track_order is None:
+            track_order = cfg.track_order
 
         # if we're passed a GroupId as domain, just initialize the file object
         # with that.  This will be faster and enable the File object to share the same http connection.
@@ -538,12 +522,14 @@ def __init__(
                 kwargs["swmr"] = swmr
             if bucket:
                 kwargs["bucket"] = bucket
+            if track_order is not None:
+                kwargs["track_order"] = track_order
             kwargs["getobjs"] = True  # TBD: disable this optionally?
 
             db = self._init_db(domain, **kwargs)
 
         root_id = db.root_id
-        root_json = db.getObjectById(root_id)
+        root_json = db.getObjectById(root_id, refresh=True)
 
         if "limits" in root_json:
             self._limits = root_json["limits"]
@@ -564,6 +550,9 @@ def __init__(
         self._lastScan = None  # when summary stats where last updated by server
         self._swmr_mode = swmr
 
+        if track_order is None:
+            track_order = cfg.track_order
+
         Group.__init__(self, self._id, track_order=track_order)
 
     def _getVerboseInfo(self):
@@ -715,31 +704,6 @@ def compressors(self):
             compressors = []
         return compressors
 
-    # override base implemention of ACL methods to use the domain rather than update root group
-    def getACL(self, username):
-        req = "/acls/" + username
-        rsp_json = self.GET(req)
-        acl_json = rsp_json["acl"]
-        return acl_json
-
-    def getACLs(self):
-        req = "/acls"
-        rsp_json = self.GET(req)
-        acls_json = rsp_json["acls"]
-        return acls_json
-
-    def putACL(self, acl):
-        if "userName" not in acl:
-            raise IOError(404, "ACL has no 'userName' key")
-        perm = {}
-        for k in ("create", "read", "update", "delete", "readACL", "updateACL"):
-            if k not in acl:
-                raise IOError(404, "Missing ACL field: {}".format(k))
-            perm[k] = acl[k]
-
-        req = "/acls/" + acl["userName"]
-        self.PUT(req, body=perm)
-
     def run_scan(self):
         MAX_WAIT = 10
         self._getVerboseInfo()

h5pyd/_hl/group.py

@@ -40,25 +40,9 @@ def __init__(self, bind, track_order=None, **kwargs):
 
         """ Create a new Group object by binding to a low-level GroupID.
         """
-
         if not isinstance(bind, GroupID):
             raise ValueError(f"{bind} is not a GroupID")
         HLObject.__init__(self, bind, track_order=track_order, **kwargs)
-        """
-        if track_order is None:
-            # set order based on group creation props
-            gcpl = self.id.gcpl_json
-            if "CreateOrder" in gcpl:
-                createOrder = gcpl["CreateOrder"]
-                if not createOrder or createOrder == "0":
-                    self._track_order = False
-                else:
-                    self._track_order = True
-            else:
-                self._track_order = False
-        else:
-            self._track_order = track_order
-        """
 
     def _get_link_json(self, h5path):
         """ Return parent_uuid and json description of link for given path """
@@ -326,7 +310,7 @@ def create_dataset_like(self, name, other, **kwupdate):
             kwupdate.setdefault(k, getattr(other, k))
         # TODO: more elegant way to pass these (dcpl to create_dataset?)
         """
-        dcpl_json = other.id.dcpl_json
+        dcpl_json = other.id.cpl_json
         track_order = None
         if "CreateOrder" in dcpl_json:
             createOrder = dcpl_json["CreateOrder"]
@@ -779,7 +763,16 @@ def __iter__(self):
         for title in titles:
             links[title] = self.id.db.getLink(self.id.uuid, title)
 
-        if self.track_order:
+        track_order = None
+        if self._track_order is not None:
+            print("self._track_order:", self._track_order)
+            # track_order = self._track_order
+        elif self.id.create_order is not None:
+            track_order = self.id.create_order
+        else:
+            track_order = False
+
+        if track_order:
             links = sorted(links.items(), key=lambda x: x[1]['created'])
         else:
             links = sorted(links.items())
@@ -1021,7 +1014,7 @@ def __reversed__(self):
         for title in titles:
             links[title] = self.id.db.getLink(self.id.uuid, title)
 
-        if self.track_order:
+        if self.id.create_order:
             links = sorted(links.items(), key=lambda x: x[1]['created'])
         else:
             links = sorted(links.items())

h5pyd/_hl/objectid.py

@@ -63,6 +63,25 @@ def obj_json(self):
         """json representation of the object"""
         return self.db.getObjectById(self.uuid)
 
+    @property
+    def cpl_json(self):
+        """ return creationProperties if found """
+        obj_json = self.obj_json
+        if "creationProperties" in obj_json:
+            cpl = obj_json["creationProperties"]
+        else:
+            cpl = {}
+        return cpl
+
+    @property
+    def create_order(self):
+        """ return create order from cpl or None if not set """
+        cpl = self.cpl_json
+        if "CreateOrder" in cpl:
+            return cpl["CreateOrder"]
+        else:
+            return None
+
     @property
     def modified(self):
         """last modified timestamp"""
@@ -171,15 +190,6 @@ def get_type(self):
         dtype = createDataType(type_json)
         return dtype
 
-    @property
-    def tcpl_json(self):
-        obj_json = self.obj_json
-        if 'creationProperties' in obj_json:
-            tcpl = obj_json['creationProperties']
-        else:
-            tcpl = {}
-        return tcpl
-
     def __init__(self, parent, obj_id, **kwds):
         """Create a new TypeID.
         """
@@ -208,20 +218,11 @@ def get_type(self):
         dtype = createDataType(type_json)
         return dtype
 
-    @property
-    def dcpl_json(self):
-        obj_json = self.obj_json
-        if 'creationProperties' in obj_json:
-            dcpl = obj_json['creationProperties']
-        else:
-            dcpl = {}
-        return dcpl
-
     @property
     def layout(self):
         layout = None
 
-        dcpl = self.dcpl_json
+        dcpl = self.cpl_json
         if dcpl and 'layout' in dcpl:
             layout = dcpl['layout']
 
@@ -230,7 +231,7 @@ def layout(self):
     @property
     def filters(self):
         filters = []
-        dcpl = self.dcpl_json
+        dcpl = self.cpl_json
         if dcpl and 'filters' in dcpl:
             filters = dcpl['filters']
         return filters
@@ -271,12 +272,3 @@ def __init__(self, parent, obj_id, **kwds):
 
         if self.collection_type != "groups":
             raise IOError(f"Unexpected collection_type: {self._collection_type}")
-
-    @property
-    def gcpl_json(self):
-        obj_json = self.obj_json
-        if 'creationProperties' in obj_json:
-            gcpl = obj_json['creationProperties']
-        else:
-            gcpl = {}
-        return gcpl

h5pyd/config.py

@@ -192,15 +192,15 @@ def track_order(self):
         if "track_order" in Config._cfg:
             track = Config._cfg["track_order"]
         else:
-            track = False
+            track = None
         return track
 
     @track_order.setter
     def track_order(self, value):
         if isinstance(value, str):
             tokens = value.split()
             if len(tokens) == 0:
-                track = False
+                track = None
             else:
                 track = bool(tokens[0])  # strip any comments
         else: