New tabs and functions v4.4

app.py

@@ -4,18 +4,17 @@ 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  # (обновлено: KPI-line + более плотные графики)
-from core.multi_charts import build_echarts_html, build_highcharts_html  # (обновлено: чистый HTML/JS)
+from core.crypto_dashboard import build_crypto_dashboard  # Plotly dashboard + KPI-line
+from core.visual_comparison import build_price_chart, build_volatility_chart  # Interactive pair comparison
 
 # === CSS loader ===
 def load_css(path: str) -> str:
     with open(path, "r", encoding="utf-8") as f:
         return f.read()
 
-# base + per-tab styles
+# === Styles ===
 base_css   = load_css("core/styles/base.css")
 crypto_css = load_css("core/styles/crypto_dashboard.css")
-multi_css  = load_css("core/styles/multi_charts.css")
 
 # === Model setup ===
 MODEL_NAME = "meta-llama/Meta-Llama-3.1-8B-Instruct"
@@ -23,9 +22,13 @@ analyzer = PortfolioAnalyzer(llm_service, MODEL_NAME)
 comparer = PortfolioComparer(llm_service, MODEL_NAME)
 chatbot = ChatAssistant(llm_service, MODEL_NAME)
 
+# === Main Interface ===
 with gr.Blocks(css=base_css) as demo:
     gr.Markdown("## Investment Portfolio Analyzer")
-    gr.Markdown("Professional AI-driven analytics for investment and crypto markets.", elem_classes="subtitle")
+    gr.Markdown(
+        "Professional AI-driven analytics for investment and crypto markets.",
+        elem_classes="subtitle",
+    )
 
     with gr.Tabs():
         # --- Analysis ---
@@ -39,7 +42,7 @@ with gr.Blocks(css=base_css) as demo:
             analyze_out = gr.Textbox(label="Analysis Result", lines=15, elem_id="analysis_output")
             analyze_btn.click(fn=analyzer.run, inputs=portfolio_input, outputs=analyze_out)
 
-        # --- Comparison ---
+        # --- Comparison Table ---
         with gr.TabItem("Comparison Table"):
             from core.comparison_table import show_comparison_table
             pid_a = gr.Textbox(label="Portfolio A", value="3852a354-e66e-4bc5-97e9-55124e31e687")
@@ -56,39 +59,54 @@ with gr.Blocks(css=base_css) as demo:
             chat_out = gr.Textbox(label="AI Response", lines=8)
             chat_btn.click(fn=chatbot.run, inputs=chat_in, outputs=chat_out)
 
-        # --- Metrics ---
+        # --- Metrics Table ---
         with gr.TabItem("Metrics Table"):
             metrics_in = gr.Textbox(label="Portfolio ID", value="b1ef37aa-5b9a-41b4-9394-8823f2de36bb")
             metrics_btn = gr.Button("Load Metrics", variant="primary")
             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 (%)")
+        # --- Visual Comparison (Interactive Plotly Edition) ---
+        with gr.TabItem("Visual Comparison"):
+            gr.Markdown("### 📊 Market Pair Comparison — Interactive Plotly Edition")
+
+            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,
+            )
 
+            price_plot = gr.Plot(label="Price Comparison")
+            vol_plot = gr.Plot(label="Volatility Comparison")
 
-            def run_visuals():
-                return build_comparison_chart(), build_volatility_chart()
+            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"))
 
-            compare_btn.click(fn=run_visuals, outputs=[price_plot, vol_plot])
+            # обновляем графики при смене пары
+            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'")
 
         # --- 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",
@@ -100,7 +118,6 @@ with gr.Blocks(css=base_css) as demo:
                 )
                 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")
@@ -111,16 +128,12 @@ with gr.Blocks(css=base_css) as demo:
                         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,
@@ -129,7 +142,6 @@ with gr.Blocks(css=base_css) as demo:
                     f"<div class='kpi-line'>{kpi_text}</div>",
                 )
 
-
             load_btn.click(
                 fn=run_dash,
                 inputs=top_slider,
@@ -137,11 +149,13 @@ with gr.Blocks(css=base_css) as demo:
                 show_progress="minimal",
             )
 
+    # --- Footer ---
     gr.Markdown("---")
     gr.Markdown(
         "<center><small style='color:#6e7681;'>Developed with Featherless.ai • Powered by OpenAI-compatible API</small></center>",
         elem_classes="footer",
     )
 
+# === Launch ===
 if __name__ == "__main__":
     demo.launch()