Update chat_handler.py

chat_handler.py

@@ -1,6 +1,6 @@
 """
-Flare – Chat Handler  (small-talk trim + resmî selamlama)
-=========================================================
+Flare – Chat Handler  (regex-intent, small-talk trim, boş-yanıt fallback)
+========================================================================
 """
 
 import re, json, uuid, sys, httpx, commentjson
@@ -17,25 +17,31 @@ from prompt_builder import build_intent_prompt, build_parameter_prompt, log
 # HELPERS
 # ─────────────────────────
 def _trim_smalltalk(raw: str) -> str:
-    """
-    Kısa selamlaşma çıktısında yalnızca ilk blok (etiketsiz) kısmını döndürür.
-    """
+    """Keep only the very first greeting sentence; cut everything else."""
     # intent etiketi öncesini al
     pos_intent = raw.find("#DETECTED_INTENT")
     if pos_intent != -1:
         raw = raw[:pos_intent]
 
-    # arka arkaya 'assistant' blokları varsa ilkini al
-    pos_asst = raw.lower().find("assistant")
-    if pos_asst != -1:
-        raw = raw[:pos_asst]
+    # model kendi prompt'umuzu eklediyse kes
+    pos_sys = raw.find("⚠️")
+    if pos_sys != -1:
+        raw = raw[:pos_sys]
 
+    # ilk 'assistant' bloğundan sonrası at
+    for marker in ["assistant\n\n", "assistant\n", "assistant"]:
+        idx = raw.lower().find(marker)
+        if 0 <= idx <= 2:
+            raw = raw[idx + len(marker):]
+
+    # resmî selam: Hoş geldiniz
+    raw = re.sub(r"Hoş[\s-]?geldin(iz)?", "Hoş geldiniz", raw, flags=re.IGNORECASE)
     return raw.strip()
 
 
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 # CONFIG LOAD
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 def load_config(path: str = "service_config.jsonc") -> dict:
     try:
         with open(path, encoding="utf-8") as f:
@@ -53,9 +59,9 @@ SPARK_URL = CFG["config"]["spark_endpoint"].rstrip("/") + "/generate"
 ALLOWED_INTENTS = {"flight-booking", "flight-info", "booking-cancel"}
 
 
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 # SESSION
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 class Session:
     def __init__(self, project_name: str):
         self.id = str(uuid.uuid4())
@@ -68,9 +74,9 @@ class Session:
 SESSIONS: Dict[str, Session] = {}
 
 
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 # SPARK CLIENT
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 async def spark_generate(session: Session,
                          system_prompt: str,
                          user_input: str) -> str:
@@ -85,14 +91,13 @@ async def spark_generate(session: Session,
         r.raise_for_status()
         d = r.json()
         raw = (d.get("assistant") or d.get("model_answer") or d.get("text", ""))
-        log(f"🪄 Spark raw: {raw!r}")          # ham içerik
+        log(f"🪄 Spark raw: {raw!r}")
         return raw.strip()
-        return (d.get("assistant") or d.get("model_answer") or d.get("text", "")).strip()
 
 
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 # FASTAPI ROUTER
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 router = APIRouter()
 
 @router.get("/")
@@ -108,16 +113,17 @@ class ChatResponse(BaseModel):
     answer: str
 
 
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 # ENDPOINTS
-# ─────────────────────────
+# ---------------------------------------------------------------------- #
 @router.post("/start_session", response_model=ChatResponse)
 async def start_session(req: StartSessionRequest):
     if req.project_name not in PROJECTS:
         raise HTTPException(404, "Unknown project")
     s = Session(req.project_name)
     SESSIONS[s.id] = s
-    return ChatResponse(session_id=s.id, answer="Hoş geldiniz! Size nasıl yardımcı olabilirim?")
+    return ChatResponse(session_id=s.id,
+                        answer="Hoş geldiniz! Size nasıl yardımcı olabilirim?")
 
 @router.post("/chat", response_model=ChatResponse)
 async def chat(body: ChatBody, x_session_id: str = Header(...)):
@@ -137,42 +143,35 @@ async def chat(body: ChatBody, x_session_id: str = Header(...)):
     # intent detect
     gen_prompt  = s.project["versions"][0]["general_prompt"]
     intents_cfg = s.project["versions"][0]["intents"]
-    intent_raw = await spark_generate(
+    intent_raw  = await spark_generate(
         s,
         build_intent_prompt(gen_prompt, s.history, user_msg, intents_cfg),
         user_msg
     )
 
-    # ─ intent_raw geldi ─
+    # boş çıktıyı yakala
     if intent_raw.strip() == "":
-        fallback = "Üzgünüm, şu anda isteğinizi işlemekte zorlanıyorum. Lütfen mesajınızı tekrar edebilir misiniz?"
+        fallback = "Üzgünüm, mesajınızı anlayamadım. Lütfen tekrar dener misiniz?"
         s.history.append({"role": "assistant", "content": fallback})
         return ChatResponse(session_id=s.id, answer=fallback)
 
-    # small-talk yolu
+    # küçük selamlaşma yolu
     if not intent_raw.startswith("#DETECTED_INTENT:"):
         clean = _trim_smalltalk(intent_raw)
-        # Selamlama resmî değilse düzelt
-        if "Hoşgeldin" in clean or "Hoş geldin" in clean:
-            clean = clean.replace("Hoşgeldin", "Hoş geldiniz").replace("Hoş geldin", "Hoş geldiniz")
         s.history.append({"role": "assistant", "content": clean})
         return ChatResponse(session_id=s.id, answer=clean)
 
-    intent_name = intent_raw.split(":", 1)[1].strip()
+    # regex ile intent + extras ayır
+    m = re.search(r"#DETECTED_INTENT:\s*([A-Za-z0-9_-]+)", intent_raw)
+    intent_name = m.group(1) if m else ""
+    extras = intent_raw[m.end():].strip() if m else ""
 
     # kısa mesaj guard
-    if len(user_msg.split()) < 3:
-        clean = _trim_smalltalk(intent_raw)
+    if len(user_msg.split()) < 3 or intent_name not in ALLOWED_INTENTS:
+        clean = _trim_smalltalk(extras or intent_raw)
         s.history.append({"role": "assistant", "content": clean})
         return ChatResponse(session_id=s.id, answer=clean)
 
-    # allowed-set
-    if intent_name not in ALLOWED_INTENTS:
-        clean = _trim_smalltalk(intent_raw)
-        s.history.append({"role": "assistant", "content": clean})
-        return ChatResponse(session_id=s.id, answer=clean)
-
-    # intent handling ...
     intent_cfg = _find_intent(s.project, intent_name)
     if not intent_cfg:
         err = "Üzgünüm, anlayamadım."
@@ -183,9 +182,10 @@ async def chat(body: ChatBody, x_session_id: str = Header(...)):
     s.history.append({"role": "assistant", "content": answer})
     return ChatResponse(session_id=s.id, answer=answer)
 
-# --------------------------------------------------------------------------- #
-# HELPER FUNCS (değişmeyen kısımlar)
-# --------------------------------------------------------------------------- #
+
+# ---------------------------------------------------------------------- #
+# HELPER FUNCS  (değişmedi)
+# ---------------------------------------------------------------------- #
 def _find_intent(project, name_):
     return next((i for i in project["versions"][0]["intents"] if i["name"] == name_), None)
 
@@ -210,15 +210,16 @@ async def _handle_intent(s, intent_cfg, user_msg):
 
 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_raw = await spark_generate(s, p_prompt, user_msg)
+    missing    = s.awaiting["missing"]
+    p_prompt   = build_parameter_prompt(intent_cfg, missing, user_msg, s.history)
+    p_raw      = await spark_generate(s, p_prompt, user_msg)
     if not p_raw.startswith("#PARAMETERS:") or _process_params(s, intent_cfg, p_raw):
         return "Üzgünüm, anlayamadım."
     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)
@@ -254,11 +255,9 @@ async def _call_api(s, intent_cfg):
             api_json = r.json()
     except Exception:
         return intent_cfg["fallback_error_prompt"]
-    summary_prompt = api["response_prompt"].replace("{{api_response}}", json.dumps(api_json, ensure_ascii=False))
-    
-    summary = await spark_generate(s, summary_prompt, "")
+
+    sum_prompt = api["response_prompt"].replace("{{api_response}}", json.dumps(api_json, ensure_ascii=False))
+    summary    = await spark_generate(s, sum_prompt, "")
     if summary.strip() == "":
-        # yedek plan
-        summary = f"İşlem sonuç verisi: {json.dumps(api_json, ensure_ascii=False)}"
-        
+        summary = f"İşlem sonucu: {json.dumps(api_json, ensure_ascii=False)}"
     return summary