tonik 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

tonik/api.py

@@ -58,16 +58,16 @@ class TonikAPI:
         dt = dt.replace(tzinfo=None)
         return dt
 
-    def feature(self,
-                group: str,
-                name: str,
-                starttime: Union[str, None],
-                endtime: Union[str, None],
-                subdir: SubdirType = None,
-                resolution: str = 'full',
-                verticalres: int = 10,
-                log: bool = False,
-                normalise: bool = False):
+    async def feature(self,
+                      group: str,
+                      name: str,
+                      starttime: Union[str, None],
+                      endtime: Union[str, None],
+                      subdir: SubdirType = None,
+                      resolution: str = 'full',
+                      verticalres: int = 10,
+                      log: bool = False,
+                      normalise: bool = False):
         _st = self.preprocess_datetime(starttime)
         _et = self.preprocess_datetime(endtime)
         g = Storage(group, rootdir=self.rootdir,
@@ -102,22 +102,24 @@ class TonikAPI:
             dates = np.tile(dates, freq.size)
             df = pd.DataFrame(
                 {'dates': dates, 'freqs': freqs, 'feature': vals})
-            df.dates = pd.to_datetime(df.dates.values).tz_localize('UTC')
+            df['dates'] = pd.to_datetime(df.dates.values).strftime(
+                '%Y-%m-%dT%H:%M:%SZ')
             output = df.to_csv(index=False,
                                columns=['dates', 'freqs', 'feature'])
         else:
             df = pd.DataFrame(data=feat.to_pandas(), columns=[feat.name])
-            df['dates'] = df.index.tz_localize('UTC')
+            df['dates'] = df.index
             if resolution != 'full':
                 try:
                     current_resolution = pd.Timedelta(
                         df['dates'].diff().mean())
                     if current_resolution < pd.Timedelta(resolution):
-                        df = df.resample(pd.Timedelta(resolution)).mean()
+                        df = df.resample(pd.Timedelta(resolution)).median()
                 except ValueError:
                     logger.warning(
                         f"Cannot resample {feat.name} to {resolution}: e")
             df.rename(columns={feat.name: 'feature'}, inplace=True)
+            df['dates'] = df['dates'].dt.strftime('%Y-%m-%dT%H:%M:%SZ')
             output = df.to_csv(index=False, columns=['dates', 'feature'])
         return StreamingResponse(iter([output]),
                                  media_type='text/csv',
@@ -144,7 +146,7 @@ class TonikAPI:
             d, units='hours since 1970-01-01 00:00:00.0', calendar='gregorian')
         return freq, dates, spec
 
-    def inventory(self, group: str, subdir: SubdirType = None, tree: bool = True) -> InventoryReturnType:
+    async def inventory(self, group: str, subdir: SubdirType = None, tree: bool = True) -> InventoryReturnType:
         sg = Storage(group, rootdir=self.rootdir, create=False)
         try:
             c = sg.get_substore(*subdir)
@@ -162,7 +164,7 @@ class TonikAPI:
                 dir_contents.remove('labels.json')
             return [fn.replace('.nc', '').replace('.zarr', '') for fn in dir_contents]
 
-    def labels(self, group: str, subdir: SubdirType = None, starttime: Optional[str] = None, endtime: Optional[str] = None):
+    async def labels(self, group: str, subdir: SubdirType = None, starttime: Optional[str] = None, endtime: Optional[str] = None):
         _st = self.preprocess_datetime(starttime)
         _et = self.preprocess_datetime(endtime)
         sg = Storage(group, rootdir=self.rootdir,

tonik/xarray2zarr.py

@@ -2,7 +2,11 @@ import logging
 import os
 
 import xarray as xr
-from zarr.errors import PathNotFoundError
+try:
+    from zarr.errors import PathNotFoundError
+except ImportError:
+    class PathNotFoundError(Exception):
+        pass
 
 from .utils import merge_arrays
 

{tonik-0.1.11.dist-info → tonik-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tonik
-Version: 0.1.11
+Version: 0.1.13
 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
@@ -9,8 +9,7 @@ License-File: LICENSE
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.7
-Requires-Dist: dask<=2024.10.0
+Requires-Python: >=3.9
 Requires-Dist: datashader>=0.14
 Requires-Dist: fastapi>=0.112
 Requires-Dist: h5netcdf>=1.1
@@ -20,9 +19,12 @@ Requires-Dist: netcdf4>=1.6
 Requires-Dist: pandas>=2.0
 Requires-Dist: python-json-logger>=2.0
 Requires-Dist: uvicorn[standard]>=0.22
-Requires-Dist: xarray>=2023.4
-Requires-Dist: zarr
+Requires-Dist: xarray[accel,io,parallel]
+Requires-Dist: zarr<3; python_version < '3.11'
+Requires-Dist: zarr>=3.0.3; python_version >= '3.11'
 Provides-Extra: dev
+Requires-Dist: httpx; extra == 'dev'
+Requires-Dist: ipykernel; extra == 'dev'
 Requires-Dist: mkdocs; extra == 'dev'
 Requires-Dist: mkdocs-jupyter; extra == 'dev'
 Requires-Dist: mkdocstrings[python]; extra == 'dev'

{tonik-0.1.11.dist-info → tonik-0.1.13.dist-info}/RECORD

@@ -1,12 +1,12 @@
 tonik/__init__.py,sha256=dov-nMeGFBzLspmj4rWKjC4r736vmaPDgMEkHSUfP98,523
-tonik/api.py,sha256=xUH-fr-xUwc_a21QYz11Dk3YjB2nRuCclmALvU64UJM,7592
+tonik/api.py,sha256=XDKiz1AzYNBOwYfaRxpMgqGRDAPJEE6wWJyBxuYPRLc,7751
 tonik/storage.py,sha256=IklM_atZD4rebUsnXsUj5JldSHU2LqmuqME03PHp_UI,10441
 tonik/utils.py,sha256=9eSVKIbs8TIZlJCz_-B7FrvOUQCQHO3K52v4Heus-uE,6135
 tonik/xarray2netcdf.py,sha256=gDNT6nxnRbXPeRqZ3URW5oXY3Nfh3TCrfueE-eUrIoY,5181
-tonik/xarray2zarr.py,sha256=xJjKcFZF0oz6gw47apuCiXFtW5HgWqnZgiIuEVQHhBI,2363
+tonik/xarray2zarr.py,sha256=RhCnS6g3yqe8mrEXhD_4PCN0EI3QPhp5X7ui_wvb_jY,2445
 tonik/package_data/index.html,sha256=GKDClUhIam_fAYbNfzAolORhSCG3ae1wW3VjWCg4PMk,2732
-tonik-0.1.11.dist-info/METADATA,sha256=xEhlRUeS79ZRxwL_-ksmf5do2OrOapKBealQRPUSFpE,2005
-tonik-0.1.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tonik-0.1.11.dist-info/entry_points.txt,sha256=mT3B4eBE8SHlAeMhFnZGor9-YkVtoWM1NVHVuypJ-uY,74
-tonik-0.1.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-tonik-0.1.11.dist-info/RECORD,,
+tonik-0.1.13.dist-info/METADATA,sha256=MNuL04Q7howEYqs_HbnLxQtIXLAoLhN5nEC9GcE3uk4,2143
+tonik-0.1.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tonik-0.1.13.dist-info/entry_points.txt,sha256=mT3B4eBE8SHlAeMhFnZGor9-YkVtoWM1NVHVuypJ-uY,74
+tonik-0.1.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+tonik-0.1.13.dist-info/RECORD,,