tonik 0.0.10__py3-none-any.whl → 0.0.11__py3-none-any.whl

tonik/storage.py

@@ -155,11 +155,7 @@ class Path(object):
 
         xd_index = dict(datetime=slice(self.starttime, self.endtime))
         with xr.open_dataset(filename, group='original', engine=self.backend) as ds:
-            try:
-                rq = ds.loc[xd_index].load()
-            except KeyError:
-                ds = ds.sortby("datetime")
-                rq = ds.loc[xd_index].load()
+            rq = ds.loc[xd_index].load()
 
         # Stack features
         if stack_length is not None:

tonik/xarray2zarr.py

@@ -14,24 +14,29 @@ def xarray2zarr(xds, path, mode='a'):
                 fout, group='original', mode='w')
         else:
             xds_existing = xr.open_zarr(fout, group='original')
-            try:
-                overlap = xds_existing.datetime.where(
-                    xds_existing.datetime == xds.datetime)
-                if overlap.size > 0:
-                    xds[feature].loc[dict(datetime=overlap)].to_zarr(
-                        fout, group='original', mode='r+', region='auto')
-                    xds[feature].drop_sel(datetime=overlap).to_zarr(
-                        fout, group='original', mode='a', append_dim="datetime")
-                else:
-                    xds[feature].to_zarr(
-                        fout, group='original', append_dim='datetime')
-            except Exception as e:
-                msg = f"Appending {feature} to {fout} failed: {e}\n"
-                msg += "Attempting to merge the two datasets."
-                logger.error(msg)
-                # remove duplicate datetime entries
-                xda_existing = xds_existing[feature].drop_duplicates(
-                    'datetime', keep='last')
-                xda_new = xds[feature].drop_duplicates('datetime', keep='last')
-                xda_new = xda_new.combine_first(xda_existing)
-                xda_new.to_zarr(fout, group='original', mode='w')
+            if xds_existing.datetime[0] > xds.datetime[0] or xds_existing.datetime[-1] > xds.datetime[-1]:
+                xds_new = xr.merge([xds_existing[feature], xds[feature]])
+                xds_new.to_zarr(fout, group='original', mode='w')
+            else:
+                try:
+                    overlap = xds_existing.datetime.where(
+                        xds_existing.datetime == xds.datetime)
+                    if overlap.size > 0:
+                        xds[feature].loc[dict(datetime=overlap)].to_zarr(
+                            fout, group='original', mode='r+', region='auto')
+                        xds[feature].drop_sel(datetime=overlap).to_zarr(
+                            fout, group='original', mode='a', append_dim="datetime")
+                    else:
+                        xds[feature].to_zarr(
+                            fout, group='original', append_dim='datetime')
+                except Exception as e:
+                    msg = f"Appending {feature} to {fout} failed: {e}\n"
+                    msg += "Attempting to merge the two datasets."
+                    logger.error(msg)
+                    # remove duplicate datetime entries
+                    xda_existing = xds_existing[feature].drop_duplicates(
+                        'datetime', keep='last')
+                    xda_new = xds[feature].drop_duplicates(
+                        'datetime', keep='last')
+                    xda_new = xda_new.combine_first(xda_existing)
+                    xda_new.to_zarr(fout, group='original', mode='w')

{tonik-0.0.10.dist-info → tonik-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tonik
-Version: 0.0.10
+Version: 0.0.11
 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.0.11.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=Ts6jKLqwcDQvPIea-swBCpnEjQr_xnAjOl-hkUelTn4,11165
+tonik/utils.py,sha256=_TxXf9o9fOvtuOvGO6-ww9F5m0QelHyfQzQw8RGjTV4,1868
+tonik/xarray2hdf5.py,sha256=cekO9vo9ZRlr0VndswJjPC27CEVD3TpRVKLAJ-aAO0g,4465
+tonik/xarray2zarr.py,sha256=0bWMP_PZ0FLr9AlxKrC5M4aJRh_VGkUfJ-A-BGgKqM8,1979
+tonik/package_data/index.html,sha256=GKDClUhIam_fAYbNfzAolORhSCG3ae1wW3VjWCg4PMk,2732
+tonik-0.0.11.dist-info/METADATA,sha256=cXj6-wI7M6kWVvcffHe3W9BJQVdJfkNigzcrd0s5XlQ,1939
+tonik-0.0.11.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+tonik-0.0.11.dist-info/entry_points.txt,sha256=VnGfC5qAzpntEHAb5pooUEpYABSgOfQoNhCEtLDJyf8,45
+tonik-0.0.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+tonik-0.0.11.dist-info/RECORD,,

tonik-0.0.10.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=sScIFA4KXURNPwTnV-rvDh6cWCy9sRrErr9BshZpw2I,11303
-tonik/utils.py,sha256=_TxXf9o9fOvtuOvGO6-ww9F5m0QelHyfQzQw8RGjTV4,1868
-tonik/xarray2hdf5.py,sha256=cekO9vo9ZRlr0VndswJjPC27CEVD3TpRVKLAJ-aAO0g,4465
-tonik/xarray2zarr.py,sha256=9gvm7vFnoe-O39-ow2pqK4xoFSg9Tg865qdqKYI-Zy8,1605
-tonik/package_data/index.html,sha256=GKDClUhIam_fAYbNfzAolORhSCG3ae1wW3VjWCg4PMk,2732
-tonik-0.0.10.dist-info/METADATA,sha256=IN-k1gZOtxQrsVlYDtpiJuBW4gIJCXRsqFO4pNCT_uo,1939
-tonik-0.0.10.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-tonik-0.0.10.dist-info/entry_points.txt,sha256=VnGfC5qAzpntEHAb5pooUEpYABSgOfQoNhCEtLDJyf8,45
-tonik-0.0.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-tonik-0.0.10.dist-info/RECORD,,