Merge pull request #856 from danielballan/update-metadata-fixup

Update metadata fixup

Author: maffettone

databroker/mongo_normalized.py

@@ -10,6 +10,7 @@
 import os
 import sys
 import threading
+from types import SimpleNamespace
 
 from bson.objectid import ObjectId, InvalidId
 import cachetools
@@ -244,6 +245,7 @@ def __init__(
         self._clear_from_cache = clear_from_cache
         self._filler_creation_lock = threading.RLock()
         self.authz_shim = authz_shim
+        self.node = SimpleNamespace(key=self.key)
 
     @functools.cached_property
     def access_blob(self):
@@ -298,7 +300,7 @@ def metadata(self):
         return metadata
 
     async def replace_metadata(self, metadata=None, specs=None, access_blob=None, drop_revision=False):
-        if access_blob:
+        if access_blob and (access_blob != self.access_blob):
             raise NotImplementedError("Updating access_blob on MongoDB-backed data is not supported.")
         if drop_revision:
             raise NotImplementedError("Must use drop_revision=False with databroker.mongo_normalized")
@@ -477,6 +479,7 @@ def __init__(
         self._event_collection = event_collection
         self._cutoff_seq_num = cutoff_seq_num
         self._run = run
+        self.node = SimpleNamespace(key=self.key)
 
     @property
     def access_blob(self):
@@ -522,7 +525,7 @@ def key(self):
         return self._metadata["descriptors"][0]["name"]
 
     async def replace_metadata(self, metadata=None, specs=None, access_blob=None, drop_revision=False):
-        if access_blob:
+        if access_blob and (access_blob != self.access_blob):
             raise NotImplementedError("Updating access_blob on MongoDB-backed data is not supported.")
         if drop_revision:
             raise NotImplementedError("Must use drop_revision=False with databroker.mongo_normalized")

databroker/tests/test_broker.py

@@ -1280,13 +1280,20 @@ def test_large_document():
     list(run.documents())
 
 
-@pytest.mark.xfail(reason="A problem for Future Dan and Phil")
 def test_update(db, RE, hw):
     RE.subscribe(db.insert)
     if not hasattr(db, "v2"):
         raise pytest.skip("v0 has no v2 accessor")
     if getattr(db.v2, "is_sql", False):
         raise pytest.skip("No 'chunks' to update on SQL-backed data")
+
+    class AuthZShim:
+        def bluesky_run_access_blob_from_metadata(self, metadata):
+            return {"tags": ["example"]}
+
+    authz_shim = AuthZShim()
+    db.v2.context.http_client.app.state.root_tree.authz_shim = authz_shim
+
     c = db.v2
     uid, = get_uids(RE(count([hw.det], 5)))
     c[uid].update_metadata(
@@ -1304,12 +1311,10 @@ def test_update(db, RE, hw):
 
     # Test stream update
     md = c[uid]["primary"].metadata_copy()[0]
-    md["descriptors"][0]["data_keys"]["det"]["chunks"] = [
-        1 for _ in md["descriptors"][0]["data_keys"]["det"]["shape"]
-    ]
+    md["descriptors"][0]["data_keys"]["det"]["chunks"] = [1]
     c[uid]["primary"].update_metadata(metadata=md)
-    assert "chunks" in c[uid]["primary"]["data"]["det"]
-    assert all(x == 1 for x  in c[uid]["primary"]["data"]["det"]["chunks"])
+    assert "chunks" in c[uid]["primary"].metadata["descriptors"][0]["data_keys"]["det"]
+    assert all(x == 1 for x in c[uid]["primary"].metadata["descriptors"][0]["data_keys"]["det"]["chunks"])
 
     # Note: Vanilla Tiled does not enforce this.
     # Perhaps it could be done at the authorization level.