diff --git a/docs/manifest/detailed-manifest-ex.json.jsx b/docs/manifest/detailed-manifest-ex.json.jsx deleted file mode 100644 index 7a4ecb4..0000000 --- a/docs/manifest/detailed-manifest-ex.json.jsx +++ /dev/null @@ -1,109 +0,0 @@ -{ - "active_manifest": "contentauth:urn:uuid:5a08e472-974c-422e-b38a-d6c7326481a5", - "manifests": { - "contentauth:urn:uuid:5a08e472-974c-422e-b38a-d6c7326481a5": { - "claim": { - "alg": "sha256", - "assertions": [ - { - "hash": "BzyThXbTh88KAa5Wb8ckQHMH+Z+noRAUxuv0OmhSQes=", - "url": "self#jumbf=c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - { - "hash": "lEORvVMPdP8FK5rTLk0zF0SttylTbG5r/6t4Svx0lXA=", - "url": "self#jumbf=c2pa.assertions/stds.schema-org.CreativeWork" - }, - { - "hash": "42l0mSt4ue0hIk5YSZ3Q8cwcotNphWsScwvDyq+qyP8=", - "url": "self#jumbf=c2pa.assertions/c2pa.actions" - }, - { - "hash": "PMfHnzmyMA2CWqP4rdBd6GrORasLnYmtnFkpAnaIs94=", - "url": "self#jumbf=c2pa.assertions/c2pa.hash.data" - } - ], - "claim_generator": "make_test_images/0.12.0 c2pa-rs/0.12.0", - "claim_generator_info": null, - "dc:format": "image/jpeg", - "dc:title": "C.jpg", - "instanceID": "xmp:iid:e928fac1-8473-4c70-8219-369e91d4e58d", - "signature": "self#jumbf=c2pa.signature" - }, - "assertion_store": { - "c2pa.thumbnail.claim.jpeg": " len = 31659", - "c2pa.actions": { - "actions": [ - { - "action": "c2pa.created" - }, - { - "action": "c2pa.drawing", - "parameters": { - "name": "gradient" - } - } - ] - }, - "c2pa.hash.data": { - "alg": "sha256", - "exclusions": [ - { - "length": 51179, - "start": 20 - } - ], - "hash": "DcGR4k9M6aLXXCeDii4tSdX45rrIM5HSr1Wy/czQ6ro=", - "name": "jumbf manifest", - "pad": "" - }, - "stds.schema-org.CreativeWork": { - "@context": "http://schema.org/", - "@type": "CreativeWork", - "author": [ - { - "@type": "Person", - "name": "Gavin Peacock" - } - ] - } - }, - "signature": { - "alg": "ps256", - "issuer": "C2PA Test Signing Cert", - "time": "2022-08-19T19:03:41+00:00" - } - } - }, - "validation_status": [ - { - "code": "claimSignature.validated", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:5a08e472-974c-422e-b38a-d6c7326481a5/c2pa.signature", - "explanation": "claim signature valid" - }, - { - "code": "assertion.hashedURI.match", - "url": "self#jumbf=c2pa.assertions/c2pa.thumbnail.claim.jpeg", - "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/c2pa.thumbnail.claim.jpeg" - }, - { - "code": "assertion.hashedURI.match", - "url": "self#jumbf=c2pa.assertions/stds.schema-org.CreativeWork", - "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/stds.schema-org.CreativeWork" - }, - { - "code": "assertion.hashedURI.match", - "url": "self#jumbf=c2pa.assertions/c2pa.actions", - "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/c2pa.actions" - }, - { - "code": "assertion.hashedURI.match", - "url": "self#jumbf=c2pa.assertions/c2pa.hash.data", - "explanation": "hashed uri matched: self#jumbf=c2pa.assertions/c2pa.hash.data" - }, - { - "code": "assertion.dataHash.match", - "url": "self#jumbf=/c2pa/contentauth:urn:uuid:5a08e472-974c-422e-b38a-d6c7326481a5/c2pa.assertions/c2pa.hash.data", - "explanation": "data hash valid" - } - ] -} diff --git a/docs/manifest/examples.mdx b/docs/manifest/examples.mdx index 268bae7..e66677e 100644 --- a/docs/manifest/examples.mdx +++ b/docs/manifest/examples.mdx @@ -3,13 +3,13 @@ id: manifest-examples title: Manifest examples --- -import CodeBlock from '@theme/CodeBlock'; +The [example-assets](https://contentauth.github.io/example-assets/) repository contains some sample assets that demonstrate Content Credentials, including links to view the corresponding manifest reports from the [C2PA Tool](../c2patool/readme.md) and to inspect the assets using Verify. See [the README as rendered in GitHub Pages](https://contentauth.github.io/example-assets/). -### Example assets + diff --git a/docs/manifest/simple-manifest-ex.json.jsx b/docs/manifest/simple-manifest-ex.json.jsx deleted file mode 100644 index 44a13a3..0000000 --- a/docs/manifest/simple-manifest-ex.json.jsx +++ /dev/null @@ -1,54 +0,0 @@ -{ - "active_manifest": "contentauth:urn:uuid:5a08e472-974c-422e-b38a-d6c7326481a5", - "manifests": { - "contentauth:urn:uuid:5a08e472-974c-422e-b38a-d6c7326481a5": { - "claim_generator": "make_test_images/0.12.0 c2pa-rs/0.12.0", - "title": "C.jpg", - "format": "image/jpeg", - "instance_id": "xmp:iid:e928fac1-8473-4c70-8219-369e91d4e58d", - "thumbnail": { - "format": "image/jpeg", - "identifier": "contentauth-urn-uuid-5a08e472-974c-422e-b38a-d6c7326481a5.jpg" - }, - "ingredients": [], - "assertions": [ - { - "label": "stds.schema-org.CreativeWork", - "data": { - "@context": "http://schema.org/", - "@type": "CreativeWork", - "author": [ - { - "@type": "Person", - "name": "Gavin Peacock" - } - ] - }, - "kind": "Json" - }, - { - "label": "c2pa.actions", - "data": { - "actions": [ - { - "action": "c2pa.created" - }, - { - "action": "c2pa.drawing", - "parameters": { - "name": "gradient" - } - } - ] - } - } - ], - "signature_info": { - "issuer": "C2PA Test Signing Cert", - "cert_serial_number": "720724073027128164015125666832722375746636448153", - "time": "2022-08-19T19:03:41+00:00" - }, - "label": "contentauth:urn:uuid:5a08e472-974c-422e-b38a-d6c7326481a5" - } - } -} diff --git a/docs/manifest/writing/assertions-actions.md b/docs/manifest/writing/assertions-actions.md index 2b04f18..49959c2 100644 --- a/docs/manifest/writing/assertions-actions.md +++ b/docs/manifest/writing/assertions-actions.md @@ -253,7 +253,9 @@ For example: { "action": "c2pa.created", "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/trainedAlgorithmicMedia", - "softwareAgent": "Adobe Firefly" + "softwareAgent": { + "name": "Tool XYZ", + }, } ] } @@ -268,7 +270,7 @@ Each object in the `actions` array has the following standard properties. |----------|-----------| ------------|---------| | `action` | Yes | The action name. See [Action names](#action-names). | `c2pa.created` | | `digitalSourceType` | No | A URL identifying a [IPTC term](https://cv.iptc.org/newscodes/digitalsourcetype/). See [Digital source type](#digital-source-type). | `http://cv.iptc.org/newscodes/`
`digitalsourcetype/digitalCapture` | -| `softwareAgent` | No | The software or hardware used to perform the action. | `"Adobe Firefly"` | +| `softwareAgent` | No | Object with same properties as [ClaimGeneratorInfo](../json-ref/manifest-def.mdx#claimgeneratorinfo). | `"softwareAgent": { "name": "My Tool", },` | | `parameters` | No | Additional information describing the action; see [Parameters](#parameters) | Reference to ingredients in the `ingredientIds` array. | | `parameters` | No | Additional information describing the action; see [Parameters](#parameters) | Reference to ingredients in the `ingredientIds` array. | @@ -336,7 +338,9 @@ For other possible values of `digitalSourceType`, see [Digital source type](#dig { "action": "c2pa.created", "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/trainedAlgorithmicMedia", - "softwareAgent": "" + "softwareAgent": { + "name": "My GenAI Tool", + }, } ] } diff --git a/docs/manifest/writing/ingredients.md b/docs/manifest/writing/ingredients.md index 5f6dedb..e3849a9 100644 --- a/docs/manifest/writing/ingredients.md +++ b/docs/manifest/writing/ingredients.md @@ -98,14 +98,15 @@ Use that ID when the manifest gets defined in an `ingredientsId` array; [for exa { "action": "c2pa.opened", "softwareAgent": { - "name": "Opened asset", + "name": "Tool XYZ", }, "parameters": { "ingredientIds": [ - parent_ingredient_id + "xmp:iid:a965983b-36fb-445a-aa80-a2d911dcc53c" ] }, - ... + }, + ... ``` Then the SDK links the ingredient with the action.