adjust parallel search and rerank

app/facebook.py

@@ -11,7 +11,7 @@ import facebook
 import requests
 from .config import Settings, get_settings
 
-from .utils import timing_decorator_async, timing_decorator_sync
+from .utils import timing_decorator_async, timing_decorator_sync, _safe_truncate
 
 class FacebookClient:
     def __init__(self, app_secret: str, page_id: Optional[str] = None, page_token: Optional[str] = None, sender_id: Optional[str] = None):
@@ -128,12 +128,19 @@ class FacebookClient:
             "access_token": access_token,
             "message": message
         }
-
+        
+        log_payload = payload.copy()
+        log_payload['message'] = _safe_truncate(log_payload['message'])
+        log_payload['access_token'] = f"{log_payload.get('access_token', '')[:5]}..." if log_payload.get('access_token') else "None"
+        
+        logger.info(f"[FACEBOOK_FORWARDER] Forwarding message to {url} for recipient {recipient_id}. Payload (truncated): {log_payload}")
         try:
             response = requests.post(url, json=payload, timeout=10)
             response.raise_for_status()
+            logger.info(f"[FACEBOOK_FORWARDER] Forwarder API returned status {response.status_code}.")
             return response.json()
         except requests.RequestException as e:
+            logger.error(f"[FACEBOOK_FORWARDER] Error calling forwarder API: {e}")
             return {"error": str(e)}
 
     def _send_message_sync(self, page_access_token: str, recipient_id: str, message: str) -> dict:
@@ -199,30 +206,43 @@ class FacebookClient:
     async def send_message(self, page_access_token: Optional[str] = None, recipient_id: Optional[str] = None, message: str = "") -> dict:
         page_access_token = page_access_token or self.page_token
         recipient_id = recipient_id or self.sender_id
+
+        if not message or not str(message).strip():
+            logger.warning(f"[FACEBOOK_SEND] Attempted to send an empty or whitespace-only message to recipient {recipient_id}. Aborting.")
+            return {}
+
         if not page_access_token or not recipient_id:
+            logger.error(f"[FACEBOOK_SEND] Missing page_access_token or recipient_id. Cannot send message.")
             raise ValueError("FacebookClient: page_access_token and recipient_id must not be None when sending a message.")
         
+        logger.info(f"[FACEBOOK_SEND] Preparing to send message to recipient {recipient_id}. Full message (truncated): '{_safe_truncate(str(message))}'")
+
         # Format message
-        response_to_send = self.format_message(message.replace('**', '*')) if isinstance(message, str) else message
+        response_to_send = self.format_message(str(message).replace('**', '*'))
         
         # Chia nhỏ nếu quá dài
         messages = self.split_message(response_to_send)
         results = []
         
-        for msg in messages:
-            if len(msg) > 2000:
-                msg = msg[:2000]  # fallback cắt cứng
+        for i, msg_part in enumerate(messages, 1):
+            if len(msg_part) > 2000:
+                msg_part = msg_part[:2000]  # fallback cắt cứng
             
-            # Wrap sync HTTP call in thread executor để giữ async
-            loop = asyncio.get_event_loop()
-            result = await loop.run_in_executor(
-                None, 
-                self.send_message_forwarder, 
-                page_access_token, 
-                recipient_id, 
-                msg
-            )
-            results.append(result)
+            logger.info(f"[FACEBOOK_SEND] Sending part {i}/{len(messages)} to recipient {recipient_id}.")
+            try:
+                # Wrap sync HTTP call in thread executor để giữ async
+                loop = asyncio.get_event_loop()
+                result = await loop.run_in_executor(
+                    None, 
+                    self.send_message_forwarder, 
+                    page_access_token, 
+                    recipient_id, 
+                    msg_part
+                )
+                results.append(result)
+            except Exception as e:
+                logger.error(f"[FACEBOOK_SEND] Failed to send part {i}/{len(messages)} to {recipient_id}. Error: {e}")
+                results.append({"error": str(e), "part": i})
         
         return results[0] if results else {}
 

app/message_processor.py

@@ -250,11 +250,11 @@ class MessageProcessor:
         asyncio.create_task(self.facebook.send_message(message=get_random_message(FOUND_REGULATIONS_MESSAGES)))
     
         #TODO: thời gian rerank kéo dài hơn 30s. Tạm thời bỏ qua bước reranking cho đến khi tìm ra phương án optimize 
-        # try:
-        #     reranked = await self.channel.reranker.rerank(question, matches, top_k=10)
-        #     if reranked: matches = reranked
-        # except Exception as e:
-        #     logger.error(f"[RERANK] Lỗi khi rerank: {e}")
+        try:
+            reranked = await self.channel.reranker.rerank(question, matches, top_k=10)
+            if reranked: matches = reranked
+        except Exception as e:
+            logger.error(f"[RERANK] Lỗi khi rerank: {e}")
     
         # --- START: Logical Retry Loop for MAX_TOKENS/SAFETY ---
         max_logical_retries = 3
@@ -351,7 +351,7 @@ class MessageProcessor:
                 lambda: self.channel.supabase.match_documents(
                     embedding=embedding,
                     match_count=match_count,
-                    user_question=full_query_context,
+                    user_question=keyword,
                     vehicle_keywords=vehicle_keywords
                 )
             )
@@ -366,14 +366,14 @@ class MessageProcessor:
             # CẢNH BÁO: Bước này rất tốn kém và làm chậm hệ thống nếu chạy cho mỗi từ khóa.
             # Việc rerank nhiều lần sẽ làm tăng chi phí và có thể chạm giới hạn API.
             reranked_matches = matches # Mặc định trả về kết quả gốc nếu rerank bị lỗi hoặc tắt
-            # try:
-            #     # Sử dụng full_query_context để rerank sẽ cho kết quả tốt hơn là chỉ dùng keyword
-            #     reranked = await self.channel.reranker.rerank(full_query_context, matches, top_k=10) 
-            #     if reranked:
-            #         reranked_matches = reranked
-            #         logger.info(f"[SEARCH_RERANK_TASK] Rerank thành công cho từ khóa '{keyword}', còn lại {len(reranked_matches)} kết quả.")
-            # except Exception as e:
-            #     logger.error(f"[SEARCH_RERANK_TASK] Lỗi khi rerank cho từ khóa '{keyword}': {e}. Sử dụng kết quả gốc.")
+            try:
+                # Sử dụng full_query_context để rerank sẽ cho kết quả tốt hơn là chỉ dùng keyword
+                reranked = await self.channel.reranker.rerank(keyword, matches, top_k=10) 
+                if reranked:
+                    reranked_matches = reranked
+                    logger.info(f"[SEARCH_RERANK_TASK] Rerank thành công cho từ khóa '{keyword}', còn lại {len(reranked_matches)} kết quả.")
+            except Exception as e:
+                logger.error(f"[SEARCH_RERANK_TASK] Lỗi khi rerank cho từ khóa '{keyword}': {e}. Sử dụng kết quả gốc.")
             
             return reranked_matches
         except Exception as e: