Update chat_handler.py

chat_handler.py

@@ -1,9 +1,10 @@
 """
-Flare – Chat Handler  (Spark /generate format)
-=============================================
+Flare – Chat Handler  (Spark /generate + safe-intent)
+====================================================
 • X-Session-ID header
-• /generate payload:
-  {project_name, user_input, context, system_prompt}
+• Spark payload: {project_name, user_input, context, system_prompt}
+• Eğer model #DETECTED_INTENT:<label> döndürür ve <label> izinli liste
+  dışında ise, mesaj small-talk olarak kabul edilir.
 """
 
 import re, json, uuid, httpx, commentjson
@@ -22,6 +23,7 @@ CFG = commentjson.load(open("service_config.jsonc", encoding="utf-8"))
 PROJECTS = {p["name"]: p for p in CFG["projects"]}
 APIS     = {a["name"]: a for a in CFG["apis"]}
 SPARK_URL = CFG["config"]["spark_endpoint"].rstrip("/") + "/generate"
+ALLOWED_INTENTS = {"flight-booking", "flight-info", "booking-cancel"}
 
 # --------------------------------------------------------------------------- #
 # SESSION
@@ -30,7 +32,7 @@ class Session:
     def __init__(self, project_name: str):
         self.id = str(uuid.uuid4())
         self.project = PROJECTS[project_name]
-        self.history: List[Dict[str, str]] = []     # {role, content}
+        self.history: List[Dict[str, str]] = []   # {"role","content"}
         self.variables: Dict[str, str] = {}
         self.awaiting: Optional[Dict] = None
         log(f"🆕 Session {self.id} for {project_name}")
@@ -38,24 +40,24 @@ class Session:
 SESSIONS: Dict[str, Session] = {}
 
 # --------------------------------------------------------------------------- #
-# Spark client
+# SPARK CLIENT
 # --------------------------------------------------------------------------- #
 async def spark_generate(session: Session,
                          system_prompt: str,
                          user_input: str) -> str:
-    """Send request to Spark /generate endpoint"""
     payload = {
         "project_name": session.project["name"],
         "user_input": user_input,
-        "context": session.history[-10:],   # only last 10 turns
+        "context": session.history[-10:],   # last 10 turns
         "system_prompt": system_prompt
     }
     async with httpx.AsyncClient(timeout=60) as c:
         r = await c.post(SPARK_URL, json=payload)
         r.raise_for_status()
-        # Spark örneğinde cevap key'i "model_answer" olabilir.
         data = r.json()
-        return data.get("assistant") or data.get("model_answer") or data.get("text", "")
+        return (data.get("assistant") or
+                data.get("model_answer") or
+                data.get("text", "")).strip()
 
 # --------------------------------------------------------------------------- #
 # FASTAPI ROUTER
@@ -97,22 +99,30 @@ async def chat(body: ChatBody,
     user_msg = body.user_input.strip()
     s.history.append({"role": "user", "content": user_msg})
 
-    # ---------------- follow-up modunda mı?
+    # ---------------- Follow-up? ----------------
     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 detection ----------------
+    # ---------------- Intent detection ----------------
     gen_prompt = s.project["versions"][0]["general_prompt"]
-    intent_out = await spark_generate(s, gen_prompt, user_msg)
-
-    if not intent_out.startswith("#DETECTED_INTENT:"):
-        s.history.append({"role": "assistant", "content": intent_out})
-        return ChatResponse(session_id=s.id, answer=intent_out)
-
-    intent_name = intent_out.split(":", 1)[1].strip()
-    intent_cfg  = _find_intent(s.project, intent_name)
+    intent_raw = await spark_generate(s, gen_prompt, user_msg)
+
+    # --- Etiket yoksa → small talk cevabı olduğu gibi döndür
+    if not intent_raw.startswith("#DETECTED_INTENT:"):
+        s.history.append({"role": "assistant", "content": intent_raw})
+        return ChatResponse(session_id=s.id, answer=intent_raw)
+
+    # --- Etiket var → ayrıştır
+    intent_name = intent_raw.split(":", 1)[1].strip()
+    if intent_name not in ALLOWED_INTENTS:
+        # Etiket geçersiz → small talk olarak ilk kısmı döndür
+        clean = intent_raw.split("#DETECTED_INTENT")[0].split("\nassistant")[0].strip()
+        s.history.append({"role": "assistant", "content": clean})
+        return ChatResponse(session_id=s.id, answer=clean)
+
+    intent_cfg = _find_intent(s.project, intent_name)
     if not intent_cfg:
         err = "Üzgünüm, anlayamadım."
         s.history.append({"role": "assistant", "content": err})
@@ -123,10 +133,11 @@ async def chat(body: ChatBody,
     return ChatResponse(session_id=s.id, answer=answer)
 
 # --------------------------------------------------------------------------- #
-# Helper functions
+# HELPER FUNCS
 # --------------------------------------------------------------------------- #
 def _find_intent(project, name_):
-    return next((i for i in project["versions"][0]["intents"] if i["name"] == name_), None)
+    return next((i for i in project["versions"][0]["intents"]
+                 if i["name"] == name_), None)
 
 def _missing(s, intent_cfg):
     return [p["name"] for p in intent_cfg["parameters"]
@@ -134,17 +145,19 @@ def _missing(s, intent_cfg):
 
 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(s, p_prompt, user_msg)
-        if p_out.startswith("#PARAMETERS:"):
-            if bad := _process_params(s, intent_cfg, p_out):
+        p_raw    = await spark_generate(s, p_prompt, user_msg)
+        if p_raw.startswith("#PARAMETERS:"):
+            if bad := _process_params(s, intent_cfg, p_raw):
                 return bad
             missing = _missing(s, intent_cfg)
 
     if missing:
         s.awaiting = {"intent": intent_cfg, "missing": missing}
-        cap = next(p for p in intent_cfg["parameters"] if p["name"] == missing[0])["caption"]
+        cap = next(p for p in intent_cfg["parameters"]
+                   if p["name"] == missing[0])["caption"]
         return f"{cap} nedir?"
 
     s.awaiting = None
@@ -154,28 +167,30 @@ 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(s, p_prompt, user_msg)
-    if not p_out.startswith("#PARAMETERS:"):
+    p_raw      = await spark_generate(s, p_prompt, user_msg)
+    if not p_raw.startswith("#PARAMETERS:"):
         return "Üzgünüm, anlayamadım."
-    if bad := _process_params(s, intent_cfg, p_out):
+    if bad := _process_params(s, intent_cfg, p_raw):
         return bad
 
     missing = _missing(s, intent_cfg)
     if missing:
         s.awaiting["missing"] = missing
-        cap = next(p for p in intent_cfg["parameters"] if p["name"] == missing[0])["caption"]
+        cap = next(p for p in intent_cfg["parameters"]
+                   if p["name"] == missing[0])["caption"]
         return f"{cap} nedir?"
 
     s.awaiting = None
     return await _call_api(s, intent_cfg)
 
-def _process_params(s, intent_cfg, p_out):
+def _process_params(s, intent_cfg, p_raw):
     try:
-        data = json.loads(p_out[len("#PARAMETERS:"):])
+        data = json.loads(p_raw[len("#PARAMETERS:"):])
     except json.JSONDecodeError:
         return "Parametreleri çözemedim."
     for pair in data.get("extracted", []):
-        p_cfg = next(p for p in intent_cfg["parameters"] if p["name"] == pair["name"])
+        p_cfg = next(p for p in intent_cfg["parameters"]
+                     if p["name"] == pair["name"])
         if not _valid(p_cfg, pair["value"]):
             return p_cfg.get("invalid_prompt", "Geçersiz değer.")
         s.variables[p_cfg["variable_name"]] = pair["value"]
@@ -189,13 +204,16 @@ async def _call_api(s, intent_cfg):
     api = APIS[intent_cfg["action"]]
     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("}}"):
             body[k] = s.variables.get(v[2:-2], "")
+
     try:
         async with httpx.AsyncClient(timeout=api["timeout_seconds"]) as c:
-            r = await c.request(api["method"], api["url"], headers=headers, json=body)
+            r = await c.request(api["method"], api["url"],
+                                headers=headers, json=body)
             r.raise_for_status()
             api_json = r.json()
     except Exception: