inj vol and depth as lists (#156)

* inj vol and depth as lists

* removes print statement

src/aind_metadata_service/sharepoint/nsb2019/mapping.py

@@ -314,9 +314,10 @@ def aind_date_range_start(self) -> Optional[datetime]:
         return self._nsb.date_range_start
 
     @property
-    def aind_dv2nd_inj(self) -> Optional[float]:
+    def aind_dv2nd_inj(self) -> Optional[List[float]]:
         """Maps dv2nd_inj to aind model"""
-        return self._parse_dv_str(self._nsb.dv2nd_inj)
+        dv = self._parse_dv_str(self._nsb.dv2nd_inj)
+        return None if dv is None else [dv]
 
     @property
     def aind_editor_id(self) -> Optional[int]:
@@ -334,19 +335,21 @@ def aind_fiber_implant1(self) -> Optional[bool]:
         return self._nsb.fiber_implant1
 
     @property
-    def aind_fiber_implant1_dv(self) -> Optional[float]:
+    def aind_fiber_implant1_dv(self) -> Optional[List[float]]:
         """Maps fiber_implant1_dv to aind model"""
-        return self._parse_dv_str(self._nsb.fiber_implant1_dv)
+        dv = self._parse_dv_str(self._nsb.fiber_implant1_dv)
+        return None if dv is None else [dv]
 
     @property
     def aind_fiber_implant2(self) -> Optional[bool]:
         """Maps fiber_implant2 to aind model"""
         return self._nsb.fiber_implant2
 
     @property
-    def aind_fiber_implant2_dv(self) -> Optional[float]:
+    def aind_fiber_implant2_dv(self) -> Optional[List[float]]:
         """Maps fiber_implant2_dv to aind model"""
-        return self._parse_dv_str(self._nsb.fiber_implant2_dv)
+        dv = self._parse_dv_str(self._nsb.fiber_implant2_dv)
+        return None if dv is None else [dv]
 
     @property
     def aind_field30(self) -> Optional[str]:
@@ -713,9 +716,10 @@ def aind_inj1_virus_strain_rt(self) -> Optional[str]:
         return self._parse_virus_strain_str(self._nsb.inj1_virus_strain_rt)
 
     @property
-    def aind_inj1_vol(self) -> Optional[str]:
+    def aind_inj1_vol(self) -> Optional[List[float]]:
         """Maps inj1_vol to aind model"""
-        return self._parse_inj_vol_str(self._nsb.inj1_vol)
+        vol = self._parse_inj_vol_str(self._nsb.inj1_vol)
+        return None if vol is None else [vol]
 
     @property
     def aind_inj1angle0(self) -> Optional[float]:
@@ -735,9 +739,10 @@ def aind_inj1angle0(self) -> Optional[float]:
         )
 
     @property
-    def aind_inj1volperdepth(self) -> Optional[float]:
+    def aind_inj1volperdepth(self) -> Optional[List[float]]:
         """Maps inj1volperdepth to aind model"""
-        return self._parse_inj_vol_str(self._nsb.inj1volperdepth)
+        volperdepth = self._parse_inj_vol_str(self._nsb.inj1volperdepth)
+        return None if volperdepth is None else [volperdepth]
 
     @property
     def aind_inj2_alternating_time(self) -> Optional[float]:
@@ -797,9 +802,10 @@ def aind_inj2_virus_strain_rt(self) -> Optional[str]:
         return self._parse_virus_strain_str(self._nsb.inj2_virus_strain_rt)
 
     @property
-    def aind_inj2_vol(self) -> Optional[float]:
+    def aind_inj2_vol(self) -> Optional[List[float]]:
         """Maps inj2_vol to aind model"""
-        return self._parse_inj_vol_str(self._nsb.inj2_vol)
+        vol = self._parse_inj_vol_str(self._nsb.inj2_vol)
+        return None if vol is None else [vol]
 
     @property
     def aind_inj2angle0(self) -> Optional[float]:
@@ -819,9 +825,10 @@ def aind_inj2angle0(self) -> Optional[float]:
         )
 
     @property
-    def aind_inj2volperdepth(self) -> Optional[float]:
+    def aind_inj2volperdepth(self) -> Optional[List[float]]:
         """Maps inj2volperdepth to aind model"""
-        return self._parse_inj_vol_str(self._nsb.inj2volperdepth)
+        volperdepth = self._parse_inj_vol_str(self._nsb.inj2volperdepth)
+        return None if volperdepth is None else [volperdepth]
 
     @property
     def aind_ionto_number_hpinj(self) -> Optional[str]:
@@ -1201,9 +1208,10 @@ def aind_virus_a_p(self) -> Optional[float]:
         return self._parse_ap_str(self._nsb.virus_a_p)
 
     @property
-    def aind_virus_d_v(self) -> Optional[float]:
+    def aind_virus_d_v(self) -> Optional[List[float]]:
         """Maps virus_d_v to aind model"""
-        return self._parse_dv_str(self._nsb.virus_d_v)
+        dv = self._parse_dv_str(self._nsb.virus_d_v)
+        return None if dv is None else [dv]
 
     @property
     def aind_virus_hemisphere(self) -> Optional[Side]:

tests/resources/json_responses/combined.json

@@ -38,7 +38,7 @@
         "workstation_id": null,
         "instrument_id": null,
         "procedure_type": "Retro-orbital injection",
-        "injection_volume": 1.0,
+        "injection_volume": [1.0],
         "injection_volume_unit": "microliter",
         "injection_eye": "Left"
       },
@@ -76,7 +76,7 @@
         "instrument_id": null,
         "injection_coordinate_ml": 1.0,
         "injection_coordinate_ap": 1.0,
-        "injection_coordinate_depth": 1.0,
+        "injection_coordinate_depth": [1.0],
         "injection_coordinate_unit": "millimeter",
         "injection_coordinate_reference": "Bregma",
         "bregma_to_lambda_distance": 4.1,
@@ -86,7 +86,7 @@
         "targeted_structure": "VISp6",
         "injection_hemisphere": null,
         "procedure_type": "Nanoject injection",
-        "injection_volume": 1.0,
+        "injection_volume": [1.0],
         "injection_volume_unit": "nanoliter"
       },
       {
@@ -113,7 +113,7 @@
             "targeted_structure": "MOp",
             "stereotactic_coordinate_ap": 1.0,
             "stereotactic_coordinate_ml": 3.0,
-            "stereotactic_coordinate_dv": 2.0,
+            "stereotactic_coordinate_dv": [2.0],
             "stereotactic_coordinate_unit": "millimeter",
             "stereotactic_coordinate_reference": "Bregma",
             "bregma_to_lambda_distance": 4.1,

tests/resources/sharepoint/nsb2019/mapped/mapped_list_item1.json

@@ -17,7 +17,7 @@
             "ferrule_material": null,
             "stereotactic_coordinate_ap": -1.6,
             "stereotactic_coordinate_ml": -3.3,
-            "stereotactic_coordinate_dv": 4.2,
+            "stereotactic_coordinate_dv": [4.2],
             "stereotactic_coordinate_unit": "millimeter",
             "stereotactic_coordinate_reference": null,
             "bregma_to_lambda_distance": 4.0,
@@ -32,7 +32,7 @@
             "ferrule_material": null,
             "stereotactic_coordinate_ap": -3.05,
             "stereotactic_coordinate_ml": -0.6,
-            "stereotactic_coordinate_dv": 4.2,
+            "stereotactic_coordinate_dv": [4.2],
             "stereotactic_coordinate_unit": "millimeter",
             "stereotactic_coordinate_reference": null,
             "bregma_to_lambda_distance": 4.0,
@@ -155,7 +155,7 @@
       "instrument_id": null,
       "injection_coordinate_ml": -0.6,
       "injection_coordinate_ap": -3.05,
-      "injection_coordinate_depth": 4.3,
+      "injection_coordinate_depth": [4.3],
       "injection_coordinate_unit": "millimeter",
       "injection_coordinate_reference": null,
       "bregma_to_lambda_distance": 4.0,

tests/resources/sharepoint/nsb2019/mapped/mapped_list_item20.json

@@ -17,7 +17,7 @@
             "ferrule_material": null,
             "stereotactic_coordinate_ap": -1.6,
             "stereotactic_coordinate_ml": -3.3,
-            "stereotactic_coordinate_dv": 4.2,
+            "stereotactic_coordinate_dv": [4.2],
             "stereotactic_coordinate_unit": "millimeter",
             "stereotactic_coordinate_reference": null,
             "bregma_to_lambda_distance": 4.0,
@@ -32,7 +32,7 @@
             "ferrule_material": null,
             "stereotactic_coordinate_ap": -3.05,
             "stereotactic_coordinate_ml": -0.6,
-            "stereotactic_coordinate_dv": 4.2,
+            "stereotactic_coordinate_dv": [4.2],
             "stereotactic_coordinate_unit": "millimeter",
             "stereotactic_coordinate_reference": null,
             "bregma_to_lambda_distance": 4.0,

tests/resources/sharepoint/nsb2019/mapped/mapped_list_item3.json

@@ -17,7 +17,7 @@
         "ferrule_material": null,
         "stereotactic_coordinate_ap": -1.6,
         "stereotactic_coordinate_ml": -3.3,
-        "stereotactic_coordinate_dv": 4.2,
+        "stereotactic_coordinate_dv": [4.2],
         "stereotactic_coordinate_unit": "millimeter",
         "stereotactic_coordinate_reference": null,
         "bregma_to_lambda_distance": 4.0,
@@ -32,7 +32,7 @@
         "ferrule_material": null,
         "stereotactic_coordinate_ap": -3.05,
         "stereotactic_coordinate_ml": -0.6,
-        "stereotactic_coordinate_dv": 4.2,
+        "stereotactic_coordinate_dv": [4.2],
         "stereotactic_coordinate_unit": "millimeter",
         "stereotactic_coordinate_reference": null,
         "bregma_to_lambda_distance": 4.0,
@@ -156,7 +156,7 @@
     "instrument_id": null,
     "injection_coordinate_ml": -0.6,
     "injection_coordinate_ap": -3.05,
-    "injection_coordinate_depth": 4.3,
+    "injection_coordinate_depth": [4.3],
     "injection_coordinate_unit": "millimeter",
     "injection_coordinate_reference": null,
     "bregma_to_lambda_distance": 4.0,