Update app.py

app.py

@@ -24,7 +24,7 @@ def analyze_stock(symbol, prediction_days=30):
             symbol = symbol.upper() + ".JK"
 
         stock = yf.Ticker(symbol)
-        data = stock.history(period="1y", interval="1d") 
+        data = stock.history(period="6mo", interval="1d")
 
         if data.empty:
             raise ValueError("No price data available for this stock.")
@@ -38,6 +38,7 @@ def analyze_stock(symbol, prediction_days=30):
         fig_technical = create_technical_chart(data, indicators)
         fig_prediction = create_prediction_chart(data, predictions)
 
+        # kalkulasi TP1, TP2, SL
         last_price = data['Close'].iloc[-1]
         tp1 = last_price * (1 + (predictions.get("change_pct", 0) / 200))
         tp2 = last_price * (1 + (predictions.get("change_pct", 0) / 100))
@@ -56,10 +57,7 @@ def analyze_stock(symbol, prediction_days=30):
             "high_30d": 0,
             "low_30d": 0,
             "change_pct": 0,
-            "summary": f"Error: {e}",
-            "tp1": 0,
-            "tp2": 0,
-            "sl": 0,
+            "summary": "Prediction unavailable.",
         }
         return {}, {}, {}, empty_fig, empty_fig, empty_fig, empty_predictions
 
@@ -75,146 +73,112 @@ def update_analysis(symbol, prediction_days):
         predictions,
     ) = analyze_stock(symbol, prediction_days)
 
-    if not fundamental_info and "Error" in predictions.get("summary", ""):
-        error_msg = f"**ERROR:** {predictions.get('summary')}"
+    if not fundamental_info:
         return (
-            gr.Markdown.update(value=error_msg),
-            gr.Markdown.update(value=error_msg),
-            gr.Markdown.update(value=error_msg),
+            "Unable to fetch stock data.",
             gr.Plot.update(value=None),
             gr.Plot.update(value=None),
             gr.Plot.update(value=None),
         )
 
-    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):,}
+    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>
     """
 
     details_list = "".join(
         [f"<li>{line.strip()}</li>" for line in signals.get("details", "").split("\n") if line.strip()]
     )
 
-    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:
+    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>
     <ul style="margin-top: 8px; padding-left: 20px; line-height: 1.6;">
     {details_list}
     </ul>
     """
 
-    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')}
+    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')}
     """
 
+    # 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 (
-        gr.Markdown.update(value=fundamentals_text),
-        gr.Markdown.update(value=trading_signal_text),
-        gr.Markdown.update(value=prediction_text),
+        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>
+        """,
         fig_price,
         fig_technical,
         fig_prediction,
     )
 
 
+# --- Perubahan utama di sini ---
 with gr.Blocks(
-    title="REXPRO FINANCIAL AI DASHBOARD",
+    title="REXPRO FINANCIAL AI DASHBOARD"
+    # Parameter theme dan css dihapus untuk kembali ke default Gradio
 ) as app:
     gr.Markdown("# REXPRO FINANCIAL AI DASHBOARD")
     gr.Markdown(
-        "Aplikasi Analisis Saham Komprehensif IDX, didukung oleh **Peramalan AI (CHRONOS-BOLT)** dan Analisis Teknikal."
+        "Comprehensive stock analytics powered by **AI forecasting and technical analysis.**"
     )
-    
-    with gr.Row(variant="panel"):
-        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):
-            analyze_button = gr.Button("RUN ANALYSIS", size="lg")
-
-    with gr.Tabs():
-        with gr.TabItem("RINGKASAN & TARGET"):
-            with gr.Row():
-                with gr.Group():
-                    fundamentals_output = gr.Markdown(
-                        "Hasil Fundamental akan muncul di sini.", 
-                        elem_classes=["card"]
-                    )
-                with gr.Group():
-                    trading_signal_output = gr.Markdown(
-                        "Ringkasan Sinyal Teknikal akan muncul di sini.",
-                        elem_classes=["card"]
-                    )
-                with gr.Group():
-                    prediction_output = gr.Markdown(
-                        "Hasil Peramalan AI & Target Trading akan muncul di sini.",
-                        elem_classes=["card"]
-                    )
-        
-        with gr.TabItem("VISUALISASI GRAFIK"):
-            gr.Markdown("## Grafik Analisis Saham")
-            
-            with gr.Row():
-                with gr.Column(scale=1):
-                    price_chart = gr.Plot(label="1. HARGA & RATA-RATA BERGERAK (MA)")
-                
-                with gr.Column(scale=1):
-                    technical_chart = gr.Plot(label="2. INDIKATOR TEKNIKAL UTAMA (RSI/MACD)")
-            
-            gr.Markdown("---")
-            
-            with gr.Row():
-                prediction_chart = gr.Plot(label="3. PROYEKSI PERAMALAN AI") 
 
+    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")
 
     analyze_button.click(
         fn=update_analysis,
         inputs=[symbol, prediction_days],
-        outputs=[
-            fundamentals_output,
-            trading_signal_output,
-            prediction_output,
-            price_chart,
-            technical_chart,
-            prediction_chart,
-        ],
+        outputs=[report_section, price_chart, technical_chart, prediction_chart],
     )
 
 if __name__ == "__main__":