Merge pull request #275 from bluesky/fix-nullable-units

Allow descriptor units to be null
bluesky · Jun 23, 2023 · 524f70d · 524f70d
2 parents d71e567 + 217eee5
commit 524f70d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/event_model/documents/event_descriptor.py b/event_model/documents/event_descriptor.py
@@ -97,7 +97,8 @@ class Configuration(TypedDict):
             "title": "DataType",
             "patternProperties": {"^([^./]+)$": {"$ref": "#/definitions/DataType"}},
             "additionalProperties": False,
-        }
+        },
+        "DataKey": {"properties": {"units": {"type": ["string", "null"]}}},
     },
     "additionalProperties": False,
 }

diff --git a/event_model/schemas/event_descriptor.json b/event_model/schemas/event_descriptor.json
@@ -84,7 +84,10 @@
             "units": {
                "title": "Units",
                "description": "Engineering units of the value",
-               "type": "string"
+               "type": [
+                  "string",
+                  "null"
+               ]
             }
          },
          "required": [

diff --git a/event_model/tests/test_em.py b/event_model/tests/test_em.py
@@ -59,7 +59,7 @@ def test_compose_run():
     assert bundle.compose_stop is compose_stop
     bundle = compose_descriptor(
         data_keys={
-            "motor": {"shape": [], "dtype": "number", "source": "..."},
+            "motor": {"shape": [], "dtype": "number", "source": "...", "units": None},
             "image": {
                 "shape": [512, 512],
                 "dtype": "number",