Update daily.py

daily.py

@@ -1,40 +1,37 @@
 # daily.py
-import yfinance as yf
 import pandas as pd
-from common import wrap_html, make_table
+import yfinance as yf
+from common import wrap_html, html_error, clean_df, make_table
+from indicater import calculate_indicators
 from chart_builder import build_chart
 
-# ============================================================
-#                  DAILY DATA PROCESSING
-# ============================================================
-
-def fetch_daily(symbol, indicators=None):
+def fetch_daily(symbol):
     """
-    Fetch daily data for 1 year, apply indicators, and return full HTML.
+    Fetches daily OHLCV data, calculates indicators, builds chart, 
+    and returns the complete HTML for Gradio UI.
     """
-    yfsymbol = f"{symbol}.NS"
     try:
-        # Fetch 1-year daily data
-        df = yf.download(yfsymbol, period="1y", interval="1d").round(2)
+        yfsymbol = symbol + ".NS"
+
+        # ---------------- Fetch daily data ----------------
+        df = yf.download(yfsymbol, period="6mo", interval="1d")
         if df.empty:
-            return wrap_html(f"<h1>No daily data available for {symbol}</h1>")
+            return html_error(f"No daily data found for {symbol}")
 
-        # Reset MultiIndex if exists
-        if isinstance(df.columns, pd.MultiIndex):
-            df.columns = df.columns.get_level_values(0)
+        df = clean_df(df)
 
-        # Build chart with optional indicators
-        chart_html = build_chart(df, indicators=['macd','supertrend','keltner','zigzag','swing','stockstick'])
+        # ---------------- Calculate indicators ----------------
+        indicators = calculate_indicators(df)
 
-        #chart_html = build_chart(df, indicators=indicators, volume=True)
+        # ---------------- Build chart ----------------
+        html_chart = build_chart(df, indicators)
 
-        # Format last 30 rows for table
-        table_html = make_table(df.tail(30))
+        # ---------------- Build table ----------------
+        table_html = make_table(df)
 
-        # Wrap in full HTML
-        full_html = wrap_html(f"{chart_html}<h2>Recent Daily Data (last 30 rows)</h2>{table_html}",
-                              title=f"Daily Data for {symbol}")
-        return full_html
+        # ---------------- Wrap into full HTML ----------------
+        html = wrap_html(f"{html_chart}<br>{table_html}", title=f"{symbol} Daily Chart")
+        return html
 
     except Exception as e:
-        return wrap_html(f"<h1>Error fetching daily data for {symbol}</h1><p>{str(e)}</p>")
+        return html_error(f"Error generating daily chart for {symbol}: {e}")