Update app/daily.py

app/daily.py

@@ -5,6 +5,8 @@ from datetime import datetime as dt
 import traceback
 from . import persist
 from .common import wrap_html
+import plotly.graph_objects as go
+import plotly.io as pio
 
 # ===========================================================
 # RAW DAILY FETCHER
@@ -17,14 +19,53 @@ def daily(symbol, date_end, date_start):
     if isinstance(df.columns, pd.MultiIndex):
         df.columns = df.columns.get_level_values(0)
     df.columns.name = None
-    df.index.name = "Date"  # name the index
+    df.index.name = "Date"
     return df
 
+# ===========================================================
+# PLOTLY CANDLESTICK
+# ===========================================================
+def plot_candlestick(df, symbol):
+    fig = go.Figure()
+
+    # Candlestick
+    fig.add_trace(go.Candlestick(
+        x=df['Date'],
+        open=df['Open'],
+        high=df['High'],
+        low=df['Low'],
+        close=df['Close'],
+        name='Price',
+        increasing_line_color='green',
+        decreasing_line_color='red'
+    ))
+
+    # Volume as bar chart
+    fig.add_trace(go.Bar(
+        x=df['Date'],
+        y=df['Volume'],
+        name='Volume',
+        marker_color='blue',
+        yaxis='y2',
+        opacity=0.3
+    ))
+
+    # Layout
+    fig.update_layout(
+        title=f'{symbol} Daily Candlestick',
+        xaxis_rangeslider_visible=False,
+        yaxis=dict(title='Price'),
+        yaxis2=dict(title='Volume', overlaying='y', side='right', showgrid=False),
+        legend=dict(orientation="h", yanchor="bottom", y=1.02, xanchor="right", x=1)
+    )
+
+    return pio.to_html(fig, full_html=False, include_plotlyjs='cdn')
+
 # ===========================================================
 # DAILY TABLE GENERATOR
 # ===========================================================
 def fetch_daily(symbol, date_end, date_start):
-    """Return HTML table of daily stock data."""
+    """Return HTML table + candlestick chart of daily stock data."""
     key = f"daily_{symbol}"
     if persist.exists(key, "html"):
         cached = persist.load(key, "html")
@@ -37,31 +78,27 @@ def fetch_daily(symbol, date_end, date_start):
             return wrap_html(f"<h1>No daily data for {symbol}</h1>")
 
         # Ensure numeric columns
-        for col in ["Open","High","Low","Close","Adj Close","Volume"]:
+        for col in ["Open","High","Low","Close","Volume"]:
             if col in df.columns:
                 df[col] = pd.to_numeric(df[col], errors='coerce')
 
         # Drop rows with missing OHLCV
         df = df.dropna(subset=["Open","High","Low","Close","Volume"]).reset_index()
 
-        # Format date correctly
+        # Format date
         df["Date"] = pd.to_datetime(df["Date"], errors='coerce')
         df = df.dropna(subset=["Date"]).reset_index(drop=True)
         df["Date"] = df["Date"].dt.strftime("%d-%b-%Y")
 
-        # Ensure Adj Close exists
-        if "Adj Close" not in df.columns:
-            df["Adj Close"] = ""
-
         # Daily change %
         df["Change %"] = ((df["Close"] - df["Open"]) / df["Open"] * 100).round(2)
 
         # Build HTML table
-        html_table = '<div id="daily_dashboard" style="max-height:600px; overflow:auto; font-family:Arial,sans-serif;">'
+        html_table = '<div style="max-height:300px; overflow:auto; font-family:Arial,sans-serif; margin-bottom:20px;">'
         html_table += '<table border="1" style="border-collapse:collapse; width:100%;">'
         html_table += '<thead style="position:sticky; top:0; background:#1a4f8a; color:white;">'
         html_table += '<tr><th>Date</th><th>Open</th><th>High</th><th>Low</th>'
-        html_table += '<th>Close</th><th>Adj Close</th><th>Volume</th><th>Change %</th></tr>'
+        html_table += '<th>Close</th><th>Volume</th><th>Change %</th></tr>'
         html_table += '</thead><tbody>'
 
         for idx, r in df.iterrows():
@@ -74,15 +111,19 @@ def fetch_daily(symbol, date_end, date_start):
             html_table += f'<td>{r["High"]}</td>'
             html_table += f'<td>{r["Low"]}</td>'
             html_table += f'<td>{r["Close"]}</td>'
-            html_table += f'<td>{r["Adj Close"]}</td>'
             html_table += f'<td>{r["Volume"]}</td>'
             html_table += f'<td style="color:{change_color}; font-weight:600;">{r["Change %"]}%</td>'
             html_table += '</tr>'
-
         html_table += '</tbody></table></div>'
 
-        persist.save(key, html_table, "html")
-        return html_table
+        # Build candlestick chart
+        chart_html = plot_candlestick(df, symbol)
+
+        # Combine
+        full_html = f'<div id="daily_dashboard">{html_table}{chart_html}</div>'
+
+        persist.save(key, full_html, "html")
+        return full_html
 
     except Exception as e:
         return wrap_html(f"<h1>Error fetch_daily: {e}</h1><pre>{traceback.format_exc()}</pre>")