Update chat_handler.py

chat_handler.py

@@ -1,8 +1,6 @@
 """
-Flare – Chat Handler  (small-talk clean fix)
-===========================================
-• Eğer model çıktısı #DETECTED_INTENT ile BAŞLAMIYORSA
-  cevabı '#DETECTED_INTENT' veya '\nassistant' görüldüğü yere kadar kes.
+Flare – Chat Handler  (small-talk trim + resmî selamlama)
+=========================================================
 """
 
 import re, json, uuid, sys, httpx, commentjson
@@ -14,8 +12,31 @@ from commentjson import JSONLibraryException
 
 from prompt_builder import build_intent_prompt, build_parameter_prompt, log
 
-# ── Config yükleme (değişmedi) ───────────────────────────────────────────────
-def load_config(path="service_config.jsonc") -> dict:
+
+# ─────────────────────────
+# 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.
+    """
+    # 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]
+
+    return raw.strip()
+
+
+# ─────────────────────────
+# CONFIG LOAD
+# ─────────────────────────
+def load_config(path: str = "service_config.jsonc") -> dict:
     try:
         with open(path, encoding="utf-8") as f:
             cfg = commentjson.load(f)
@@ -31,7 +52,10 @@ 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 objesi (değişmedi) ───────────────────────────────────────────────
+
+# ─────────────────────────
+# SESSION
+# ─────────────────────────
 class Session:
     def __init__(self, project_name: str):
         self.id = str(uuid.uuid4())
@@ -43,7 +67,10 @@ class Session:
 
 SESSIONS: Dict[str, Session] = {}
 
-# ── Spark client (değişmedi) ─────────────────────────────────────────────────
+
+# ─────────────────────────
+# SPARK CLIENT
+# ─────────────────────────
 async def spark_generate(session: Session,
                          system_prompt: str,
                          user_input: str) -> str:
@@ -56,12 +83,13 @@ async def spark_generate(session: Session,
     async with httpx.AsyncClient(timeout=60) as c:
         r = await c.post(SPARK_URL, json=payload)
         r.raise_for_status()
-        data = r.json()
-        return (data.get("assistant") or
-                data.get("model_answer") or
-                data.get("text", "")).strip()
+        d = r.json()
+        return (d.get("assistant") or d.get("model_answer") or d.get("text", "")).strip()
 
-# ── FastAPI router setup (değişmedi) ─────────────────────────────────────────
+
+# ─────────────────────────
+# FASTAPI ROUTER
+# ─────────────────────────
 router = APIRouter()
 
 @router.get("/")
@@ -76,14 +104,17 @@ class ChatResponse(BaseModel):
     session_id: str
     answer: str
 
-# ── Endpoints ────────────────────────────────────────────────────────────────
+
+# ─────────────────────────
+# 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="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(...)):
@@ -94,42 +125,45 @@ async def chat(body: ChatBody, x_session_id: str = Header(...)):
     user_msg = body.user_input.strip()
     s.history.append({"role": "user", "content": user_msg})
 
-    # follow-up? ----------------------------------------------------------------
+    # 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 detect -------------------------------------------------------------
-    gen_prompt   = s.project["versions"][0]["general_prompt"]
-    intents_cfg  = s.project["versions"][0]["intents"]
-    intent_raw   = await spark_generate(
+    # intent detect
+    gen_prompt  = s.project["versions"][0]["general_prompt"]
+    intents_cfg = s.project["versions"][0]["intents"]
+    intent_raw = await spark_generate(
         s,
         build_intent_prompt(gen_prompt, s.history, user_msg, intents_cfg),
         user_msg
     )
 
-    # small-talk? ---------------------------------------------------------------
+    # small-talk yolu
     if not intent_raw.startswith("#DETECTED_INTENT:"):
-        clean = intent_raw.split("#DETECTED_INTENT")[0].split("\nassistant")[0].strip()
+        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()
 
-    # short-message guard -------------------------------------------------------
+    # kısa mesaj guard
     if len(user_msg.split()) < 3:
-        clean = intent_raw.split("#DETECTED_INTENT")[0].split("\nassistant")[0].strip()
+        clean = _trim_smalltalk(intent_raw)
         s.history.append({"role": "assistant", "content": clean})
         return ChatResponse(session_id=s.id, answer=clean)
 
-    # allowed intent? -----------------------------------------------------------
+    # allowed-set
     if intent_name not in ALLOWED_INTENTS:
-        clean = intent_raw.split("#DETECTED_INTENT")[0].split("\nassistant")[0].strip()
+        clean = _trim_smalltalk(intent_raw)
         s.history.append({"role": "assistant", "content": clean})
         return ChatResponse(session_id=s.id, answer=clean)
 
-    # devam: parametre akışı (değişmedi) ----------------------------------------
+    # intent handling ...
     intent_cfg = _find_intent(s.project, intent_name)
     if not intent_cfg:
         err = "Üzgünüm, anlayamadım."