v.1.32

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.31")
+        gr.Markdown("# AI-анализ мониторинга новостей v.1.32")
         
         with gr.Row():
             file_input = gr.File(
@@ -667,6 +667,14 @@ def create_interface():
                     variant="stop",
                     size="lg"
                 )
+        
+        # Add status messages container
+        with gr.Row():
+            status_box = gr.Textbox(
+                label="Статус дедупликации",
+                interactive=False,
+                value=""
+            )
             
         with gr.Row():
             progress = gr.Textbox(
@@ -688,12 +696,9 @@ def create_interface():
             with gr.Column(scale=1):
                 events_plot = gr.Plot(label="Распределение событий")
                 
-        with gr.Row():
-            download_file = gr.File(
-                label="📥 Скачать полный отчет",
-                file_types=[".xlsx"],
-                interactive=False
-            )
+        # Add download button
+        download_btn = gr.Button("📥 Скачать результаты", visible=False)
+        output_file = gr.File(label="", visible=False)
                 
         def stop_processing():
             control.request_stop()
@@ -703,7 +708,7 @@ def create_interface():
         def analyze(file_bytes):
             if file_bytes is None:
                 gr.Warning("Пожалуйста, загрузите файл")
-                return None, None, None, None, "Ожидание файла..."
+                return None, None, None, False, None, "Ожидание файла...", ""
                 
             try:
                 # Reset stop flag
@@ -718,7 +723,9 @@ def create_interface():
                 df = pd.read_excel(file_obj, sheet_name='Публикации')
                 original_count = len(df)
                 df = fuzzy_deduplicate(df, 'Выдержки из текста', threshold=55)
-                logger.info(f"Removed {original_count - len(df)} duplicate entries")
+                removed_count = original_count - len(df)
+                dedup_message = f"Удалено {removed_count} дубликатов из {original_count} записей"
+                logger.info(f"Removed {removed_count} duplicate entries")
                 
                 processed_rows = []
                 total = len(df)
@@ -736,8 +743,10 @@ def create_interface():
                                     result_df,
                                     fig_sentiment,
                                     fig_events,
-                                    (output, "partial_results.xlsx"),
-                                    f"Обработка остановлена. Обработано {len(processed_rows)}/{total} строк"
+                                    True,  # Show download button
+                                    output,  # Raw bytes
+                                    f"Обработка остановлена. Обработано {len(processed_rows)}/{total} строк",
+                                    dedup_message
                                 )
                         break
                         
@@ -781,8 +790,10 @@ def create_interface():
                                 result_df,
                                 fig_sentiment,
                                 fig_events,
-                                (output, f"results_{len(processed_rows)}_rows.xlsx"),
-                                f"Обработано {len(processed_rows)}/{total} строк"
+                                True,  # Show download button
+                                output,  # Raw bytes
+                                f"Обработано {len(processed_rows)}/{total} строк",
+                                dedup_message
                             )
                     
                     # Cleanup GPU resources after batch
@@ -799,26 +810,47 @@ def create_interface():
                             final_df,
                             fig_sentiment,
                             fig_events,
-                            (output, "results.xlsx"),
-                            "Обработка завершена!"
+                            True,  # Show download button
+                            output,  # Raw bytes
+                            "Обработка завершена!",
+                            dedup_message
                         )
                 else:
-                    return None, None, None, None, "Нет обработанных данных"
+                    return None, None, None, False, None, "Нет обработанных данных", ""
                     
             except Exception as e:
                 error_msg = f"Ошибка анализа: {str(e)}"
                 logger.error(error_msg)
                 gr.Error(error_msg)
-                return None, None, None, None, error_msg
+                return None, None, None, False, None, error_msg, ""
             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,
             inputs=[file_input],
-            outputs=[stats, sentiment_plot, events_plot, download_file, progress]
+            outputs=[
+                stats,
+                sentiment_plot,
+                events_plot,
+                download_btn,  # Visibility control
+                output_file,  # Actual file content
+                progress,
+                status_box
+            ]
+        )
+        
+        # Connect download button to file output
+        download_btn.click(
+            fn=trigger_download,
+            inputs=[download_btn, output_file],
+            outputs=[download_btn, output_file]
         )
         
     return app