Support annotation metadata in annotation PATCH-ing

h/schemas/annotation.py

@@ -230,6 +230,8 @@ def validate(self, data):
                 new_appstruct.get("target_uri", self.existing_target_uri),
             )
 
+        new_appstruct["metadata_jwe"] = appstruct.pop("metadata_jwe", None)
+
         new_appstruct["extra"] = appstruct
 
         return new_appstruct

h/services/annotation_write.py

@@ -112,6 +112,7 @@ def update_annotation(
         """
         initial_target_uri = annotation.target_uri
 
+        annotation_metadata_jwe = data.pop("metadata_jwe", None)
         self._update_annotation_values(annotation, data)
         if update_timestamp:
             annotation.updated = datetime.utcnow()
@@ -134,9 +135,13 @@ def update_annotation(
                 document.get("document_uri_dicts", {}),
                 updated=annotation.updated,
             )
-
         self.upsert_annotation_slim(annotation)
 
+        if annotation_metadata_jwe:
+            self._annotation_metadata_service.set_annotation_metadata_from_jwe(
+                annotation, annotation_metadata_jwe
+            )
+
         # The search index service by default does not reindex if the existing ES
         # entry's timestamp matches the DB timestamp. If we're not changing this
         # timestamp, we need to force reindexing.