Fix 500 Internal Server Error: correct server initialization and models

server/app.py

@@ -6,6 +6,7 @@ from openenv_core.env_server import create_fastapi_app
 from .models import CloudAction, CloudObservation
 from .environment import CloudAuditEnv
 from typing import Any, Dict
+from dataclasses import asdict
 import os
 import sys
 
@@ -13,7 +14,7 @@ import sys
 env = CloudAuditEnv()
 
 # Create the FastAPI app using openenv-core
-app = create_fastapi_app(lambda: env, CloudAction, CloudObservation)
+app = create_fastapi_app(env, CloudAction, CloudObservation)
 
 @app.exception_handler(Exception)
 async def general_exception_handler(request: Request, exc: Exception):
@@ -41,7 +42,7 @@ async def reset_with_task(request: Dict[str, Any] = Body(default={})) -> Dict[st
     """Reset the environment, forwarding task_id from the request body."""
     task_id = request.get("task_id", "easy")
     observation = env.reset(task_id=task_id)
-    return observation.model_dump()
+    return asdict(observation)
 
 # Add custom routes for the UI
 static_dir = os.path.join(os.path.dirname(__file__), "static")

server/models.py

@@ -1,6 +1,7 @@
 from enum import Enum
 from typing import List, Optional, Dict, Any
-from pydantic import BaseModel, Field
+from pydantic.dataclasses import dataclass
+from pydantic import ConfigDict, BaseModel
 
 class CloudActionType(str, Enum):
     LIST = "list"
@@ -9,7 +10,8 @@ class CloudActionType(str, Enum):
     LOGS = "logs"
     SUBMIT = "submit"
 
-class CloudAction(BaseModel):
+@dataclass(config=ConfigDict(arbitrary_types_allowed=True))
+class CloudAction:
     action: CloudActionType
     resource_type: Optional[str] = None
     resource_id: Optional[str] = None
@@ -17,8 +19,10 @@ class CloudAction(BaseModel):
     start_time: Optional[str] = None
     end_time: Optional[str] = None
     answer: Optional[str] = None
+    metadata: Optional[Dict[str, Any]] = None
 
-class CloudObservation(BaseModel):
+@dataclass(config=ConfigDict(arbitrary_types_allowed=True))
+class CloudObservation:
     resources: Optional[List[Dict[str, Any]]] = None
     details: Optional[Dict[str, Any]] = None
     status: Optional[str] = None