Update persist.py

persist.py

@@ -11,7 +11,7 @@ from typing import Any
 BASE_DIR = "./data/store"
 os.makedirs(BASE_DIR, exist_ok=True)
 
-# TTL validity map (centralized)
+# TTL validity map
 VALIDITY_MAP = {
     "result": {"days": 7},
     "qresult": {"days": 7},
@@ -22,7 +22,7 @@ VALIDITY_MAP = {
 }
 
 # ==============================
-# Helper functions
+# Helpers
 # ==============================
 def _ts():
     return datetime.now().strftime("%Y_%m_%d_%H_%M_%S")
@@ -34,7 +34,6 @@ def _list_files():
     return os.listdir(BASE_DIR)
 
 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)
@@ -51,7 +50,8 @@ def save(name: str, data: Any, ftype: str) -> bool:
     try:
         if ftype == "csv":
             if not isinstance(data, pd.DataFrame):
-                raise TypeError("CSV requires pandas DataFrame")
+                print(f"[SAVE FAILED] CSV requires pandas DataFrame for {filename}")
+                return False
             data.to_csv(path, index=False)
         elif ftype == "json":
             with open(path, "w", encoding="utf-8") as f:
@@ -63,72 +63,80 @@ def save(name: str, data: Any, ftype: str) -> bool:
             with open(path, "wb") as f:
                 pickle.dump(data, f)
         else:
-            raise ValueError(f"Unsupported file type: {ftype}")
+            print(f"[SAVE FAILED] Unsupported file type: {ftype} for {filename}")
+            return False
+        print(f"[SAVE OK] {filename}")
         return True
-    except Exception:
+    except Exception as e:
+        print(f"[SAVE FAILED] {filename} - Exception: {e}")
         return False
 
 # ==============================
 # Load function
 # ==============================
 def load(name: str, ftype: str):
-    """
-    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
-    """
     filename = _latest(name, ftype) if "." not in name else name
     path = _path(filename)
     if not os.path.exists(path):
+        print(f"[LOAD FAILED] File does not exist: {filename}")
         return False
     try:
         if filename.endswith(".csv"):
-            return pd.read_csv(path)
-        if filename.endswith(".json"):
+            df = pd.read_csv(path)
+        elif filename.endswith(".json"):
             with open(path, "r", encoding="utf-8") as f:
-                return json.load(f)
-        if filename.endswith(".html"):
+                df = json.load(f)
+        elif filename.endswith(".html"):
             with open(path, "r", encoding="utf-8") as f:
-                return f.read()
-        if filename.endswith(".pkl"):
+                df = f.read()
+        elif filename.endswith(".pkl"):
             with open(path, "rb") as f:
-                return pickle.load(f)
-        return False
-    except Exception:
+                df = pickle.load(f)
+        else:
+            print(f"[LOAD FAILED] Unsupported file type: {filename}")
+            return False
+        print(f"[LOAD OK] {filename}")
+        return df
+    except Exception as e:
+        print(f"[LOAD FAILED] {filename} - Exception: {e}")
         return False
 
 # ==============================
 # Exists with TTL
 # ==============================
 def exists(name: str, ftype: str) -> bool:
-    """
-    Check if file exists and is within TTL defined in VALIDITY_MAP
-    Returns True/False
-    """
     filename = _latest(name, ftype)
     if not filename:
+        print(f"[EXISTS] No file found for {name}.{ftype}")
         return False
 
     path = _path(filename)
     if not os.path.exists(path):
+        print(f"[EXISTS] File not present: {filename}")
         return False
 
     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
+        print(f"[EXISTS] File exists with no TTL: {filename}")
+        return True
 
     now = datetime.now()
+    is_valid = True
     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"])
+        is_valid = (now - mtime) <= timedelta(minutes=validity["minutes"])
+    elif "hours" in validity:
+        is_valid = (now - mtime) <= timedelta(hours=validity["hours"])
+    elif "days" in validity:
+        is_valid = (now - mtime) <= timedelta(days=validity["days"])
+
+    if is_valid:
+        print(f"[EXISTS] File exists and valid: {filename}")
+    else:
+        print(f"[EXISTS] File expired: {filename}")
 
-    return True
+    return is_valid
 
 # ==============================
 # Utilities
@@ -140,20 +148,3 @@ def list_files(name=None, ftype=None):
     if ftype:
         files = [f for f in files if f.endswith("." + ftype)]
     return files
-'''
-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 with TTL
-if exists("intraday_RELIANCE", "csv"):
-    df_cached = load("intraday_RELIANCE", "csv")
-
-# Save HTML
-save("intraday_RELIANCE", "<h1>Hello</h1>", "html")
-if exists("intraday_RELIANCE", "html"):
-    html_cached = load("intraday_RELIANCE", "html")
-'''