Latest updates

app.py

@@ -99,46 +99,48 @@ FIELDS = {
     "Payment Terms": ["Payment Terms?"],
 }
 
+EMPTY_TABLE = dict(
+    headers=["Field", "Value"], value=[[name, None] for name in FIELDS.keys()]
+)
 
-def process_path(path):
+
+def process_document(document, model, error=None):
+    if document is not None and error is None:
+        preview, json_output, table = process_fields(document, model)
+        return (
+            document,
+            preview,
+            gr.update(visible=True),
+            gr.update(visible=False, value=None),
+            json_output,
+            table,
+        )
+    else:
+        return (
+            None,
+            None,
+            gr.update(visible=False),
+            gr.update(visible=True, value=error) if error is not None else None,
+            None,
+            None,
+        )
+
+
+def process_path(path, model):
     error = None
+    document = None
     if path:
         try:
             document = load_document(path)
-            return (
-                document,
-                gr.update(visible=True, value=document.preview),
-                gr.update(visible=True),
-                gr.update(visible=False, value=None),
-                gr.update(visible=False, value=None),
-                None,
-            )
         except Exception as e:
             traceback.print_exc()
             error = str(e)
-    return (
-        None,
-        gr.update(visible=False, value=None),
-        gr.update(visible=False),
-        gr.update(visible=False, value=None),
-        gr.update(visible=False, value=None),
-        gr.update(visible=True, value=error) if error is not None else None,
-        None,
-    )
 
+    return process_document(document, model, error)
 
-def process_upload(file):
-    if file:
-        return process_path(file.name)
-    else:
-        return (
-            None,
-            gr.update(visible=False, value=None),
-            gr.update(visible=False),
-            gr.update(visible=False, value=None),
-            gr.update(visible=False, value=None),
-            None,
-        )
+
+def process_upload(file, model):
+    return process_path(file.name if file else None, model)
 
 
 colors = ["#64A087", "green", "black"]
@@ -212,16 +214,10 @@ def load_example_document(img, title, model):
             document = load_document(QUESTION_FILES[title])
         else:
             document = ImageDocument(Image.fromarray(img), ocr_reader=get_ocr_reader())
-        preview, answer, table = process_fields(document, model)
-        return (
-            document,
-            preview,
-            gr.update(visible=True),
-            answer,
-            table,
-        )
     else:
-        return None, None, gr.update(visible=False), None, None
+        document = None
+
+    return process_document(document, model)
 
 
 CSS = """
@@ -379,6 +375,7 @@ with gr.Blocks(css=CSS) as demo:
                 choices=list(CHECKPOINTS.keys()),
                 value=list(CHECKPOINTS.keys())[0],
                 label="Model",
+                visible=False,
             )
 
             with gr.Row():
@@ -388,10 +385,7 @@ with gr.Blocks(css=CSS) as demo:
                 )
             with gr.Tabs():
                 with gr.TabItem("Table"):
-                    output_table = gr.Dataframe(
-                        headers=["Field", "Value"],
-                        value=[[name, None] for name in FIELDS.keys()],
-                    )
+                    output_table = gr.Dataframe(**EMPTY_TABLE)
 
                 with gr.TabItem("JSON"):
                     output = gr.JSON(label="Output", visible=False)
@@ -399,10 +393,10 @@ with gr.Blocks(css=CSS) as demo:
     for cb in [img_clear_button, clear_button]:
         cb.click(
             lambda _: (
-                gr.update(visible=False, value=None),
-                None,
-                gr.update(visible=False, value=None),
-                gr.update(value=None),
+                gr.update(visible=False, value=None), # image
+                None, # document 
+                gr.update(visible=False, value=None), # output
+                gr.update(**EMPTY_TABLE), # output_table
                 gr.update(visible=False),
                 None,
                 None,
@@ -427,13 +421,14 @@ with gr.Blocks(css=CSS) as demo:
 
     upload.change(
         fn=process_upload,
-        inputs=[upload],
-        outputs=[document, image, img_clear_button, output, output_table, url_error],
+        inputs=[upload, model],
+        outputs=[document, image, img_clear_button, url_error, output, output_table],
     )
+
     submit.click(
         fn=process_path,
-        inputs=[url],
-        outputs=[document, image, img_clear_button, output, output_table, url_error],
+        inputs=[url, model],
+        outputs=[document, image, img_clear_button, url_error, output, output_table],
     )
 
     question.submit(
@@ -457,7 +452,7 @@ with gr.Blocks(css=CSS) as demo:
     example_image.change(
         fn=load_example_document,
         inputs=[example_image, example_question, model],
-        outputs=[document, image, img_clear_button, output, output_table],
+        outputs=[document, image, img_clear_button, url_error, output, output_table],
     )
 
 if __name__ == "__main__":