From 8621f2b79172515648448e3ab2cd275f4786d777 Mon Sep 17 00:00:00 2001
From: Justin Oros <JustinOros@gmail.com>
Date: Thu, 26 Mar 2026 09:48:17 -0700
Subject: [PATCH] fix: timezone bugs

---
 alpaca_trader/config.json | 8 ++++----
 alpaca_trader/engine.py   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/alpaca_trader/config.json b/alpaca_trader/config.json
index 088e493..6155aa1 100644
--- a/alpaca_trader/config.json
+++ b/alpaca_trader/config.json
@@ -25,7 +25,7 @@
     "VOLUME_MULTIPLIER": 0.7,
     "ATR_STOP_MULTIPLIER": 2.5,
     "MAX_HOLD_TIME": 86400,
-    "REGIME_DETECTION": false,
+    "REGIME_DETECTION": true,
     "MULTIFRAME_FILTER": false,
     "BB_WINDOW": 20,
     "BB_STD": 2.0,
@@ -37,13 +37,13 @@
     "USE_FIBONACCI": false,
     "MAX_TRADES_PER_DAY": 2,
     "SKIP_MONDAYS_FRIDAYS": false,
-    "USE_200_SMA_FILTER": true,
-    "REQUIRE_MACD_CONFIRMATION": true,
+    "USE_200_SMA_FILTER": false,
+    "REQUIRE_MACD_CONFIRMATION": false,
     "MIN_RISK_REWARD": 2.0,
     "PULLBACK_PERCENTAGE": 0.382,
     "ENABLE_SHORT_SELLING": false,
     "RSI_BUY_MAX": 60,
-    "RSI_SELL_MIN": 35,
+    "RSI_SELL_MIN": 20,
     "RSI_SELL_MAX": 70,
     "RSI_RANGE_OVERSOLD": 30,
     "RSI_RANGE_OVERBOUGHT": 70,
diff --git a/alpaca_trader/engine.py b/alpaca_trader/engine.py
index db2d686..d279262 100644
--- a/alpaca_trader/engine.py
+++ b/alpaca_trader/engine.py
@@ -3,7 +3,7 @@ import sys
 import logging
 import json
 import time
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from dotenv import load_dotenv
 import pandas as pd
@@ -561,8 +561,8 @@ def log_missed_signal(timestamp, signal_type, reject_reason, price_at_signal, sy
         if SIGNALS_PATH.exists():
             existing = pd.read_csv(SIGNALS_PATH)
             df = pd.concat([existing, df], ignore_index=True)
-            cutoff_date = datetime.now(EASTERN) - timedelta(days=30)
-            df['timestamp'] = pd.to_datetime(df['timestamp'], format='ISO8601')
+            cutoff_date = datetime.now(timezone.utc) - timedelta(days=30)
+            df['timestamp'] = pd.to_datetime(df['timestamp'], format='mixed', utc=True)
             df = df[df['timestamp'] > cutoff_date]
         
         df.to_csv(SIGNALS_PATH, index=False)