Update api_client.py

Author: Cfomodz

api_client.py

@@ -1,57 +1,56 @@
-# api_client.py
-import requests
 import json
+from datetime import datetime
 import logging
-from datetime import datetime, timedelta
-from config import API_BASE_URL, TOKEN_ENDPOINT
+from config import APIConfig
 
 class APIClient:
-    def __init__(self, credentials):
-        self.credentials = credentials
+    def __init__(self):
+        self.config = APIConfig
         self.session = requests.Session()
+        self.logger = logging.getLogger(__name__)
+        logging.basicConfig(**self.config.LOGGING_CONFIG)
         self.token_info = self.load_token() or self.authenticate()
 
     def authenticate(self):
-        """ Authenticate with the API and return the token information. """
+        """ Authenticates with the API and stores the new token information. """
+        self.logger.info("Authenticating with API to retrieve new tokens.")
         data = {
             'grant_type': 'client_credentials',
-            'client_id': self.credentials.app_key,
-            'client_secret': self.credentials.app_secret
+            'client_id': self.config.APP_KEY,
+            'client_secret': self.config.APP_SECRET
         }
-        response = self.session.post(TOKEN_ENDPOINT, data=data)
-        response.raise_for_status()  # This will raise an error for non-200 responses
+        response = self.session.post(f"{self.config.API_BASE_URL}/v1/oauth/token", data=data)
+        response.raise_for_status()
         token_data = response.json()
         self.save_token(token_data)
         return token_data
 
     def save_token(self, token_data):
-        """ Save token data to a local JSON file """
+        """ Saves the token data securely to a file. """
+        token_data['expires_at'] = (datetime.now() + timedelta(seconds=token_data['expires_in'])).isoformat()
         with open('token_data.json', 'w') as f:
             json.dump(token_data, f)
+        self.logger.info("Token data saved successfully.")
 
     def load_token(self):
-        """ Load token data from a local JSON file """
+        """ Loads the token data from a file if it is still valid. """
         try:
             with open('token_data.json', 'r') as f:
                 token_data = json.load(f)
-                token_expiration = datetime.fromisoformat(token_data['expires_at'])
-                if datetime.now() < token_expiration - timedelta(minutes=5):  # buffer for token expiration
+                if datetime.now() < datetime.fromisoformat(token_data['expires_at']):
+                    self.logger.info("Token loaded successfully from file.")
                     return token_data
-        except (FileNotFoundError, KeyError):
-            return None
+        except (FileNotFoundError, KeyError, ValueError) as e:
+            self.logger.warning(f"Loading token failed: {e}")
+        return None
 
     def make_request(self, method, endpoint, **kwargs):
-        """ Make an HTTP request using the authenticated session. """
-        url = f"{API_BASE_URL}{endpoint}"
+        """ Makes an HTTP request using the authenticated session. """
+        url = f"{self.config.API_BASE_URL}{endpoint}"
         response = self.session.request(method, url, **kwargs)
-        if response.status_code == 401:  # Token expired or not valid
+        if response.status_code == 401:  # Token expired
+            self.logger.warning("Token expired. Refreshing token...")
             self.token_info = self.authenticate()
-            response = self.session.request(method, url, **kwargs)  # Retry request
-        response.raise_for_status()  # Raise an exception for bad responses
+            response = self.session.request(method, url, **kwargs)
+        response.raise_for_status()
         return response.json()
-
-    def get(self, endpoint, params=None):
-        return self.make_request('GET', endpoint, params=params)
-
-    def post(self, endpoint, data=None):
-        return self.make_request('POST', endpoint, json=data)