Update app.py

app.py

@@ -157,122 +157,237 @@ with gr.Blocks() as interface:
     #       gr.update(value=final_log)
     #   )
     
-    def threaded_batch_runner(file=None, text="", email=""):
-      print("📧 EMAIL RECEIVED:", email)
-      import tempfile
-      from mtdna_backend import (
-          extract_accessions_from_input,
-          summarize_results,
-          save_to_excel,
-          hash_user_id,
-          increment_usage,
-      )
-      import os
-
-      global_stop_flag.value = False  # reset stop flag
-
-      tmp_dir = tempfile.mkdtemp()
-      output_file_path = os.path.join(tmp_dir, "batch_output_live.xlsx")
-      limited_acc = 50 + (10 if email.strip() else 0)
-
-      # Step 1: Parse input
-      accessions, error = extract_accessions_from_input(file, text)
-      print(accessions)  
-      if error:
-          yield (
-              "",                          # output_table
-              gr.update(visible=False),   # results_group
-              gr.update(visible=False),   # download_file
-              "",                          # usage_display
-              "❌ Error",                  # status
-              str(error)                        # progress_box
-          )
-          return
-
-      total = len(accessions)
-      if total > limited_acc:
-          accessions = accessions[:limited_acc]
-          warning = f"⚠️ Only processing first {limited_acc} accessions."
-      else:
-          warning = f"✅ All {total} accessions will be processed."
-
-      all_rows = []
-      processed_accessions = 0  # ✅ tracks how many accessions were processed
-      email_tracked = False  
-      log_lines = []
-
-      # Step 2: Loop through accessions
-      for i, acc in enumerate(accessions):
-          if global_stop_flag.value:
-              log_lines.append(f"🛑 Stopped at {acc} ({i+1}/{total})")
-              usage_text = ""
-              if email.strip() and not email_tracked:
-                  # user_hash = hash_user_id(email)
-                  # usage_count = increment_usage(user_hash, len(all_rows))
-                  print("print(processed_accessions at stop)  ",processed_accessions)
-                  usage_count = increment_usage(email, processed_accessions)
-                  email_tracked = True
-                  usage_text = f"**{usage_count}** samples used by this email. Ten more samples are added first (you now have 60 limited accessions), then wait we will contact you via this email."
-              else:
-                  usage_text = f"The limited accession is 50. The user has used {processed_accessions}, and only {50-processed_accessions} left."    
-              yield (
-                  make_html_table(all_rows),
-                  gr.update(visible=True),
-                  gr.update(value=output_file_path, visible=True),
-                  gr.update(value=usage_text, visible=True),
-                  "🛑 Stopped",
-                  "\n".join(log_lines)
-              )
-              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)
-          )
-
-          try:
-              print(acc)
-              rows = summarize_results(acc)
-              all_rows.extend(rows)
-              processed_accessions += 1  # ✅ count only successful accessions
-              save_to_excel(all_rows, "", "", output_file_path, is_resume=False)
-              log_lines.append(f"✅ Processed {acc} ({i+1}/{total})")
-          except Exception as e:
-              log_lines.append(f"❌ Failed to process {acc}: {e}")
-
-          yield (
-              make_html_table(all_rows),
-              gr.update(visible=True),
-              gr.update(visible=False),
-              "",
-              "⏳ Processing...",
-              "\n".join(log_lines)
-          )
-
-      # Final update
-      usage_text = ""
+    # def threaded_batch_runner(file=None, text="", email=""):
+    #   print("📧 EMAIL RECEIVED:", email)
+    #   import tempfile
+    #   from mtdna_backend import (
+    #       extract_accessions_from_input,
+    #       summarize_results,
+    #       save_to_excel,
+    #       hash_user_id,
+    #       increment_usage,
+    #   )
+    #   import os
+
+    #   global_stop_flag.value = False  # reset stop flag
+
+    #   tmp_dir = tempfile.mkdtemp()
+    #   output_file_path = os.path.join(tmp_dir, "batch_output_live.xlsx")
+    #   limited_acc = 50 + (10 if email.strip() else 0)
+
+    #   # Step 1: Parse input
+    #   accessions, error = extract_accessions_from_input(file, text)
+    #   print(accessions)  
+    #   if error:
+    #       yield (
+    #           "",                          # output_table
+    #           gr.update(visible=False),   # results_group
+    #           gr.update(visible=False),   # download_file
+    #           "",                          # usage_display
+    #           "❌ Error",                  # status
+    #           str(error)                        # progress_box
+    #       )
+    #       return
+
+    #   total = len(accessions)
+    #   if total > limited_acc:
+    #       accessions = accessions[:limited_acc]
+    #       warning = f"⚠️ Only processing first {limited_acc} accessions."
+    #   else:
+    #       warning = f"✅ All {total} accessions will be processed."
+
+    #   all_rows = []
+    #   processed_accessions = 0  # ✅ tracks how many accessions were processed
+    #   email_tracked = False  
+    #   log_lines = []
+
+    #   # Step 2: Loop through accessions
+    #   for i, acc in enumerate(accessions):
+    #       if global_stop_flag.value:
+    #           log_lines.append(f"🛑 Stopped at {acc} ({i+1}/{total})")
+    #           usage_text = ""
+    #           if email.strip() and not email_tracked:
+    #               # user_hash = hash_user_id(email)
+    #               # usage_count = increment_usage(user_hash, len(all_rows))
+    #               print("print(processed_accessions at stop)  ",processed_accessions)
+    #               usage_count = increment_usage(email, processed_accessions)
+    #               email_tracked = True
+    #               usage_text = f"**{usage_count}** samples used by this email. Ten more samples are added first (you now have 60 limited accessions), then wait we will contact you via this email."
+    #           else:
+    #               usage_text = f"The limited accession is 50. The user has used {processed_accessions}, and only {50-processed_accessions} left."    
+    #           yield (
+    #               make_html_table(all_rows),
+    #               gr.update(visible=True),
+    #               gr.update(value=output_file_path, visible=True),
+    #               gr.update(value=usage_text, visible=True),
+    #               "🛑 Stopped",
+    #               "\n".join(log_lines)
+    #           )
+    #           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)
+    #       )
+
+    #       try:
+    #           print(acc)
+    #           rows = summarize_results(acc)
+    #           all_rows.extend(rows)
+    #           processed_accessions += 1  # ✅ count only successful accessions
+    #           save_to_excel(all_rows, "", "", output_file_path, is_resume=False)
+    #           log_lines.append(f"✅ Processed {acc} ({i+1}/{total})")
+    #       except Exception as e:
+    #           log_lines.append(f"❌ Failed to process {acc}: {e}")
+
+    #       yield (
+    #           make_html_table(all_rows),
+    #           gr.update(visible=True),
+    #           gr.update(visible=False),
+    #           "",
+    #           "⏳ Processing...",
+    #           "\n".join(log_lines)
+    #       )
+
+    #   # Final update
+    #   usage_text = ""
       
-      if email.strip() and not email_tracked:
-          # user_hash = hash_user_id(email)
-          # usage_count = increment_usage(user_hash, len(all_rows))
-          print("print(processed_accessions final)  ",processed_accessions)  
-          usage_count = increment_usage(email, processed_accessions)
-          usage_text = f"**{usage_count}** samples used by this email. Ten more samples are added first (you now have 60 limited accessions), then wait we will contact you via this email."
-      elif not email.strip():
-          usage_text = f"The limited accession is 50. The user has used {processed_accessions}, and only {50-processed_accessions} left."
-      yield (
-          make_html_table(all_rows),
-          gr.update(visible=True),
-          gr.update(value=output_file_path, visible=True),
-          gr.update(value=usage_text, visible=True),
-          "✅ Done",
-          "\n".join(log_lines)
-      )
+    #   if email.strip() and not email_tracked:
+    #       # user_hash = hash_user_id(email)
+    #       # usage_count = increment_usage(user_hash, len(all_rows))
+    #       print("print(processed_accessions final)  ",processed_accessions)  
+    #       usage_count = increment_usage(email, processed_accessions)
+    #       usage_text = f"**{usage_count}** samples used by this email. Ten more samples are added first (you now have 60 limited accessions), then wait we will contact you via this email."
+    #   elif not email.strip():
+    #       usage_text = f"The limited accession is 50. The user has used {processed_accessions}, and only {50-processed_accessions} left."
+    #   yield (
+    #       make_html_table(all_rows),
+    #       gr.update(visible=True),
+    #       gr.update(value=output_file_path, visible=True),
+    #       gr.update(value=usage_text, visible=True),
+    #       "✅ Done",
+    #       "\n".join(log_lines)
+    #   )
+    def threaded_batch_runner(file=None, text="", email=""):
+        print("📧 EMAIL RECEIVED:", repr(email))
+        import tempfile
+        from mtdna_backend import (
+            extract_accessions_from_input,
+            summarize_results,
+            save_to_excel,
+            increment_usage,
+        )
+        import os
+    
+        global_stop_flag.value = False  # reset stop flag
+    
+        tmp_dir = tempfile.mkdtemp()
+        output_file_path = os.path.join(tmp_dir, "batch_output_live.xlsx")
+        limited_acc = 50 + (10 if email.strip() else 0)
+    
+        # Step 1: Parse input
+        accessions, error = extract_accessions_from_input(file, text)
+        print("🧪 Accessions received:", accessions)
+        if error:
+            yield (
+                "",                          # output_table
+                gr.update(visible=False),   # results_group
+                gr.update(visible=False),   # download_file
+                "",                          # usage_display
+                "❌ Error",                  # status
+                str(error)                  # progress_box
+            )
+            return
+    
+        total = len(accessions)
+        if total > limited_acc:
+            accessions = accessions[:limited_acc]
+            warning = f"⚠️ Only processing first {limited_acc} accessions."
+        else:
+            warning = f"✅ All {total} accessions will be processed."
+    
+        all_rows = []
+        processed_accessions = 0  # ✅ track successful accessions
+        email_tracked = False
+        log_lines = []
+    
+        # Step 2: Loop through accessions
+        for i, acc in enumerate(accessions):
+            if global_stop_flag.value:
+                log_lines.append(f"🛑 Stopped at {acc} ({i+1}/{total})")
+                usage_text = ""
+    
+                if email.strip() and not email_tracked:
+                    print(f"🧪 increment_usage at STOP: {email=} {processed_accessions=}")
+                    usage_count = increment_usage(email, processed_accessions)
+                    email_tracked = True
+                    usage_text = f"**{usage_count}** samples used by this email. Ten more samples are added first (you now have 60 limited accessions), then wait we will contact you via this email."
+                else:
+                    usage_text = f"The limited accession is 50. The user has used {processed_accessions}, and only {50 - processed_accessions} left."
+    
+                yield (
+                    make_html_table(all_rows),
+                    gr.update(visible=True),
+                    gr.update(value=output_file_path, visible=True),
+                    gr.update(value=usage_text, visible=True),
+                    "🛑 Stopped",
+                    "\n".join(log_lines)
+                )
+                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)
+            )
+    
+            try:
+                print("📄 Processing accession:", acc)
+                rows = summarize_results(acc)
+                all_rows.extend(rows)
+                processed_accessions += 1  # ✅ only count success
+                save_to_excel(all_rows, "", "", output_file_path, is_resume=False)
+                log_lines.append(f"✅ Processed {acc} ({i+1}/{total})")
+            except Exception as e:
+                log_lines.append(f"❌ Failed to process {acc}: {e}")
+    
+            yield (
+                make_html_table(all_rows),
+                gr.update(visible=True),
+                gr.update(visible=False),
+                "",
+                "⏳ Processing...",
+                "\n".join(log_lines)
+            )
+    
+        # Step 3: Final usage update
+        usage_text = ""
+        if email.strip() and not email_tracked:
+            print(f"🧪 increment_usage at END: {email=} {processed_accessions=}")
+            usage_count = increment_usage(email, processed_accessions)
+            email_tracked = True
+            usage_text = f"**{usage_count}** samples used by this email. Ten more samples are added first (you now have 60 limited accessions), then wait we will contact you via this email."
+        elif not email.strip():
+            usage_text = f"The limited accession is 50. The user has used {processed_accessions}, and only {50 - processed_accessions} left."
+    
+        yield (
+            make_html_table(all_rows),
+            gr.update(visible=True),
+            gr.update(value=output_file_path, visible=True),
+            gr.update(value=usage_text, visible=True),
+            "✅ Done",
+            "\n".join(log_lines)
+        )
+
 
     # def threaded_batch_runner(file=None, text="", email=""):
     #   global_stop_flag.value = False