Update utils.py

utils.py

@@ -59,7 +59,15 @@ def calculate_technical_indicators(data):
     upper, middle, lower = calculate_bollinger_bands(data['Close'])
     current_price = data['Close'].iloc[-1]
     bb_position = (current_price - lower.iloc[-1]) / (upper.iloc[-1] - lower.iloc[-1])
-    indicators['bollinger'] = {'upper': upper.iloc[-1], 'middle': middle.iloc[-1], 'lower': lower.iloc[-1], 'position': 'UPPER' if bb_position > 0.8 else 'LOWER' if bb_position < 0.2 else 'MIDDLE'}
+    indicators['bollinger'] = {
+        'upper': upper.iloc[-1],
+        'middle': middle.iloc[-1],
+        'lower': lower.iloc[-1],
+        'upper_values': upper,
+        'middle_values': middle,
+        'lower_values': lower,
+        'position': 'UPPER' if bb_position > 0.8 else 'LOWER' if bb_position < 0.2 else 'MIDDLE'
+    }
     sma_20_series = data['Close'].rolling(20).mean()
     sma_50_series = data['Close'].rolling(50).mean()
     indicators['moving_averages'] = {'sma_20': sma_20_series.iloc[-1], 'sma_50': sma_50_series.iloc[-1], 'sma_200': data['Close'].rolling(200).mean().iloc[-1], 'ema_12': data['Close'].ewm(span=12).mean().iloc[-1], 'ema_26': data['Close'].ewm(span=26).mean().iloc[-1], 'sma_20_values': sma_20_series, 'sma_50_values': sma_50_series}
@@ -197,47 +205,17 @@ def create_price_chart(data, indicators):
     fig.update_layout(title='Technical Analysis Dashboard', height=900, showlegend=True, xaxis_rangeslider_visible=False)
     return fig
 
-def create_prediction_chart(data, predictions):
-    if not len(predictions['values']):
-        return go.Figure()
-    fig = go.Figure()
-    fig.add_trace(go.Scatter(x=data.index[-60:], y=data['Close'].values[-60:], name='Historical Price', line=dict(color='blue', width=2)))
-    fig.add_trace(go.Scatter(x=predictions['dates'], y=predictions['values'], name='AI Prediction', line=dict(color='red', width=2, dash='dash')))
-    pred_std = np.std(predictions['values'])
-    upper_band = predictions['values'] + (pred_std * 1.96)
-    lower_band = predictions['values'] - (pred_std * 1.96)
-    fig.add_trace(go.Scatter(x=predictions['dates'], y=upper_band, name='Upper Band', line=dict(color='lightcoral', width=1), fill=None))
-    fig.add_trace(go.Scatter(x=predictions['dates'], y=lower_band, name='Lower Band', line=dict(color='lightcoral', width=1), fill='tonexty', fillcolor='rgba(255,182,193,0.2)'))
-    fig.update_layout(title=f'Price Prediction - Next {len(predictions["dates"])} Days', xaxis_title='Date', yaxis_title='Price (IDR)', hovermode='x unified', height=500)
-    return fig
-
 def create_technical_chart(data, indicators):
-    fig = make_subplots(
-        rows=2,
-        cols=2,
-        subplot_titles=('Bollinger Bands', 'Volume', 'Price vs MA', 'RSI Analysis'),
-        specs=[[{"secondary_y": False}, {"secondary_y": False}], [{"secondary_y": False}, {"secondary_y": False}]]
-    )
-
+    fig = make_subplots(rows=2, cols=2, subplot_titles=('Bollinger Bands', 'Volume', 'Price vs MA', 'RSI Analysis'), specs=[[{"secondary_y": False}, {"secondary_y": False}], [{"secondary_y": False}, {"secondary_y": False}]])
     fig.add_trace(go.Scatter(x=data.index, y=data['Close'], name='Price', line=dict(color='black')), row=1, col=1)
-    fig.add_trace(go.Scatter(x=data.index, y=indicators['bollinger']['upper'], name='Upper Band', line=dict(color='red', width=1)), row=1, col=1)
-    fig.add_trace(go.Scatter(x=data.index, y=indicators['bollinger']['lower'], name='Lower Band', line=dict(color='green', width=1), fill='tonexty', fillcolor='rgba(0,255,0,0.1)'), row=1, col=1)
-
+    fig.add_trace(go.Scatter(x=data.index, y=indicators['bollinger']['upper_values'], name='Upper Band', line=dict(color='red', width=1)), row=1, col=1)
+    fig.add_trace(go.Scatter(x=data.index, y=indicators['bollinger']['lower_values'], name='Lower Band', line=dict(color='green', width=1), fill='tonexty', fillcolor='rgba(0,255,0,0.1)'), row=1, col=1)
     fig.add_trace(go.Bar(x=data.index, y=data['Volume'], name='Volume', marker_color='lightblue'), row=1, col=2)
-
     fig.add_trace(go.Scatter(x=data.index, y=data['Close'], name='Price', line=dict(color='gray')), row=2, col=1)
     fig.add_trace(go.Scatter(x=data.index, y=indicators['moving_averages']['sma_20_values'], name='SMA 20', line=dict(color='orange', dash='dash')), row=2, col=1)
     fig.add_trace(go.Scatter(x=data.index, y=indicators['moving_averages']['sma_50_values'], name='SMA 50', line=dict(color='blue', dash='dash')), row=2, col=1)
-
     fig.add_trace(go.Scatter(x=data.index, y=indicators['rsi']['values'], name='RSI', line=dict(color='purple')), row=2, col=2)
     fig.add_hline(y=70, line_dash="dash", line_color="red", row=2, col=2)
     fig.add_hline(y=30, line_dash="dash", line_color="green", row=2, col=2)
-
-    fig.update_layout(
-        title='Technical Indicators Overview',
-        height=800,
-        showlegend=False,
-        hovermode='x unified'
-    )
+    fig.update_layout(title='Technical Indicators Overview', height=800, showlegend=False, hovermode='x unified')
     return fig
-