New tabs and functions v4.2

app.py

@@ -4,6 +4,8 @@ from core.analyzer import PortfolioAnalyzer
 from core.comparer import PortfolioComparer
 from core.chat import ChatAssistant
 from core.metrics import show_metrics_table
+from core.crypto_dashboard import build_crypto_dashboard
+from core.visual_comparison import build_price_chart, build_volatility_chart   # ✅ сюда!
 from core.crypto_dashboard import build_crypto_dashboard  # (обновлено: KPI-line + более плотные графики)
 from core.multi_charts import build_echarts_html, build_highcharts_html  # (обновлено: чистый HTML/JS)
 
@@ -63,29 +65,10 @@ with gr.Blocks(css=base_css) as demo:
             metrics_out = gr.Dataframe(label="Portfolio Metrics", wrap=True)
             metrics_btn.click(fn=show_metrics_table, inputs=metrics_in, outputs=metrics_out)
 
-        # --- Visual Comparison (BTC vs ETH Plotly Edition) ---
-        with gr.TabItem("Visual Comparison (BTC vs ETH)"):
-            gr.Markdown("### 📈 BTC vs ETH — Market Comparison (Plotly Edition)")
-
-            from core.visual_comparison import build_comparison_chart, build_volatility_chart
-
-            compare_btn = gr.Button("Generate Comparison", variant="primary")
-            price_plot = gr.Plot(label="Price Trend (BTC vs ETH)")
-            vol_plot = gr.Plot(label="Daily Volatility (%)")
-
-
-            def run_visuals():
-                return build_comparison_chart(), build_volatility_chart()
-
-            compare_btn.click(fn=run_visuals, outputs=[price_plot, vol_plot])
-
         # --- Visual Comparison (Plotly Edition, Auto & Interactive) ---
         with gr.TabItem("Visual Comparison"):
             gr.Markdown("### 📊 Market Pair Comparison — BTC vs ETH (default)")
 
-            from core.visual_comparison import build_price_chart, build_volatility_chart
-
-            # Список популярных активов
             available_pairs = [
                 ("bitcoin", "ethereum"),
                 ("bitcoin", "solana"),
@@ -94,7 +77,6 @@ with gr.Blocks(css=base_css) as demo:
                 ("bitcoin", "toncoin"),
             ]
 
-            # Выпадающий список выбора пары
             pair_selector = gr.Dropdown(
                 label="Select Pair for Comparison",
                 choices=[f"{a.capitalize()} vs {b.capitalize()}" for a, b in available_pairs],
@@ -102,25 +84,20 @@ with gr.Blocks(css=base_css) as demo:
                 interactive=True,
             )
 
-            # Два графика: цена и волатильность
             price_plot = gr.Plot(label="Price Comparison")
             vol_plot = gr.Plot(label="Volatility Comparison")
 
 
-            # Функция обновления графиков
             def update_visuals(selected_pair: str):
                 for a, b in available_pairs:
                     if selected_pair.lower() == f"{a} vs {b}":
                         return build_price_chart((a, b)), build_volatility_chart((a, b))
-                # fallback — если вдруг не найдено
                 return build_price_chart(("bitcoin", "ethereum")), build_volatility_chart(("bitcoin", "ethereum"))
 
 
-            # Связываем обновление графиков при смене пары
             pair_selector.change(fn=update_visuals, inputs=pair_selector, outputs=[price_plot, vol_plot])
-
-            # Первичная инициализация при загрузке интерфейса
-            demo.load(fn=update_visuals, inputs=None, outputs=[price_plot, vol_plot], _js="() => 'Bitcoin vs Ethereum'")
+            demo.load(fn=update_visuals, inputs=None, outputs=[price_plot, vol_plot],
+                      _js="() => 'Bitcoin vs Ethereum'")
 
 if __name__ == "__main__":
     demo.launch()