xPushkal commited on
Commit
05ced48
·
1 Parent(s): 93b580d

env fixed

Browse files
Files changed (1) hide show
  1. inference.py +31 -8
inference.py CHANGED
@@ -26,10 +26,6 @@ STDOUT FORMAT
26
 
27
  from pathlib import Path
28
 
29
- from dotenv import load_dotenv
30
-
31
- load_dotenv(Path(__file__).resolve().parent / ".env")
32
-
33
  import asyncio
34
  import json
35
  import os
@@ -39,14 +35,36 @@ import textwrap
39
  import time
40
  from typing import Any, Dict, List, Optional
41
 
 
 
 
 
 
 
 
 
 
42
  from openai import OpenAI
43
  from openenv.core.containers.runtime import LocalDockerProvider
44
 
45
  from models import PolicyViolation
46
  from my_env import Action, LegalContractClient
47
 
48
- API_BASE_URL = os.environ["API_BASE_URL"]
49
- MODEL_NAME = os.environ["MODEL_NAME"]
 
 
 
 
 
 
 
 
 
 
 
 
 
50
  TASK_NAME = os.getenv("PROCUREMENT_TASK", "easy")
51
  BENCHMARK = "procurement-contract-audit"
52
  MAX_STEPS = int(os.getenv("MAX_STEPS", "10"))
@@ -54,6 +72,11 @@ TEMPERATURE = 0.0
54
  MAX_TOKENS = 4096
55
  SUCCESS_SCORE_THRESHOLD = float(os.getenv("SUCCESS_SCORE_THRESHOLD", "0.5"))
56
 
 
 
 
 
 
57
 
58
  class Port7860DockerProvider(LocalDockerProvider):
59
  MAX_RETRIES = 3
@@ -371,8 +394,8 @@ def get_model_violations(client, contract_text, rules_to_check, step, feedback):
371
  async def run_task(task_id: str):
372
  """Run a single task and return results."""
373
  client = OpenAI(
374
- base_url=os.environ["API_BASE_URL"],
375
- api_key=os.environ["HF_TOKEN"],
376
  timeout=60.0,
377
  )
378
  image_name = os.environ.get("LOCAL_IMAGE_NAME", "my-env")
 
26
 
27
  from pathlib import Path
28
 
 
 
 
 
29
  import asyncio
30
  import json
31
  import os
 
35
  import time
36
  from typing import Any, Dict, List, Optional
37
 
38
+ # Only load .env as a fallback for LOCAL development.
39
+ # The validator / CI runner injects its own env vars (API_BASE_URL, API key)
40
+ # BEFORE the process starts, so we must NOT override them.
41
+ from dotenv import load_dotenv
42
+
43
+ _env_path = Path(__file__).resolve().parent / ".env"
44
+ if _env_path.exists():
45
+ load_dotenv(_env_path, override=False) # never override existing env vars
46
+
47
  from openai import OpenAI
48
  from openenv.core.containers.runtime import LocalDockerProvider
49
 
50
  from models import PolicyViolation
51
  from my_env import Action, LegalContractClient
52
 
53
+
54
+ def _resolve_api_key() -> str:
55
+ """Return the API key from whichever env var the runner provided."""
56
+ for var in ("HF_TOKEN", "OPENAI_API_KEY", "API_KEY"):
57
+ val = os.environ.get(var)
58
+ if val:
59
+ return val
60
+ raise EnvironmentError(
61
+ "No API key found. Set one of: HF_TOKEN, OPENAI_API_KEY, API_KEY"
62
+ )
63
+
64
+
65
+ API_BASE_URL = os.environ.get("API_BASE_URL", "https://router.huggingface.co/v1")
66
+ API_KEY = _resolve_api_key()
67
+ MODEL_NAME = os.environ.get("MODEL_NAME", "Qwen/Qwen2.5-72B-Instruct")
68
  TASK_NAME = os.getenv("PROCUREMENT_TASK", "easy")
69
  BENCHMARK = "procurement-contract-audit"
70
  MAX_STEPS = int(os.getenv("MAX_STEPS", "10"))
 
72
  MAX_TOKENS = 4096
73
  SUCCESS_SCORE_THRESHOLD = float(os.getenv("SUCCESS_SCORE_THRESHOLD", "0.5"))
74
 
75
+ # Debug: show which endpoint and key prefix are in use
76
+ print(f"[CONFIG] API_BASE_URL = {API_BASE_URL}")
77
+ print(f"[CONFIG] MODEL_NAME = {MODEL_NAME}")
78
+ print(f"[CONFIG] API_KEY = {API_KEY[:8]}...{API_KEY[-4:]}")
79
+
80
 
81
  class Port7860DockerProvider(LocalDockerProvider):
82
  MAX_RETRIES = 3
 
394
  async def run_task(task_id: str):
395
  """Run a single task and return results."""
396
  client = OpenAI(
397
+ base_url=API_BASE_URL,
398
+ api_key=API_KEY,
399
  timeout=60.0,
400
  )
401
  image_name = os.environ.get("LOCAL_IMAGE_NAME", "my-env")