v.1.36

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.35")
+        gr.Markdown("# AI-анализ мониторинга новостей v.1.36")
         
         with gr.Row():
             file_input = gr.File(
@@ -668,7 +668,6 @@ def create_interface():
                     size="lg"
                 )
         
-        # Add status messages container
         with gr.Row():
             status_box = gr.Textbox(
                 label="Статус дедупликации",
@@ -695,25 +694,26 @@ def create_interface():
                 sentiment_plot = gr.Plot(label="Распределение тональности")
             with gr.Column(scale=1):
                 events_plot = gr.Plot(label="Распределение событий")
-                
-        # Add download button
-        download_btn = gr.Button("📥 Скачать результаты", visible=False)
-        output_file = gr.File(label="", visible=False)
-                
+        
         def stop_processing():
             control.request_stop()
             return "Остановка обработки..."
-                
-        @spaces.GPU(duration=300)
-        def analyze(file_bytes):
+        
+        @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 None, None, None, False, (None, None), "Ожидание файла...", ""
+                return {
+                    "status": "Ожидание файла...",
+                    "dedup_message": "",
+                    "dataframe": None,
+                    "sentiment_plot": None,
+                    "events_plot": None,
+                    "download": None
+                }
                 
             try:
-                # Reset stop flag
-                control.reset()
-                
                 file_obj = io.BytesIO(file_bytes)
                 logger.info("File loaded into BytesIO successfully")
                 
@@ -798,60 +798,73 @@ def create_interface():
                     # Cleanup GPU resources after batch
                     torch.cuda.empty_cache()
                     time.sleep(2)
+
                 
                 # Create final results
                 if processed_rows:
-                    final_df = pd.DataFrame(processed_rows)
-                    output_bytes_io = create_output_file(final_df, file_obj)
-                    if output_bytes_io:
-                        fig_sentiment, fig_events = create_visualizations(final_df)
-                        return (
-                            final_df,
-                            fig_sentiment,
-                            fig_events,
-                            True,
-                            ("результаты_анализа.xlsx", output_bytes_io.getvalue()),  # Return tuple of (name, bytes)
-                            "Обработка завершена!",
-                            dedup_message
-                        )
+                    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 None, None, None, False, (None, None), "Нет обработанных данных", ""
+                    return {
+                        "status": "Нет обработанных данных",
+                        "dedup_message": dedup_message,
+                        "dataframe": None,
+                        "sentiment_plot": None,
+                        "events_plot": None,
+                        "download": None
+                    }
                     
             except Exception as e:
                 error_msg = f"Ошибка анализа: {str(e)}"
                 logger.error(error_msg)
                 gr.Error(error_msg)
-                return None, None, None, False, (None, None), error_msg, ""
+                return {
+                    "status": error_msg,
+                    "dedup_message": "",
+                    "dataframe": None,
+                    "sentiment_plot": None,
+                    "events_plot": None,
+                    "download": None
+                }
             finally:
                 if detector:
                     detector.cleanup()
-                    
-        def trigger_download(show_button, file_content):
-            """Handle download button visibility and file content"""
-            return gr.update(visible=show_button), file_content
             
         stop_btn.click(fn=stop_processing, outputs=[progress])
         analyze_btn.click(
-            fn=analyze,
+            fn=process_and_download,
             inputs=[file_input],
             outputs=[
+                progress,
+                status_box,
                 stats,
                 sentiment_plot,
                 events_plot,
-                download_btn,  # Visibility control
-                output_file,  # Actual file content
-                progress,
-                status_box
+                download_button  # This will update dynamically
             ]
         )
         
-        # Connect download button to file output
-        download_btn.click(
-            fn=trigger_download,
-            inputs=[download_btn, output_file],
-            outputs=[download_btn, output_file]
-        )
-        
     return app
 
 if __name__ == "__main__":