Update app.py

app.py

@@ -38,6 +38,16 @@ 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))
+        sl = last_price * 0.95
+
+        predictions["tp1"] = tp1
+        predictions["tp2"] = tp2
+        predictions["sl"] = sl
+
         return fundamental_info, indicators, signals, fig_price, fig_technical, fig_prediction, predictions
 
     except Exception as e:
@@ -67,60 +77,61 @@ def update_analysis(symbol, prediction_days):
         return (
             "Unable to fetch stock data.",
             "No technical signals available.",
+            "No prediction data available.",
             gr.Plot.update(value=None),
             gr.Plot.update(value=None),
             gr.Plot.update(value=None),
-            "0",
-            "0",
-            "0",
-            "No prediction data available.",
         )
 
     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>
-"""
+    <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 = 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>
-"""
+    <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 = 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>Model Insight:</b><br>{predictions.get('summary', 'No analysis available')}
-"""
+    <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')}
+    """
 
     return (
-        fundamentals,
-        trading_signal,
+        f"""
+        <div class='triple-panel'>
+            <div class='panel-box'>{fundamentals}</div>
+            <div class='panel-box'>{trading_signal}</div>
+            <div class='panel-box'>{prediction}</div>
+        </div>
+        """,
         fig_price,
         fig_technical,
         fig_prediction,
-        f"{predictions.get('high_30d', 0):,.2f}",
-        f"{predictions.get('low_30d', 0):,.2f}",
-        f"{predictions.get('change_pct', 0):.2f}%",
-        prediction,
     )
 
 
@@ -145,12 +156,6 @@ with gr.Blocks(
             font-weight: 600;
             margin-bottom: 6px;
         }
-        .gr-markdown {
-            background-color: #ffffff;
-            border-radius: 10px;
-            border: 1px solid #e2e8f0;
-            padding: 16px;
-        }
         .gr-button {
             background-color: #2563eb !important;
             color: white !important;
@@ -158,31 +163,33 @@ with gr.Blocks(
             border-radius: 8px;
             padding: 10px 18px;
         }
-        .gr-textbox input {
-            background-color: #ffffff !important;
-            color: #1e293b !important;
-            border: 1px solid #d1d5db !important;
+        .panel-box {
+            background-color: #ffffff;
+            border-radius: 10px;
+            border: 1px solid #e2e8f0;
+            padding: 16px;
+            flex: 1;
+            min-width: 30%;
         }
-        .gr-slider {
-            background-color: #ffffff !important;
+        .triple-panel {
+            display: flex;
+            flex-direction: row;
+            justify-content: space-between;
+            gap: 16px;
+            width: 100%;
         }
+        ul { margin: 0; padding: 0 0 0 18px; }
+        li { margin-bottom: 4px; }
         .gr-plot {
             background-color: #ffffff;
             border: 1px solid #e2e8f0;
             border-radius: 10px;
         }
-        ul {
-            margin: 0;
-            padding: 0 0 0 18px;
-        }
-        li {
-            margin-bottom: 4px;
-        }
     """,
 ) as app:
     gr.Markdown("# REXPRO FINANCIAL AI DASHBOARD")
     gr.Markdown(
-        "A modern financial intelligence dashboard powered by **AI forecasting and technical analytics.**"
+        "Comprehensive stock analytics powered by **AI forecasting and technical analysis.**"
     )
 
     with gr.Row():
@@ -203,13 +210,7 @@ with gr.Blocks(
         analyze_button = gr.Button("RUN ANALYSIS")
 
     gr.Markdown("---")
-
-    with gr.Row():
-        with gr.Column(scale=1):
-            fundamentals_output = gr.HTML()
-        with gr.Column(scale=1):
-            signal_output = gr.HTML()
-
+    report_section = gr.HTML()
     gr.Markdown("---")
 
     with gr.Tab("MARKET CHARTS"):
@@ -219,28 +220,10 @@ with gr.Blocks(
         gr.Markdown("---")
         prediction_chart = gr.Plot(label="AI FORECAST PROJECTION")
 
-    with gr.Tab("AI FORECAST SUMMARY"):
-        with gr.Row():
-            predicted_high = gr.Textbox(label="PREDICTED HIGH (30D)", interactive=False)
-            predicted_low = gr.Textbox(label="PREDICTED LOW (30D)", interactive=False)
-            predicted_change = gr.Textbox(label="EXPECTED CHANGE (%)", interactive=False)
-        gr.Markdown("---")
-        prediction_summary = gr.HTML()
-
     analyze_button.click(
         fn=update_analysis,
         inputs=[symbol, prediction_days],
-        outputs=[
-            fundamentals_output,
-            signal_output,
-            price_chart,
-            technical_chart,
-            prediction_chart,
-            predicted_high,
-            predicted_low,
-            predicted_change,
-            prediction_summary,
-        ],
+        outputs=[report_section, price_chart, technical_chart, prediction_chart],
     )
 
 if __name__ == "__main__":