v.1.41

app.py

@@ -645,7 +645,7 @@ def create_interface():
     control = ProcessControl()
     
     with gr.Blocks(theme=gr.themes.Soft()) as app:
-        gr.Markdown("# AI-анализ мониторинга новостей v.1.38")
+        gr.Markdown("# AI-анализ мониторинга новостей v.1.41")
         
         with gr.Row():
             file_input = gr.File(
@@ -686,7 +686,8 @@ def create_interface():
             stats = gr.DataFrame(
                 label="Результаты анализа",
                 interactive=False,
-                wrap=True
+                wrap=True,
+                max_rows=20
             )
             
         with gr.Row():
@@ -694,29 +695,29 @@ def create_interface():
                 sentiment_plot = gr.Plot(label="Распределение тональности")
             with gr.Column(scale=1):
                 events_plot = gr.Plot(label="Распределение событий")
-                # Add download button with initial state of invisible
+                
+        with gr.Row():
+            download_button = gr.Button(
+                "📥 Скачать результаты",
+                visible=False
+            )
         
-        download_button = gr.Button("📥 Скачать результаты", visible=False)
-        file_output = gr.File(label="Результаты анализа", visible=False)
-
-
         def stop_processing():
             control.request_stop()
             return "Остановка обработки..."
-        
-        @spaces.GPU(duration=300)        
+                
+        @spaces.GPU(duration=300)
         def process_and_download(file_bytes):
-            """Process file and return download button state"""
             if file_bytes is None:
                 gr.Warning("Пожалуйста, загрузите файл")
-                return {
-                    "status": "Ожидание файла...",
-                    "dedup_message": "",
-                    "dataframe": None,
-                    "sentiment_plot": None,
-                    "events_plot": None,
-                    "download": None
-                }
+                return (
+                    pd.DataFrame(),  # empty dataframe for stats
+                    None,  # sentiment plot
+                    None,  # events plot
+                    gr.update(visible=False),  # download button visibility
+                    "Ожидание файла...",  # progress message
+                    ""  # dedup message
+                )
                 
             try:
                 file_obj = io.BytesIO(file_bytes)
@@ -735,6 +736,8 @@ def create_interface():
                 processed_rows = []
                 total = len(df)
                 batch_size = 3
+
+                
                 
                 for batch_start in range(0, total, batch_size):
                     if control.should_stop():
@@ -785,103 +788,84 @@ def create_interface():
                             continue
                     
                     # Create intermediate results
-                    if processed_rows:
-                        result_df = pd.DataFrame(processed_rows)
-                        output_bytes_io = create_output_file(result_df, file_obj)
-                        if output_bytes_io:
-                            fig_sentiment, fig_events = create_visualizations(result_df)
-                            yield (
-                                result_df,
-                                fig_sentiment,
-                                fig_events,
-                                True,
-                                (f"results_{len(processed_rows)}_rows.xlsx", output_bytes_io.getvalue()),  # Return tuple of (name, bytes)
-                                f"Обработано {len(processed_rows)}/{total} строк",
-                                dedup_message
-                            )
-                    
-                    # Cleanup GPU resources after batch
-                    torch.cuda.empty_cache()
-                    time.sleep(2)
-
-                
-                # Create final results
                 if processed_rows:
                     result_df = pd.DataFrame(processed_rows)
-                    output_bytes_io = create_output_file(result_df, file_obj)
                     fig_sentiment, fig_events = create_visualizations(result_df)
                     
-                    # Create download component
-                    download = gr.Button("📥 Скачать результаты")
-                    
-                    @download.click
-                    def on_download_click():
-                        return {
-                            "name": "результаты_анализа.xlsx",
-                            "data": output_bytes_io.getvalue(),
-                            "mime": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-                        }
-                    
-                    return {
-                        "status": "Обработка завершена!",
-                        "dedup_message": dedup_message,
-                        "dataframe": result_df,
-                        "sentiment_plot": fig_sentiment,
-                        "events_plot": fig_events,
-                        "download": download
-                    }
-                else:
-                    return {
-                        "status": "Нет обработанных данных",
-                        "dedup_message": dedup_message,
-                        "dataframe": None,
-                        "sentiment_plot": None,
-                        "events_plot": None,
-                        "download": None
-                    }
+                    # Save the file and store bytes in session state for later download
+                    output_bytes_io = create_output_file(result_df, file_obj)
+                    if output_bytes_io:
+                        # Store in session state for download
+                        if not hasattr(st.session_state, 'download_data'):
+                            st.session_state.download_data = {}
+                        st.session_state.download_data['file'] = output_bytes_io.getvalue()
+                        
+                        # Return results
+                        return (
+                            result_df,  # stats dataframe
+                            fig_sentiment,  # sentiment plot
+                            fig_events,  # events plot
+                            gr.update(visible=True),  # show download button
+                            "Обработка завершена!",  # progress message
+                            dedup_message  # 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
+                )
                     
             except Exception as e:
                 error_msg = f"Ошибка анализа: {str(e)}"
                 logger.error(error_msg)
                 gr.Error(error_msg)
-                return {
-                    "status": error_msg,
-                    "dedup_message": "",
-                    "dataframe": None,
-                    "sentiment_plot": None,
-                    "events_plot": None,
-                    "download": None
-                }
+                return (
+                    pd.DataFrame(),
+                    None,
+                    None,
+                    gr.update(visible=False),
+                    error_msg,
+                    ""
+                )
             finally:
                 if detector:
                     detector.cleanup()
         
-        def handle_file_download(file_bytes):
-            """Handle file download when button is clicked"""
-            if file_bytes is not None:
-                return (file_bytes, "результаты_анализа.xlsx")
-            return None
-                    
+        def handle_download():
+            """Download handler for the button"""
+            try:
+                if hasattr(st.session_state, 'download_data') and st.session_state.download_data.get('file'):
+                    return st.session_state.download_data['file']
+                return None
+            except Exception as e:
+                logger.error(f"Download error: {str(e)}")
+                return None
+            
         stop_btn.click(fn=stop_processing, outputs=[progress])
+        
         analyze_btn.click(
             fn=process_and_download,
             inputs=[file_input],
             outputs=[
-                progress,
-                status_box,
                 stats,
                 sentiment_plot,
                 events_plot,
-                download_button  # This will update dynamically
+                download_button,
+                progress,
+                status_box
             ]
         )
         
         download_button.click(
-            fn=handle_file_download,
-            inputs=[file_output],
-            outputs=[file_output]
+            fn=handle_download,
+            inputs=[],
+            outputs=[gr.File(label="", visible=False)]
         )
-
+        
     return app
 
 if __name__ == "__main__":