Update app.py

app.py

@@ -29,8 +29,7 @@ app = dash.Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP])
 server = app.server
 
 # Logging setup
-logging.basicConfig(filename='app.log', level=logging.INFO, 
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 # Thread-local storage for database connections
@@ -229,10 +228,6 @@ async def process_url(url, depth, progress_callback):
 
 # App layout
 app.layout = dbc.Container([
-    dcc.Location(id='url', refresh=True),
-    dcc.Interval(id='completion-check-interval', interval=1000, n_intervals=0),  # Check every second
-    dcc.Store(id='refresh-flag', data={'refreshed': False}),
-    dcc.Store(id='task-complete-store'),
     dcc.Store(id='pdf-store'),
     dcc.Store(id='progress-store', data={'progress': 0, 'message': ''}),
     dbc.Card(
@@ -248,8 +243,7 @@ app.layout = dbc.Container([
                 html.Div(id="progress-message", className="text-center"),
             ], className="mb-3"),
             dcc.Interval(id="progress-interval", interval=1000, n_intervals=0),
-            dcc.Download(id="download-pdf"),
-            dcc.Interval(id="check-pdf-ready", interval=1000, n_intervals=0) # Check every second
+            dcc.Download(id="download-pdf")
         ]),
         className="mt-4"
     )
@@ -260,15 +254,15 @@ app.layout = dbc.Container([
     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"),
-    Input("check-pdf-ready", "n_intervals"),  # Add this line
     State("url-input", "value"),
     State("depth-slider", "value"),
     State("progress-store", "data"),
     prevent_initial_call=True
 )
-def update_progress(submit_clicks, n_intervals, check_pdf_intervals, url, depth, progress_data):
+def update_progress(submit_clicks, n_intervals, url, depth, progress_data):
     global generated_file
     ctx = dash.callback_context
     if not ctx.triggered:
@@ -278,48 +272,28 @@ def update_progress(submit_clicks, n_intervals, check_pdf_intervals, url, depth,
 
     if triggered_id == "submit-button":
         if not url:
-            return False, True, 0, "Please enter a URL"
-        
-        # Reset generated_file
-        generated_file = None
-        
+            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)
         
-        return True, True, 0, "Processing... Please wait."
+        return True, True, 0, "Processing... Please wait.", None
 
-    elif triggered_id in ["progress-interval", "check-pdf-ready"]:
+    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
-        elif progress == 100 and generated_file is not None:
-            return False, False, 100, "PDF ready for download!"
+            return False, True, 100, message, None
+        elif progress == 100 and generated_file:
+            # Encode the PDF file as base64
+            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
-
-    return False, True, 0, ""
-
-@app.callback(
-    Output('url', 'refresh'),
-    Output('refresh-flag', 'data'),
-    Input('completion-check-interval', 'n_intervals'),
-    State('refresh-flag', 'data'),
-    prevent_initial_call=True
-)
-def check_task_completion(n_intervals, refresh_flag):
-    if refresh_flag['refreshed']:
-        raise PreventUpdate
+            return True, True, progress, message, None
 
-    # Check the application logs for the completion message
-    with open('app.log', 'r') as log_file:
-        log_contents = log_file.read()
-        if "INFO:__main__:Background task completed successfully" in log_contents:
-            return True, {'refreshed': True}
-
-    raise PreventUpdate
+    return False, True, 0, "", None
 
 @app.callback(
     Output("download-pdf", "data"),
@@ -346,26 +320,10 @@ def background_task(url, depth, task_id):
         logger.info("Background task completed successfully")
         generated_file = pdf_content
         app.layout.children[1].data = {'progress': 100, 'message': "PDF generation complete. Ready for download!"}
-        # Update the task-complete-store
-        app.layout.children[0].data = {'complete': True}
     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)}"}
 
-app.clientside_callback(
-    """
-    function(data) {
-        if (data && data.complete) {
-            location.reload();
-            return null;
-        }
-        return null;
-    }
-    """,
-    Output('task-complete-store', 'data'),
-    Input('task-complete-store', 'data')
-)
-
 if __name__ == '__main__':
     print("Starting the Dash application...")
     app.run(debug=True, host='0.0.0.0', port=7860)