Implement access token

app/base_api.py

@@ -1,6 +1,10 @@
 import httpx
 
 class BaseAPI():
+    def __init__(self):
+        self._client = httpx.AsyncClient()
+        self.access_token = None # Placeholder, will be set by derived class or external config
+
     async def __aenter__(self):
         """Allows using the client with async with."""
         return self
@@ -11,68 +15,29 @@ class BaseAPI():
 
     async def close(self):
         """Closes the underlying asynchronous HTTP client."""
-        await self._client.close()
+        if self._client: # Ensure _client exists before trying to close
+            await self._client.close()
 
     async def _post(self, endpoint: str, data: dict = None):
         """
         Asynchronous helper method for making POST requests.
-
-        Args:
-            endpoint: The API endpoint (e.g., "/op25/start").
-            data: The data to send in the request body (as a dictionary).
-
-        Returns:
-            The JSON response from the API.
-
-        Raises:
-            httpx.RequestError: If the request fails.
-            httpx.HTTPStatusError: If the API returns an error status code (4xx or 5xx).
+        This method will now implicitly use the _request method,
+        so authentication logic is centralized.
         """
-        url = f"{self.base_url}{endpoint}"
-        try:
-            # Use await with the asynchronous httpx client
-            response = await self._client.post(url, json=data)
-            response.raise_for_status() # Raise HTTPStatusError for bad responses (4xx or 5xx)
-            return response.json()
-        except httpx.HTTPStatusError as e:
-            print(f"HTTP error occurred: {e}")
-            print(f"Response body: {e.response.text}") # Access response text from the exception
-            raise
-        except httpx.RequestError as e:
-            print(f"Request to '{url}' failed: {e}")
-            raise
+        return await self._request("POST", endpoint, json=data)
 
     async def _get(self, endpoint: str):
         """
         Asynchronous helper method for making GET requests.
-
-        Args:
-            endpoint: The API endpoint (e.g., "/op25/status").
-
-        Returns:
-            The JSON response from the API.
-
-        Raises:
-            httpx.RequestError: If the request fails.
-            httpx.HTTPStatusError: If the API returns an error status code (4xx or 5xx).
+        This method will now implicitly use the _request method,
+        so authentication logic is centralized.
         """
-        url = f"{self.base_url}{endpoint}"
-        try:
-            # Use await with the asynchronous httpx client
-            response = await self._client.get(url)
-            response.raise_for_status() # Raise HTTPStatusError for bad responses (4xx or 5xx)
-            return response.json()
-        except httpx.HTTPStatusError as e:
-            print(f"HTTP error occurred: {e}")
-            print(f"Response body: {e.response.text}") # Access response text from the exception
-            raise
-        except httpx.RequestError as e:
-            print(f"Request to '{url}' failed: {e}")
-            raise
+        return await self._request("GET", endpoint)
 
     async def _request(self, method, endpoint, **kwargs):
         """
         Helper method to make an asynchronous HTTP request.
+        This is where the access_token will be injected.
 
         Args:
             method (str): The HTTP method (e.g., 'GET', 'POST').
@@ -86,15 +51,20 @@ class BaseAPI():
             httpx.HTTPStatusError: If the request returns a non-2xx status code.
             httpx.RequestError: For other request-related errors.
         """
-        url = f"{self.base_url}{endpoint}"
+        url = f"{self.base_url}{endpoint}" # base_url must be defined in derived class or passed to BaseAPI
+
+        headers = kwargs.pop("headers", {})
+        if self.access_token: # Check if access_token is set
+            headers["Authorization"] = f"Bearer {self.access_token}"
+        kwargs["headers"] = headers
+
         try:
             response = await self._client.request(method, url, **kwargs)
             response.raise_for_status() # Raise an exception for bad status codes (4xx or 5xx)
             return response.json()
         except httpx.HTTPStatusError as e:
             print(f"HTTP error occurred: {e}")
-            # You might want to return the error response body or raise the exception
             raise
         except httpx.RequestError as e:
             print(f"An error occurred while requesting {e.request.url!r}: {e}")
-            raise
+            raise