DevikaJ2005 commited on
Commit
723cc80
·
1 Parent(s): 29faa15

Use injected proxy credentials for baseline agent

Browse files
Files changed (2) hide show
  1. inference.py +8 -6
  2. llm_agent.py +63 -13
inference.py CHANGED
@@ -79,8 +79,10 @@ def get_env(*names: str, default: str = "") -> str:
79
 
80
  for name in names:
81
  value = os.getenv(name)
82
- if value:
83
- return value
 
 
84
  return default
85
 
86
 
@@ -258,8 +260,8 @@ def main() -> Dict[str, object]:
258
  logger.info(
259
  "Agent mode: %s | API_BASE_URL=%s | MODEL_NAME=%s",
260
  getattr(agent, "name", agent.__class__.__name__),
261
- get_env("API_BASE_URL", "APIBASEURL", default="https://router.huggingface.co/v1"),
262
- get_env("MODEL_NAME", "MODELNAME", default="<offline-heuristic>"),
263
  )
264
 
265
  easy_predictions, easy_ground_truth, easy_confidences, agent = run_task(env, agent, "easy")
@@ -279,8 +281,8 @@ def main() -> Dict[str, object]:
279
  )
280
  grading_result["metadata"] = {
281
  "agent_name": getattr(agent, "name", agent.__class__.__name__),
282
- "api_base_url": get_env("API_BASE_URL", "APIBASEURL", default="https://router.huggingface.co/v1"),
283
- "model_name": get_env("MODEL_NAME", "MODELNAME"),
284
  "seed": 42,
285
  "data_snapshot": env.data_loader.get_bundle_summary(),
286
  "tasks": {
 
79
 
80
  for name in names:
81
  value = os.getenv(name)
82
+ if value is not None:
83
+ stripped_value = value.strip()
84
+ if stripped_value:
85
+ return stripped_value
86
  return default
87
 
88
 
 
260
  logger.info(
261
  "Agent mode: %s | API_BASE_URL=%s | MODEL_NAME=%s",
262
  getattr(agent, "name", agent.__class__.__name__),
263
+ getattr(agent, "api_base_url", get_env("API_BASE_URL", "APIBASEURL", default="https://router.huggingface.co/v1")),
264
+ getattr(agent, "model_name", get_env("MODEL_NAME", "MODELNAME", default="<offline-heuristic>")),
265
  )
266
 
267
  easy_predictions, easy_ground_truth, easy_confidences, agent = run_task(env, agent, "easy")
 
281
  )
282
  grading_result["metadata"] = {
283
  "agent_name": getattr(agent, "name", agent.__class__.__name__),
284
+ "api_base_url": getattr(agent, "api_base_url", get_env("API_BASE_URL", "APIBASEURL", default="https://router.huggingface.co/v1")),
285
+ "model_name": getattr(agent, "model_name", get_env("MODEL_NAME", "MODELNAME")),
286
  "seed": 42,
287
  "data_snapshot": env.data_loader.get_bundle_summary(),
288
  "tasks": {
llm_agent.py CHANGED
@@ -15,6 +15,7 @@ except ImportError: # pragma: no cover - dependency installed in submission ima
15
  OpenAI = None
16
 
17
  logger = logging.getLogger(__name__)
 
18
 
19
 
20
  def get_env(*names: str, default: Optional[str] = None) -> Optional[str]:
@@ -22,8 +23,10 @@ def get_env(*names: str, default: Optional[str] = None) -> Optional[str]:
22
 
23
  for name in names:
24
  value = os.getenv(name)
25
- if value:
26
- return value
 
 
27
  return default
28
 
29
 
@@ -132,7 +135,7 @@ class OpenAIFraudDetectionAgent:
132
  raise RuntimeError(
133
  "OpenAI baseline request failed for "
134
  f"{observation.transaction_id} using model '{self.model_name}' at '{self.api_base_url}'. "
135
- "Check MODEL_NAME, HF_TOKEN, and API_BASE_URL."
136
  ) from exc
137
 
138
  def _build_messages(self, observation) -> list[Dict[str, str]]:
@@ -192,20 +195,68 @@ class OpenAIFraudDetectionAgent:
192
  return payload
193
 
194
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
195
  def build_default_agent() -> object:
196
  """Create the required OpenAI client agent when configured, else use the offline fallback."""
197
 
198
  model_name = get_env("MODEL_NAME", "MODELNAME")
199
- api_key = get_env("HF_TOKEN", "HFTOKEN", "OPENAI_API_KEY", "OPENAIAPIKEY", "API_KEY", "APIKEY")
200
- api_base_url = get_env("API_BASE_URL", "APIBASEURL", default="https://router.huggingface.co/v1")
201
 
202
- # Only use OpenAI if BOTH model_name and api_key are set
203
- if model_name and api_key:
 
204
  try:
205
  return OpenAIFraudDetectionAgent(
206
- model_name=model_name,
207
  api_key=api_key,
208
- api_base_url=api_base_url,
209
  )
210
  except Exception as exc:
211
  logger.warning(
@@ -213,15 +264,14 @@ def build_default_agent() -> object:
213
  )
214
  return HeuristicFraudDetectionAgent()
215
 
216
- # If only one is set or neither is set, fall back to heuristic
217
- if model_name or api_key:
218
  logger.warning(
219
- "Only one of MODEL_NAME and HF_TOKEN/API_KEY was set (both required for OpenAI mode). "
220
  "Falling back to the deterministic heuristic agent."
221
  )
222
  else:
223
  logger.warning(
224
- "MODEL_NAME and HF_TOKEN/API_KEY were not set. "
225
  "Falling back to the deterministic heuristic agent."
226
  )
227
  return HeuristicFraudDetectionAgent()
 
15
  OpenAI = None
16
 
17
  logger = logging.getLogger(__name__)
18
+ DEFAULT_PROXY_MODEL = "gpt-4o-mini"
19
 
20
 
21
  def get_env(*names: str, default: Optional[str] = None) -> Optional[str]:
 
23
 
24
  for name in names:
25
  value = os.getenv(name)
26
+ if value is not None:
27
+ stripped_value = value.strip()
28
+ if stripped_value:
29
+ return stripped_value
30
  return default
31
 
32
 
 
135
  raise RuntimeError(
136
  "OpenAI baseline request failed for "
137
  f"{observation.transaction_id} using model '{self.model_name}' at '{self.api_base_url}'. "
138
+ "Check API_BASE_URL, API_KEY, and MODEL_NAME."
139
  ) from exc
140
 
141
  def _build_messages(self, observation) -> list[Dict[str, str]]:
 
195
  return payload
196
 
197
 
198
+ def discover_model_name(api_key: str, api_base_url: str) -> Optional[str]:
199
+ """Query the configured proxy for available models and pick a sensible default."""
200
+
201
+ if OpenAI is None:
202
+ raise ImportError("openai package is not installed. Install project dependencies first.")
203
+
204
+ client = OpenAI(base_url=api_base_url, api_key=api_key, timeout=15.0)
205
+
206
+ try:
207
+ response = client.models.list()
208
+ model_ids = sorted(
209
+ {
210
+ getattr(model, "id", "").strip()
211
+ for model in response
212
+ if getattr(model, "id", "").strip()
213
+ }
214
+ )
215
+ except Exception as exc:
216
+ logger.warning(
217
+ "Could not list models from API_BASE_URL=%s: %s. Falling back to default proxy model %s.",
218
+ api_base_url,
219
+ exc,
220
+ DEFAULT_PROXY_MODEL,
221
+ )
222
+ return DEFAULT_PROXY_MODEL
223
+
224
+ if not model_ids:
225
+ logger.warning(
226
+ "The proxy at API_BASE_URL=%s returned no models. Falling back to default proxy model %s.",
227
+ api_base_url,
228
+ DEFAULT_PROXY_MODEL,
229
+ )
230
+ return DEFAULT_PROXY_MODEL
231
+
232
+ preferred_models = [
233
+ DEFAULT_PROXY_MODEL,
234
+ "gpt-4.1-mini",
235
+ "gpt-4o",
236
+ "gpt-4.1",
237
+ ]
238
+ for preferred_model in preferred_models:
239
+ if preferred_model in model_ids:
240
+ return preferred_model
241
+
242
+ return model_ids[0]
243
+
244
+
245
  def build_default_agent() -> object:
246
  """Create the required OpenAI client agent when configured, else use the offline fallback."""
247
 
248
  model_name = get_env("MODEL_NAME", "MODELNAME")
249
+ api_key = get_env("API_KEY", "APIKEY", "OPENAI_API_KEY", "OPENAIAPIKEY", "HF_TOKEN", "HFTOKEN")
250
+ api_base_url = get_env("API_BASE_URL", "APIBASEURL")
251
 
252
+ if api_key:
253
+ resolved_api_base_url = api_base_url or "https://router.huggingface.co/v1"
254
+ resolved_model_name = model_name or discover_model_name(api_key, resolved_api_base_url)
255
  try:
256
  return OpenAIFraudDetectionAgent(
257
+ model_name=resolved_model_name,
258
  api_key=api_key,
259
+ api_base_url=resolved_api_base_url,
260
  )
261
  except Exception as exc:
262
  logger.warning(
 
264
  )
265
  return HeuristicFraudDetectionAgent()
266
 
267
+ if model_name and not api_key:
 
268
  logger.warning(
269
+ "MODEL_NAME was set but no API_KEY-compatible credential was available. "
270
  "Falling back to the deterministic heuristic agent."
271
  )
272
  else:
273
  logger.warning(
274
+ "API_KEY-compatible credentials were not set. "
275
  "Falling back to the deterministic heuristic agent."
276
  )
277
  return HeuristicFraudDetectionAgent()