Standardize on SGT timezone globally

Author: rohan436

main.py

@@ -28,6 +28,7 @@
     FMP_API_KEY,
     TWELVE_DATA_API_KEY,
     DATA_DIR,
+    get_now_sgt,
 )
 from src.provider_router import ProviderRouter, FilteredStock
 from src.gmail_sender import GmailSender
@@ -43,13 +44,13 @@ def wait_for_network(check_interval: int = 300):
     """
     print("\n[Network] Checking internet connectivity...")
 
-    start_time = datetime.now()
+    start_time = get_now_sgt()
     start_date = start_time.date()
     attempt = 0
 
     while True:
         attempt += 1
-        current_time = datetime.now()
+        current_time = get_now_sgt()
         current_date = current_time.date()
 
         # Stop checking if we've moved to the next day
@@ -176,7 +177,7 @@ def mark_day_completed(run_timestamp: datetime, stocks_count: int, email_sent: b
 def main():
     """Main entry point."""
     args = parse_args()
-    run_timestamp = datetime.now()
+    run_timestamp = get_now_sgt()
 
     # Show status if requested
     if args.status:

src/cache.py

@@ -9,7 +9,7 @@
 from pathlib import Path
 from typing import Optional, Dict, Any, List
 
-from .config import CACHE_DB_PATH, PROFILE_CACHE_DAYS
+from .config import CACHE_DB_PATH, PROFILE_CACHE_DAYS, get_now_sgt
 
 
 class ProfileCache:
@@ -56,7 +56,7 @@ def get(self, symbol: str) -> Optional[Dict[str, Any]]:
                 SELECT * FROM company_profiles 
                 WHERE symbol = ? AND last_updated > ?
                 """,
-                (symbol.upper(), datetime.now() - timedelta(days=PROFILE_CACHE_DAYS))
+                (symbol.upper(), get_now_sgt() - timedelta(days=PROFILE_CACHE_DAYS))
             )
             row = cursor.fetchone()
 
@@ -94,7 +94,7 @@ def set(self, symbol: str, profile_data: Dict[str, Any]):
                     profile_data.get("sector", ""),
                     profile_data.get("industry", ""),
                     json.dumps(profile_data),
-                    datetime.now()
+                    get_now_sgt()
                 )
             )
             conn.commit()
@@ -140,7 +140,7 @@ def clear_expired(self):
                 DELETE FROM company_profiles 
                 WHERE last_updated < ?
                 """,
-                (datetime.now() - timedelta(days=PROFILE_CACHE_DAYS),)
+                (get_now_sgt() - timedelta(days=PROFILE_CACHE_DAYS),)
             )
             conn.commit()
 
@@ -155,7 +155,7 @@ def stats(self) -> Dict[str, Any]:
                 SELECT COUNT(*) FROM company_profiles 
                 WHERE last_updated > ?
                 """,
-                (datetime.now() - timedelta(days=PROFILE_CACHE_DAYS),)
+                (get_now_sgt() - timedelta(days=PROFILE_CACHE_DAYS),)
             )
             valid = cursor.fetchone()[0]
 

src/config.py

@@ -6,12 +6,22 @@
 import os
 import time
 import datetime
+import pytz
 from pathlib import Path
 from dotenv import load_dotenv
 
-# Set timezone to Singapore
+# Set timezone to Singapore (SGT)
+SGT = pytz.timezone('Asia/Singapore')
 os.environ['TZ'] = 'Asia/Singapore'
-time.tzset()
+try:
+    time.tzset()
+except AttributeError:
+    # tzset only works on Unix
+    pass
+
+def get_now_sgt():
+    """Get current time in Singapore Timezone."""
+    return datetime.datetime.now(SGT)
 
 # Load .env file from project root
 PROJECT_ROOT = Path(__file__).parent.parent

src/credit_tracker.py

@@ -11,9 +11,10 @@
 from threading import Lock
 
 from .config import (
-    CREDIT_TRACKER_PATH,
     TWELVE_DATA_DAILY_LIMIT,
-    TWELVE_DATA_MINUTE_LIMIT
+    TWELVE_DATA_MINUTE_LIMIT,
+    SGT,
+    get_now_sgt,
 )
 
 
@@ -39,9 +40,10 @@ def _load_state(self):
                     self._last_date = state.get("last_date", "")
 
                     # Reset if it's a new day
-                    if self._last_date != str(date.today()):
+                    today_sgt = str(get_now_sgt().date())
+                    if self._last_date != today_sgt:
                         self._daily_credits = 0
-                        self._last_date = str(date.today())
+                        self._last_date = today_sgt
             except (json.JSONDecodeError, KeyError):
                 self._reset_state()
         else:
@@ -50,7 +52,7 @@ def _load_state(self):
     def _reset_state(self):
         """Reset to initial state."""
         self._daily_credits = 0
-        self._last_date = str(date.today())
+        self._last_date = str(get_now_sgt().date())
         self._save_state()
 
     def _save_state(self):
@@ -59,17 +61,18 @@ def _save_state(self):
             json.dump({
                 "daily_credits": self._daily_credits,
                 "last_date": self._last_date,
-                "last_updated": datetime.now().isoformat()
+                "last_updated": get_now_sgt().isoformat()
             }, f, indent=2)
 
     @property
     def daily_credits_used(self) -> int:
         """Get the number of credits used today."""
         with self._lock:
             # Check if we need to reset for a new day
-            if self._last_date != str(date.today()):
+            today_sgt = str(get_now_sgt().date())
+            if self._last_date != today_sgt:
                 self._daily_credits = 0
-                self._last_date = str(date.today())
+                self._last_date = today_sgt
                 self._save_state()
             return self._daily_credits
 
@@ -111,9 +114,10 @@ def record_usage(self, credits: int = 1):
         """
         with self._lock:
             # Check for day rollover
-            if self._last_date != str(date.today()):
+            today_sgt = str(get_now_sgt().date())
+            if self._last_date != today_sgt:
                 self._daily_credits = 0
-                self._last_date = str(date.today())
+                self._last_date = today_sgt
 
             self._daily_credits += credits
             self._minute_calls.append(time.time())
@@ -143,7 +147,7 @@ def get_status(self) -> Dict[str, Any]:
             "daily_limit": TWELVE_DATA_DAILY_LIMIT,
             "minute_remaining": self.minute_credits_remaining,
             "minute_limit": TWELVE_DATA_MINUTE_LIMIT,
-            "date": str(date.today())
+            "date": str(get_now_sgt().date())
         }
 
     def throttle_if_needed(self, credits_needed: int = 1) -> bool: