Making changes again

inference.py

@@ -100,9 +100,9 @@ Your goal is to investigate logs and alerts, identify the threat, and mitigate i
 # ---------------------------------------------------------------------------
 
 def _format_observation(obs: IncidentObservation) -> str:
-    logs_txt     = "\n".join(f"  [{l.log_id}] {l.timestamp} — {l.message}" for l in obs.logs)
-    alerts_txt   = "\n".join(f"  [{a.severity.upper()}] {a.message}" for a in obs.alerts)
-    services_txt = "\n".join(f"  {s.name}: {s.status}" for s in obs.services)
+    logs_txt     = "\n".join(f"  [{l['log_id']}] {l['timestamp']} — {l['message']}" for l in obs.logs)
+    alerts_txt   = "\n".join(f"  [{a['severity'].upper()}] {a['message']}" for a in obs.alerts)
+    services_txt = "\n".join(f"  {s['name']}: {s['status']}" for s in obs.services)
     return (
         f"=== Incident Dashboard (Step {obs.step_count}) ===\n\n"
         f"LOGS:\n{logs_txt}\n\n"

pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "httpx>=0.27.0",
     "openai>=1.30.0",
     "python-dotenv>=1.0.0",
-    "openenv>=0.2.0",
+    "openenv-core>=0.2.0",
 ]
 
 [project.scripts]

server/app.py

@@ -1,15 +1,6 @@
 """
 server/app.py — FastAPI server for xsecure.
 Uses openenv-core's create_fastapi_app — all endpoints generated automatically.
-
-Endpoints provided by openenv-core:
-    GET  /health   — health check
-    POST /reset    — reset environment (also used by prevalidation.sh)
-    POST /step     — execute action
-    GET  /state    — current state
-    WS   /ws       — persistent WebSocket session
-    GET  /docs     — OpenAPI docs
-    GET  /web      — interactive web UI
 """
 
 from __future__ import annotations
@@ -17,22 +8,16 @@ from __future__ import annotations
 import os
 
 try:
-    from openenv.core.env_server import create_fastapi_app
+    from openenv_core.env_server import create_fastapi_app
 except ImportError:
     from core.env_server import create_fastapi_app
 
 from .environment import IncidentEnvironment
+from models import IncidentAction, IncidentObservation   # ← required by create_fastapi_app
 
-# ---------------------------------------------------------------------------
-# App — openenv-core creates all routes automatically
-# ---------------------------------------------------------------------------
-
-env = IncidentEnvironment()
+# Pass the CLASS (not an instance) plus action and observation classes
 app = create_fastapi_app(IncidentEnvironment, IncidentAction, IncidentObservation)
 
-# ---------------------------------------------------------------------------
-# Entry point — required by openenv validate and pyproject.toml scripts
-# ---------------------------------------------------------------------------
 
 def main():
     import uvicorn