Update app.py

app.py

@@ -1,29 +1,45 @@
-import sys
-import os
-
-# 🔑 CRITICAL for Hugging Face Spaces
-sys.path.append(os.path.dirname(__file__))
-
-# ---------- Always explicitly import local modules ----------
-import common
-import stock
-import indices_html
-import index_live_html
-import preopen_html
-import eq_html
-import bhavcopy_html
-import nsepython
-import yahooinfo
-import build_nse_fno
-
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
+import os
+import importlib.util
+
+# -------------------------------------------------------
+# Explicit module loader (HF-safe)
+# -------------------------------------------------------
+BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+
+def load_module(name):
+    path = os.path.join(BASE_DIR, f"{name}.py")
+    if not os.path.exists(path):
+        raise ImportError(f"Module file not found: {path}")
+
+    spec = importlib.util.spec_from_file_location(name, path)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+# -------------------------------------------------------
+# Load ALL local modules explicitly
+# -------------------------------------------------------
+common = load_module("common")
+stock = load_module("stock")
+indices_html = load_module("indices_html")
+index_live_html = load_module("index_live_html")
+preopen_html = load_module("preopen_html")
+eq_html = load_module("eq_html")
+bhavcopy_html = load_module("bhavcopy_html")
+build_nse_fno = load_module("build_nse_fno")
+
+# External libs (installed via requirements.txt)
+import nsepython
+import yahooinfo
 
-# ---------- FastAPI app ----------
+# -------------------------------------------------------
+# FastAPI app
+# -------------------------------------------------------
 app = FastAPI(title="Stock / Index Backend")
 
-# ---------- CORS ----------
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -31,7 +47,9 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# ---------- Valid req_type options ----------
+# -------------------------------------------------------
+# Valid request types
+# -------------------------------------------------------
 STOCK_REQ = [
     "info", "intraday", "daily", "nse_eq", "qresult", "result",
     "balance", "cashflow", "dividend", "split", "other", "stock_hist"
@@ -45,154 +63,117 @@ INDEX_REQ = [
     "index_pe_pb_div", "index_total_returns"
 ]
 
-# ---------- Request Model ----------
+# -------------------------------------------------------
+# Request model
+# -------------------------------------------------------
 class FetchRequest(BaseModel):
-    mode: str               # stock / index
+    mode: str
     req_type: str
     name: str
-    date_start: str         # dd-mm-yyyy
-    date_end: str           # dd-mm-yyyy
+    date_start: str
+    date_end: str
 
-# ---------- Health ----------
+# -------------------------------------------------------
+# Health
+# -------------------------------------------------------
 @app.get("/")
 def health():
     return {"status": "ok", "service": "backend alive"}
 
-# ---------- STOCK Handlers ----------
+# -------------------------------------------------------
+# STOCK handler
+# -------------------------------------------------------
 def handle_stock(req: FetchRequest):
-    try:
-        if req.req_type not in STOCK_REQ:
-            raise HTTPException(status_code=400, detail=f"Invalid stock req_type: {req.req_type}")
-
-        t = req.req_type.lower()
-
-        if t == "info":
-            return common.wrap(yahooinfo.fetch_info(req.name))
-
-        if t == "intraday":
-            return common.wrap(stock.fetch_intraday(req.name, req.date_start, req.date_end))
-
-        if t == "daily":
-            return common.wrap(stock.fetch_daily(req.name, req.date_start, req.date_end))
-
-        if t == "nse_eq":
-            return eq_html.build_eq_html(req.name)
-
-        if t == "qresult":
-            return common.wrap(stock.fetch_qresult(req.name))
-
-        if t == "result":
-            return common.wrap(stock.fetch_result(req.name))
-
-        if t == "balance":
-            return common.wrap(stock.fetch_balance(req.name))
-
-        if t == "cashflow":
-            return common.wrap(stock.fetch_cashflow(req.name))
-
-        if t == "dividend":
-            return common.wrap(stock.fetch_dividend(req.name))
-
-        if t == "split":
-            return common.wrap(stock.fetch_split(req.name))
-
-        if t == "other":
-            return common.wrap(stock.fetch_other(req.name))
-
-        if t == "stock_hist":
-            return nsepython.nse_stock_hist(
-                req.date_start, req.date_end, req.name
-            ).to_html()
-
-        return common.wrap(f"<h3>No handler for stock req_type: {t}</h3>")
-
-    except Exception as e:
-        return {"error": str(e)}
-
-# ---------- INDEX Handlers ----------
+    t = req.req_type.lower()
+
+    if t == "info":
+        return common.wrap(yahooinfo.fetch_info(req.name))
+    if t == "intraday":
+        return common.wrap(stock.fetch_intraday(req.name, req.date_start, req.date_end))
+    if t == "daily":
+        return common.wrap(stock.fetch_daily(req.name, req.date_start, req.date_end))
+    if t == "nse_eq":
+        return eq_html.build_eq_html(req.name)
+    if t == "qresult":
+        return common.wrap(stock.fetch_qresult(req.name))
+    if t == "result":
+        return common.wrap(stock.fetch_result(req.name))
+    if t == "balance":
+        return common.wrap(stock.fetch_balance(req.name))
+    if t == "cashflow":
+        return common.wrap(stock.fetch_cashflow(req.name))
+    if t == "dividend":
+        return common.wrap(stock.fetch_dividend(req.name))
+    if t == "split":
+        return common.wrap(stock.fetch_split(req.name))
+    if t == "other":
+        return common.wrap(stock.fetch_other(req.name))
+    if t == "stock_hist":
+        return nsepython.nse_stock_hist(
+            req.date_start, req.date_end, req.name
+        ).to_html()
+
+    return common.wrap(f"<h3>Unhandled stock req_type: {t}</h3>")
+
+# -------------------------------------------------------
+# INDEX handler
+# -------------------------------------------------------
 def handle_index(req: FetchRequest):
-    try:
-        if req.req_type not in INDEX_REQ:
-            raise HTTPException(status_code=400, detail=f"Invalid index req_type: {req.req_type}")
-
-        t = req.req_type.lower()
-
-        if t == "indices":
-            return indices_html.build_indices_html()
-
-        if t == "nse_open":
-            return index_live_html.build_index_live_html()
-
-        if t == "nse_preopen":
-            return preopen_html.build_preopen_html()
-
-        if t == "nse_fno":
-            return build_nse_fno.nse_fno_html(req.date_end, req.name)
-
-        if t == "nse_fiidii":
-            return nsepython.nse_fiidii().to_html()
-
-        if t == "nse_events":
-            return nsepython.nse_events().to_html()
-
-        if t == "nse_future":
-            return common.wrap(nsepython.nse_future(req.name))
-
-        if t == "nse_highlow":
-            return nsepython.nse_highlow(req.date_end).to_html()
-
-        if t == "stock_highlow":
-            return nsepython.stock_highlow(req.date_end).to_html()
-
-        if t == "nse_bhav":
-            return bhavcopy_html.build_bhavcopy_html(req.date_end)
-
-        if t == "nse_largedeals":
-            return nsepython.nse_largedeals().to_html()
-
-        if t == "nse_bulkdeals":
-            return nsepython.nse_bulkdeals().to_html()
-
-        if t == "nse_blockdeals":
-            return nsepython.nse_blockdeals().to_html()
-
-        if t == "nse_most_active":
-            return nsepython.nse_most_active().to_html()
-
-        if t == "index_history":
-            return nsepython.index_history(
-                "NIFTY", req.date_start, req.date_end
-            ).to_html()
-
-        if t == "largedeals_historical":
-            return nsepython.nse_largedeals_historical(
-                req.date_start, req.date_end
-            ).to_html()
-
-        if t == "index_pe_pb_div":
-            return nsepython.index_pe_pb_div(
-                "NIFTY", req.date_start, req.date_end
-            ).to_html()
-
-        if t == "index_total_returns":
-            return nsepython.index_total_returns(
-                "NIFTY", req.date_start, req.date_end
-            ).to_html()
-
-        return common.wrap(f"<h3>No handler for index req_type: {t}</h3>")
-
-    except Exception as e:
-        return {"error": str(e)}
-
-# ---------- Main POST Endpoint ----------
+    t = req.req_type.lower()
+
+    if t == "indices":
+        return indices_html.build_indices_html()
+    if t == "nse_open":
+        return index_live_html.build_index_live_html()
+    if t == "nse_preopen":
+        return preopen_html.build_preopen_html()
+    if t == "nse_fno":
+        return build_nse_fno.nse_fno_html(req.date_end, req.name)
+    if t == "nse_fiidii":
+        return nsepython.nse_fiidii().to_html()
+    if t == "nse_events":
+        return nsepython.nse_events().to_html()
+    if t == "nse_future":
+        return common.wrap(nsepython.nse_future(req.name))
+    if t == "nse_highlow":
+        return nsepython.nse_highlow(req.date_end).to_html()
+    if t == "stock_highlow":
+        return nsepython.stock_highlow(req.date_end).to_html()
+    if t == "nse_bhav":
+        return bhavcopy_html.build_bhavcopy_html(req.date_end)
+    if t == "nse_largedeals":
+        return nsepython.nse_largedeals().to_html()
+    if t == "nse_bulkdeals":
+        return nsepython.nse_bulkdeals().to_html()
+    if t == "nse_blockdeals":
+        return nsepython.nse_blockdeals().to_html()
+    if t == "nse_most_active":
+        return nsepython.nse_most_active().to_html()
+    if t == "index_history":
+        return nsepython.index_history("NIFTY", req.date_start, req.date_end).to_html()
+    if t == "largedeals_historical":
+        return nsepython.nse_largedeals_historical(
+            req.date_start, req.date_end
+        ).to_html()
+    if t == "index_pe_pb_div":
+        return nsepython.index_pe_pb_div(
+            "NIFTY", req.date_start, req.date_end
+        ).to_html()
+    if t == "index_total_returns":
+        return nsepython.index_total_returns(
+            "NIFTY", req.date_start, req.date_end
+        ).to_html()
+
+    return common.wrap(f"<h3>Unhandled index req_type: {t}</h3>")
+
+# -------------------------------------------------------
+# Main API
+# -------------------------------------------------------
 @app.post("/api/fetch")
 def fetch_data(req: FetchRequest):
-    mode = req.mode.lower()
-
-    if mode == "stock":
+    if req.mode.lower() == "stock":
         return handle_stock(req)
-
-    if mode == "index":
+    if req.mode.lower() == "index":
         return handle_index(req)
 
-    raise HTTPException(status_code=400, detail=f"Invalid mode: {req.mode}")
+    raise HTTPException(status_code=400, detail="Invalid mode")