New tabs and functions v4.3

app.py

@@ -4,8 +4,6 @@ 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)
 
@@ -65,39 +63,85 @@ 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 (Plotly Edition, Auto & Interactive) ---
-        with gr.TabItem("Visual Comparison"):
-            gr.Markdown("### 📊 Market Pair Comparison — BTC vs ETH (default)")
-
-            available_pairs = [
-                ("bitcoin", "ethereum"),
-                ("bitcoin", "solana"),
-                ("ethereum", "bnb"),
-                ("solana", "dogecoin"),
-                ("bitcoin", "toncoin"),
-            ]
-
-            pair_selector = gr.Dropdown(
-                label="Select Pair for Comparison",
-                choices=[f"{a.capitalize()} vs {b.capitalize()}" for a, b in available_pairs],
-                value="Bitcoin vs Ethereum",
-                interactive=True,
+        # --- 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])
+
+        # --- Crypto Intelligence Dashboard (Plotly Edition + KPI line) ---
+        with gr.TabItem("Crypto Intelligence Dashboard"):
+            # Подключаем стили вкладки
+            gr.HTML(f"<style>{crypto_css}</style>")
+
+            # KPI line (фиксированная строка без скачков, с минимальными отступами)
+            with gr.Row(elem_id="kpi_row"):
+                kpi_line = gr.HTML(elem_id="kpi_line")
+
+            # Controls (Top N slider + кнопка)
+            with gr.Row(elem_id="controls_row"):
+                top_slider = gr.Slider(
+                    label="Top N coins",
+                    minimum=20,
+                    maximum=100,
+                    step=10,
+                    value=50,
+                    scale=70,
+                )
+                load_btn = gr.Button("Generate Dashboard", variant="primary", scale=30)
+
+            # Основной контент — графики и текстовый инсайт
+            with gr.Row(equal_height=True, elem_id="main_charts_row"):
+                with gr.Column(scale=70):
+                    treemap_plot = gr.Plot(label="Market Composition")
+                with gr.Column(scale=30):
+                    ai_box = gr.Textbox(
+                        label="AI Market Summary",
+                        lines=18,
+                        elem_id="ai_summary_sidebar",
+                    )
+
+            # Нижний ряд с двумя графиками
+            with gr.Row(equal_height=True, elem_id="bottom_charts_row"):
+                movers_plot = gr.Plot(label="Top Movers", scale=50)
+                scatter_plot = gr.Plot(label="Market Cap vs Volume", scale=50)
+
+
+            # === Callback ===
+            def run_dash(n):
+                fig_treemap, fig_bar, fig_bubble, ai_comment, kpi_text = build_crypto_dashboard(n)
+                # KPI-строка уже готова, возвращаем её с обёрткой <div>
+                return (
+                    fig_treemap,
+                    fig_bar,
+                    fig_bubble,
+                    ai_comment,
+                    f"<div class='kpi-line'>{kpi_text}</div>",
+                )
+
+
+            load_btn.click(
+                fn=run_dash,
+                inputs=top_slider,
+                outputs=[treemap_plot, movers_plot, scatter_plot, ai_box, kpi_line],
+                show_progress="minimal",
             )
 
-            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))
-                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'")
+    gr.Markdown("---")
+    gr.Markdown(
+        "<center><small style='color:#6e7681;'>Developed with Featherless.ai • Powered by OpenAI-compatible API</small></center>",
+        elem_classes="footer",
+    )
 
 if __name__ == "__main__":
     demo.launch()