refactor: 💡 retire dotenv on esaclient

Author: scnsh

esa_client.py

@@ -1,23 +1,23 @@
 import logging
-import os
 
 import requests
-from dotenv import load_dotenv
 
-load_dotenv()
+# from dotenv import load_dotenv
+
+# load_dotenv()
 logger = logging.getLogger(__name__)
 
 
 class EsaClient:
-    def __init__(self):
-        self.token = os.getenv("ESA_TOKEN")
-        self.team_name = os.getenv("ESA_TEAM_NAME")
+    def __init__(self, token: str, team_name: str):
+        self.token = token
+        self.team_name = team_name
 
         if not self.token:
-            logger.error("Environment variable ESA_TOKEN is not set.")
+            logger.error("Token is required but was not provided.")
             raise ValueError("ESA_TOKEN is required")
         if not self.team_name:
-            logger.error("Environment variable ESA_TEAM_NAME is not set.")
+            logger.error("Team name is required but was not provided.")
             raise ValueError("ESA_TEAM_NAME is required")
 
         self.base_url = f"https://api.esa.io/v1/teams/{self.team_name}"
@@ -118,6 +118,9 @@ def delete_post(self, post_number: int):
 
 # Example usage (optional, for testing during development)
 if __name__ == "__main__":
+    from dotenv import load_dotenv
+
+    load_dotenv()
     logging.basicConfig(level=logging.INFO)
     try:
         client = EsaClient()

tests/test_esa_client.py

@@ -7,16 +7,9 @@
 
 
 @pytest.fixture
-def mock_env(monkeypatch):
-    "Set up environment variables for testing."
-    monkeypatch.setenv("ESA_TOKEN", "test_token")
-    monkeypatch.setenv("ESA_TEAM_NAME", "test_team")
-
-
-@pytest.fixture
-def client(mock_env):
-    "Return an instance of EsaClient with mocked env vars."
-    return EsaClient()
+def client():
+    "Return an instance of EsaClient with specified token and team_name."
+    return EsaClient(token="test_token", team_name="test_team")
 
 
 def test_esa_client_initialization(client):
@@ -27,20 +20,20 @@ def test_esa_client_initialization(client):
     assert client.session.headers["Authorization"] == f"Bearer {client.token}"
 
 
-def test_esa_client_initialization_missing_token(monkeypatch):
-    "Test ValueError is raised if ESA_TOKEN is missing."
-    monkeypatch.delenv("ESA_TOKEN", raising=False)  # Ensure it's removed if exists
-    monkeypatch.setenv("ESA_TEAM_NAME", "test_team")
+def test_esa_client_initialization_missing_token():
+    "Test ValueError is raised if token is missing or invalid."
     with pytest.raises(ValueError, match="ESA_TOKEN is required"):
-        EsaClient()
+        EsaClient(token=None, team_name="test_team")
+    with pytest.raises(ValueError, match="ESA_TOKEN is required"):
+        EsaClient(token="", team_name="test_team")
 
 
-def test_esa_client_initialization_missing_team_name(monkeypatch):
-    "Test ValueError is raised if ESA_TEAM_NAME is missing."
-    monkeypatch.setenv("ESA_TOKEN", "test_token")
-    monkeypatch.delenv("ESA_TEAM_NAME", raising=False)  # Ensure it's removed if exists
+def test_esa_client_initialization_missing_team_name():
+    "Test ValueError is raised if team_name is missing or invalid."
+    with pytest.raises(ValueError, match="ESA_TEAM_NAME is required"):
+        EsaClient(token="test_token", team_name=None)
     with pytest.raises(ValueError, match="ESA_TEAM_NAME is required"):
-        EsaClient()
+        EsaClient(token="test_token", team_name="")
 
 
 @patch("esa_client.requests.Session.request")