tonik 0.1.4__tar.gz → 0.1.6__tar.gz

{tonik-0.1.4 → tonik-0.1.6}/PKG-INFO

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

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

{tonik-0.1.4 → tonik-0.1.6}/src/tonik/api.py

@@ -1,8 +1,9 @@
 import logging
 import os
+import sys
 from argparse import ArgumentParser
 from datetime import datetime
-from typing import Annotated
+from typing import Annotated, List, Union
 from urllib.parse import unquote
 
 import datashader as dsh
@@ -19,6 +20,13 @@ 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()]
+
 
 class TonikAPI:
 
@@ -62,7 +70,7 @@ class TonikAPI:
                 verticalres: int = 10,
                 log: bool = False,
                 normalise: bool = False,
-                subdir: Annotated[list[str] | None, Query()] = None):
+                subdir: SubdirType = None):
         _st = self.preprocess_datetime(starttime)
         _et = self.preprocess_datetime(endtime)
         g = Storage(group, rootdir=self.rootdir,

{tonik-0.1.4 → tonik-0.1.6}/src/tonik/xarray2netcdf.py

@@ -91,7 +91,7 @@ def xarray2netcdf(xArray, fdir, group="original", timedim="datetime",
             rootGrp.attrs['resolution'] = resolution
             rootGrp.attrs['resolution_units'] = 'h'
             try:
-                _setMetaInfo(featureName, h5f, xArray)
+                _setMetaInfo(featureName, rootGrp, xArray)
             except KeyError as e:
                 logging.warning(
                     f"Could not set all meta info for {featureName}: {e}")
@@ -117,8 +117,7 @@ def _create_h5_Structure(defaultGroupName, featureName, h5f, xArray, starttime,
     return rootGrp
 
 
-def _setMetaInfo(featureName, h5f, xArray):
-    h5f.attrs['station'] = xArray.attrs['station']
-    h5f.attrs['latitude'] = -42
-    h5f.attrs['longitude'] = 168
-    h5f.attrs['datatype'] = featureName
+def _setMetaInfo(featureName, rootGrp, xArray):
+    for key, value in xArray.attrs.items():
+        rootGrp.attrs[key] = value
+    rootGrp.attrs['feature'] = featureName

{tonik-0.1.4 → tonik-0.1.6}/tests/test_save.py

@@ -89,6 +89,22 @@ def test_xarray2netcdf_resolution(tmp_path_factory):
     assert xdf_test.attrs['resolution_units'] == 'h'
 
 
+def test_xarray2netcdf_attributes(tmp_path_factory):
+    starttime = datetime(2022, 7, 18, 0, 0, 0)
+    xdf = generate_test_data(dim=1, ndays=1, tstart=starttime,
+                             add_nans=False)
+    temp_dir = tmp_path_factory.mktemp('test_xarray2netcdf')
+    g = Storage('test_experiment', rootdir=temp_dir,
+                starttime=datetime(2000, 1, 1),
+                endtime=datetime.fromisoformat(xdf.attrs['endtime']),
+                backend='netcdf')
+    c = g.get_substore('MDR', '00', 'HHZ')
+    c.save(xdf, archive_starttime=starttime)
+    xdf_test = c('rsam')
+    assert xdf_test.attrs['station'] == xdf.attrs['station']
+    assert xdf_test.attrs['feature'] == 'rsam'
+
+
 def test_xarray2netcdf_with_gaps(tmp_path_factory):
     """
     Test writing xarray data to hdf5 with gaps.