Update chat_handler.py

chat_handler.py

@@ -1,14 +1,15 @@
 """
-Flare – Chat Handler (router edition)
-=====================================
-app.py → from chat_handler import router
+Flare – Chat Handler (header edition)
+====================================
+/start_session -> JSON body döner
+/chat          -> X-Session-ID header + {"user_input": "..."}
 """
 
 import re, json, uuid, httpx, commentjson
 from datetime import datetime
 from typing import Dict, List, Optional
 
-from fastapi import APIRouter, HTTPException
+from fastapi import APIRouter, HTTPException, Header, Request
 from pydantic import BaseModel
 
 from prompt_builder import build_intent_prompt, build_parameter_prompt, log
@@ -46,7 +47,7 @@ async def spark_generate(prompt: str) -> str:
 # ----------------------------------------------------------------------------
 # FASTAPI ROUTER
 # ----------------------------------------------------------------------------
-router = APIRouter()          # <<–– exported to app.py
+router = APIRouter()
 
 @router.get("/")
 def health():
@@ -55,9 +56,12 @@ def health():
 # Schemas
 class StartSessionRequest(BaseModel):
     project_name: str
-class ChatRequest(BaseModel):
-    session_id: str
+
+class ChatBody(BaseModel):
     user_input: str
+    # session_id optional for legacy
+    session_id: Optional[str] = None
+
 class ChatResponse(BaseModel):
     session_id: str
     answer: str
@@ -72,20 +76,25 @@ async def start_session(req: StartSessionRequest):
     return ChatResponse(session_id=s.id, answer="Nasıl yardımcı olabilirim?")
 
 @router.post("/chat", response_model=ChatResponse)
-async def chat(req: ChatRequest):
-    if req.session_id not in SESSIONS:
-        raise HTTPException(404, "Invalid session")
-    s = SESSIONS[req.session_id]
-    user_msg = req.user_input.strip()
+async def chat(body: ChatBody,
+               request: Request,
+               x_session_id: Optional[str] = Header(None)):
+    # 1) Session ID alma: header > body
+    sid = x_session_id or body.session_id
+    if not sid or sid not in SESSIONS:
+        raise HTTPException(404, "Invalid or missing session")
+
+    s = SESSIONS[sid]
+    user_msg = body.user_input.strip()
     s.history.append({"role": "user", "content": user_msg})
 
-    # --- follow-up? ---
+    # ---------------- follow-up modunda mı?
     if s.awaiting:
         answer = await _followup(s, user_msg)
         s.history.append({"role": "assistant", "content": answer})
         return ChatResponse(session_id=s.id, answer=answer)
 
-    # --- intent detect ---
+    # ---------------- intent detect
     gen_prompt = s.project["versions"][0]["general_prompt"]
     intent_prompt = build_intent_prompt(gen_prompt, s.history, user_msg)
     intent_out = await spark_generate(intent_prompt)
@@ -106,21 +115,21 @@ async def chat(req: ChatRequest):
     return ChatResponse(session_id=s.id, answer=answer)
 
 # ----------------------------------------------------------------------------
-# Helper funcs  (değişmedi, sadece router’a ihtiyaç yok)
+# Helper funcs (aynı)
 # ----------------------------------------------------------------------------
 def _find_intent(project, name_):
     return next((i for i in project["versions"][0]["intents"] if i["name"] == name_), None)
 
-def _missing(session, intent_cfg):
-    return [p["name"] for p in intent_cfg["parameters"] if p["variable_name"] not in session.variables]
+def _missing(s, intent_cfg):
+    return [p["name"] for p in intent_cfg["parameters"] if p["variable_name"] not in s.variables]
 
 async def _handle_intent(s, intent_cfg, user_msg):
     missing = _missing(s, intent_cfg)
     if missing:
         p_prompt = build_parameter_prompt(intent_cfg, missing, user_msg, s.history)
-        p_out    = await spark_generate(p_prompt)
-        if p_out.startswith("#PARAMETERS:"):
-            if bad := _process_params(s, intent_cfg, p_out):
+        out      = await spark_generate(p_prompt)
+        if out.startswith("#PARAMETERS:"):
+            if bad := _process_params(s, intent_cfg, out):
                 return bad
             missing = _missing(s, intent_cfg)
     if missing:
@@ -134,10 +143,10 @@ async def _followup(s, user_msg):
     intent_cfg = s.awaiting["intent"]
     missing    = s.awaiting["missing"]
     p_prompt   = build_parameter_prompt(intent_cfg, missing, user_msg, s.history)
-    p_out      = await spark_generate(p_prompt)
-    if not p_out.startswith("#PARAMETERS:"):
+    out        = await spark_generate(p_prompt)
+    if not out.startswith("#PARAMETERS:"):
         return "Üzgünüm, anlayamadım."
-    if bad := _process_params(s, intent_cfg, p_out):
+    if bad := _process_params(s, intent_cfg, out):
         return bad
     missing = _missing(s, intent_cfg)
     if missing:
@@ -147,11 +156,11 @@ async def _followup(s, user_msg):
     s.awaiting = None
     return await _call_api(s, intent_cfg)
 
-def _process_params(s, intent_cfg, p_out):
+def _process_params(s, intent_cfg, out):
     try:
-        data = json.loads(p_out[len("#PARAMETERS:"):])
+        data = json.loads(out[len("#PARAMETERS:"):])
     except json.JSONDecodeError:
-        return "Üzgünüm, parametreleri çözemiyorum."
+        return "Parametreleri çözemedim."
     for pair in data.get("extracted", []):
         p_cfg = next(p for p in intent_cfg["parameters"] if p["name"] == pair["name"])
         if not _valid(p_cfg, pair["value"]):
@@ -165,9 +174,8 @@ def _valid(p_cfg, val):
 
 async def _call_api(s, intent_cfg):
     api = APIS[intent_cfg["action"]]
-    token   = "testtoken"
+    token = "testtoken"
     headers = {k: v.replace("{{token}}", token) for k, v in api["headers"].items()}
-
     body = json.loads(json.dumps(api["body_template"]))
     for k, v in body.items():
         if isinstance(v, str) and v.startswith("{{") and v.endswith("}}"):