Update app.py via AI Editor

app.py

@@ -60,6 +60,7 @@ app.layout = html.Div([
     dcc.Store(id='session-id', storage_type='local'),
     dcc.Store(id='current-slide-index', storage_type='session'),
     dcc.Store(id='files-box-store', storage_type='session'),
+    dcc.Store(id='loading-active', storage_type='session', data=False),
     html.Script('''
     (function() {
         function uuidv4() {
@@ -112,18 +113,7 @@ app.layout = html.Div([
                             dbc.CardHeader("All Uploaded/Generated Files", className="bg-light"),
                             dbc.CardBody(id="files-box", className="mb-2"),
                         ], className="mb-3 shadow-sm"),
-                        dbc.Button("Generate Slides", id='generate-button', color="primary", className="w-100 mt-2", size="lg"),
-                        html.Div([
-                            dbc.Label("Generated Slide Sets", className="fw-bold"),
-                            dcc.Dropdown(
-                                id='slide-generation-list',
-                                options=[],
-                                value=None,
-                                placeholder="No slides generated yet",
-                                clearable=False,
-                                style={'marginBottom': '10px'}
-                            )
-                        ], className="mt-3"),
+                        dbc.Button("Generate Content", id='generate-content-button', color="primary", className="w-100 mt-2", size="lg"),
                         html.Div([
                             html.Div("Status / Log:", className="fw-bold mb-1"),
                             html.Div(id='log-output', style={'whiteSpace': 'pre-line', 'height': '150px', 'overflowY': 'scroll', 'border': '1px solid #ddd', 'padding': '10px'})
@@ -141,13 +131,16 @@ app.layout = html.Div([
                             style={'height': '400px', 'resize': 'vertical'},
                             className="mb-3"
                         ),
-                        dcc.Loading(
-                            id="loading-ppt",
-                            type="default",
-                            children=[
-                                dbc.Button("Generate PowerPoint", id='generate-ppt-button', color="primary", className="w-100 mt-3", size="lg")
-                            ],
-                            style={'width': '100%'}
+                        dbc.Button("Generate PowerPoint", id='generate-ppt-button', color="primary", className="w-100 mt-3", size="lg"),
+                        html.Div(
+                            dcc.Loading(
+                                id="loading-box",
+                                type="default",
+                                fullscreen=False,
+                                children=html.Div(id="loading-placeholder", style={'height': '100px'})
+                            ),
+                            id="loading-box-container",
+                            style={'marginTop': '2rem', 'marginBottom': '1rem', 'minHeight': '120px', 'display': 'flex', 'justifyContent': 'center', 'alignItems': 'center'}
                         ),
                     ])
                 ], className="mb-4 shadow-sm")
@@ -290,14 +283,12 @@ def store_session_id(n_intervals):
     Output('files-box', 'children'),
     Output('slides-content', 'value'),
     Output('log-output', 'children'),
-    Output('slide-generation-list', 'options'),
-    Output('slide-generation-list', 'value'),
     Output('current-slide-index', 'data'),
     Output("download-dynamic", "data"),
+    Output('loading-active', 'data'),
     Input('upload-file', 'contents'),
-    Input('generate-button', 'n_clicks'),
+    Input('generate-content-button', 'n_clicks'),
     Input('generate-ppt-button', 'n_clicks'),
-    Input('slide-generation-list', 'value'),
     Input({'type': 'file-download', 'index': dash.ALL}, 'n_clicks'),
     Input({'type': 'file-delete', 'index': dash.ALL}, 'n_clicks'),
     State('upload-file', 'filename'),
@@ -307,12 +298,13 @@ def store_session_id(n_intervals):
     State('current-slide-index', 'data'),
     State({'type': 'file-download', 'index': dash.ALL}, 'id'),
     State({'type': 'file-delete', 'index': dash.ALL}, 'id'),
+    State('loading-active', 'data'),
     prevent_initial_call=True
 )
 def unified_callback(
-    upload_contents, gen_btn, gen_ppt_btn, selected_slide_idx, file_downloads, file_deletes,
+    upload_contents, gen_content_btn, gen_ppt_btn, file_downloads, file_deletes,
     upload_filename, document_text, slides_content, session_id, current_slide_idx,
-    download_ids, delete_ids
+    download_ids, delete_ids, loading_prev
 ):
     ctx = callback_context
     if not ctx.triggered or not session_id:
@@ -321,10 +313,10 @@ def unified_callback(
     session = get_or_create_session_data(session_id)
     slides_md = slides_content
     log_str = ""
-    slide_list = session.get('slide_markdown_names', [])
     slide_md_list = session.get('slide_markdowns', [])
     slide_idx = current_slide_idx if current_slide_idx is not None else None
     download_data = None
+    loading_on = False
 
     with session['lock']:
         if 'files_box' not in session:
@@ -372,16 +364,11 @@ def unified_callback(
             return html.Div("No files uploaded or generated yet.", className="text-muted")
         return files_box
 
-    dropdown_options = [
-        {'label': slide_name, 'value': idx}
-        for idx, slide_name in enumerate(slide_list)
-    ]
-    dropdown_value = slide_idx if (slide_idx is not None and slide_idx < len(slide_list)) else (len(slide_list) - 1 if slide_list else None)
-
     with session['lock']:
         log_str = '\n'.join(session['log_messages'][:100])
 
     if button_id == 'upload-file':
+        loading_on = True
         if upload_contents and upload_filename:
             try:
                 header, content_string = upload_contents.split(',')
@@ -394,9 +381,11 @@ def unified_callback(
                 with session['lock']:
                     session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - Error uploading file: {str(e)}")
                     log_str = '\n'.join(session['log_messages'][:100])
-        return rebuild_files_box(session), slides_content, log_str, dropdown_options, dropdown_value, slide_idx, None
+        loading_on = False
+        return rebuild_files_box(session), slides_content, log_str, slide_idx, None, loading_on
 
-    elif button_id == 'generate-button':
+    elif button_id == 'generate-content-button':
+        loading_on = True
         decoded_file_text = None
         uploaded_files = [f for f in session['files_box'] if f['type'] == 'uploaded']
         if uploaded_files:
@@ -409,7 +398,8 @@ def unified_callback(
                     with session['lock']:
                         session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - Could not decode uploaded file as text. Please upload a UTF-8 or Latin-1 encoded text file.")
                         log_str = '\n'.join(session['log_messages'][:100])
-                    return rebuild_files_box(session), "Could not decode uploaded file as text. Please upload a UTF-8 or Latin-1 encoded text file.", log_str, dropdown_options, dropdown_value, slide_idx, None
+                    loading_on = False
+                    return rebuild_files_box(session), "Could not decode uploaded file as text. Please upload a UTF-8 or Latin-1 encoded text file.", log_str, slide_idx, None, loading_on
         combined_text = ""
         if decoded_file_text and document_text:
             combined_text = decoded_file_text.strip() + "\n\n" + document_text.strip()
@@ -421,7 +411,8 @@ def unified_callback(
             with session['lock']:
                 session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - Please upload a file or enter text.")
                 log_str = '\n'.join(session['log_messages'][:100])
-            return rebuild_files_box(session), "Please upload a file or enter text.", log_str, dropdown_options, dropdown_value, slide_idx, None
+            loading_on = False
+            return rebuild_files_box(session), "Please upload a file or enter text.", log_str, slide_idx, None, loading_on
         try:
             add_log("Starting slide generation...", session_id)
             slides_markdown = process_document(combined_text, session_id)
@@ -434,20 +425,19 @@ def unified_callback(
                 session['current_slide_md'] = slides_markdown
                 slide_idx = len(session['slide_markdowns']) - 1
                 log_str = '\n'.join(session['log_messages'][:100])
-            dropdown_options = [
-                {'label': name, 'value': idx}
-                for idx, name in enumerate(session['slide_markdown_names'])
-            ]
-            dropdown_value = slide_idx
         except Exception as e:
             add_log(f"An error occurred during slide generation: {str(e)}", session_id)
             with session['lock']:
                 log_str = '\n'.join(session['log_messages'][:100])
-            return rebuild_files_box(session), f"An error occurred: {str(e)}", log_str, dropdown_options, dropdown_value, slide_idx, None
-        return rebuild_files_box(session), slides_md, log_str, dropdown_options, dropdown_value, slide_idx, None
+            loading_on = False
+            return rebuild_files_box(session), f"An error occurred: {str(e)}", log_str, slide_idx, None, loading_on
+        loading_on = False
+        return rebuild_files_box(session), slides_md, log_str, slide_idx, None, loading_on
 
     elif button_id == 'generate-ppt-button':
+        loading_on = True
         if not slides_content or not session_id:
+            loading_on = False
             raise PreventUpdate
         try:
             add_log("Starting PowerPoint generation...", session_id)
@@ -461,23 +451,10 @@ def unified_callback(
             add_log(f"An error occurred during PowerPoint generation: {str(e)}", session_id)
             with session['lock']:
                 log_str = '\n'.join(session['log_messages'][:100])
-            return rebuild_files_box(session), slides_content, log_str, dropdown_options, dropdown_value, slide_idx, None
-        return rebuild_files_box(session), slides_content, log_str, dropdown_options, dropdown_value, slide_idx, None
-
-    elif button_id == 'slide-generation-list':
-        try:
-            if selected_slide_idx is not None and 0 <= selected_slide_idx < len(slide_md_list):
-                slides_md = slide_md_list[selected_slide_idx]
-                slide_idx = selected_slide_idx
-                dropdown_value = slide_idx
-            else:
-                slides_md = ""
-        except Exception as e:
-            add_log(f"An error occurred while loading slide set: {str(e)}", session_id)
-            with session['lock']:
-                log_str = '\n'.join(session['log_messages'][:100])
-            return rebuild_files_box(session), slides_content, log_str, dropdown_options, dropdown_value, slide_idx, None
-        return rebuild_files_box(session), slides_md, log_str, dropdown_options, dropdown_value, slide_idx, None
+            loading_on = False
+            return rebuild_files_box(session), slides_content, log_str, slide_idx, None, loading_on
+        loading_on = False
+        return rebuild_files_box(session), slides_content, log_str, slide_idx, None, loading_on
 
     elif button_id.startswith("{"):
         triggered_id = eval(button_id)
@@ -487,7 +464,8 @@ def unified_callback(
                 if 0 <= idx < len(session['files_box']):
                     file_bytes = session['files_box'][idx]['content']
                     file_name = session['files_box'][idx]['name']
-                    return rebuild_files_box(session), slides_content, log_str, dropdown_options, dropdown_value, slide_idx, dcc.send_bytes(file_bytes, file_name)
+                    loading_on = False
+                    return rebuild_files_box(session), slides_content, log_str, slide_idx, dcc.send_bytes(file_bytes, file_name), loading_on
         elif triggered_id['type'] == 'file-delete':
             idx = triggered_id['index']
             with session['lock']:
@@ -496,13 +474,27 @@ def unified_callback(
                     del session['files_box'][idx]
                     session['log_messages'].insert(0, f"{time.strftime('%H:%M:%S')} - File '{deleted_name}' deleted.")
                     log_str = '\n'.join(session['log_messages'][:100])
-            return rebuild_files_box(session), slides_content, log_str, dropdown_options, dropdown_value, slide_idx, None
+            loading_on = False
+            return rebuild_files_box(session), slides_content, log_str, slide_idx, None, loading_on
         else:
+            loading_on = False
             raise PreventUpdate
 
     else:
+        loading_on = False
         raise PreventUpdate
 
+# Loading indicator logic
+@app.callback(
+    Output("loading-box", "children"),
+    Input('loading-active', 'data')
+)
+def update_loading_box(loading_active):
+    if loading_active:
+        return dcc.Loading(type="default", fullscreen=False, children=html.Div(style={'height': '100px'}))
+    else:
+        return html.Div(style={'height': '100px'})
+
 if __name__ == '__main__':
     print("Starting the Dash application...")
     app.run(debug=True, host='0.0.0.0', port=7860, threaded=True)