Update persist.py

persist.py

@@ -2,28 +2,39 @@ import os
 import json
 import pickle
 import pandas as pd
+from datetime import datetime, timedelta
 from typing import Any
-from datetime import datetime
 
 # ==============================
-# HF Persistent Base Directory
+# Configuration
 # ==============================
-BASE_DIR = "/data/store"
+BASE_DIR = "./data/store"
 os.makedirs(BASE_DIR, exist_ok=True)
 
+# TTL validity map (centralized)
+VALIDITY_MAP = {
+    "result": {"days": 7},
+    "qresult": {"days": 7},
+    "bhav": {"days": 1},
+    "intraday": {"minutes": 15},
+    "eq": {"hours": 1},
+    "daily": {"days": 1},
+}
+
 # ==============================
-# Helpers
+# Helper functions
 # ==============================
 def _ts():
     return datetime.now().strftime("%Y_%m_%d_%H_%M_%S")
 
-def _path(name):
-    return os.path.join(BASE_DIR, name)
+def _path(filename: str):
+    return os.path.join(BASE_DIR, filename)
 
 def _list_files():
     return os.listdir(BASE_DIR)
 
-def _latest(prefix, ext):
+def _latest(prefix: str, ext: str):
+    """Return latest file with prefix + ext"""
     files = [
         f for f in _list_files()
         if f.startswith(prefix + "_") and f.endswith("." + ext)
@@ -31,111 +42,96 @@ def _latest(prefix, ext):
     return max(files) if files else None
 
 # ==============================
-# SAVE
+# Save function
 # ==============================
-def save(name: str, data: Any, ftype: str = "csv") -> str | bool:
+def save(name: str, data: Any, ftype: str) -> bool:
     ts = _ts()
     filename = f"{name}_{ts}.{ftype}"
     path = _path(filename)
-
     try:
         if ftype == "csv":
             if not isinstance(data, pd.DataFrame):
                 raise TypeError("CSV requires pandas DataFrame")
             data.to_csv(path, index=False)
-
         elif ftype == "json":
             with open(path, "w", encoding="utf-8") as f:
                 json.dump(data, f, indent=2)
-
         elif ftype == "html":
             with open(path, "w", encoding="utf-8") as f:
                 f.write(str(data))
-
         elif ftype == "pkl":
             with open(path, "wb") as f:
                 pickle.dump(data, f)
-
         else:
-            raise ValueError("Unsupported file type")
-
-        return filename
-
+            raise ValueError(f"Unsupported file type: {ftype}")
+        return True
     except Exception:
         return False
 
 # ==============================
-# LOAD (STRICT)
+# Load function
 # ==============================
-def load(name: str, ftype: str | None = None):
+def load(name: str, ftype: str):
     """
-    Allowed:
-      load("nifty_YYYY_MM_DD_HH_MM_SS.csv")
-      load("nifty", "csv")
+    Load file by:
+      1) full filename (name_YYYY_MM_DD_HH_MM_SS.ext)
+      2) base name + ftype (latest)
+    Returns False if file not present
     """
-
-    # Full filename
-    if "." in name:
-        filename = name
-
-    # Base name + type
-    else:
-        if not ftype:
-            return False
-        filename = _latest(name, ftype)
-        if not filename:
-            return False
-
+    filename = _latest(name, ftype) if "." not in name else name
     path = _path(filename)
     if not os.path.exists(path):
         return False
-
     try:
         if filename.endswith(".csv"):
             return pd.read_csv(path)
-
         if filename.endswith(".json"):
             with open(path, "r", encoding="utf-8") as f:
                 return json.load(f)
-
         if filename.endswith(".html"):
             with open(path, "r", encoding="utf-8") as f:
                 return f.read()
-
         if filename.endswith(".pkl"):
             with open(path, "rb") as f:
                 return pickle.load(f)
-
         return False
-
     except Exception:
         return False
 
 # ==============================
-# EXISTS (NEW FUNCTION)
+# Exists with TTL
 # ==============================
-def exists(name: str, ftype: str | None = None) -> bool:
+def exists(name: str, ftype: str) -> bool:
     """
-    True  -> file exists
-    False -> file not present
-
-    Allowed:
-      exists("nifty_YYYY_MM_DD_HH_MM_SS.csv")
-      exists("nifty", "csv")
+    Check if file exists and is within TTL defined in VALIDITY_MAP
+    Returns True/False
     """
+    filename = _latest(name, ftype)
+    if not filename:
+        return False
 
-    # Full filename
-    if "." in name:
-        return os.path.exists(_path(name))
-
-    # Base name + type
-    if not ftype:
+    path = _path(filename)
+    if not os.path.exists(path):
         return False
 
-    return _latest(name, ftype) is not None
+    mtime = datetime.fromtimestamp(os.path.getmtime(path))
+    func_name = name.split("_")[0]
+    validity = VALIDITY_MAP.get(func_name)
+    if not validity:
+        return True  # no TTL → always valid
+
+    now = datetime.now()
+    if "minutes" in validity:
+        return (now - mtime) <= timedelta(minutes=validity["minutes"])
+    if "hours" in validity:
+        return (now - mtime) <= timedelta(hours=validity["hours"])
+    if "days" in validity:
+        return (now - mtime) <= timedelta(days=validity["days"])
+
+    return True
 
 # ==============================
-# UTILITIES
+# Utilities
 # ==============================
 def list_files(name=None, ftype=None):
     files = sorted(_list_files())
@@ -144,14 +140,20 @@ def list_files(name=None, ftype=None):
     if ftype:
         files = [f for f in files if f.endswith("." + ftype)]
     return files
-    
-# SAVE
-#save("nifty", df, "csv")
+'''
+import pandas as pd
+from hf_persistence import save, load, exists
+
+# Save DataFrame
+df = pd.DataFrame({"A":[1,2], "B":[3,4]})
+save("intraday_RELIANCE", df, "csv")
 
-# CHECK existence (NO load)
-#if exists("nifty", "csv"):
-    #df = load("nifty", "csv")
+# Check existence with TTL
+if exists("intraday_RELIANCE", "csv"):
+    df_cached = load("intraday_RELIANCE", "csv")
 
-# CHECK specific file
-#if exists("nifty_2025_12_18_10_30_00.csv"):
-    #df_old = load("nifty_2025_12_18_10_30_00.csv")
+# Save HTML
+save("intraday_RELIANCE", "<h1>Hello</h1>", "html")
+if exists("intraday_RELIANCE", "html"):
+    html_cached = load("intraday_RELIANCE", "html")
+'''