post overhaul cleanup

Author: Cfomodz

api_client.py

@@ -11,9 +11,10 @@
 
 
 class APIClient:
-    def __init__(self):
+    def __init__(self, initials):
+        self.initials = initials
         self.account_numbers = None
-        self.config = APIConfig
+        self.config = APIConfig(self.initials)
         self.session = requests.Session()
         self.setup_logging()
         self.token_info = self.load_token()
@@ -23,7 +24,7 @@ def __init__(self):
             self.manual_authorization_flow()
 
     def setup_logging(self):
-        logging.basicConfig(**APIConfig.LOGGING_CONFIG)
+        logging.basicConfig(**self.config.LOGGING_CONFIG)
         self.logger = logging.getLogger(__name__)
 
     def ensure_valid_token(self):
@@ -42,7 +43,7 @@ def ensure_valid_token(self):
     def manual_authorization_flow(self):
         """ Handle the manual steps required to get the authorization code from the user. """
         self.logger.info("Starting manual authorization flow.")
-        auth_url = f"{APIConfig.API_BASE_URL}/v1/oauth/authorize?client_id={APIConfig.APP_KEY}&redirect_uri={APIConfig.CALLBACK_URL}&response_type=code"
+        auth_url = f"{self.config.API_BASE_URL}/v1/oauth/authorize?client_id={self.config.APP_KEY}&redirect_uri={self.config.CALLBACK_URL}&response_type=code"
         webbrowser.open(auth_url)
         self.logger.info(f"Please authorize the application by visiting: {auth_url}")
         response_url = ColorPrint.input(
@@ -91,26 +92,26 @@ def refresh_access_token(self):
     def save_token(self, token_data):
         """ Save token data securely. """
         token_data['expires_at'] = (datetime.now() + timedelta(seconds=token_data['expires_in'])).isoformat()
-        with open('token_data.json', 'w') as f:
+        with open(f'schwab_token_data_{self.initials}.json', 'w') as f:
             json.dump(token_data, f)
         self.logger.info("Token data saved successfully.")
 
     def load_token(self):
         """ Load token data. """
         try:
-            with open('token_data.json', 'r') as f:
+            with open(f'schwab_token_data_{self.initials}.json', 'r') as f:
                 token_data = json.load(f)
                 return token_data
         except Exception as e:
             self.logger.warning(f"Loading token failed: {e}")
         return None
 
     def validate_token(self, force=False):
-        """ Validate the current token's validity. """
-        print(self.token_info['expires_at'])
-        print(datetime.now())
-        print(datetime.fromisoformat(self.token_info['expires_at']))
-        print(datetime.now() < datetime.fromisoformat(self.token_info['expires_at']))
+        """ Validate the current token. """
+        # print(self.token_info['expires_at'])
+        # print(datetime.now())
+        # print(datetime.fromisoformat(self.token_info['expires_at']))
+        # print(datetime.now() < datetime.fromisoformat(self.token_info['expires_at']))
         if self.token_info and datetime.now() < datetime.fromisoformat(self.token_info['expires_at']):
             print(f"Token expires in {datetime.fromisoformat(self.token_info['expires_at']) - datetime.now()} seconds")
             return True

config.py

@@ -6,31 +6,33 @@
 
 
 class APIConfig:
-    if SANDBOX:
-        API_BASE_URL = "http://localhost:4020"
-        TRADER_BASE_URL = API_BASE_URL
-        ACCOUNTS_BASE_URL = f"{API_BASE_URL}/accounts"
-        MARKET_DATA_BASE_URL = f"{API_BASE_URL}/marketdata"
-        ORDERS_BASE_URL = ACCOUNTS_BASE_URL
-        STREAMER_INFO_URL = f"{API_BASE_URL}/streamer-info"
-    else:
-        API_BASE_URL = "https://api.schwabapi.com"
-        TRADER_BASE_URL = f"{API_BASE_URL}/trader/v1"
-        ACCOUNTS_BASE_URL = f"{TRADER_BASE_URL}/accounts"
-        MARKET_DATA_BASE_URL = f"{API_BASE_URL}/marketdata/v1"
-        ORDERS_BASE_URL = ACCOUNTS_BASE_URL
-        STREAMER_INFO_URL = f"{API_BASE_URL}/streamer-info"
-    REQUEST_TIMEOUT = 30  # Timeout for API requests in seconds
-    RETRY_STRATEGY = {
-        'total': 3,  # Total number of retries to allow
-        'backoff_factor': 1  # Factor by which the delay between retries will increase
-    }
-    TOKEN_REFRESH_THRESHOLD_SECONDS = 300  # Time in seconds before token expiration to attempt refresh
-    DEBUG_MODE = False
-    LOGGING_CONFIG = {
-        'level': 'INFO',
-        'format': '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-    }
-    APP_KEY = os.getenv('APP_KEY')
-    APP_SECRET = os.getenv('APP_SECRET')
-    CALLBACK_URL = os.getenv('CALLBACK_URL')
+    def __init__(self, initials):
+        self.initials = initials
+        if SANDBOX:
+            self.API_BASE_URL = "http://localhost:4020"
+            self.TRADER_BASE_URL = self.API_BASE_URL
+            self.ACCOUNTS_BASE_URL = f"{self.API_BASE_URL}/accounts"
+            self.MARKET_DATA_BASE_URL = f"{self.API_BASE_URL}/marketdata"
+            self.ORDERS_BASE_URL = self.ACCOUNTS_BASE_URL
+            self.STREAMER_INFO_URL = f"{self.API_BASE_URL}/streamer-info"
+        else:
+            self.API_BASE_URL = "https://api.schwabapi.com"
+            self.TRADER_BASE_URL = f"{self.API_BASE_URL}/trader/v1"
+            self.ACCOUNTS_BASE_URL = f"{self.TRADER_BASE_URL}/accounts"
+            self.MARKET_DATA_BASE_URL = f"{self.API_BASE_URL}/marketdata/v1"
+            self.ORDERS_BASE_URL = self.ACCOUNTS_BASE_URL
+            self.STREAMER_INFO_URL = f"{self.API_BASE_URL}/streamer-info"
+        self.REQUEST_TIMEOUT = 30  # Timeout for API requests in seconds
+        self. RETRY_STRATEGY = {
+            'total': 3,  # Total number of retries to allow
+            'backoff_factor': 1  # Factor by which the delay between retries will increase
+        }
+        self.TOKEN_REFRESH_THRESHOLD_SECONDS = 300  # Time in seconds before token expiration to attempt refresh
+        self.DEBUG_MODE = False
+        self.LOGGING_CONFIG = {
+            'level': 'INFO',
+            'format': '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+        }
+        self.APP_KEY = os.getenv(f'SCHWAB_APP_KEY_{self.initials}')
+        self.APP_SECRET = os.getenv(f'SCHWAB_APP_SECRET_{self.initials}')
+        self.CALLBACK_URL = os.getenv('CALLBACK_URL')

orders.py

@@ -1,14 +1,21 @@
+from datetime import datetime, timezone, timedelta
+
+
 class Orders:
     def __init__(self, client):
         self.client = client
         self.base_url = client.config.ORDERS_BASE_URL
 
     def get_orders(self, account_hash, max_results=100, from_entered_time=None, to_entered_time=None, status=None):
         """Retrieve a list of orders for a specified account."""
+        if from_entered_time is None:
+            from_entered_time = (datetime.now(timezone.utc) - timedelta(days=364)).isoformat(timespec='seconds')
+        if to_entered_time is None:
+            to_entered_time = datetime.now(timezone.utc).isoformat(timespec='seconds')
         params = {
             'maxResults': max_results,
-            'fromEnteredTime': from_entered_time.isoformat() if from_entered_time else None,
-            'toEnteredTime': to_entered_time.isoformat() if to_entered_time else None,
+            'fromEnteredTime': from_entered_time,
+            'toEnteredTime': to_entered_time,
             'status': status
         }
         endpoint = f"{self.base_url}/{account_hash}/orders"
@@ -27,9 +34,9 @@ def get_order(self, account_hash, order_id):
     def cancel_order(self, account_hash, order_id):
         """Cancel a specific order."""
         endpoint = f"{self.base_url}/{account_hash}/orders/{order_id}"
-        return self.client.delete(endpoint)
+        return self.client.make_request(endpoint, method='DELETE')
 
     def replace_order(self, account_hash, order_id, new_order_details):
         """Replace an existing order with new details."""
         endpoint = f"{self.base_url}/{account_hash}/orders/{order_id}"
-        return self.client.put(endpoint, data=new_order_details)
+        return self.client.make_request(endpoint, method='PUT', data=new_order_details)