fixup! [a] Create PFB-based verbatim manifest format for AnVIL (#6040)

test/service/test_manifest.py

@@ -1300,7 +1300,10 @@ def test_manifest_content_disposition_header(self):
     def test_verbatim_jsonl_manifest(self):
         bundle = self._load_canned_bundle(one(self.bundles()))
         expected = [
-            bundle.metadata_files[d]
+            {
+                'type': d.rsplit('_', 1)[0],
+                'contents': bundle.metadata_files[d],
+            }
             for d in [
                 'cell_suspension_0.json',
                 'project_0.json',
@@ -1312,12 +1315,12 @@ def test_verbatim_jsonl_manifest(self):
         response = self._get_manifest(ManifestFormat.verbatim_jsonl, {})
         self.assertEqual(200, response.status_code)
         response = [
-            json.loads(row)['contents']
+            json.loads(row)
             for row in response.content.decode().splitlines()
         ]
 
         def sort_key(hca_doc: JSON) -> str:
-            return hca_doc['provenance']['document_id']
+            return hca_doc['contents']['provenance']['document_id']
 
         expected.sort(key=sort_key)
         response.sort(key=sort_key)