tonik 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

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):
         """
@@ -199,7 +199,7 @@ class Path(object):
         """
         filename = self.feature_path(feature)
         with xr.open_dataset(filename, group='original', engine=self.engine) as ds:
-            return ds.sizes
+            return ds[feature].sizes
 
 
 class Storage(Path):

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.1.dist-info → tonik-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tonik
-Version: 0.1.1
+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.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+tonik/__init__.py,sha256=ZBVGh4dm_l9xwiBGb33O5QV9MfZeNiEd3DBDAm6DiHk,511
+tonik/api.py,sha256=8YS0WCMlm5xs2N6V8n9BiP87ywJC_BUzYsPvWR9KWJk,6499
+tonik/storage.py,sha256=DNIfNb3oCgICcUI_MADQjQdUqkmZJIu42zCYGRs9ers,11512
+tonik/utils.py,sha256=3nSRU_GnV6arP4e63YHn4oEV8XbqzVAW8FCvQVIwGdg,2757
+tonik/xarray2netcdf.py,sha256=w8ubAWa2yCnk9-JQ_e7CHdfEjvjcK1pXol8Qy_PT2hY,5241
+tonik/xarray2zarr.py,sha256=jTrHFpjN3lEDIJEI6RyPvvbW2jZsfYwGE_LQaZ6dwx8,2099
+tonik/package_data/index.html,sha256=GKDClUhIam_fAYbNfzAolORhSCG3ae1wW3VjWCg4PMk,2732
+tonik-0.1.3.dist-info/METADATA,sha256=DaGP_RFy6luf75DQMr9UA3cfJXlOVJbdHFPU09RCE_4,1938
+tonik-0.1.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+tonik-0.1.3.dist-info/entry_points.txt,sha256=VnGfC5qAzpntEHAb5pooUEpYABSgOfQoNhCEtLDJyf8,45
+tonik-0.1.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+tonik-0.1.3.dist-info/RECORD,,

tonik-0.1.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-tonik/__init__.py,sha256=ZBVGh4dm_l9xwiBGb33O5QV9MfZeNiEd3DBDAm6DiHk,511
-tonik/api.py,sha256=8YS0WCMlm5xs2N6V8n9BiP87ywJC_BUzYsPvWR9KWJk,6499
-tonik/storage.py,sha256=oy7Nz89zeiZchsqpouttzWhSL6UgenUQZiaMX6SdpsI,11499
-tonik/utils.py,sha256=3nSRU_GnV6arP4e63YHn4oEV8XbqzVAW8FCvQVIwGdg,2757
-tonik/xarray2netcdf.py,sha256=aZSSMADmS0DpnprT5TBqERGxrycZTPTNuQhxm1rOsh0,5135
-tonik/xarray2zarr.py,sha256=jTrHFpjN3lEDIJEI6RyPvvbW2jZsfYwGE_LQaZ6dwx8,2099
-tonik/package_data/index.html,sha256=GKDClUhIam_fAYbNfzAolORhSCG3ae1wW3VjWCg4PMk,2732
-tonik-0.1.1.dist-info/METADATA,sha256=kSVqgQLr_k3j7s3mfcAnY5nt4LrA-xplhYFiQFLnUIw,1938
-tonik-0.1.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-tonik-0.1.1.dist-info/entry_points.txt,sha256=VnGfC5qAzpntEHAb5pooUEpYABSgOfQoNhCEtLDJyf8,45
-tonik-0.1.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-tonik-0.1.1.dist-info/RECORD,,