Update app.py

app.py

@@ -26,8 +26,7 @@ custom_css = """
     width: 100%; height: 100%;
     background: rgba(0,0,0,0.6);
     z-index: 9999;
-    display: flex;
-    flex-direction: column;
+    display: none; /* hidden by default */
     justify-content: center;
     align-items: center;
 }
@@ -41,6 +40,7 @@ custom_css = """
 }
 """
 
+
 with gr.Blocks() as interface:
     # with gr.Tab("CURIOUS ABOUT THIS PRODUCT?"):
     #     gr.HTML(value=pricing_html)
@@ -73,6 +73,16 @@ with gr.Blocks() as interface:
     
         status = gr.Markdown(visible=False)
         
+        with gr.Group(visible=False, elem_id="nps-overlay") as nps_modal:
+            with gr.Column(elem_id="nps-box"):
+                gr.Markdown("### How likely are you to recommend this tool to a colleague or peer?")
+                nps_slider = gr.Slider(minimum=0, maximum=10, step=1, label="Your NPS Score (0-10)")
+                nps_text = gr.Textbox(label="Any feedback?", lines=3)
+                with gr.Row():
+                    nps_submit = gr.Button("Submit")
+                    nps_close = gr.Button("X", elem_id="nps-close")
+
+        
         with gr.Group(visible=False) as results_group:
           # with gr.Accordion("Open to See the Result", open=False) as results:  
           #     with gr.Row():
@@ -97,10 +107,10 @@ with gr.Blocks() as interface:
           submit_report_button = gr.Button("Submit", visible=False)
           status_report = gr.Markdown(visible=False)  
 
-          nps_question = gr.Markdown("### How likely are you to recommend this tool to a colleague or peer (0 = Not at all, 10 = Definitely)?")
-          nps_slider = gr.Slider(minimum=0, maximum=10, step=1, label="Your NPS Score (0-10)")
-          nps_button = gr.Button("Submit")
-          nps_output = gr.Textbox(label="", interactive=False, visible=True)  # Start empty  
+          # nps_question = gr.Markdown("### How likely are you to recommend this tool to a colleague or peer (0 = Not at all, 10 = Definitely)?")
+          # nps_slider = gr.Slider(minimum=0, maximum=10, step=1, label="Your NPS Score (0-10)")
+          # nps_button = gr.Button("Submit")
+          # nps_output = gr.Textbox(label="", interactive=False, visible=True)  # Start empty  
             
           download_file = gr.File(label="Download File Here", visible=False, interactive=True)
           progress_box = gr.Textbox(label="Live Processing Log", lines=20, interactive=False)
@@ -488,17 +498,26 @@ with gr.Blocks() as interface:
                     )
                     return
                 limited_acc = int(max_allowed-usage_count)
+            
+            # Step 1: Parse input
+            accessions, error = extract_accessions_from_input(file, text)
+            ### NEW: Hide inputs, show processed_info at start
             yield (
-                "",
-                gr.update(visible=False),
-                gr.update(visible=False),     # show stop button
-                "", 
+                make_html_table(all_rows), # output_table
+                gr.update(visible=False),   # results_group
+                gr.update(visible=False),   # download_file
+                "", # usage_display
+                "⏳ Processing...", # status
+                "", # progess_box
+                gr.update(visible=True), # run_button,
+                gr.update(visible=True),     # show stop button
+                gr.update(visible=True),     # show reset button
+                gr.update(visible=False),    # hide raw_text
+                gr.update(visible=False),    # hide file_upload
                 gr.update(value=f"Processed/Input accessions: {', '.join(accessions)}", visible=True),  # processed_info
-                "⏳ Processing...",
+                gr.update(visible=False)     # hide NPS modal at start
             )
             
-            # Step 1: Parse input
-            accessions, error = extract_accessions_from_input(file, text)
             log_submission_to_gsheet(email, accessions)
 
             print("🧪 Accessions received:", accessions)
@@ -569,26 +588,59 @@ with gr.Blocks() as interface:
                     else:
                         usage_text = f"The limited accession is 30. The user has used {processed_accessions}, and only {30 - processed_accessions} left."
         
+                    # yield (
+                    #     make_html_table(all_rows),
+                    #     gr.update(visible=True),
+                    #     #gr.update(value=output_file_path, visible=True),
+                    #     gr.update(value=output_file_path, visible=bool(output_file_path)),
+                    #     gr.update(value=usage_text, visible=True),
+                    #     "🛑 Stopped",
+                    #     "\n".join(log_lines)
+                    # )
                     yield (
                         make_html_table(all_rows),
-                        gr.update(visible=True),
-                        #gr.update(value=output_file_path, visible=True),
-                        gr.update(value=output_file_path, visible=bool(output_file_path)),
-                        gr.update(value=usage_text, visible=True),
-                        "🛑 Stopped",
-                        "\n".join(log_lines)
+                        gr.update(visible=True),                           # results_group
+                        gr.update(value=output_file_path, visible=bool(output_file_path)),  # download_file
+                        gr.update(value=usage_text, visible=True),         # usage_display
+                        "🛑 Stopped",                                       # "✅ Done" or "🛑 Stopped"
+                        "\n".join(log_lines),
+                        gr.update(visible=False),                          # run_button
+                        gr.update(visible=False),                          # stop_button
+                        gr.update(visible=True),                           # reset_button
+                        gr.update(visible=False),                          # raw_text
+                        gr.update(visible=False),                          # file_upload
+                        gr.update(value="", visible=False),                # processed_info
+                        gr.update(visible=True)                            # NPS modal now visible
                     )
+
                     return
         
                 log_lines.append(f"[{i+1}/{total}] Processing {acc}")
+                # yield (
+                #     make_html_table(all_rows),
+                #     gr.update(visible=True),
+                #     gr.update(visible=False),
+                #     "",
+                #     "⏳ Processing...",
+                #     "\n".join(log_lines)
+                # )
+                # Hide inputs, show processed_info at start
                 yield (
-                    make_html_table(all_rows),
-                    gr.update(visible=True),
-                    gr.update(visible=False),
-                    "",
-                    "⏳ Processing...",
-                    "\n".join(log_lines)
+                    make_html_table(all_rows),         # output_table
+                    gr.update(visible=True),          # results_group
+                    gr.update(visible=False),          # download_file
+                    "",                                # usage_display
+                    "⏳ Processing...",                 # status
+                    "\n".join(log_lines),              # progress_box
+                    gr.update(visible=True),           # run_button
+                    gr.update(visible=True),           # stop_button
+                    gr.update(visible=True),           # reset_button
+                    gr.update(visible=False),          # hide raw_text
+                    gr.update(visible=False),          # hide file_upload
+                    gr.update(value=f"Processed/Input accessions: {', '.join(accessions)}", visible=True),  # processed_info
+                    gr.update(visible=False)           # hide NPS modal at start
                 )
+
         
                 # try:
                 #     print("📄 Processing accession:", acc)
@@ -611,14 +663,30 @@ with gr.Blocks() as interface:
                 # If stop was pressed during this accession
                 if not success and global_stop_flag.value:
                     log_lines.append(f"🛑 Cancelled {acc} before completion")
+                    # yield (
+                    #     make_html_table(all_rows),
+                    #     gr.update(visible=True),
+                    #     gr.update(visible=False),
+                    #     "",
+                    #     "🛑 Stopped",
+                    #     "\n".join(log_lines)
+                    # )
                     yield (
                         make_html_table(all_rows),
-                        gr.update(visible=True),
-                        gr.update(visible=False),
-                        "",
-                        "🛑 Stopped",
-                        "\n".join(log_lines)
+                        gr.update(visible=True),                           # results_group
+                        gr.update(value=output_file_path, visible=bool(output_file_path)),  # download_file
+                        gr.update(value=usage_text, visible=True),         # usage_display
+                        "🛑 Stopped",                                       # "✅ Done" or "🛑 Stopped"
+                        "\n".join(log_lines),
+                        gr.update(visible=False),                          # run_button
+                        gr.update(visible=False),                          # stop_button
+                        gr.update(visible=True),                           # reset_button
+                        gr.update(visible=False),                          # raw_text
+                        gr.update(visible=False),                          # file_upload
+                        gr.update(value="", visible=False),                # processed_info
+                        gr.update(visible=True)                            # NPS modal now visible
                     )
+
                     break  # stop processing entirely
                 
                 # If it finished normally
@@ -634,14 +702,29 @@ with gr.Blocks() as interface:
                         log_lines.append(f"⚠️ Skipped {acc} due to timeout or error")
                 
                 # Always yield updated logs after each attempt
+                # yield (
+                #     make_html_table(all_rows),
+                #     gr.update(visible=True),
+                #     gr.update(visible=False),
+                #     "",
+                #     "⏳ Processing...",
+                #     "\n".join(log_lines)
+                # )
                 yield (
-                    make_html_table(all_rows),
-                    gr.update(visible=True),
-                    gr.update(visible=False),
-                    "",
-                    "⏳ Processing...",
-                    "\n".join(log_lines)
-                )
+                    make_html_table(all_rows),         # output_table
+                    gr.update(visible=True),          # results_group
+                    gr.update(visible=False),          # download_file
+                    "",                                # usage_display
+                    "⏳ Processing...",                 # status
+                    "\n".join(log_lines),              # progress_box
+                    gr.update(visible=True),           # run_button
+                    gr.update(visible=True),           # stop_button
+                    gr.update(visible=True),           # reset_button
+                    gr.update(visible=False),          # hide raw_text
+                    gr.update(visible=False),          # hide file_upload
+                    gr.update(value=f"Processed/Input accessions: {', '.join(accessions)}", visible=True),  # processed_info
+                    gr.update(visible=False)           # hide NPS modal at start
+                )                
 
                 # except Exception as e:
                 #     log_lines.append(f"❌ Failed to process {acc}: {e}")
@@ -666,14 +749,29 @@ with gr.Blocks() as interface:
             elif not email.strip():
                 usage_text = f"The limited accession is 30. The user has used {processed_accessions}, and only {30 - processed_accessions} left."
         
+            # yield (
+            #     make_html_table(all_rows),
+            #     gr.update(visible=True),
+            #     #gr.update(value=output_file_path, visible=True),
+            #     gr.update(value=output_file_path, visible=bool(output_file_path)),
+            #     gr.update(value=usage_text, visible=True),
+            #     "✅ Done",
+            #     "\n".join(log_lines)
+            # )
             yield (
                 make_html_table(all_rows),
-                gr.update(visible=True),
-                #gr.update(value=output_file_path, visible=True),
-                gr.update(value=output_file_path, visible=bool(output_file_path)),
-                gr.update(value=usage_text, visible=True),
-                "✅ Done",
-                "\n".join(log_lines)
+                gr.update(visible=True),                           # results_group
+                gr.update(value=output_file_path, visible=bool(output_file_path)),  # download_file
+                gr.update(value=usage_text, visible=True),         # usage_display
+                "✅ Done",                                      # "✅ Done" or "🛑 Stopped"
+                "\n".join(log_lines),
+                gr.update(visible=False),                          # run_button
+                gr.update(visible=False),                          # stop_button
+                gr.update(visible=True),                           # reset_button
+                gr.update(visible=False),                          # raw_text
+                gr.update(visible=False),                          # file_upload
+                gr.update(value="", visible=False),                # processed_info
+                gr.update(visible=True)                            # NPS modal now visible
             )
     
         # SUBMIT REPORT UI
@@ -811,25 +909,43 @@ with gr.Blocks() as interface:
         #         gr.update(value="", visible=False),  # usage_display
         #         gr.update(value="", visible=False),  # progress_box
         #     )
-        def reset_fields():
-          global_stop_flag.value = True  # Reset the stop flag
+        # def reset_fields():
+        #   global_stop_flag.value = True  # Reset the stop flag
     
-          return (
-              gr.update(value=""),          # raw_text
-              gr.update(value=None),        # file_upload
-              gr.update(value=[], visible=True),   # output_table
-              gr.update(value="", visible=True),   # status — reset and make visible again
-              gr.update(visible=False),     # results_group
-              gr.update(value="", visible=True),   # usage_display — reset and make visible again
-              gr.update(value="", visible=True),   # progress_box �� reset AND visible!
-              # report-related reset below
-              gr.update(value="", visible=False),  # report_textbox
-              gr.update(visible=False),            # submit_report_button
-              gr.update(value="", visible=False),  # status_report
-              gr.update(value=0),            # nps_slider
-              gr.update(value="", visible=False)  # nps_output
+        #   return (
+        #       gr.update(value=""),          # raw_text
+        #       gr.update(value=None),        # file_upload
+        #       gr.update(value=[], visible=True),   # output_table
+        #       gr.update(value="", visible=True),   # status — reset and make visible again
+        #       gr.update(visible=False),     # results_group
+        #       gr.update(value="", visible=True),   # usage_display — reset and make visible again
+        #       gr.update(value="", visible=True),   # progress_box — reset AND visible!
+        #       # report-related reset below
+        #       gr.update(value="", visible=False),  # report_textbox
+        #       gr.update(visible=False),            # submit_report_button
+        #       gr.update(value="", visible=False),  # status_report
+        #       gr.update(value=0),            # nps_slider
+        #       gr.update(value="", visible=False)  # nps_output
 
+        #     )
+        def reset_fields():
+            global_stop_flag.value = True  # Stop any running job
+        
+            return (
+                gr.update(value="", visible=True),   # raw_text
+                gr.update(value=None, visible=True), # file_upload
+                gr.update(value=[], visible=True),   # output_table
+                gr.update(value="", visible=True),   # status
+                gr.update(visible=False),            # results_group
+                gr.update(value="", visible=True),   # usage_display
+                gr.update(value="", visible=True),   # progress_box
+                gr.update(value="", visible=False),  # report_textbox
+                gr.update(visible=False),             # submit_report_button
+                gr.update(value="", visible=False),  # status_report
+                gr.update(value="", visible=False),  # processed_info
+                gr.update(visible=False)              # hide NPS modal
             )
+
             
         #inputMode.change(fn=toggle_input_mode, inputs=inputMode, outputs=[single_input_group, batch_input_group])
         #run_button.click(fn=classify_with_loading, inputs=[], outputs=[status])
@@ -878,14 +994,36 @@ with gr.Blocks() as interface:
         # )
         interface.queue()  # No arguments here!
     
+        # run_button.click(
+        #     fn=threaded_batch_runner,
+        #     inputs=[file_upload, raw_text, user_email],
+        #     outputs=[output_table, results_group, download_file, usage_display, status, progress_box],
+        #     concurrency_limit=1,  # ✅ correct in Gradio 5.x
+        #     queue=True,            # ✅ ensure the queue is used
+        #     #every=0.5
+        # )
         run_button.click(
             fn=threaded_batch_runner,
             inputs=[file_upload, raw_text, user_email],
-            outputs=[output_table, results_group, download_file, usage_display, status, progress_box],
-            concurrency_limit=1,  # ✅ correct in Gradio 5.x
-            queue=True,            # ✅ ensure the queue is used
-            #every=0.5
+            outputs=[
+                output_table,      # 1
+                results_group,     # 2
+                download_file,     # 3
+                usage_display,     # 4
+                status,            # 5
+                progress_box,      # 6
+                run_button,        # 7
+                stop_button,       # 8
+                reset_button,      # 9
+                raw_text,          # 10
+                file_upload,       # 11
+                processed_info,    # 12
+                nps_modal          # 13
+            ],
+            concurrency_limit=1,
+            queue=True
         )
+
         
     
         
@@ -907,15 +1045,34 @@ with gr.Blocks() as interface:
         # )
         #stop_button.click(fn=lambda sf: (gr.update(value="❌ Stopping...", visible=True), setattr(sf, "value", True) or sf), inputs=[gr.State(stop_flag)], outputs=[status, gr.State(stop_flag)])
     
+        # reset_button.click(
+        #     fn=reset_fields,
+        #     inputs=[],
+        #     #outputs=[raw_text, file_upload, resume_file, output_table, status, results_group, usage_display, progress_box]
+        #     outputs=[raw_text, file_upload, output_table, status, results_group, usage_display, progress_box,
+        #             report_textbox,
+        #             submit_report_button,
+        #             status_report, nps_slider, nps_output]
+        #             ) 
         reset_button.click(
             fn=reset_fields,
             inputs=[],
-            #outputs=[raw_text, file_upload, resume_file, output_table, status, results_group, usage_display, progress_box]
-            outputs=[raw_text, file_upload, output_table, status, results_group, usage_display, progress_box,
-                    report_textbox,
-                    submit_report_button,
-                    status_report, nps_slider, nps_output]
-                    )  
+            outputs=[
+                raw_text, 
+                file_upload, 
+                output_table, 
+                status, 
+                results_group, 
+                usage_display, 
+                progress_box,
+                report_textbox,
+                submit_report_button,
+                status_report, 
+                processed_info,
+                nps_modal
+            ]
+        )
+
     
         # download_button.click(
         #   fn=mtdna_backend.save_batch_output, 
@@ -936,8 +1093,10 @@ with gr.Blocks() as interface:
             outputs=[feedback_status]
         )
         
-        nps_button.click(fn=submit_nps, inputs=[user_email, nps_slider], outputs=nps_output)
-
+        #nps_button.click(fn=submit_nps, inputs=[user_email, nps_slider], outputs=nps_output)
+        nps_submit.click(fn=submit_nps, inputs=[user_email, nps_slider, nps_text], outputs=[])
+        nps_close.click(fn=lambda: gr.update(visible=False), outputs=[nps_modal])
+    
         
         gr.HTML("""
         <style>