update logic and cache gold data

app.py

@@ -14,13 +14,15 @@ import re
 from psx_scraper import PsxScraper
 from metals_price import MetalsPrice
 import os
+import pytz
 
 
 CACHE = {
     "dividends": None,
     "gainers": None,
     "last_updated": None,
-    "circuit_breaker": None
+    "circuit_breaker": None,
+    "gold_price": None
 }
 
 BASE_URL = "https://www.psx.com.pk"
@@ -336,24 +338,19 @@ def get_announcements_scrap():
     return announcements
 
 
-def normalize_gold_prices(data: list):
-    cleaned = []
+def get_gold_data():
 
-    for item in data:
-        try:
-            cleaned.append({
-                "price": float(item["avg_price"]),
-                "date": datetime.strptime(
-                    item["day"], "%Y-%m-%d %H:%M:%S"
-                ).date().isoformat()
-            })
-        except Exception:
-            continue  # skip bad rows safely
-
-    # VERY IMPORTANT for charts
-    cleaned.sort(key=lambda x: x["date"])
-
-    return cleaned
+    BASE_URL = "https://api.gold-api.com/history"
+    
+    # Initialize the class
+    metals_api = MetalsPrice(api_key=f"{api_key_metal}", base_url=BASE_URL)
+    
+    # Last 730 days (2 years)
+    end = int(datetime.utcnow().timestamp())
+    start = int((datetime.utcnow() - timedelta(days=730)).timestamp())
+    
+    data = metals_api.get_price_history("XAU", start, end)
+    return data
 
 
 def get_circuit_breakers():
@@ -371,13 +368,31 @@ def background_scrap():
     while True:
         try:
             print("Updating cached data...")
+
+            pakistan_tz = pytz.timezone('Asia/Karachi')
+            current_time = datetime.now(pakistan_tz)
+            start_time = current_time.replace(hour=9, minute=0, second=0, microsecond=0)
+            end_time = current_time.replace(hour=17, minute=0, second=0, microsecond=0)
+
+            if start_time <= current_time <= end_time:
             
-            CACHE["dividends"] = simple_dividend_extraction()
-            CACHE["gainers"] = get_active_gainers()
-            CACHE["last_updated"] = time.time()
-            CACHE["circuit_breaker"] = get_circuit_breakers()
+                CACHE["dividends"] = simple_dividend_extraction()
+                CACHE["gainers"] = get_active_gainers()
+                CACHE["last_updated"] = time.time()
+                CACHE["circuit_breaker"] = get_circuit_breakers()
+                CACHE["gold_price"] = get_gold_data()
 
-            print("✅ Cache updated")
+                print(f"Next update after 3 hours delay...")
+
+                time.sleep(10800)
+            else:
+                next_run = current_time.replace(hour=9, minute=0, second=0, microsecond=0)
+                if current_time > next_run:
+                    next_run += timedelta(days=1)
+                
+                sleep_seconds = (next_run - current_time).total_seconds()
+                print(f"Outside working hours. Next update at {next_run.strftime('%Y-%m-%d %H:%M:%S %Z')}")
+                time.sleep(sleep_seconds)
         except Exception as e:
             print("Background scrape error:", e)
         time.sleep(3600)
@@ -442,19 +457,5 @@ def get_all_circuit_breakers():
 
 @app.get("/gold_price")
 def get_gold_historial_price():
-    print("key testing")
-    print(f"{api_key_metal}")
-    response = []
-
-    BASE_URL = "https://api.gold-api.com/history"
-    
-    # Initialize the class
-    metals_api = MetalsPrice(api_key=f"{api_key_metal}", base_url=BASE_URL)
     
-    # Last 730 days (2 years)
-    end = int(datetime.utcnow().timestamp())
-    start = int((datetime.utcnow() - timedelta(days=730)).timestamp())
-    
-    data = metals_api.get_price_history("XAU", start, end)
-    
-    return data
+    return CACHE["gold_price"]

metals_price.py

@@ -18,7 +18,7 @@ class MetalsPrice:  # Fixed typo: "Metails" -> "Metals"
         start_timestamp: int = int(datetime.utcnow().timestamp()),
         end_timestamp: int = int((datetime.utcnow() - timedelta(days=730)).timestamp()),
         group_by: str = "day",
-        aggregation: str = "avg",
+        aggregation: str = "max_price",
         order_by: str = "desc"
     ) -> List[Dict[str, Any]]:
         """

requirements.txt

@@ -3,4 +3,5 @@ uvicorn
 requests
 beautifulsoup4
 jinja2
-pydantic
+pydantic
+pytz