feat: Change ingredient_ids to org.cai.ingredientIds.

Add an array with tag :"org.cai.ingredientIds" to action parameters to associate one or more ingredients with an action.
contentauth · Oct 10, 2024 · 0f97a9c · 0f97a9c
1 parent 8b852ce
commit 0f97a9c
Show file tree

Hide file tree

Showing 26 changed files with 812 additions and 811 deletions.
diff --git a/make_test_images/json_manifests/C.json b/make_test_images/json_manifests/C.json
@@ -1,7 +1,7 @@
 {
-  "active_manifest": "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd",
+  "active_manifest": "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90",
   "manifests": {
-    "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd": {
+    "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90": {
       "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1",
       "claim_generator_info": [
         {
@@ -15,10 +15,10 @@
       ],
       "title": "C.jpg",
       "format": "image/jpeg",
-      "instance_id": "xmp:iid:8cbdca3c-5917-4f43-92f4-3a735da05e6f",
+      "instance_id": "xmp:iid:6aef2adf-688f-4045-a7e1-56b087eed896",
       "thumbnail": {
         "format": "image/jpeg",
-        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
+        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
       },
       "ingredients": [],
       "assertions": [
@@ -56,9 +56,9 @@
         "alg": "Ps256",
         "issuer": "C2PA Test Signing Cert",
         "cert_serial_number": "720724073027128164015125666832722375746636448153",
-        "time": "2024-10-08T22:56:47+00:00"
+        "time": "2024-10-10T22:42:36+00:00"
       },
-      "label": "contentauth:urn:uuid:5e6321a5-8e38-44b4-928f-739da7d964bd"
+      "label": "contentauth:urn:uuid:e46d3d9f-deaf-46b1-8cff-9dc9cd637f90"
     }
   }
 }
diff --git a/make_test_images/json_manifests/CA.json b/make_test_images/json_manifests/CA.json
@@ -1,7 +1,7 @@
 {
-  "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737",
+  "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2",
   "manifests": {
-    "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": {
+    "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": {
       "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1",
       "claim_generator_info": [
         {
@@ -15,10 +15,10 @@
       ],
       "title": "CA.jpg",
       "format": "image/jpeg",
-      "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6",
+      "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5",
       "thumbnail": {
         "format": "image/jpeg",
-        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
+        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
       },
       "ingredients": [
         {
@@ -61,7 +61,7 @@
                       "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4="
                     }
                   ],
-                  "ingredient_ids": [
+                  "org.cai.ingredientIds": [
                     "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb"
                   ]
                 }
@@ -80,9 +80,9 @@
         "alg": "Ps256",
         "issuer": "C2PA Test Signing Cert",
         "cert_serial_number": "720724073027128164015125666832722375746636448153",
-        "time": "2024-10-08T22:56:47+00:00"
+        "time": "2024-10-10T22:42:36+00:00"
       },
-      "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737"
+      "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2"
     }
   }
 }
diff --git a/make_test_images/json_manifests/CACA.json b/make_test_images/json_manifests/CACA.json
@@ -1,7 +1,7 @@
 {
-  "active_manifest": "contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128",
+  "active_manifest": "contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547",
   "manifests": {
-    "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737": {
+    "contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547": {
       "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1",
       "claim_generator_info": [
         {
@@ -13,24 +13,24 @@
           "version": "0.36.1"
         }
       ],
-      "title": "CA.jpg",
+      "title": "CACA.jpg",
       "format": "image/jpeg",
-      "instance_id": "xmp:iid:a04258f8-c4c0-4eb0-8950-eb3990f3ffc6",
+      "instance_id": "xmp:iid:0492a949-e4e3-4d13-a893-e9a6462ba161",
       "thumbnail": {
         "format": "image/jpeg",
-        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
+        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
       },
       "ingredients": [
         {
-          "title": "A.jpg",
+          "title": "CA.jpg",
           "format": "image/jpeg",
-          "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb",
-          "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb",
+          "instance_id": "xmp:iid:f5528711-b891-44f9-80e7-38410fa3961f",
           "thumbnail": {
             "format": "image/jpeg",
-            "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg"
+            "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
           },
-          "relationship": "parentOf"
+          "relationship": "parentOf",
+          "active_manifest": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2"
         }
       ],
       "assertions": [
@@ -55,14 +55,14 @@
               {
                 "action": "c2pa.opened",
                 "parameters": {
-                  "ingredient_ids": [
-                    "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb"
-                  ],
                   "ingredient": [
                     {
                       "url": "self#jumbf=c2pa.assertions/c2pa.ingredient",
-                      "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4="
+                      "hash": "G0zapTTWE/Yl2k5m6rCHSeVDVwnRu0DUNPM9Xi4uEqg="
                     }
+                  ],
+                  "org.cai.ingredientIds": [
+                    "xmp:iid:f5528711-b891-44f9-80e7-38410fa3961f"
                   ]
                 }
               },
@@ -80,11 +80,11 @@
         "alg": "Ps256",
         "issuer": "C2PA Test Signing Cert",
         "cert_serial_number": "720724073027128164015125666832722375746636448153",
-        "time": "2024-10-08T22:56:47+00:00"
+        "time": "2024-10-10T22:42:37+00:00"
       },
-      "label": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737"
+      "label": "contentauth:urn:uuid:a5dc9189-1dbd-41d7-842d-b935de331547"
     },
-    "contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128": {
+    "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2": {
       "claim_generator": "make_test_images/0.36.1 c2pa-rs/0.36.1",
       "claim_generator_info": [
         {
@@ -96,24 +96,24 @@
           "version": "0.36.1"
         }
       ],
-      "title": "CACA.jpg",
+      "title": "CA.jpg",
       "format": "image/jpeg",
-      "instance_id": "xmp:iid:96bd5fde-68a2-4cd9-8b4e-8da4fef602b5",
+      "instance_id": "xmp:iid:6a6b5d47-5799-47dc-b164-b9960d212de5",
       "thumbnail": {
         "format": "image/jpeg",
-        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
+        "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
       },
       "ingredients": [
         {
-          "title": "CA.jpg",
+          "title": "A.jpg",
           "format": "image/jpeg",
-          "instance_id": "xmp:iid:84cca206-6223-429b-a506-a6e2e4529015",
+          "document_id": "xmp.did:813ee422-9736-4cdc-9be6-4e35ed8e41cb",
+          "instance_id": "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb",
           "thumbnail": {
             "format": "image/jpeg",
-            "identifier": "self#jumbf=/c2pa/contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737/c2pa.assertions/c2pa.thumbnail.claim.jpeg"
+            "identifier": "self#jumbf=c2pa.assertions/c2pa.thumbnail.ingredient.jpeg"
           },
-          "relationship": "parentOf",
-          "active_manifest": "contentauth:urn:uuid:dc78d6ff-c364-4924-aba0-2029cf2de737"
+          "relationship": "parentOf"
         }
       ],
       "assertions": [
@@ -138,14 +138,14 @@
               {
                 "action": "c2pa.opened",
                 "parameters": {
+                  "org.cai.ingredientIds": [
+                    "xmp.iid:813ee422-9736-4cdc-9be6-4e35ed8e41cb"
+                  ],
                   "ingredient": [
                     {
                       "url": "self#jumbf=c2pa.assertions/c2pa.ingredient",
-                      "hash": "zeRFSCBe57n6NlId4kRSAjK5oJLnmL4uLditT59KIcE="
+                      "hash": "5dNlxTKe4afGAicpJa1hF1R3mBZKE+Bl0xmh0McXuO4="
                     }
-                  ],
-                  "ingredient_ids": [
-                    "xmp:iid:84cca206-6223-429b-a506-a6e2e4529015"
                   ]
                 }
               },
@@ -163,9 +163,9 @@
         "alg": "Ps256",
         "issuer": "C2PA Test Signing Cert",
         "cert_serial_number": "720724073027128164015125666832722375746636448153",
-        "time": "2024-10-08T22:56:47+00:00"
+        "time": "2024-10-10T22:42:36+00:00"
       },
-      "label": "contentauth:urn:uuid:c24acef2-e697-45af-9fd4-563ccf230128"
+      "label": "contentauth:urn:uuid:89ba3c19-2ad4-445a-bb7d-bda815bad4c2"
     }
   }
 }