From 6794b5b551c262ae18f8fdc46cef0fc3445db8d8 Mon Sep 17 00:00:00 2001
From: Andrew Davison <andrew.davison@cnrs.fr>
Date: Fri, 25 Aug 2023 16:50:27 +0200
Subject: [PATCH] bugfix: 2D array data should validate

---
 api/data_models.py   |  2 +-
 api/test/test_api.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/api/data_models.py b/api/data_models.py
index 83c3705..707c33e 100644
--- a/api/data_models.py
+++ b/api/data_models.py
@@ -76,7 +76,7 @@ class AnalogSignal(BaseModel):
     name: str
     times_dimensionality: str
     values_units: str
-    values: list[float]
+    values: list[float] | list[list[float]]
     times: list[float] | None = None
 
     @classmethod
diff --git a/api/test/test_api.py b/api/test/test_api.py
index eabcd51..5ce7617 100644
--- a/api/test/test_api.py
+++ b/api/test/test_api.py
@@ -102,6 +102,24 @@ def test_get_analogsignal_data(self):
 
             assert json_data["values_units"] == value_units[analogsignal_id]
 
+    def test_get_analogsignal_data_2(self):
+        test_file = "https://gin.g-node.org/NeuralEnsemble/ephy_testing_data/raw/master/intan/intan_rhd_test_1.rhd"
+        params = urllib.parse.urlencode(
+            {"url": test_file, "segment_id": 0, "analog_signal_id": 0, "type": "IntanIO", "down_sample_factor": 1000}
+        )
+        response = test_client.get(f"/api/analogsignaldata/?{params}")
+        assert response.status_code == 200
+        json_data = response.json()
+        assert json_data["t_start"] == 0.0
+        assert json_data["t_stop"] == 1.0
+        assert json_data["sampling_period"] == 3.3333333333333335e-02
+        assert json_data["name"] == "RHD2000 amplifier channel"
+        assert json_data["times_dimensionality"] == "s"
+        assert json_data["values_units"] == "uV"
+        assert len(json_data["values"]) == 192
+        assert len(json_data["values"][0]) == 30
+        assert len(json_data["values"][191]) == 30
+
     def test_spiketrain(self):
         test_file = "https://gin.g-node.org/NeuralEnsemble/ephy_testing_data/raw/master/neuroexplorer/File_neuroexplorer_1.nex"
         params = urllib.parse.urlencode(