Update app.py

app.py

@@ -16,15 +16,16 @@ from conversation_logic import ConversationEngine
 from generator_engine import GeneratorEngine
 from logging_store import LoggingStore
 from models import ChatRequest, EventLogRequest, SessionFinalizeRequest, SessionStartRequest
+from question_support_loader import question_support_bank
 from retrieval_engine import RetrievalEngine
 from ui_html import HOME_HTML
 from utils import clamp01, get_user_text
-from question_support_loader import question_support_bank
 
 retriever = RetrievalEngine()
 generator = GeneratorEngine()
 engine = ConversationEngine(retriever=retriever, generator=generator)
 store = LoggingStore()
+question_support_bank.load()
 
 app = FastAPI(title="GameAI")
 app.add_middleware(
@@ -33,11 +34,9 @@ app.add_middleware(
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
-    question_support_bank.load()
 )
-print(question_support_bank.get("TEST_PERCENT_001"))
+
 # Lightweight in-memory chat session state cache.
-# This lets repeated /chat requests work as long as the caller reuses session_id.
 CHAT_SESSION_STATE: Dict[str, Dict[str, Any]] = {}
 
 
@@ -45,10 +44,6 @@ def _as_dict(value: Any) -> Dict[str, Any]:
     return value if isinstance(value, dict) else {}
 
 
-def _as_list(value: Any) -> List[Any]:
-    return value if isinstance(value, list) else []
-
-
 def _extract_session_id(req_data: Dict[str, Any], req: ChatRequest) -> Optional[str]:
     candidates = [
         req_data.get("session_id"),
@@ -69,11 +64,9 @@ def _extract_chat_history(req_data: Dict[str, Any], req: ChatRequest) -> List[Di
         getattr(req, "chat_history", None),
         getattr(req, "history", None),
     ]
-
     for candidate in candidates:
         if isinstance(candidate, list):
             return [item for item in candidate if isinstance(item, dict)]
-
     return []
 
 
@@ -81,17 +74,14 @@ def _recover_session_state_from_history(chat_history: List[Dict[str, Any]]) -> D
     for item in reversed(chat_history):
         if not isinstance(item, dict):
             continue
-
         direct_state = item.get("session_state")
         if isinstance(direct_state, dict) and direct_state:
             return dict(direct_state)
-
         meta = item.get("meta")
         if isinstance(meta, dict):
             meta_state = meta.get("session_state")
             if isinstance(meta_state, dict) and meta_state:
                 return dict(meta_state)
-
     return {}
 
 
@@ -109,9 +99,6 @@ def _merge_session_state(
     parsed_built_on_previous_turn: bool,
 ) -> Dict[str, Any]:
     state: Dict[str, Any] = {}
-
-    # Start with cache, then history recovery, then explicit incoming state.
-    # Explicit client-provided state wins.
     if cached_state:
         state.update(cached_state)
     if history_state:
@@ -119,31 +106,22 @@ def _merge_session_state(
     if incoming_state:
         state.update(incoming_state)
 
-    # Apply parsed Unity hidden context only when present.
     if parsed_question_text:
         state["question_text"] = parsed_question_text
-
     if parsed_hint_stage:
         state["hint_stage"] = parsed_hint_stage
-
     if parsed_user_last_input_type:
         state["user_last_input_type"] = parsed_user_last_input_type
-
     if parsed_built_on_previous_turn:
         state["built_on_previous_turn"] = parsed_built_on_previous_turn
-
     if parsed_help_mode:
         state["help_mode"] = parsed_help_mode
-
     if parsed_intent:
         state["intent"] = parsed_intent
-
     if parsed_topic:
         state["topic"] = parsed_topic
-
     if parsed_category:
         state["category"] = parsed_category
-
     return state
 
 
@@ -153,6 +131,7 @@ def health() -> Dict[str, Any]:
         "ok": True,
         "app": "GameAI",
         "generator_available": generator.available(),
+        "question_support_loaded": True,
     }
 
 
@@ -164,9 +143,8 @@ def home() -> str:
 @app.post("/chat")
 async def chat(request: Request) -> JSONResponse:
     try:
-        raw_body: Any = None
         try:
-            raw_body = await request.json()
+            raw_body: Any = await request.json()
         except Exception:
             try:
                 raw_body = (await request.body()).decode("utf-8", errors="ignore")
@@ -191,7 +169,6 @@ async def chat(request: Request) -> JSONResponse:
         parsed_built_on_previous_turn = bool(parsed.get("built_on_previous_turn", False))
 
         game_fields = extract_game_context_fields(hidden_context)
-
         chat_history = _extract_chat_history(req_data, req)
         incoming_session_state = _as_dict(req_data.get("session_state", getattr(req, "session_state", None)))
         history_session_state = _recover_session_state_from_history(chat_history)
@@ -216,11 +193,11 @@ async def chat(request: Request) -> JSONResponse:
         question_text = (
             (getattr(req, "question_text", None) or "").strip()
             or parsed_question_text
-            or game_fields["question"]
+            or game_fields.get("question", "")
             or str(session_state.get("question_text", "") or "").strip()
         )
-
-        options_text = getattr(req, "options_text", None) or game_fields["options"]
+        options_text = getattr(req, "options_text", None) or game_fields.get("options", [])
+        question_id = req_data.get("question_id") or getattr(req, "question_id", None) or session_state.get("question_id")
 
         category = (
             req_data.get("category")
@@ -234,28 +211,12 @@ async def chat(request: Request) -> JSONResponse:
         verbosity = clamp01(req_data.get("verbosity", getattr(req, "verbosity", 0.5)), 0.5)
         transparency = clamp01(req_data.get("transparency", getattr(req, "transparency", 0.5)), 0.5)
 
-        incoming_help_mode = (
-            req_data.get("help_mode")
-            or getattr(req, "help_mode", None)
-            or parsed_help_mode
-            or None
-        )
-        
-        explicit_intent = (
-            req_data.get("intent")
-            or getattr(req, "intent", None)
-            or parsed_intent
-            or None
-        )
-        
-        resolved_user_text = (
-            req_data.get("raw_user_text")
-            or actual_user_message
-            or full_text
-            or ""
-        )
+        incoming_help_mode = req_data.get("help_mode") or getattr(req, "help_mode", None) or parsed_help_mode or None
+        explicit_intent = req_data.get("intent") or getattr(req, "intent", None) or parsed_intent or None
+
+        resolved_user_text = req_data.get("raw_user_text") or actual_user_message or full_text or ""
         resolved_user_text = str(resolved_user_text).strip()
-        
+
         intent = explicit_intent or detect_intent(resolved_user_text, incoming_help_mode)
         help_mode = incoming_help_mode or intent_to_help_mode(intent)
 
@@ -269,6 +230,7 @@ async def chat(request: Request) -> JSONResponse:
             chat_history=chat_history,
             question_text=question_text,
             options_text=options_text,
+            question_id=question_id,
             session_state=session_state,
             category=category,
         )
@@ -283,7 +245,6 @@ async def chat(request: Request) -> JSONResponse:
             "used_retrieval": result.used_retrieval,
             "used_generator": result.used_generator,
         }
-
         if isinstance(result.meta, dict):
             meta.update(result.meta)
 
@@ -291,20 +252,9 @@ async def chat(request: Request) -> JSONResponse:
         if session_id and returned_session_state:
             CHAT_SESSION_STATE[session_id] = dict(returned_session_state)
 
-        return JSONResponse(
-            {
-                "reply": result.reply,
-                "meta": meta,
-            }
-        )
+        return JSONResponse({"reply": result.reply, "meta": meta})
     except Exception as e:
-        return JSONResponse(
-            {
-                "error": type(e).__name__,
-                "detail": str(e),
-            },
-            status_code=500,
-        )
+        return JSONResponse({"error": type(e).__name__, "detail": str(e)}, status_code=500)
 
 
 @app.post("/log/session/start")
@@ -329,4 +279,4 @@ def research_sessions() -> Dict[str, Any]:
 
 @app.get("/research/session/{session_id}")
 def research_session(session_id: str) -> Dict[str, Any]:
-    return store.get_session(session_id)
+    return store.get_session(session_id)