Update app.py

app.py

@@ -34,8 +34,8 @@ css = """
 
 .markdown-fail-container {
     background-color: #FFF1F0;
-    padding: 10px;
-    margin: 10px;
+    padding: 20px;
+    margin: 20px;
     border-radius: 1px;
     border: 2px solid red;
     text-align: center;
@@ -82,8 +82,8 @@ def json_to_html_table(data, image_keys):
 
 def check_liveness(frame):
   if frame is None:
-    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed! <br/> Select Image File</p></div>"""
-    return liveness_result
+    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed</p></div>"""
+    return [liveness_result, {"status": "error", "result": "select image file!"}]
   
   img_bytes = io.BytesIO()
   Image.open(frame).save(img_bytes, format="JPEG")
@@ -97,14 +97,14 @@ def check_liveness(frame):
 
     result = requests.post(url=url, files=files, headers=headers)
   except:
-    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed! <br/> Failed to Open File</p></div>"""
-    return liveness_result
+    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed</p></div>"""
+    return [liveness_result, {"status": "error", "result": "failed to open file!"}]
 
   if result.ok:
     json_result = result.json()
     if json_result.get("resultCode") == "Error":
-      liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed!</p></div>"""
-      return liveness_result
+      liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed</p></div>"""
+      return [liveness_result, {"status": "error", "result": "server error!"}]
 
     process_results = json_result.get("result")
     status = process_results.get("status")
@@ -118,14 +118,15 @@ def check_liveness(frame):
       if screenReply < screenReplayThreshold or portraitReplace < portraitReplaceThreshold or printedCopy < printedCopyThreshold:
         liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check:  SPOOF</p></div>"""
 
+      json_output = {"status": "ok", "data": {"screenreplay_integrity_score": screenReply, "portraitreplace_integrity_score": portraitReplace, "printedcutout_integrity_score": printedCopy}}
       # Update json_result with the modified process_results
-      return liveness_result
+      return [liveness_result, json_output]
     
-    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed! <br/>Document not found!</p></div>"""
-    return liveness_result
+    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed</p></div>"""
+    return [liveness_result, {"status": "error", "result": "document not found!"}]
   else:
-    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed! <br/>{result.text}</p></div>"""
-    return liveness_result
+    liveness_result = f"""<div class="markdown-fail-container"><p style="text-align: center; font-size: 20px; color: red;">Liveness Check Failed</p></div>"""
+    return [liveness_result, {"status": "error", "result": f"{result.text}"}]
     
 def idcard_recognition(frame1, frame2):
   url = "https://recognito-iddocumentrecognition.p.rapidapi.com/api/read_idcard"
@@ -138,9 +139,8 @@ def idcard_recognition(frame1, frame2):
   elif frame1 is None and frame2 is not None:
     files = {'image': open(frame2, 'rb')}
   else:
-    return ['', None, None, None]
+    return ['', None, None]
   
-  liveness_result = check_liveness(frame1)
   headers = {"X-RapidAPI-Key": os.environ.get("API_KEY")}
     
   r = requests.post(url=url, files=files, headers=headers)
@@ -194,7 +194,7 @@ def idcard_recognition(frame1, frame2):
   
   result = json_to_html_table(result_table_dict, {'portrait'})
   json_result = json.dumps(rawValues, indent=6)
-  return [result, json_result, images, liveness_result]
+  return [result, json_result, images]
   
 def launch_demo():
   with gr.Blocks(css=css) as demo:
@@ -231,38 +231,54 @@ def launch_demo():
       """
     )
 
-    with gr.Row():
-      with gr.Column(scale=6):
-        with gr.Row():
-          with gr.Column(scale=3):
-            id_image_input1 = gr.Image(type='filepath', label='Front', elem_classes="example-image")
-          with gr.Column(scale=3):
-            id_image_input2 = gr.Image(type='filepath', label='Back', elem_classes="example-image")
-        
+    with gr.Tabs():
+      with gr.Tab("ID Document Recognition"):
         with gr.Row():
-          id_examples = gr.Examples(
-            examples=[['examples/1_f.png', 'examples/1_b.png'], 
-                      ['examples/2_f.png', 'examples/2_b.png'], 
-                      ['examples/3_f.png', 'examples/3_b.png'], 
-                      ['examples/4.png', None]],
-            inputs=[id_image_input1, id_image_input2],
-            outputs=None,
-            fn=idcard_recognition
-          )
-        
-      with gr.Blocks():
-        with gr.Column(scale=4, min_width=400, elem_classes="block-background"):     
-          id_recognition_button = gr.Button("ID Card Recognition", variant="primary", size="lg")
-          liveness_result = gr.Markdown("")
-          with gr.Tab("Key Fields"):
-            id_result_output = gr.HTML()
-          with gr.Tab("Raw JSON"):
-            json_result_output = gr.JSON()
-          with gr.Tab("Images"):
-            image_result_output = gr.HTML()
+          with gr.Column(scale=6):
+            with gr.Row():
+              with gr.Column(scale=3):
+                id_image_input1 = gr.Image(type='filepath', label='Front', elem_classes="example-image")
+              with gr.Column(scale=3):
+                id_image_input2 = gr.Image(type='filepath', label='Back', elem_classes="example-image")
+            
+            with gr.Row():
+              id_examples = gr.Examples(
+                examples=[['examples/1_f.png', 'examples/1_b.png'], 
+                          ['examples/2_f.png', 'examples/2_b.png'], 
+                          ['examples/3_f.png', 'examples/3_b.png'], 
+                          ['examples/4.png', None]],
+                inputs=[id_image_input1, id_image_input2],
+                outputs=None,
+                fn=idcard_recognition
+              )
+            
+          with gr.Blocks():
+            with gr.Column(scale=4, min_width=400, elem_classes="block-background"):     
+              id_recognition_button = gr.Button("ID Card Recognition", variant="primary", size="lg")
 
+              with gr.Tab("Key Fields"):
+                id_result_output = gr.HTML()
+              with gr.Tab("Raw JSON"):
+                json_result_output = gr.JSON()
+              with gr.Tab("Images"):
+                image_result_output = gr.HTML()
+              
+              id_recognition_button.click(idcard_recognition, inputs=[id_image_input1, id_image_input2], outputs=[id_result_output, json_result_output, image_result_output])
 
-      id_recognition_button.click(idcard_recognition, inputs=[id_image_input1, id_image_input2], outputs=[id_result_output, json_result_output, image_result_output, liveness_result])
+      with gr.Tab("ID Document Liveness Detection"):
+        with gr.Row():
+          with gr.Column(scale=1):
+            id_image_input = gr.Image(label="Image", type='filepath', elem_classes="example-image")
+            gr.Examples(examples=['examples/1_f.png', 'examples/2_f.png', 'examples/3_f.png', 'examples/4.png'], inputs=id_image_input)
+
+          with gr.Blocks():
+            with gr.Column(scale=1, elem_classes="block-background"):     
+              check_liveness_button = gr.Button("Check Document Liveness", variant="primary", size="lg")
+              
+              liveness_result = gr.Markdown("")
+              json_output = gr.JSON()
+              
+              check_liveness_button.click(check_liveness, inputs=id_image_input, outputs=[liveness_result, json_output])
     
     gr.HTML('<a href="https://visitorbadge.io/status?path=https%3A%2F%2Fhuggingface.co%2Fspaces%2Frecognito%2FID-Document-Verification"><img src="https://api.visitorbadge.io/api/combined?path=https%3A%2F%2Fhuggingface.co%2Fspaces%2Frecognito%2FID-Document-Verification&labelColor=%2337d67a&countColor=%23263759&style=flat" /></a>')
     
@@ -270,3 +286,4 @@ def launch_demo():
 
 if __name__ == '__main__':
   launch_demo()
+