tonik 0.1.7__tar.gz → 0.1.9__tar.gz

{tonik-0.1.7 → tonik-0.1.9}/.devcontainer/devcontainer.json

@@ -4,6 +4,8 @@
 	"name": "Python 3",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
 	"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bullseye",
+	//"image": "mcr.microsoft.com/devcontainers/python:1-3.9-bullseye",
+
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

{tonik-0.1.7 → tonik-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tonik
-Version: 0.1.7
+Version: 0.1.9
 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.7 → tonik-0.1.9}/pyproject.toml

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

{tonik-0.1.7 → tonik-0.1.9}/src/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,12 +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()]
-else:
-    # For Python 3.9 and below, use Union from typing
-    SubdirType = Annotated[Union[List[str], None], Query()]
+SubdirType = Annotated[Union[List[str], None], Query()]
+InventoryReturnType = Union[list, dict]
 
 
 class TonikAPI:
@@ -64,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)
@@ -147,7 +142,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) -> list | dict:
+    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)

{tonik-0.1.7 → tonik-0.1.9}/src/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]: