Fix plumbing, and keep field around, for now

app.py

@@ -125,14 +125,13 @@ def process_document(document, fields, model, error=None):
             gr.update(visible=False),
             gr.update(visible=True, value=error) if error is not None else None,
             None,
-            None,
+            gr.update(**empty_table(fields)),
         )
 
 
-def process_path(path, model):
+def process_path(path, fields, model):
     error = None
     document = None
-    fields = {**FIELDS}
     if path:
         try:
             document = load_document(path)
@@ -143,8 +142,8 @@ def process_path(path, model):
     return process_document(document, fields, model, error)
 
 
-def process_upload(file, model):
-    return process_path(file.name if file else None, model)
+def process_upload(file, fields, model):
+    return process_path(file.name if file else None, fields, model)
 
 
 colors = ["#64A087", "green", "black"]
@@ -175,9 +174,9 @@ def process_question(
     annotate_page(prediction, pages, document)
 
     field_name = question.rstrip("?")
-    fields = {**FIELDS, field_name: [question]}
-    output[field_name] = prediction
-    table = output_table.values.tolist() + [[field_name, prediction.get("answer")]]
+    fields = {field_name: [question], **fields}
+    output = {field_name: prediction, **output}
+    table = [[field_name, prediction.get("answer")]] + output_table.values.tolist()
     return (
         gr.update(visible=True, value=pages),
         fields,
@@ -207,9 +206,8 @@ def process_fields(document, fields, model=list(CHECKPOINTS.keys())[0]):
     )
 
 
-def load_example_document(img, title, model):
+def load_example_document(img, title, fields, model):
     document = None
-    fields = {**FIELDS}
     if img is not None:
         if title in QUESTION_FILES:
             document = load_document(QUESTION_FILES[title])
@@ -400,10 +398,10 @@ with gr.Blocks(css=CSS) as demo:
             lambda _: (
                 gr.update(visible=False, value=None),  # image
                 None,  # document
-                {**FIELDS},  # fields
+                # {**FIELDS},  # fields
                 gr.update(visible=False, value=None),  # output
-                gr.update(**empty_table(FIELDS)),  # output_table
-                gr.update(visible=False),
+                # gr.update(**empty_table(FIELDS)),  # output_table
+                # gr.update(visible=False),
                 None,
                 None,
                 None,
@@ -414,10 +412,10 @@ with gr.Blocks(css=CSS) as demo:
             outputs=[
                 image,
                 document,
-                fields,
+                # fields,
                 output,
-                output_table,
-                img_clear_button,
+                # output_table,
+                # img_clear_button,
                 example_image,
                 upload,
                 url,
@@ -438,13 +436,13 @@ with gr.Blocks(css=CSS) as demo:
 
     upload.change(
         fn=process_upload,
-        inputs=[upload, model],
+        inputs=[upload, fields, model],
         outputs=submit_outputs,
     )
 
     submit.click(
         fn=process_path,
-        inputs=[url, model],
+        inputs=[url, fields, model],
         outputs=submit_outputs,
     )
 
@@ -468,7 +466,7 @@ with gr.Blocks(css=CSS) as demo:
 
     example_image.change(
         fn=load_example_document,
-        inputs=[example_image, example_question, model],
+        inputs=[example_image, example_question, fields, model],
         outputs=submit_outputs,
     )