Update app.py

app.py

@@ -1,8 +1,6 @@
 import gradio as gr
 import requests
 import time
-import re
-import json
 import random
 from urllib.parse import urlparse, parse_qs
 from threading import Event
@@ -14,17 +12,17 @@ class ReportSender:
         self.is_running = False
 
     def execute_reports_loop(self, master_url_batch, cookie_header, batch_count, current_status):
-        """The main continuous execution loop (now includes initial checks)."""
-        if self.is_running and current_status == "Running":
-            yield " WARNING: A batch is already running.", self.is_running, "Running"
+        """The main continuous execution loop."""
+        if self.is_running:
+            yield gr.update(), True, "Running" 
             return
             
         if not master_url_batch or not master_url_batch.strip():
-            yield " Error: Report URL Batch is empty. Please paste one or more full, working report URLs.", False, "Stopped"
+            yield "Error: Report URL Batch is empty.", False, "Stopped"
             return
             
         if not cookie_header or not cookie_header.strip():
-            yield " Error: Cookie Header is missing. Required for authentication.", False, "Stopped"
+            yield "Error: Cookie Header is missing.", False, "Stopped"
             return
         
         self.stop_event.clear()
@@ -35,7 +33,7 @@ class ReportSender:
 
         if not master_urls:
             self.is_running = False
-            yield " Error: No valid URLs found in the Report URL Batch input. Ensure each URL starts with 'http' or 'https'.", False, "Stopped"
+            yield "Error: No valid URLs found.", False, "Stopped"
             return
 
         USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36"
@@ -63,9 +61,9 @@ class ReportSender:
 
         log_history = f" Starting batch loop for {num_urls} report types...\n"
         if csrf_token:
-            log_history += " ℹ️  CSRF Token detected and applied to headers.\n"
+            log_history += " ℹ️  CSRF Token detected and applied.\n"
         else:
-            log_history += " ⚠️ WARNING: Could not find 'tt_csrf_token' in cookie. Requests may fail.\n"
+            log_history += " ⚠️ WARNING: Could not find 'tt_csrf_token'. Requests may fail.\n"
 
         yield log_history, self.is_running, "Running" 
         total_requests_sent = 0
@@ -101,7 +99,6 @@ class ReportSender:
                             parsed = response.json()
                             status_code_val = parsed.get('status_code', -1)
                             status_code_msg = parsed.get('status_message', 'No Message')
-                            
                             if status_code_val == 0:
                                 is_json_success = True
                         except:
@@ -126,16 +123,14 @@ class ReportSender:
                     )
                     
                     log_history += log_entry
-                    if (total_requests_sent % 5 == 0) or (len(log_history.split('\n')) > 30):
-                        yield log_history, self.is_running, "Running"
+                    
+                    yield log_history, self.is_running, "Running"
                         
                 except requests.exceptions.Timeout:
-                    log_history += f"[{time.strftime('%H:%M:%S')}]  ERROR: REQ ({total_requests_sent+1}): {report_name} - Timeout after 10s.\n"
-                    total_requests_sent += 1
+                    log_history += f"[{time.strftime('%H:%M:%S')}]  ERROR: Timeout.\n"
                     yield log_history, self.is_running, "Running"
                 except Exception as e:
-                    log_history += f"[{time.strftime('%H:%M:%S')}]  FATAL ERROR: REQ ({total_requests_sent+1}): {report_name} - {str(e)}\n"
-                    total_requests_sent += 1
+                    log_history += f"[{time.strftime('%H:%M:%S')}]  ERROR: {str(e)}\n"
                     yield log_history, self.is_running, "Running"
             
             if batch_count != -1:
@@ -144,13 +139,14 @@ class ReportSender:
                     self.stop_event.set()
         
         self.is_running = False
-        log_history += f"\n\n DONE. Total Requests Sent: {total_requests_sent}."
+        log_history += f"\n\n🛑 STOPPED. Total Requests Sent: {total_requests_sent}."
         yield log_history, self.is_running, "Stopped"
 
     def stop_execution(self):
         """Sets the event flag to stop the continuous loop."""
         self.stop_event.set()
-        return "Stopping...", False, "Stopping..."
+        self.is_running = False
+        return False, "Stopping..."
 
 sender = ReportSender()
 
@@ -164,26 +160,22 @@ with gr.Blocks() as app:
             gr.Markdown("### 1. Request Context (CRITICAL)")
             cookie_input = gr.Textbox(
                 label="Full Browser Cookie Header (REQUIRED)", 
-                placeholder="Paste the ENTIRE 'Cookie: ...' string from your working browser request here.",
-                lines=5,
-                max_lines=5
+                placeholder="Paste the ENTIRE 'Cookie: ...' string...",
+                lines=5, max_lines=5
             )
 
             gr.Markdown("### 2. Report URLs Batch")
             master_url_batch_input = gr.Textbox(
-                label="Master Signed Report URLs (One full URL per line)", 
-                placeholder="Paste ONE OR MORE FULLY SIGNED & WORKING report URLs here.",
-                lines=5,
-                max_lines=10
+                label="Master Signed Report URLs", 
+                placeholder="Paste ONE OR MORE FULLY SIGNED URLs...",
+                lines=5, max_lines=10
             )
 
             gr.Markdown("### 3. Loop Control")
             with gr.Row(equal_height=False): 
                 batch_count_input = gr.Number(
-                    label="Batch Count (Total Cycles)",
-                    info="Set to -1 for continuous run.",
-                    value=-1, 
-                    scale=1
+                    label="Batch Count (-1 for infinite)",
+                    value=-1, scale=1
                 )
                 status_box = gr.Textbox(label="Status", value="Stopped", interactive=False, scale=1)
             
@@ -195,35 +187,35 @@ with gr.Blocks() as app:
             gr.Markdown("### 4. Execution Logs")
             logs_output = gr.Textbox(
                 show_label=False,
-                placeholder="Request logs will appear here...", 
-                lines=20,
-                max_lines=20,
+                placeholder="Logs will appear here...", 
+                lines=20, max_lines=20,
                 autoscroll=True,
                 elem_id="log-box"
             )
 
-    send_btn.click(
+    run_event = send_btn.click(
         fn=sender.execute_reports_loop,
         inputs=[master_url_batch_input, cookie_input, batch_count_input, current_status],
         outputs=[logs_output, is_running_state, status_box],
-    ).then(
-        lambda is_running: [gr.Button(interactive=not is_running), gr.Button(interactive=is_running)],
-        inputs=[is_running_state],
-        outputs=[send_btn, stop_btn],
-        queue=False
     )
-    
+    send_btn.click(
+        fn=lambda: [gr.Button(interactive=False), gr.Button(interactive=True)],
+        outputs=[send_btn, stop_btn]
+    )
+    run_event.then(
+        fn=lambda: [gr.Button(interactive=True), gr.Button(interactive=False)],
+        outputs=[send_btn, stop_btn]
+    )
     stop_btn.click(
         fn=sender.stop_execution,
         inputs=[],
-        outputs=[logs_output, is_running_state, status_box],
+        outputs=[is_running_state, status_box], 
+        cancels=[run_event], 
         queue=False
     ).then(
-        lambda: [gr.Button(interactive=True), gr.Button(interactive=False), gr.Textbox(value="Stopped")],
-        outputs=[send_btn, stop_btn, current_status],
-        queue=False
+        fn=lambda: [gr.Button(interactive=True), gr.Button(interactive=False), "Stopped"],
+        outputs=[send_btn, stop_btn, status_box]
     )
-    
     status_box.change(lambda x: x, inputs=status_box, outputs=current_status)
 
 if __name__ == "__main__":