tonik 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

tonik/api.py

@@ -3,7 +3,7 @@ import os
 import sys
 from argparse import ArgumentParser
 from datetime import datetime
-from typing import Annotated, List, Union
+from typing import Annotated, List, Union, Optional
 from urllib.parse import unquote
 
 import datashader as dsh
@@ -20,14 +20,8 @@ from .storage import Storage
 
 logger = logging.getLogger(__name__)
 
-if sys.version_info >= (3, 10):
-    # For Python 3.10 and above, use the new union operator '|'
-    SubdirType = Annotated[list[str] | None, Query()]
-    InventoryReturnType = list | dict
-else:
-    # For Python 3.9 and below, use Union from typing
-    SubdirType = Annotated[Union[List[str], None], Query()]
-    InventoryReturnType = Union[list, dict]
+SubdirType = Annotated[Union[List[str], None], Query()]
+InventoryReturnType = Union[list, dict]
 
 
 class TonikAPI:
@@ -66,21 +60,20 @@ class TonikAPI:
     def feature(self,
                 group: str,
                 name: str,
-                starttime: str = None,
-                endtime: str = None,
+                starttime: Union[str, None],
+                endtime: Union[str, None],
+                subdir: SubdirType = None,
                 resolution: str = 'full',
                 verticalres: int = 10,
                 log: bool = False,
-                normalise: bool = False,
-                subdir: SubdirType = None):
+                normalise: bool = False):
         _st = self.preprocess_datetime(starttime)
         _et = self.preprocess_datetime(endtime)
         g = Storage(group, rootdir=self.rootdir,
                     starttime=_st, endtime=_et,
                     create=False)
-        if subdir is None:
-            c = g
-        else:
+        c = g
+        if subdir:
             c = g.get_substore(*subdir)
         try:
             feat = c(name)
@@ -169,9 +162,11 @@ class TonikAPI:
 def main(argv=None):
     parser = ArgumentParser()
     parser.add_argument("--rootdir", default='/tmp')
+    parser.add_argument("-p", "--port", default=8003, type=int)
+    parser.add_argument("--host", default='0.0.0.0')
     args = parser.parse_args(argv)
     ta = TonikAPI(args.rootdir)
-    uvicorn.run(ta.app, host="0.0.0.0", port=8003)
+    uvicorn.run(ta.app, host=args.host, port=args.port)
 
 
 if __name__ == "__main__":

tonik/xarray2zarr.py

@@ -36,7 +36,7 @@ def xarray2zarr(xds: xr.Dataset, path: str, mode: str = 'a', group='original'):
         else:
             try:
                 xds_existing = xr.open_zarr(fout, group=group)
-            except PathNotFoundError:
+            except (PathNotFoundError, FileNotFoundError):
                 xds[feature].to_zarr(fout, group=group, mode='a')
                 continue
             if xds_existing.datetime[0] > xds.datetime[0] or xds_existing.datetime[-1] > xds.datetime[-1]:

{tonik-0.1.8.dist-info → tonik-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tonik
-Version: 0.1.8
+Version: 0.1.10
 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
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.7
 Requires-Dist: datashader>=0.14
-Requires-Dist: fastapi>=0.95
+Requires-Dist: fastapi>=0.112
 Requires-Dist: h5netcdf>=1.1
 Requires-Dist: h5py>=3.8
 Requires-Dist: matplotlib

tonik-0.1.10.dist-info/RECORD

@@ -0,0 +1,12 @@
+tonik/__init__.py,sha256=ZBVGh4dm_l9xwiBGb33O5QV9MfZeNiEd3DBDAm6DiHk,511
+tonik/api.py,sha256=JaKHzavqYDjZo2DypTHgAaM01Y4EOkn6UF3ZVm50F5k,6694
+tonik/storage.py,sha256=GNJ6w9VHOeTR_ZJMZ-Ipqe3nFK2I91fkHYwg1k9bEuo,9470
+tonik/utils.py,sha256=3nSRU_GnV6arP4e63YHn4oEV8XbqzVAW8FCvQVIwGdg,2757
+tonik/xarray2netcdf.py,sha256=RUsPwPDEOnUIMGt7_9F1VDyg83zu8x-Qs3jmZs3Dq0o,5173
+tonik/xarray2zarr.py,sha256=xJjKcFZF0oz6gw47apuCiXFtW5HgWqnZgiIuEVQHhBI,2363
+tonik/package_data/index.html,sha256=GKDClUhIam_fAYbNfzAolORhSCG3ae1wW3VjWCg4PMk,2732
+tonik-0.1.10.dist-info/METADATA,sha256=gDvofXsP2pnRFDcwYzCd67dZ6BC0GGBDtdC_sn71k7o,1940
+tonik-0.1.10.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+tonik-0.1.10.dist-info/entry_points.txt,sha256=VnGfC5qAzpntEHAb5pooUEpYABSgOfQoNhCEtLDJyf8,45
+tonik-0.1.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+tonik-0.1.10.dist-info/RECORD,,

tonik-0.1.8.dist-info/RECORD

@@ -1,12 +0,0 @@
-tonik/__init__.py,sha256=ZBVGh4dm_l9xwiBGb33O5QV9MfZeNiEd3DBDAm6DiHk,511
-tonik/api.py,sha256=l9_F0ioK9n7UbKpGJKbJts-xwkFC4GBv10R2qLS6Du8,6832
-tonik/storage.py,sha256=GNJ6w9VHOeTR_ZJMZ-Ipqe3nFK2I91fkHYwg1k9bEuo,9470
-tonik/utils.py,sha256=3nSRU_GnV6arP4e63YHn4oEV8XbqzVAW8FCvQVIwGdg,2757
-tonik/xarray2netcdf.py,sha256=RUsPwPDEOnUIMGt7_9F1VDyg83zu8x-Qs3jmZs3Dq0o,5173
-tonik/xarray2zarr.py,sha256=EhEo5kqzrKyXR37RX2zYtgOAviZdRqstZi_4ZtUmSDc,2342
-tonik/package_data/index.html,sha256=GKDClUhIam_fAYbNfzAolORhSCG3ae1wW3VjWCg4PMk,2732
-tonik-0.1.8.dist-info/METADATA,sha256=po93NQ8aYXBg6mGARBTPO1r1qq8_gsl8slfsyaC1rZM,1938
-tonik-0.1.8.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-tonik-0.1.8.dist-info/entry_points.txt,sha256=VnGfC5qAzpntEHAb5pooUEpYABSgOfQoNhCEtLDJyf8,45
-tonik-0.1.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-tonik-0.1.8.dist-info/RECORD,,