Merge branch 'main' into update-list-to-support-raw-strings

NeurodataWithoutBorders · Apr 17, 2024 · 0272ff0 · 0272ff0
2 parents 1a8d8d7 + 8dc7d73
commit 0272ff0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pyflask/manageNeuroconv/manage_neuroconv.py b/pyflask/manageNeuroconv/manage_neuroconv.py
@@ -411,7 +411,7 @@ def get_metadata_schema(source_data: Dict[str, dict], interfaces: dict) -> Dict[
         ecephys_properties["ElectrodeColumns"] = {
             "type": "array",
             "minItems": 0,
-            "items": {"$ref": "#/properties/Ecephys/properties/definitions/ElectrodeColumn"},
+            "items": {"$ref": "#/properties/Ecephys/definitions/ElectrodeColumn"},
         }
 
         ecephys_schema["required"].append("ElectrodeColumns")
@@ -429,7 +429,7 @@ def get_metadata_schema(source_data: Dict[str, dict], interfaces: dict) -> Dict[
             ecephys_properties["UnitColumns"] = {
                 "type": "array",
                 "minItems": 0,
-                "items": {"$ref": "#/properties/Ecephys/properties/definitions/UnitColumn"},
+                "items": {"$ref": "#/properties/Ecephys/definitions/UnitColumn"},
             }
 
             schema["properties"]["Ecephys"]["required"].append("UnitColumns")
@@ -463,7 +463,7 @@ def on_sorting_interface(name, sorting_interface):
             "maxItems": n_units,
             "items": {
                 "allOf": [
-                    {"$ref": "#/properties/Ecephys/properties/definitions/Unit"},
+                    {"$ref": "#/properties/Ecephys/definitions/Unit"},
                     {"required": list(map(lambda info: info["name"], unit_columns))},
                 ]
             },
@@ -499,7 +499,7 @@ def on_recording_interface(name, recording_interface):
             "maxItems": n_electrodes,
             "items": {
                 "allOf": [
-                    {"$ref": "#/properties/Ecephys/properties/definitions/Electrode"},
+                    {"$ref": "#/properties/Ecephys/definitions/Electrode"},
                     {"required": list(map(lambda info: info["name"], electrode_columns))},
                 ]
             },
@@ -521,7 +521,7 @@ def on_recording_interface(name, recording_interface):
     # Delete Ecephys metadata if no interfaces processed
     if has_ecephys:
 
-        defs = ecephys_properties["definitions"]
+        defs = ecephys_schema["definitions"]
 
         electrode_def = defs["Electrodes"]
 

diff --git a/schemas/json/ecephys_metadata_schema_example.json b/schemas/json/ecephys_metadata_schema_example.json
@@ -8,7 +8,7 @@
         "type": "array",
         "minItems": 1,
         "items": {
-          "$ref": "#/properties/Ecephys/properties/definitions/Device"
+          "$ref": "#/properties/Ecephys/definitions/Device"
         },
         "default": [
           {
@@ -22,7 +22,7 @@
         "type": "array",
         "minItems": 1,
         "items": {
-          "$ref": "#/properties/Ecephys/properties/definitions/ElectrodeGroup"
+          "$ref": "#/properties/Ecephys/definitions/ElectrodeGroup"
         },
         "default": [
           {