Merge branch '93-occasional-crashes-due-to-undefined-variable-dt-in-get_csv-hapiclient-version-028'

Author: rweigel

CHANGES.txt

@@ -120,3 +120,7 @@ v0.2.8b2:
 	2026-05-20 -- Refactor
 v0.2.8:
 	2026-06-04 -- Compat. fixes for hapiplot package.
+v0.2.8b0
+	2026-06-08 -- Show time parsing error message
+v0.2.9
+	2026-06-08 -- 93-occasional-crashes-due-to-undefined-variable-dt-in-get_csv-hapiclient-version-028

Makefile

@@ -22,6 +22,7 @@
 #  1. make release
 #  2. Manually create a release at https://github.com/hapi-server/client-python/releases 
 #     (could do this automatically using https://stackoverflow.com/questions/21214562/how-to-release-versions-on-github-through-the-command-line)
+#     To test: gh release create <tagname> --target <branchname>
 #  3. Wait ~5 minutes and execute
 #  4. make release-test-all
 #     (Will fail until new version is available at pypi.org for pip install.

hapiclient/cache.py

@@ -171,7 +171,7 @@ def data_cache_read_metax(SERVER, DATASET, PARAMETERS, START, STOP, opts):
   from hapiclient.log import log
 
   if not opts["usecache"]:
-    log('Not checking data cache because usecache is False.')
+    log('Not checking subsetted metadata cache because usecache is False.')
     return None
 
   fnamepklx = data_cache_paths(SERVER, DATASET, PARAMETERS, START, STOP, opts['cachedir'])['pkl']

hapiclient/get.py

@@ -174,12 +174,9 @@ def get_csv(meta, SERVER, DATASET, PARAMETERS, START, STOP, opts):
   if opts["cache"]:
     tic0 = time.time()
     urlretrieve(urlcsv, fnamecsv)
-    toc0 = time.time() - tic0
     log('Reading and parsing %s' % os.path.basename(fnamecsv))
-    tic = time.time()
     if os.path.getsize(fnamecsv) == 0:
       file_empty = True
-      data = np.array([], dtype=dt)
   else:
     from io import StringIO
     log('Writing %s to buffer' % urlcsv)
@@ -188,22 +185,27 @@ def get_csv(meta, SERVER, DATASET, PARAMETERS, START, STOP, opts):
     fnamecsv.seek(0, os.SEEK_END)
     if fnamecsv.tell() == 0:
       file_empty = True
-      data = np.array([], dtype=dt)
     else:
       fnamecsv.seek(0)
-    toc0 = time.time() - tic0
     log('Parsing StringIO buffer.')
-    tic = time.time()
 
-  if not file_empty:
+  toc0 = time.time() - tic0
+
+  tic1 = time.time()
+
+  if file_empty:
+    log("Response is empty. Returning empty data array.")
+    dt, _, _, _, _ = _compute_dt(meta, opts)
+    data = np.array([], dtype=dt)
+  else:
     if missing_length(meta, opts):
       data = _parse_csv_missing_length(fnamecsv, meta, opts, urlcsv)
     else:
       data = _parse_csv(fnamecsv, meta, opts, urlcsv)
 
-  toc = time.time() - tic
+  toc1 = time.time() - tic1
 
-  return data, toc0, toc
+  return data, toc0, toc1
 
 
 def _parse_csv(fnamecsv, meta, opts, urlcsv):

test/test_hapi_data_requests.py

@@ -212,8 +212,38 @@ def test_unicode():
             assert compare.read(server, dataset, parameter, run, opts.copy(), logger=logger)
             assert compare.cache(server, dataset, parameter, opts.copy(), logger=logger)
 
+def test_empty_response():
+    from hapiclient import hapi
+
+    server  = 'http://hapi-server.org/servers/TestData2.0/hapi'
+    dataset = 'dataset1'
+
+    # Time range with no data.
+    start   = '1970-01-01T00:00:00.1Z'
+    stop    = '1970-01-01T00:00:00.2Z'
+
+    _kwargs = kwargs.copy()
+    _kwargs['cache'] = False
+    _kwargs['usecache'] = False
+    data_csv, meta = hapi(server, dataset, '', start, stop, format='csv', **_kwargs)
+    data_bin, meta = hapi(server, dataset, '', start, stop, format='binary', **_kwargs)
+
+    assert len(data_csv) == 0
+    assert compare.equal(data_csv, data_bin)
+
+    for i in range(2):
+        _kwargs = kwargs.copy()
+        _kwargs['cache'] = True
+        _kwargs['usecache'] = True
+        data_csv, meta = hapi(server, dataset, '', start, stop, format='csv', **_kwargs)
+        data_bin, meta = hapi(server, dataset, '', start, stop, format='binary', **_kwargs)
+
+        assert len(data_csv) == 0
+        assert compare.equal(data_csv, data_bin)
+
 
 if __name__ == '__main__':
+    test_empty_response()
     test_subset_short()
     test_reader_timing_short()
     test_reader_timing_long()