mathi3046 commited on
Commit
e27dbae
·
1 Parent(s): 13b6972

Fix OpenAI key env handling and pydantic model_dump

Browse files
Files changed (3) hide show
  1. app/env.py +2 -2
  2. inference.py +7 -5
  3. server.py +3 -3
app/env.py CHANGED
@@ -53,8 +53,8 @@ class SupportDeskEnv:
53
  self.state_data.history.append({"role": "user", "content": self.state_data.user_message})
54
 
55
  return {
56
- "observation": self.state_data.dict(),
57
- "reward": reward.dict(),
58
  "done": done,
59
  "info": {"expected_category": self.expected_category, "task_score": task_score}
60
  }
 
53
  self.state_data.history.append({"role": "user", "content": self.state_data.user_message})
54
 
55
  return {
56
+ "observation": self.state_data.model_dump(),
57
+ "reward": reward.model_dump(),
58
  "done": done,
59
  "info": {"expected_category": self.expected_category, "task_score": task_score}
60
  }
inference.py CHANGED
@@ -7,7 +7,8 @@ from openai import OpenAI
7
  # ENV VARIABLES (STRICT)
8
  # =============================
9
  API_BASE_URL = os.environ.get("API_BASE_URL")
10
- API_KEY = os.environ.get("API_KEY")
 
11
  MODEL_NAME = os.environ.get("MODEL_NAME", "gpt-4o-mini")
12
 
13
  ENV_URL = "http://localhost:7860"
@@ -16,10 +17,11 @@ ENV_URL = "http://localhost:7860"
16
  # 🔥 GLOBAL LLM CLIENT
17
  # =============================
18
  try:
19
- client = OpenAI(
20
- base_url=API_BASE_URL,
21
- api_key=API_KEY
22
- )
 
23
  print("✅ LLM CLIENT INITIALIZED", flush=True)
24
  except Exception as e:
25
  print(f"❌ CLIENT INIT FAILED: {e}", flush=True)
 
7
  # ENV VARIABLES (STRICT)
8
  # =============================
9
  API_BASE_URL = os.environ.get("API_BASE_URL")
10
+ # Prefer OPENAI_API_KEY, but keep API_KEY as a backward-compatible fallback.
11
+ API_KEY = os.environ.get("OPENAI_API_KEY") or os.environ.get("API_KEY")
12
  MODEL_NAME = os.environ.get("MODEL_NAME", "gpt-4o-mini")
13
 
14
  ENV_URL = "http://localhost:7860"
 
17
  # 🔥 GLOBAL LLM CLIENT
18
  # =============================
19
  try:
20
+ client_kwargs = {"api_key": API_KEY}
21
+ if API_BASE_URL:
22
+ client_kwargs["base_url"] = API_BASE_URL
23
+
24
+ client = OpenAI(**client_kwargs)
25
  print("✅ LLM CLIENT INITIALIZED", flush=True)
26
  except Exception as e:
27
  print(f"❌ CLIENT INIT FAILED: {e}", flush=True)
server.py CHANGED
@@ -19,13 +19,13 @@ def root():
19
  async def reset(req: dict = {}):
20
  level = req.get("level", "medium")
21
  obs = await env.reset(level)
22
- return {"observation": obs.dict()}
23
 
24
  # Optional GET (for browser testing)
25
  @app.get("/reset")
26
  async def reset_get():
27
  obs = await env.reset("medium")
28
- return {"observation": obs.dict()}
29
 
30
  # -----------------------------
31
  # STEP
@@ -41,7 +41,7 @@ async def step(action: Action):
41
  @app.get("/state")
42
  async def state():
43
  obs = await env.state()
44
- return {"observation": obs.dict()}
45
 
46
  # -----------------------------
47
  # RUN SERVER
 
19
  async def reset(req: dict = {}):
20
  level = req.get("level", "medium")
21
  obs = await env.reset(level)
22
+ return {"observation": obs.model_dump()}
23
 
24
  # Optional GET (for browser testing)
25
  @app.get("/reset")
26
  async def reset_get():
27
  obs = await env.reset("medium")
28
+ return {"observation": obs.model_dump()}
29
 
30
  # -----------------------------
31
  # STEP
 
41
  @app.get("/state")
42
  async def state():
43
  obs = await env.state()
44
+ return {"observation": obs.model_dump()}
45
 
46
  # -----------------------------
47
  # RUN SERVER