Merge pull request #4 from Patch-Code-Prosperity/dev

post overhaul cleanup

Author: Cfomodz

accounts.py

@@ -1,16 +1,18 @@
-from config import TRADER_BASE_URL
+import datetime
 import logging
 
+
 class Accounts:
     def __init__(self, client):
         self.client = client
         self.logger = logging.getLogger(__name__)
-        self.base_url = TRADER_BASE_URL
+        self.base_url = client.config.TRADER_BASE_URL
 
     def get_account_numbers(self):
         """Retrieve account numbers associated with the user's profile."""
         try:
-            return self.client.get(f'{self.base_url}/accountNumbers')
+            response = self.client.get(f'{self.base_url}/accountNumbers')
+            return response.json()
         except Exception as e:
             self.logger.error(f"Failed to get account numbers: {e}")
             return None

api_client.py

@@ -4,6 +4,7 @@
 from datetime import datetime, timedelta
 from config import APIConfig
 
+
 class APIClient:
     def __init__(self):
         self.session = requests.Session()
@@ -12,7 +13,7 @@ def __init__(self):
         if not self.validate_credentials():
             logging.error("Invalid or missing credentials. Please check your configuration.")
             exit(1)
-        
+
         self.token_info = self.load_token() or self.authenticate()
 
     def setup_logging(self):

config.py

@@ -3,15 +3,16 @@
 
 load_dotenv()
 
+
 class APIConfig:
     API_BASE_URL = "https://api.schwabapi.com"
     TRADER_BASE_URL = f"{API_BASE_URL}/trader/v1"
     MARKET_DATA_BASE_URL = f"{API_BASE_URL}/marketdata/v1"
     ORDER_BASE_URL = f"{API_BASE_URL}/accounts"
     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
+        '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

main.py

@@ -2,16 +2,15 @@
 from api_client import APIClient
 from accounts import Accounts
 from orders import Orders
-from market_data import MarketData
+
 
 def main():
     client = APIClient()  # Initialize the API client
     accounts_api = Accounts(client)
     orders_api = Orders(client)
-    market_data_api = MarketData(client)
 
     # Get account numbers for linked accounts
-    print(accounts_api.get_account_numbers().json())
+    print(accounts_api.get_account_numbers())
 
     # Get positions for linked accounts
     print(accounts_api.get_all_accounts().json())
@@ -46,7 +45,8 @@ def main():
     print(orders_api.get_orders(3000, datetime.now() - timedelta(days=7), datetime.now()).json())
 
     # Get all transactions for an account
-    print(accounts_api.get_account_transactions('account_hash', datetime.now() - timedelta(days=7), datetime.now(), "TRADE").json())
+    print(accounts_api.get_account_transactions('account_hash', datetime.now() - timedelta(days=7), datetime.now(),
+                                                "TRADE").json())
 
     # Get user preferences for an account
     print(accounts_api.get_user_preferences('account_hash').json())
@@ -83,6 +83,8 @@ def main():
     # Get instruments for a CUSIP
     print(instruments.by_cusip("037833100").json())  # 037833100 = AAPL
 
+
 if __name__ == '__main__':
-    print("Welcome to the unofficial Schwab API interface!\nGitHub: https://github.com/Patch-Code-Prosperity/Pythonic-Schwab-API")
+    print(
+        "Welcome to the unofficial Schwab API interface!\nGitHub: https://github.com/Patch-Code-Prosperity/Pythonic-Schwab-API")
     main()

market_data.py

@@ -15,6 +15,7 @@ def get_single(self, symbol_id, fields=None):
         params = {'fields': fields}
         return self.client.get(f"{self.base_url}/{symbol_id}", params=params)
 
+
 class Options:
     def __init__(self, client, base_url):
         self.client = client
@@ -24,6 +25,7 @@ def get_chains(self, symbol, **kwargs):
         params = {'symbol': symbol, **kwargs}
         return self.client.get(self.base_url, params=params)
 
+
 class PriceHistory:
     def __init__(self, client, base_url):
         self.client = client
@@ -33,6 +35,7 @@ def by_symbol(self, symbol, **kwargs):
         params = {'symbol': symbol, **kwargs}
         return self.client.get(self.base_url, params=params)
 
+
 class Movers:
     def __init__(self, client, base_url):
         self.client = client
@@ -42,6 +45,7 @@ def get_movers(self, index, **kwargs):
         params = {'index': index, **kwargs}
         return self.client.get(self.base_url, params=params)
 
+
 class MarketHours:
     def __init__(self, client, base_url):
         self.client = client
@@ -55,6 +59,7 @@ def by_market(self, market_id, date):
         params = {'date': date}
         return self.client.get(f"{self.base_url}/{market_id}", params=params)
 
+
 class Instruments:
     def __init__(self, client, base_url):
         self.client = client

orders.py

@@ -1,9 +1,7 @@
-from config import ORDER_BASE_URL
-
 class Orders:
     def __init__(self, client):
         self.client = client
-        self.base_url = ORDER_BASE_URL
+        self.base_url = client.config.ORDER_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."""

utilities.py

@@ -1,11 +1,8 @@
-# utilities.py
-
-import datetime
-
 def clean_params(params):
     """Remove None values from a dictionary of parameters."""
     return {k: v for k, v in params.items() if v is not None}
 
+
 def convert_time(dt=None, format_type="8601"):
     """Convert datetime objects into a string format according to a specified type."""
     if dt is None:
@@ -19,6 +16,7 @@ def convert_time(dt=None, format_type="8601"):
     formatter = formats.get(format_type, str)
     return formatter(dt)
 
+
 def format_list(items):
     """Convert a list of items into a comma-separated string or return single item as string."""
     if items is None: