updates

main.py

@@ -37,25 +37,27 @@ def generate_image(prompt, model):
     filename = str(uuid.uuid4()) + ".jpg"
     image.save(filename)
 
-    # assertion = {
-    #    "assertions": [
-    #        {
-    #            "label": "com.truepic.custom.ai",
-    #            "data": {
-    #                "model_name": modelName,
-    #                "model_version": modelVersion,
-    #                "prompt": prompt,
-    #            },
-    #        }
-    #    ]
-    # }
-
-    # json_object = json.dumps(assertion)
+    assertion = {
+       "assertions": [
+           {
+               "label": "com.truepic.custom.ai",
+               "data": {
+                   "model_name": modelName,
+                   "model_version": modelVersion,
+                   "prompt": prompt,
+               },
+           }
+       ]
+    }
+
+    json_object = json.dumps(assertion)
 
     subprocess.check_output(
         [
             "./scripts/sign.sh",
             filename,
+            "--assertions-inline",
+            json_object
         ]
     )
 
@@ -97,15 +99,15 @@ def verify_image(fileUpload: UploadFile):
         
         c2pa_string = str(response_list[0])
         c2pa = c2pa_string.split(":", 1)
-        c2pa = c2pa[1].translate(None, " '")
+        c2pa = c2pa[1].strip(" ").strip("'")
 
         watermark_string = str(response_list[1])
         watermark = watermark_string.split(":", 1)
-        watermark = watermark[1].translate(None, " '")
+        watermark = watermark[1].strip(" ").strip("'")
 
         original_media_string = str(response_list[2])
         original_media = original_media_string.split(":", 1)
-        original_media = original_media[1].translate(None, " '")
+        original_media = original_media[1].strip(" ").strip("'")
 
  
     return {"response": fileUpload.filename, "contains_c2pa" : c2pa, "contains_watermark" : watermark, "original_media" : original_media}

scripts/sign.sh

@@ -14,6 +14,7 @@ debug_echo() {
 
 
 MEDIA_FILE=$(readlink -f "$1")
+shift
 
 TRUEPIC_CLI=/home/user/app/truepic
 STEG_SCRIPTS=/home/user/app/scripts/
@@ -34,7 +35,7 @@ fi
 
 debug_echo -n "Signing media..."
 signed_no_watermark=$(mktemp).${extension}
-${TRUEPIC_CLI} sign $MEDIA_FILE --output ${signed_no_watermark} > /dev/null 2>&1
+${TRUEPIC_CLI} sign $MEDIA_FILE "$@" --output ${signed_no_watermark} > /dev/null 2>&1
 debug_echo " --> ${signed_no_watermark}"
 
 debug_echo

static/index.html

@@ -77,7 +77,14 @@
               </div>
             </div>
             <div class="display-verify">
-              <div class="image-container"></div>
+              <p>Contains Credentials: <span id="contentCredentialResults"></span></p>
+              <p>Digital Watermark: <span id="digitalWatermarkResults"></span></p>
+              <p>Original Media: <span id="originalMedia"></span></p>
+              <!--
+                <div class="image-container">
+
+                </div>
+              -->
             </div>
           </div>
           <div class="col right-column">
@@ -253,6 +260,9 @@
           console.log("contains_watermark", data.contains_watermark);
           console.log("original_media", data.original_media);
 
+          document.getElementById("contentCredentialResults").innerHTML =  data.contains_c2pa;
+          document.getElementById("digitalWatermarkResults").innerHTML =  data.contains_watermark;
+          document.getElementById("originalMedia").innerHTML =  data.original_media;
 
 /*
           const path = "/" + data.response;