Update app.py

app.py

@@ -262,38 +262,53 @@ app.layout = dbc.Container([
     State("progress-store", "data"),
     prevent_initial_call=True
 )
-def update_progress(submit_clicks, n_intervals, url, depth, progress_data):
-    global generated_file
+@app.callback(
+    Output("submit-button", "disabled"),
+    Output("download-button", "disabled"),
+    Output("progress-bar", "value"),
+    Output("progress-message", "children"),
+    Output("pdf-store", "data"),
+    Input("submit-button", "n_clicks"),
+    Input("progress-interval", "n_intervals"),
+    State("url-input", "value"),
+    State("depth-slider", "value"),
+    prevent_initial_call=True
+)
+def update_progress(submit_clicks, n_intervals, url, depth):
+    global generated_file, progress_data
     ctx = dash.callback_context
-    if not ctx.triggered:
-        raise PreventUpdate
+    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0] if ctx.triggered else None
 
-    triggered_id = ctx.triggered[0]['prop_id'].split('.')[0]
+    with data_lock:
+        current_progress = progress_data['progress']
+        message = progress_data['message']
+        pdf_ready = generated_file is not None
 
     if triggered_id == "submit-button":
         if not url:
             return False, True, 0, "Please enter a URL", None
-
-        # Start the background task
-        task_id = str(uuid.uuid4())
-        executor.submit(background_task, url, depth, task_id)
         
+        with data_lock:
+            progress_data = {'progress': 0, 'message': "Processing... Please wait."}
+        
+        executor.submit(background_task, url, depth)
         return True, True, 0, "Processing... Please wait.", None
 
     elif triggered_id == "progress-interval":
-        progress = progress_data['progress']
-        message = progress_data['message']
-
-        if isinstance(message, str) and message.startswith("Error"):
-            return False, True, 100, message, None
-        elif progress == 100 and generated_file:
-            # Encode the PDF file as base64
+        if pdf_ready:
             encoded_pdf = base64.b64encode(generated_file).decode('utf-8')
-            return False, False, 100, "PDF ready for download!", {'content': encoded_pdf, 'filename': f"website_content_{int(time.time())}.pdf"}
-        elif progress > 0:
-            return True, True, progress, message, None
-
-    return False, True, 0, "", None
+            return (
+                False, False, 100,
+                "PDF ready for download!",
+                {'content': encoded_pdf, 'filename': f"website_content_{int(time.time())}.pdf"}
+            )
+        return (
+            True, True, current_progress,
+            message,
+            None
+        )
+
+    return dash.no_update
 
 @app.callback(
     Output("download-pdf", "data"),
@@ -307,22 +322,34 @@ def download_pdf(n_clicks, pdf_data):
     
     return dcc.send_bytes(base64.b64decode(pdf_data['content']), pdf_data['filename'])
 
-def background_task(url, depth, task_id):
-    global generated_file
-
-    def progress_callback(message):
-        progress = int(float(message.split()[-1].strip('%')))
-        app.layout.children[1].data = {'progress': progress, 'message': message}
+def background_task(url, depth):
+    global generated_file, progress_data
+    
+    def update_progress_safe(message, progress):
+        with data_lock:
+            progress_data['progress'] = progress
+            progress_data['message'] = message
 
     try:
         logger.info(f"Starting background task for URL: {url}, depth: {depth}")
-        pdf_content = asyncio.run(process_url(url, depth, progress_callback))
+        
+        async def run_async():
+            return await process_url(url, depth, lambda msg: update_progress_safe(msg, int(float(msg.split()[-1].strip('%')))))
+        
+        pdf_content = asyncio.run(run_async())
+        
+        with data_lock:
+            generated_file = pdf_content
+            progress_data['progress'] = 100
+            progress_data['message'] = "PDF generation complete. Ready for download!"
+            
         logger.info("Background task completed successfully")
-        generated_file = pdf_content
-        app.layout.children[1].data = {'progress': 100, 'message': "PDF generation complete. Ready for download!"}
+        
     except Exception as e:
         logger.error(f"Error in background task: {str(e)}")
-        app.layout.children[1].data = {'progress': 100, 'message': f"Error: {str(e)}"}
+        with data_lock:
+            progress_data['message'] = f"Error: {str(e)}"
+            progress_data['progress'] = 100
 
 if __name__ == '__main__':
     print("Starting the Dash application...")