refactor: improve environment variable handling for API authentication - 18:47

backend/models/model_manager.py

@@ -17,10 +17,12 @@ class ModelManager:
             self.hf_client = HFClient(settings.HF_INFERENCE_URL, hf_token)
             
     def get_client(self, agent_id: str) -> Tuple[AsyncOpenAI, str]:
-        if "API_BASE_URL" in os.environ and "API_KEY" in os.environ:
+        api_base = os.environ.get("API_BASE_URL", "")
+        api_key = os.environ.get("API_KEY", "")
+        if api_base and api_key:
             client = AsyncOpenAI(
-                base_url=os.environ["API_BASE_URL"],
-                api_key=os.environ["API_KEY"]
+                base_url=api_base,
+                api_key=api_key
             )
             model_name = os.environ.get("MODEL_NAME", "")
             if agent_id == "agent_a":

inference.py

@@ -25,13 +25,12 @@ load_dotenv(ROOT / "default.env", override=False)
 
 API_BASE_URL = os.getenv("API_BASE_URL", "https://router.huggingface.co/v1")
 MODEL_NAME = os.getenv("MODEL_NAME", "meta-llama/Llama-3.1-8B-Instruct")
-HF_TOKEN = os.getenv("HF_TOKEN")
+HF_TOKEN = os.getenv("HF_TOKEN", "")
 
-# Fallbacks to ensure os.environ has the keys before we strictly read them
-if "API_BASE_URL" not in os.environ:
+if "API_BASE_URL" not in os.environ or not os.environ["API_BASE_URL"]:
     os.environ["API_BASE_URL"] = API_BASE_URL
-if "API_KEY" not in os.environ:
-    os.environ["API_KEY"] = HF_TOKEN or "none"
+if "API_KEY" not in os.environ or not os.environ["API_KEY"]:
+    os.environ["API_KEY"] = "none"
 
 # The client should NOT be initialized here at the module level.
 # If the evaluator imports this file before patching os.environ, it will permanently bind to fallbacks.