fix: defer get_variable to xarray.io.Reader (#107)

Author: hrodmn

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## unreleased
 
-* nothing
+* fix: actually use `sel_method` when loading the variable by @hrodmn ([#107](https://github.com/developmentseed/titiler-multidim/pull/107))
 
 # 0.7.0
 

pyproject.toml

@@ -153,3 +153,4 @@ excludes = ["tests/", "**/.mypy_cache", "**/.DS_Store"]
 [tool.pytest.ini_options]
 addopts = "--cov=titiler.multidim --cov-report term-missing -s -vv"
 pythonpath = ["src", "tests"]
+norecursedirs = ["infrastructure"]

src/titiler/multidim/reader.py

@@ -1,18 +1,17 @@
 """XarrayReader"""
 
-import pickle
 import os
-from typing import Any, List, Optional, Dict
+import pickle
+from typing import Any, Dict, List, Optional
 from urllib.parse import urlparse
 
-
 import attr
 import xarray as xr
 from pydantic_settings import BaseSettings
+from titiler.xarray.io import Reader, xarray_open_dataset
 
 from titiler.multidim.redis_pool import get_redis
 from titiler.multidim.settings import ApiSettings
-from titiler.xarray.io import Reader, get_variable, xarray_open_dataset
 
 try:
     import icechunk
@@ -231,11 +230,6 @@ def __attrs_post_init__(self):
             print(f"Adding dataset in Cache: {cache_key}")
             cache_client.set(cache_key, data_bytes, ex=300)
 
-        self.input = get_variable(
-            self.ds,
-            self.variable,
-            sel=self.sel,
-        )
         super().__attrs_post_init__()
 
     @classmethod

tests/fixtures/generate_test_netcdf.py

@@ -1,7 +1,8 @@
 """Create NetCDF fixture."""
 
 import numpy as np
-from netCDF4 import Dataset
+from netCDF4 import Dataset, date2num
+from datetime import datetime, timedelta
 
 # File name
 filename = "testfile.nc"
@@ -35,7 +36,16 @@
 )
 
 # Fill variables with data
-times[:] = np.arange(5)
+# Create actual datetime values starting from 2020-01-01 with daily intervals
+start_date = datetime(2020, 1, 1)
+time_values = [start_date + timedelta(days=i) for i in range(5)]
+units = "days since 1970-01-01 00:00:00"
+calendar = "gregorian"
+times[:] = date2num(time_values, units=units, calendar=calendar)
+times.units = units
+times.calendar = calendar
+times.standard_name = "time"
+
 lats[:] = np.linspace(lat_min + res / 2, lat_max - res / 2, lat_n)
 lons[:] = np.linspace(lon_min + res / 2, lon_max - res / 2, lon_n)
 data[:, :, :] = np.random.randint(-128, 127, size=(5, lat_n, lon_n), dtype=np.int8)

tests/fixtures/responses/testfile_nc_histogram.json

@@ -1,42 +1,42 @@
 [
   {
     "bucket": [-128.0, -102.5999984741211],
-    "value": 6598
+    "value": 6653
   },
   {
     "bucket": [-102.5999984741211, -77.19999694824219],
-    "value": 6254
+    "value": 6327
   },
   {
     "bucket": [-77.19999694824219, -51.80000305175781],
-    "value": 6562
+    "value": 6644
   },
   {
     "bucket": [-51.80000305175781, -26.400001525878906],
-    "value": 6446
+    "value": 6312
   },
   {
     "bucket": [-26.400001525878906, -1.0],
-    "value": 6235
+    "value": 6369
   },
   {
     "bucket": [-1.0, 24.399993896484375],
-    "value": 6658
+    "value": 6508
   },
   {
     "bucket": [24.399993896484375, 49.80000305175781],
-    "value": 6428
+    "value": 6411
   },
   {
     "bucket": [49.80000305175781, 75.19999694824219],
-    "value": 6670
+    "value": 6749
   },
   {
     "bucket": [75.19999694824219, 100.59999084472656],
-    "value": 6257
+    "value": 6320
   },
   {
     "bucket": [100.59999084472656, 126.0],
-    "value": 6692
+    "value": 6507
   }
 ]

tests/fixtures/responses/testfile_nc_info.json

@@ -2,7 +2,7 @@
   "bounds": [-180.0, -90.0, 180.0, 90.0],
   "crs": "http://www.opengis.net/def/crs/EPSG/0/4326",
   "band_metadata": [["b1", {}]],
-  "band_descriptions": [["b1", "0.0"]],
+  "band_descriptions": [["b1", "2020-01-01T00:00:00.000000000"]],
   "dtype": "float32",
   "nodata_type": "None",
   "name": "data",

tests/fixtures/responses/testfile_nc_tilejson.json

@@ -3,11 +3,10 @@
   "version": "1.0.0",
   "scheme": "xyz",
   "tiles": [
-    "http://testserver/tiles/WebMercatorQuad/{z}/{x}/{y}@1x?url=tests%2Ffixtures%2Ftestfile.nc&variable=data&decode_times=false&sel=time%3D0"
+    "http://testserver/tiles/WebMercatorQuad/{z}/{x}/{y}@1x?url=tests%2Ffixtures%2Ftestfile.nc&variable=data&decode_times=true&sel=time%3D2020-01-01"
   ],
   "minzoom": 0,
   "maxzoom": 0,
   "bounds": [-180.0, -90.0, 180.0, 90.0],
   "center": [0.0, 0.0, 0]
 }
-

tests/fixtures/testfile.nc

@@ -1,10 +1,9 @@
 import json
 import os
-import pytest
 
+import pytest
 from helpers import find_string_in_stream
 
-
 DATA_DIR = "tests/fixtures"
 test_zarr_store_v2 = os.path.join(DATA_DIR, "zarr_store_v2.zarr")
 test_zarr_store_v3 = os.path.join(DATA_DIR, "zarr_store_v3.zarr")
@@ -71,8 +70,8 @@
     "params": {
         "url": test_netcdf_store,
         "variable": "data",
-        "decode_times": False,
-        "sel": "time=0",
+        "decode_times": True,
+        "sel": "time=2020-01-01",
     },
     "variables": ["data"],
 }
@@ -233,3 +232,10 @@ def test_map_with_params(store_params, app):
     assert response.status_code == 200
     assert response.headers["Content-Type"] == "text/html; charset=utf-8"
     assert find_string_in_stream(response, '<div id="map"></div>')
+
+
+def test_sel_nearest_netcdf(app):
+    params = store_params["netcdf_store"]["params"].copy()
+    params.update({"sel": "time=2020-01-06", "sel_method": "nearest"})
+    response = app.get("/info", params=params)
+    assert response.status_code == 200