Allowed external="STREAM:" keys to not be represented in data in Comp…

…oseEvent and ComposeEventPage
bluesky · Jul 4, 2023 · c565a96 · c565a96
1 parent 19e6744
commit c565a96
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/event_model/__init__.py b/event_model/__init__.py
@@ -2249,11 +2249,21 @@ def __call__(
         )
         if validate:
             schema_validators[DocumentNames.event_page].validate(doc)
+
+            def keys_without_stream_keys(dictionary):
+                return [
+                    key for key in dictionary.keys() if (
+                        "external" in self.descriptor["data_keys"][key] and
+                        self.descriptor["data_keys"][key]["external"] == "STREAM:"
+                    )
+                ]
             if not (
-                self.descriptor["data_keys"].keys() == data.keys() == timestamps.keys()
+                keys_without_stream_keys(self.descriptor["data_keys"]) ==
+                keys_without_stream_keys(data) ==
+                keys_without_stream_keys(timestamps)
             ):
                 raise EventModelValidationError(
-                    "These sets of keys must match:\n"
+                    "These sets of keys must match (other than \"STREAM:\" keys):\n"
                     "event['data'].keys(): {}\n"
                     "event['timestamps'].keys(): {}\n"
                     "descriptor['data_keys'].keys(): {}\n".format(
@@ -2331,11 +2341,21 @@ def __call__(
         )
         if validate:
             schema_validators[DocumentNames.event].validate(doc)
+
+            def keys_without_stream_keys(dictionary):
+                return [
+                    key for key in dictionary.keys() if (
+                        "external" not in self.descriptor["data_keys"][key] or
+                        self.descriptor["data_keys"][key]["external"] == "STREAM:"
+                    )
+                ]
             if not (
-                self.descriptor["data_keys"].keys() == data.keys() == timestamps.keys()
+                keys_without_stream_keys(self.descriptor["data_keys"]) ==
+                keys_without_stream_keys(data) ==
+                keys_without_stream_keys(timestamps)
             ):
                 raise EventModelValidationError(
-                    "These sets of keys must match:\n"
+                    "These sets of keys must match (other than \"STREAM:\" keys):\n"
                     "event['data'].keys(): {}\n"
                     "event['timestamps'].keys(): {}\n"
                     "descriptor['data_keys'].keys(): {}\n".format(