v.1.45

app.py

@@ -643,10 +643,12 @@ def create_output_file(df, uploaded_file):
 
 def create_interface():
     control = ProcessControl()
-    file_data = gr.State(value=None)
-
+    
     with gr.Blocks(theme=gr.themes.Soft()) as app:
-        gr.Markdown("# AI-анализ мониторинга новостей v.1.44")
+        # Create state for file data
+        current_file = gr.State(None)
+        
+        gr.Markdown("# AI-анализ мониторинга новостей v.1.45")
         
         with gr.Row():
             file_input = gr.File(
@@ -687,7 +689,8 @@ def create_interface():
             stats = gr.DataFrame(
                 label="Результаты анализа",
                 interactive=False,
-                wrap=True
+                wrap=True,
+                max_rows=20
             )
             
         with gr.Row():
@@ -696,17 +699,18 @@ def create_interface():
             with gr.Column(scale=1):
                 events_plot = gr.Plot(label="Распределение событий")
                 
+        # Create a download row with both button and file components
         with gr.Row():
-            download_button = gr.Button(
+            download_btn = gr.Button(
                 "📥 Скачать результаты",
                 visible=False
             )
-        
             file_output = gr.File(
-                label="Скачать результаты",
-                visible=False
+                label="",
+                visible=False,
+                interactive=False
             )
-
+                
         def stop_processing():
             control.request_stop()
             return "Остановка обработки..."
@@ -716,12 +720,13 @@ def create_interface():
             if file_bytes is None:
                 gr.Warning("Пожалуйста, загрузите файл")
                 return (
-                    pd.DataFrame(),  # empty dataframe for stats
-                    None,  # sentiment plot
-                    None,  # events plot
-                    gr.update(visible=False),  # download button visibility
-                    "Ожидание файла...",  # progress message
-                    ""  # dedup message
+                    pd.DataFrame(),
+                    None,
+                    None,
+                    gr.update(visible=False),
+                    None,
+                    "Ожидание файла...",
+                    ""
                 )
                 
             try:
@@ -798,27 +803,27 @@ def create_interface():
                     result_df = pd.DataFrame(processed_rows)
                     output_bytes_io = create_output_file(result_df, file_obj)
                     fig_sentiment, fig_events = create_visualizations(result_df)
-
+                    
                     if output_bytes_io:
-                        output_bytes = output_bytes_io.getvalue()
+                        # Return values in the correct order
                         return (
                             result_df,
                             fig_sentiment,
                             fig_events,
                             gr.update(visible=True),
-                            f"Обработано {len(processed_rows)}/{total} строк",
-                            dedup_message, 
-                            (output_bytes, "результаты_анализа.xlsx")
+                            output_bytes_io.getvalue(),
+                            "Обработка завершена!",
+                            dedup_message
                         )
                 
                 return (
-                    pd.DataFrame(),  # empty dataframe
-                    None,  # sentiment plot
-                    None,  # events plot
-                    gr.update(visible=False),  # hide download button
-                    "Нет обработанных данных",  # progress message
-                    dedup_message,  # dedup message
-                    None
+                    pd.DataFrame(),
+                    None,
+                    None,
+                    gr.update(visible=False),
+                    None,
+                    "Нет обработанных данных",
+                    dedup_message
                 )
                     
             except Exception as e:
@@ -830,22 +835,21 @@ def create_interface():
                     None,
                     None,
                     gr.update(visible=False),
+                    None,
                     error_msg,
-                    "", 
-                    None
+                    ""
                 )
             finally:
                 if detector:
                     detector.cleanup()
         
-        def handle_download(file_data):
-            """Handle file download when button is clicked"""
-            if file_data is not None:
-                return file_data
-            return None
+        def update_file_output():
+            """Handler for download button click"""
+            return gr.update(visible=True, value=("результаты_анализа.xlsx", current_file.value))
             
         stop_btn.click(fn=stop_processing, outputs=[progress])
         
+        # Main processing
         analyze_btn.click(
             fn=process_and_download,
             inputs=[file_input],
@@ -853,16 +857,16 @@ def create_interface():
                 stats,
                 sentiment_plot,
                 events_plot,
-                download_button,
+                download_btn,
+                current_file,  # State for file data
                 progress,
-                status_box, 
-                file_data
+                status_box
             ]
         )
         
-        download_button.click(
-            fn=handle_download,
-            inputs=[file_data],
+        # Download handling
+        download_btn.click(
+            fn=update_file_output,
             outputs=[file_output]
         )