tonik 0.1.2__tar.gz → 0.1.3__tar.gz

{tonik-0.1.2 → tonik-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tonik
-Version: 0.1.2
+Version: 0.1.3
 Summary: Store time series data as HDF5 files and access them through an API.
 Project-URL: Homepage, https://tsc-tools.github.io/tonik
 Project-URL: Issues, https://github.com/tsc-tools/tonik/issues

{tonik-0.1.2 → tonik-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "tonik"
-version = "0.1.2"
+version = "0.1.3"
 authors = [
   { name="Yannik Behr", email="y.behr@gns.cri.nz" },
   { name="Christof Mueller", email="c.mueller@gns.cri.nz" }

{tonik-0.1.2 → tonik-0.1.3}/src/tonik/storage.py

@@ -156,15 +156,16 @@ class Path(object):
 
         xd_index = dict(datetime=slice(self.starttime, self.endtime))
         with xr.open_dataset(filename, group='original', engine=self.engine) as ds:
-            rq = ds.loc[xd_index].load()
+            rq = ds[feature].loc[xd_index].load()
+            rq.attrs = ds.attrs
 
         # Stack features
         if stack_length is not None:
             logger.debug("Stacking feature...")
             try:
-                xdf = rq[feature].rolling(datetime=int(num_periods),
-                                          center=False,
-                                          min_periods=1).mean()
+                xdf = rq.rolling(datetime=int(num_periods),
+                                 center=False,
+                                 min_periods=1).mean()
                 # Return requested timeframe to that defined in initialisation
                 self.starttime += pd.to_timedelta(stack_length)
                 xdf_new = xdf.loc[self.starttime:self.endtime]
@@ -175,8 +176,7 @@ class Path(object):
                              format(stack_length, feature))
             else:
                 return xdf_new
-
-        return rq[feature]
+        return rq
 
     def load(self, *args, **kwargs):
         """

{tonik-0.1.2 → tonik-0.1.3}/src/tonik/xarray2netcdf.py

@@ -88,6 +88,8 @@ def xarray2netcdf(xArray, fdir, rootGroupName="original", timedim="datetime",
                 data[indices] = xArray[featureName].values
             rootGrp.attrs['endtime'] = str(num2date(times[-1], units=rootGrp[timedim].attrs['units'],
                                                     calendar=rootGrp[timedim].attrs['calendar']))
+            rootGrp.attrs['resolution'] = resolution
+            rootGrp.attrs['resolution_units'] = 'h'
             try:
                 _setMetaInfo(featureName, h5f, xArray)
             except KeyError as e:
@@ -102,7 +104,7 @@ def _create_h5_Structure(defaultGroupName, featureName, h5f, xArray, starttime,
     coordinates.attrs['units'] = 'hours since 1970-01-01 00:00:00.0'
     coordinates.attrs['calendar'] = 'gregorian'
     rootGrp.attrs['starttime'] = str(starttime)
-    for label, size in xArray.dims.items():
+    for label, size in xArray.sizes.items():
         if not np.issubdtype(xArray[label].dtype, np.datetime64):
             rootGrp.dimensions[label] = size
             coordinates = rootGrp.create_variable(label, (label,), float)

{tonik-0.1.2 → tonik-0.1.3}/tests/backend_speed_test.py

@@ -18,7 +18,10 @@ def write_read(backend):
     test_dir = tempfile.mkdtemp()
     sg = Storage('speed_test', test_dir, starttime=tstart, endtime=tend,
                  backend=backend)
-    sg.save(spec)
+    kwargs = {}
+    if backend == 'netcdf':
+        kwargs['archive_starttime'] = tstart
+    sg.save(spec, **kwargs)
     spec_test = sg('ssam')
 
 

{tonik-0.1.2 → tonik-0.1.3}/tests/test_save.py

@@ -85,6 +85,8 @@ def test_xarray2netcdf_resolution(tmp_path_factory):
     xdf_test = c('rsam')
     assert xdf_test.loc['2022-07-18T00:12:00'] == xdf['rsam'].loc['2022-07-18T00:10:00']
     assert np.isnan(xdf_test.loc['2022-07-18T00:06:00'].data)
+    assert xdf_test.attrs['resolution'] == 0.1
+    assert xdf_test.attrs['resolution_units'] == 'h'
 
 
 def test_xarray2netcdf_with_gaps(tmp_path_factory):