Update chat_handler.py

chat_handler.py

@@ -1,5 +1,5 @@
 """
-Flare – Chat Handler  (v1.6 · detaylı log)
+Flare – Chat Handler  (v1.7 · parameter parsing düzeltmesi)
 ==========================================
 """
 
@@ -247,7 +247,10 @@ async def _handle_parameter_followup(session: Session, user_input: str, version)
     prompt = build_parameter_prompt(intent_config, missing, user_input, session.chat_history)
     raw = await spark_generate(session, prompt, user_input)
     
-    if not raw.startswith("#PARAMETERS:"):
+    # Try parsing with or without #PARAMETERS: prefix
+    success = _process_parameters(session, intent_config, raw)
+    
+    if not success:
         # Increment miss count
         session.missing_ask_count += 1
         log(f"⚠️ No parameters extracted, miss count: {session.missing_ask_count}")
@@ -257,12 +260,6 @@ async def _handle_parameter_followup(session: Session, user_input: str, version)
             return "Üzgünüm, istediğiniz bilgileri anlayamadım. Başka bir konuda yardımcı olabilir miyim?"
         return "Üzgünüm, anlayamadım. Lütfen tekrar söyler misiniz?"
     
-    # Process parameters
-    success = _process_parameters(session, intent_config, raw)
-    if not success:
-        log("❌ Parameter processing failed")
-        return "Girdiğiniz bilgilerde bir hata var. Lütfen kontrol edip tekrar deneyin."
-    
     # Check if we have all required parameters
     missing = _get_missing_parameters(session, intent_config)
     log(f"📊 Still missing params: {missing}")
@@ -292,13 +289,14 @@ async def _extract_parameters(session: Session, intent_config, user_input: str)
     prompt = build_parameter_prompt(intent_config, missing, user_input, session.chat_history)
     raw = await spark_generate(session, prompt, user_input)
     
-    if raw.startswith("#PARAMETERS:"):
-        success = _process_parameters(session, intent_config, raw)
-        if success:
-            missing = _get_missing_parameters(session, intent_config)
-            log(f"📊 After extraction, missing: {missing}")
+    # Try processing with flexible parsing
+    success = _process_parameters(session, intent_config, raw)
+    
+    if success:
+        missing = _get_missing_parameters(session, intent_config)
+        log(f"📊 After extraction, missing: {missing}")
     else:
-        log("⚠️ No #PARAMETERS tag in response")
+        log("⚠️ Failed to extract parameters from response")
     
     if missing:
         # Still missing parameters
@@ -323,10 +321,47 @@ def _get_missing_parameters(session: Session, intent_config) -> List[str]:
     return missing
 
 def _process_parameters(session: Session, intent_config, raw: str) -> bool:
-    """Process parameter extraction response"""
+    """Process parameter extraction response with flexible parsing"""
     try:
-        json_str = raw[len("#PARAMETERS:"):]
-        log(f"🔍 Parsing parameters JSON: {json_str[:200]}")
+        # Try to parse JSON, handling both with and without #PARAMETERS: prefix
+        json_str = raw
+        if raw.startswith("#PARAMETERS:"):
+            json_str = raw[len("#PARAMETERS:"):]
+            log(f"🔍 Found #PARAMETERS: prefix, removing it")
+        
+        # Clean up any trailing content after JSON
+        # Find the closing brace for the JSON object
+        brace_count = 0
+        json_end = -1
+        in_string = False
+        escape_next = False
+        
+        for i, char in enumerate(json_str):
+            if escape_next:
+                escape_next = False
+                continue
+                
+            if char == '\\':
+                escape_next = True
+                continue
+                
+            if char == '"' and not escape_next:
+                in_string = not in_string
+                continue
+                
+            if not in_string:
+                if char == '{':
+                    brace_count += 1
+                elif char == '}':
+                    brace_count -= 1
+                    if brace_count == 0:
+                        json_end = i + 1
+                        break
+        
+        if json_end > 0:
+            json_str = json_str[:json_end]
+            log(f"🔍 Cleaned JSON string: {json_str[:200]}")
+        
         data = json.loads(json_str)
         
         extracted = data.get("extracted", [])
@@ -361,6 +396,10 @@ def _process_parameters(session: Session, intent_config, raw: str) -> bool:
         
         return any_valid
         
+    except json.JSONDecodeError as e:
+        log(f"❌ JSON parsing error: {e}")
+        log(f"❌ Failed to parse: {raw[:200]}")
+        return False
     except Exception as e:
         log(f"❌ Parameter processing error: {e}")
         return False