fix for track_info and getserverinfo

Author: jreadey

h5pyd/_hl/attrs.py

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

h5pyd/_hl/base.py

@@ -381,7 +381,8 @@ def __init__(self, oid, file=None, track_order=None):
             self.log.addHandler(fh)
         else:
             pass
-        self._track_order = None  # TBD: set by track_order?
+
+        self._track_order = track_order  # TBD: set by track_order?
 
     def __hash__(self):
         return hash(self.id.id)

h5pyd/_hl/files.py

@@ -365,6 +365,13 @@ def _init_db(self,
 
         db = Hdf5db(app_logger=self.log)  # initialize hdf5 db
 
+        if track_order is None:
+            cfg = config.get_config()
+            if cfg.track_order:
+                track_order = True
+            else:
+                track_order = None
+
         kwargs = {"app_logger": self.log}
         if swmr:
             kwargs["swmr"] = True  # disable metadata caching in swmr mode
@@ -484,11 +491,8 @@ 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.
@@ -550,9 +554,6 @@ 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):

h5pyd/_hl/group.py

@@ -127,6 +127,13 @@ def create_group(self, h5path, track_order=None):
         if self.read_only:
             raise ValueError("No write intent")
 
+        if track_order is None:
+            cfg = config.get_config()
+            if cfg.track_order:
+                track_order = True
+            else:
+                track_order = None
+
         if isinstance(h5path, bytes):
             h5path = h5path.decode('utf-8')
 
@@ -249,12 +256,14 @@ def create_dataset(self, name, shape=None, dtype=None, data=None, **kwds):
         if "track_order" in kwds:
             track_order = kwds["track_order"]
         else:
-            track_order = None
-
-        cfg = config.get_config()
+            cfg = config.get_config()
+            if cfg.track_order:
+                track_order = True
+            else:
+                track_order = None
 
         datasetId = dataset.make_new_dset(self, shape=shape, dtype=dtype, data=data, **kwds)
-        dset = Dataset(datasetId, track_order=(track_order or cfg.track_order))
+        dset = Dataset(datasetId, track_order=track_order)
 
         if name is not None:
             items = name.split('/')
@@ -500,16 +509,15 @@ def __getitem__(self, name, track_order=None):
 
         if tgt_id is not None:
             collection = getCollectionForId(tgt_id)
-
             if collection == 'groups':
-                tgt = Group(GroupID(self, tgt_id, obj_json=tgt_json), track_order=track_order)
+                tgt = Group(GroupID(self, tgt_id), track_order=track_order)
             elif collection == 'datatypes':
-                tgt = Datatype(TypeID(self, tgt_id, obj_json=tgt_json))
+                tgt = Datatype(TypeID(self, tgt_id), track_order=track_order)
             elif collection == 'datasets':
                 # create a Table if the dataset is one dimensional and compound
                 shape_json = tgt_json["shape"]
                 dtype_json = tgt_json["type"]
-                dset_id = DatasetID(self, tgt_id, obj_json=tgt_json, track_order=track_order)
+                dset_id = DatasetID(self, tgt_id)
                 if getRank(shape_json) == 1 and dtype_json["class"] == 'H5T_COMPOUND':
                     tgt = Table(dset_id, track_order=track_order)
                 else:
@@ -565,7 +573,7 @@ def get(self, name, default=None, getclass=False, getlink=False, track_order=Non
             Return HardLink, SoftLink and ExternalLink classes.  Return
             "default" if nothing with that name exists.
 
-        "track_order" is (T/F):
+        "track_order" is (T/F/None):
             If a group is returned, it's items will be listed by creation order if track_order
             is True and lexicographically if False.  If track_order is not set, the track_order
             used at group creation time will be used.
@@ -708,7 +716,6 @@ def __setitem__(self, name, obj):
             db.createExternalLink(self.id.uuid, name, obj.path, obj.filename)
 
         elif isinstance(obj, numpy.dtype):
-            # print "create named type"
             ctype_id = db.createCommittedType(obj)
             db.createHardLink(self.id.uuid, name, ctype_id)
 
@@ -765,8 +772,7 @@ def __iter__(self):
 
         track_order = None
         if self._track_order is not None:
-            print("self._track_order:", self._track_order)
-            # 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:

h5pyd/serverinfo.py

@@ -19,7 +19,7 @@
 
 def getServerInfo(endpoint=None, username=None, password=None, api_key=None, **kwds):
 
-    print("GetServerInfo")
+    """ return server state info """
 
     cfg = config.get_config()  # get credentials from .hscfg file (if found)
 

test/hl/test_group.py

@@ -413,8 +413,8 @@ def test_get_dataset_track_order(self):
         with h5py.File(filename) as f:
             g = f['order']
 
-            d = g.get('dset', track_order=True)
-            self.assertEqual(list(d.attrs), list(self.titles))
+            d1 = g.get('dset', track_order=True)
+            self.assertEqual(list(d1.attrs), list(self.titles))
 
             d2 = g.get('dset2', track_order=False)
             ref = sorted(self.titles)