fix retry error

app/embedding.py

@@ -4,7 +4,7 @@ from loguru import logger
 import httpx
 from tenacity import retry, stop_after_attempt, wait_exponential
 
-from .utils import timing_decorator
+from .utils import timing_decorator_async, timing_decorator_sync
 
 class EmbeddingClient:
     def __init__(self):
@@ -15,7 +15,7 @@ class EmbeddingClient:
         """
         self._client = httpx.AsyncClient()
 
-    @timing_decorator
+    @timing_decorator_async
     @retry(stop=stop_after_attempt(3), wait=wait_exponential(multiplier=1, min=4, max=10), reraise=True)
     async def create_embedding(self, text: str) -> List[float]:
         """
@@ -45,6 +45,7 @@ class EmbeddingClient:
             logger.error(f"Error creating embedding: {e}")
             raise
 
+    @timing_decorator_sync
     def cosine_similarity(self, embedding1: List[float], embedding2: List[float]) -> float:
         """
         Tính cosine similarity giữa hai embedding.

app/facebook.py

@@ -6,7 +6,7 @@ import httpx
 from fastapi import HTTPException, Request
 from loguru import logger
 
-from .utils import timing_decorator
+from .utils import timing_decorator_async, timing_decorator_sync
 
 class FacebookClient:
     def __init__(self, app_secret: str):
@@ -18,7 +18,7 @@ class FacebookClient:
         self.app_secret = app_secret
         self._client = httpx.AsyncClient()
 
-    @timing_decorator
+    @timing_decorator_async
     async def verify_webhook(self, token: str, challenge: str, verify_token: str) -> int:
         """
         Xác thực webhook Facebook bằng verify_token và trả về challenge.
@@ -47,7 +47,7 @@ class FacebookClient:
         
         return hmac.compare_digest(signature[7:], expected)
 
-    @timing_decorator
+    @timing_decorator_async
     async def send_message(self, page_access_token: str, recipient_id: str, message: str) -> Dict[str, Any]:
         """
         Gửi message tới user qua Facebook Messenger API.
@@ -70,7 +70,7 @@ class FacebookClient:
             logger.error(f"Error sending message to Facebook: {e}")
             raise HTTPException(status_code=500, detail="Failed to send message to Facebook")
 
-    @timing_decorator
+    @timing_decorator_sync
     def parse_message(self, body: Dict[str, Any]) -> Optional[Dict[str, Any]]:
         """
         Parse message từ payload Facebook webhook.

app/main.py

@@ -12,7 +12,7 @@ from .facebook import FacebookClient
 from .sheets import SheetsClient
 from .supabase_db import SupabaseClient
 from .embedding import EmbeddingClient
-from .utils import setup_logging, extract_command, extract_keywords, timing_decorator, ensure_log_dir, validate_config
+from .utils import setup_logging, extract_command, extract_keywords, timing_decorator_async, timing_decorator_sync, ensure_log_dir, validate_config
 from .constants import VEHICLE_KEYWORDS, SHEET_RANGE
 from .health import router as health_router
 
@@ -88,7 +88,7 @@ async def verify_webhook(request: Request):
     )
 
 @app.post("/webhook")
-@timing_decorator
+@timing_decorator_async
 async def webhook(request: Request):
     """
     Nhận và xử lý message từ Facebook Messenger webhook.

app/sheets.py

@@ -8,7 +8,7 @@ import pickle
 from datetime import datetime
 from loguru import logger
 
-from .utils import timing_decorator
+from .utils import timing_decorator_sync
 from .constants import SHEET_RANGE
 
 SCOPES = ['https://www.googleapis.com/auth/spreadsheets']
@@ -26,7 +26,7 @@ class SheetsClient:
         self.creds = None
         self.service = None
 
-    @timing_decorator
+    @timing_decorator_sync
     def authenticate(self) -> None:
         """
         Xác thực với Google Sheets API, tạo self.service.
@@ -50,8 +50,8 @@ class SheetsClient:
 
         self.service = build('sheets', 'v4', credentials=self.creds)
 
-    @timing_decorator
-    async def get_conversation_history(self, user_id: str, page_id: str) -> List[Dict[str, Any]]:
+    @timing_decorator_sync
+    def get_conversation_history(self, user_id: str, page_id: str) -> List[Dict[str, Any]]:
         """
         Lấy lịch sử hội thoại của user từ Google Sheets.
         Input: user_id (str), page_id (str)
@@ -87,8 +87,8 @@ class SheetsClient:
             logger.error(f"Error getting conversation history: {e}")
             return []
 
-    @timing_decorator
-    async def log_conversation(
+    @timing_decorator_sync
+    def log_conversation(
         self,
         user_id: str,
         page_id: str,

app/supabase_db.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Optional
 from supabase.client import create_client, Client
 from loguru import logger
 
-from .utils import timing_decorator
+from .utils import timing_decorator_sync
 
 class SupabaseClient:
     def __init__(self, url: str, key: str):
@@ -13,7 +13,7 @@ class SupabaseClient:
         """
         self.client: Client = create_client(url, key)
 
-    @timing_decorator
+    @timing_decorator_sync
     def get_page_token(self, page_id: str):
         """
         Lấy access token của Facebook page từ Supabase.
@@ -29,7 +29,7 @@ class SupabaseClient:
             logger.error(f"Error getting page token: {e}")
             return None
 
-    @timing_decorator
+    @timing_decorator_sync
     def match_documents(self, embedding: List[float], match_count: int = 5):
         """
         Truy vấn vector similarity search qua RPC match_documents.
@@ -53,7 +53,7 @@ class SupabaseClient:
             logger.error(f"Error matching documents: {e}")
             return []
 
-    @timing_decorator
+    @timing_decorator_sync
     def store_embedding(self, text: str, embedding: List[float], metadata: Dict[str, Any]):
         """
         Lưu embedding vào Supabase.

app/utils.py

@@ -4,11 +4,10 @@ from loguru import logger
 from typing import Any, Callable
 import os
 
-def timing_decorator(func: Callable) -> Callable:
+def timing_decorator_async(func: Callable) -> Callable:
     """
     Decorator đo thời gian thực thi của hàm async, log thời lượng xử lý.
-    Input: func (Callable) - hàm async cần đo.
-    Output: Kết quả trả về của func.
+    Dùng cho async def.
     """
     @wraps(func)
     async def wrapper(*args: Any, **kwargs: Any) -> Any:
@@ -16,7 +15,22 @@ def timing_decorator(func: Callable) -> Callable:
         result = await func(*args, **kwargs)
         end_time = time.time()
         duration = end_time - start_time
-        logger.info(f"{func.__name__} took {duration:.2f} seconds to execute")
+        logger.info(f"[TIMING][async] {func.__name__} took {duration:.2f} seconds to execute")
+        return result
+    return wrapper
+
+def timing_decorator_sync(func: Callable) -> Callable:
+    """
+    Decorator đo thời gian thực thi của hàm sync, log thời lượng xử lý.
+    Dùng cho def thường.
+    """
+    @wraps(func)
+    def wrapper(*args: Any, **kwargs: Any) -> Any:
+        start_time = time.time()
+        result = func(*args, **kwargs)
+        end_time = time.time()
+        duration = end_time - start_time
+        logger.info(f"[TIMING][sync] {func.__name__} took {duration:.2f} seconds to execute")
         return result
     return wrapper