Update app.py

app.py

@@ -24,7 +24,8 @@ def analyze_stock(symbol, prediction_days=30):
             symbol = symbol.upper() + ".JK"
 
         stock = yf.Ticker(symbol)
-        data = stock.history(period="6mo", interval="1d")
+        # Fetching data for a slightly longer period for better analysis base
+        data = stock.history(period="1y", interval="1d") 
 
         if data.empty:
             raise ValueError("No price data available for this stock.")
@@ -57,8 +58,12 @@ def analyze_stock(symbol, prediction_days=30):
             "high_30d": 0,
             "low_30d": 0,
             "change_pct": 0,
-            "summary": "Prediction unavailable.",
+            "summary": f"Error: {e}",
+            "tp1": 0,
+            "tp2": 0,
+            "sl": 0,
         }
+        # Mengembalikan string kosong untuk data yang akan ditampilkan di Markdown
         return {}, {}, {}, empty_fig, empty_fig, empty_fig, empty_predictions
 
 
@@ -73,112 +78,165 @@ def update_analysis(symbol, prediction_days):
         predictions,
     ) = analyze_stock(symbol, prediction_days)
 
-    if not fundamental_info:
+    if not fundamental_info and "Error" in predictions.get("summary", ""):
+        # Jika terjadi error, kembalikan hasil error ke semua output
+        error_msg = f"**ERROR:** {predictions.get('summary')}"
         return (
-            "Unable to fetch stock data.",
+            gr.Markdown.update(value=error_msg),
+            gr.Markdown.update(value=error_msg),
+            gr.Markdown.update(value=error_msg),
             gr.Plot.update(value=None),
             gr.Plot.update(value=None),
             gr.Plot.update(value=None),
         )
 
-    fundamentals = f"""
-    <h4>COMPANY FUNDAMENTALS</h4>
-    <b>Name:</b> {fundamental_info.get('name', 'N/A')} ({symbol.upper()})<br>
-    <b>Current Price:</b> Rp{fundamental_info.get('current_price', 0):,.2f}<br>
-    <b>Market Cap:</b> {fundamental_info.get('market_cap', 0):,}<br>
-    <b>P/E Ratio:</b> {fundamental_info.get('pe_ratio', 0):.2f}<br>
-    <b>Dividend Yield:</b> {fundamental_info.get('dividend_yield', 0):.2f}%<br>
-    <b>Volume:</b> {fundamental_info.get('volume', 0):,}<br>
+    # --- Formatting Fundamental Data ---
+    fundamentals_text = f"""
+    ### COMPANY FUNDAMENTALS
+    - **Name:** {fundamental_info.get('name', 'N/A')} ({symbol.upper()})
+    - **Current Price:** Rp{fundamental_info.get('current_price', 0):,.2f}
+    - **Market Cap:** {fundamental_info.get('market_cap', 0):,}
+    - **P/E Ratio:** {fundamental_info.get('pe_ratio', 0):.2f}
+    - **Dividend Yield:** {fundamental_info.get('dividend_yield', 0):.2f}%
+    - **Volume:** {fundamental_info.get('volume', 0):,}
     """
 
+    # --- Formatting Technical Signals ---
     details_list = "".join(
         [f"<li>{line.strip()}</li>" for line in signals.get("details", "").split("\n") if line.strip()]
     )
 
-    trading_signal = f"""
-    <h4>TECHNICAL SIGNAL SUMMARY</h4>
-    <b>Overall Trend:</b> {signals.get('overall', 'N/A')}<br>
-    <b>Signal Strength:</b> {signals.get('strength', 0):.2f}%<br>
-    <b>Support:</b> Rp{signals.get('support', 0):,.2f}<br>
-    <b>Resistance:</b> Rp{signals.get('resistance', 0):,.2f}<br>
-    <b>Stop Loss:</b> Rp{signals.get('stop_loss', 0):,.2f}<br><br>
-    <b>Detailed Signals:</b>
+    trading_signal_text = f"""
+    ### TECHNICAL SIGNAL SUMMARY
+    - **Overall Trend:** **{signals.get('overall', 'N/A')}**
+    - **Signal Strength:** {signals.get('strength', 0):.2f}%
+    - **Support:** Rp{signals.get('support', 0):,.2f}
+    - **Resistance:** Rp{signals.get('resistance', 0):,.2f}
+    - **Stop Loss:** Rp{signals.get('stop_loss', 0):,.2f}
+
+    #### Detailed Signals:
     <ul style="margin-top: 8px; padding-left: 20px; line-height: 1.6;">
     {details_list}
     </ul>
     """
 
-    prediction = f"""
-    <h4>30-DAY AI FORECAST (CHRONOS-BOLT)</h4>
-    <b>Predicted High:</b> Rp{predictions.get('high_30d', 0):,.2f}<br>
-    <b>Predicted Low:</b> Rp{predictions.get('low_30d', 0):,.2f}<br>
-    <b>Expected Change:</b> {predictions.get('change_pct', 0):.2f}%<br><br>
-    <b>TP1:</b> Rp{predictions.get('tp1', 0):,.2f}<br>
-    <b>TP2:</b> Rp{predictions.get('tp2', 0):,.2f}<br>
-    <b>Stop Loss:</b> Rp{predictions.get('sl', 0):,.2f}<br><br>
-    <b>Model Insight:</b><br>{predictions.get('summary', 'No analysis available')}
+    # --- Formatting Prediction Data ---
+    prediction_text = f"""
+    ### 30-DAY AI FORECAST
+    - **Predicted High:** Rp{predictions.get('high_30d', 0):,.2f}
+    - **Predicted Low:** Rp{predictions.get('low_30d', 0):,.2f}
+    - **Expected Change:** **{predictions.get('change_pct', 0):.2f}%**
+
+    #### Trading Targets
+    - **TP1 (Target Price 1):** Rp{predictions.get('tp1', 0):,.2f}
+    - **TP2 (Target Price 2):** Rp{predictions.get('tp2', 0):,.2f}
+    - **Stop Loss:** Rp{predictions.get('sl', 0):,.2f}
+
+    #### Model Insight
+    > {predictions.get('summary', 'No analysis available')}
     """
 
-    # Karena custom CSS dihapus, kita akan menggunakan div sederhana tanpa class 'panel-box' dan 'triple-panel'
-    # Gradio secara otomatis akan menata elemen-elemen ini dengan lebih standar
     return (
-        f"""
-        <div style="display: flex; flex-direction: row; gap: 16px;">
-            <div style="flex: 1; min-width: 30%; border: 1px solid #ccc; padding: 10px; border-radius: 5px;">{fundamentals}</div>
-            <div style="flex: 1; min-width: 30%; border: 1px solid #ccc; padding: 10px; border-radius: 5px;">{trading_signal}</div>
-            <div style="flex: 1; min-width: 30%; border: 1px solid #ccc; padding: 10px; border-radius: 5px;">{prediction}</div>
-        </div>
-        """,
+        gr.Markdown.update(value=fundamentals_text),
+        gr.Markdown.update(value=trading_signal_text),
+        gr.Markdown.update(value=prediction_text),
         fig_price,
         fig_technical,
         fig_prediction,
     )
 
 
-# --- Perubahan utama di sini ---
+# --- STRUKTUR UI BARU ---
 with gr.Blocks(
-    title="REXPRO FINANCIAL AI DASHBOARD"
-    # Parameter theme dan css dihapus untuk kembali ke default Gradio
+    title="REXPRO FINANCIAL AI DASHBOARD",
+    # Menggunakan tema standar Gradio. Perbaikan layout yang membuat professional.
 ) as app:
     gr.Markdown("# REXPRO FINANCIAL AI DASHBOARD")
     gr.Markdown(
-        "Comprehensive stock analytics powered by **AI forecasting and technical analysis.**"
+        "Aplikasi Analisis Saham Komprehensif IDX, didukung oleh **Peramalan AI (CHRONOS-BOLT)** dan Analisis Teknikal."
     )
-
-    with gr.Row():
-        symbol = gr.Textbox(
-            label="STOCK SYMBOL (IDX)",
-            value="BBCA",
-            placeholder="Example: BBCA, TLKM, ADRO, BMRI",
-            interactive=True,
-        )
-        prediction_days = gr.Slider(
-            label="FORECAST PERIOD (DAYS)",
-            minimum=5,
-            maximum=60,
-            step=5,
-            value=30,
-            interactive=True,
-        )
-        analyze_button = gr.Button("RUN ANALYSIS")
-
-    gr.Markdown("---")
-    # Bagian report_section diubah agar lebih kompatibel dengan tema default,
-    # menggunakan sedikit inline CSS untuk meniru tata letak tiga kolom dasar.
-    report_section = gr.HTML() 
-    gr.Markdown("---")
-
-    with gr.Tab("MARKET CHARTS"):
-        with gr.Row():
-            price_chart = gr.Plot(label="PRICE & MOVING AVERAGES")
-            technical_chart = gr.Plot(label="TECHNICAL INDICATORS OVERVIEW")
-        gr.Markdown("---")
-        prediction_chart = gr.Plot(label="AI FORECAST PROJECTION")
-
+    
+    # 1. Row Kontrol Utama
+    with gr.Row(variant="panel"): # Menggunakan panel untuk membedakan area kontrol
+        with gr.Column(scale=1):
+            symbol = gr.Textbox(
+                label="MASUKKAN SIMBOL SAHAM (IDX)",
+                value="BBCA",
+                placeholder="Contoh: BBCA, TLKM, ADRO, BMRI",
+                interactive=True,
+                show_label=True
+            )
+        with gr.Column(scale=1):
+            prediction_days = gr.Slider(
+                label="PERIODE PERAMALAN (HARI)",
+                minimum=5,
+                maximum=60,
+                step=5,
+                value=30,
+                interactive=True,
+                show_label=True
+            )
+        with gr.Column(min_width=150, scale=0):
+            # Tombol diletakkan di bawah input untuk tampilan yang lebih rapi
+            analyze_button = gr.Button("RUN ANALYSIS", size="lg")
+
+    # 2. Tab untuk Hasil
+    with gr.Tabs():
+        # Tab 1: Ringkasan Analisis (Textual)
+        with gr.TabItem("RINGKASAN & TARGET"):
+            # Menggunakan gr.Row untuk membuat 3 "kartu" atau kolom hasil
+            with gr.Row():
+                # Grup untuk Fundamental
+                with gr.Group():
+                    fundamentals_output = gr.Markdown(
+                        "Hasil Fundamental akan muncul di sini.", 
+                        elem_classes=["card"]
+                    )
+                # Grup untuk Sinyal Teknikal
+                with gr.Group():
+                    trading_signal_output = gr.Markdown(
+                        "Ringkasan Sinyal Teknikal akan muncul di sini.",
+                        elem_classes=["card"]
+                    )
+                # Grup untuk Prediksi AI & Target
+                with gr.Group():
+                    prediction_output = gr.Markdown(
+                        "Hasil Peramalan AI & Target Trading akan muncul di sini.",
+                        elem_classes=["card"]
+                    )
+        
+        # Tab 2: Grafik Analisis
+        with gr.TabItem("VISUALISASI GRAFIK"):
+            gr.Markdown("## Grafik Analisis Saham")
+            
+            with gr.Row():
+                # Grafik 1: Harga & MA
+                with gr.Column(scale=1):
+                    price_chart = gr.Plot(label="1. HARGA & RATA-RATA BERGERAK (MA)", height=450)
+                
+                # Grafik 2: Indikator Teknikal
+                with gr.Column(scale=1):
+                    technical_chart = gr.Plot(label="2. INDIKATOR TEKNIKAL UTAMA (RSI/MACD)", height=450)
+            
+            gr.Markdown("---")
+            
+            with gr.Row():
+                # Grafik 3: Prediksi AI
+                prediction_chart = gr.Plot(label="3. PROYEKSI PERAMALAN AI", height=500)
+
+
+    # Definisi Event Handler
     analyze_button.click(
         fn=update_analysis,
         inputs=[symbol, prediction_days],
-        outputs=[report_section, price_chart, technical_chart, prediction_chart],
+        outputs=[
+            fundamentals_output,
+            trading_signal_output,
+            prediction_output,
+            price_chart,
+            technical_chart,
+            prediction_chart,
+        ],
     )
 
 if __name__ == "__main__":