quick fix timestamp

app/sheets.py

@@ -17,19 +17,11 @@ from .constants import SHEET_RANGE
 SCOPES = ['https://www.googleapis.com/auth/spreadsheets']
 
 def generate_conversation_id(user_id: str, page_id: str, timestamp: str) -> str:
-    """
-    Tạo conversation_id duy nhất dựa trên user_id, page_id và timestamp.
-    """
     hash_input = f"{user_id}:{page_id}:{timestamp}"
     return hashlib.sha256(hash_input.encode()).hexdigest()[:32]
 
 class SheetsClient:
     def __init__(self, credentials_file: str, token_file: str, sheet_id: str):
-        """
-        Khởi tạo SheetsClient với thông tin xác thực và sheet_id.
-        Input: credentials_file (str), token_file (str), sheet_id (str)
-        Output: SheetsClient instance.
-        """
         self.credentials_file = credentials_file
         self.token_file = token_file
         self.sheet_id = sheet_id
@@ -38,12 +30,6 @@ class SheetsClient:
 
     @timing_decorator_sync
     def authenticate(self) -> None:
-        """
-        Xác thực với Google Sheets API, tạo self.service.
-        Đọc credentials từ biến môi trường GOOGLE_SHEETS_CREDENTIALS_JSON nếu có, nếu không thì dùng file.
-        Input: None
-        Output: None (raise exception nếu lỗi)
-        """
         credentials_json = os.getenv("GOOGLE_SHEETS_CREDENTIALS_JSON")
         if credentials_json:
             info = json.loads(credentials_json)
@@ -53,7 +39,6 @@ class SheetsClient:
             if os.path.exists(self.token_file):
                 with open(self.token_file, 'rb') as token:
                     self.creds = pickle.load(token)
-
             if not self.creds or not self.creds.valid:
                 if self.creds and self.creds.expired:
                     self.creds.refresh(Request())
@@ -61,24 +46,15 @@ class SheetsClient:
                     flow = InstalledAppFlow.from_client_secrets_file(
                         self.credentials_file, SCOPES)
                     self.creds = flow.run_local_server(port=0)
-
                 with open(self.token_file, 'wb') as token:
                     pickle.dump(self.creds, token)
-
         self.service = build('sheets', 'v4', credentials=self.creds)
 
     @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 chưa hoàn thành của user từ Google Sheets.
-        Input: user_id (str), page_id (str)
-        Output: list[dict] các dòng hội thoại chưa hoàn thành.
-        """
         try:
             if not self.service:
                 self.authenticate()
-            if not self.service:
-                raise RuntimeError("Google Sheets service not initialized")
             range_name = SHEET_RANGE
             result = self.service.spreadsheets().values().get(
                 spreadsheetId=self.sheet_id,
@@ -90,10 +66,10 @@ class SheetsClient:
                 row = row + [""] * (14 - len(row))
                 try:
                     timestamps = json.loads(row[12]) if row[12] else []
+                    if not isinstance(timestamps, list):
+                        timestamps = [str(timestamps)]
                 except Exception:
                     timestamps = []
-                if not isinstance(timestamps, list):
-                    timestamps = [timestamps]
                 if row[4] == user_id and row[5] == page_id:
                     history.append({
                         'conversation_id': row[0],
@@ -108,7 +84,7 @@ class SheetsClient:
                         'originalpurpose': row[9],
                         'originalquestion': row[10],
                         'systemresponse': row[11],
-                        'timestamp': row[12],
+                        'timestamp': timestamps,
                         'isdone': row[13].lower() == 'true'
                     })
             return history
@@ -131,66 +107,57 @@ class SheetsClient:
         originalpurpose: str = "",
         originalquestion: str = "",
         systemresponse: str = "",
-        timestamp: str = None,
+        timestamp: Optional[str] = None,
         isdone: bool = False
     ) -> Optional[Dict[str, Any]]:
-        """
-        Ghi log hội thoại vào Google Sheets.
-        Dùng các trường original* cho các cột tương ứng trong sheet và các logic liên quan.
-        """
         try:
             if not self.service:
                 self.authenticate()
-            if not self.service:
-                raise RuntimeError("Google Sheets service not initialized")
 
-            # Get existing data to check for duplicates
             result = self.service.spreadsheets().values().get(
                 spreadsheetId=self.sheet_id,
                 range=SHEET_RANGE
             ).execute()
             values = result.get('values', [])
-            logger.info(f"[DEBUG] Gsheet values {values}")
-            # Đảm bảo timestamp là str
-            ts = datetime.now().isoformat()
-            # Đảm bảo timestamp luôn là list
-            if timestamp is None:
-                timestamp = []
-            elif not isinstance(timestamp, list):
-                timestamp = [timestamp]
-            # Chống trùng bản ghi dựa trên sender_id, page_id, timestamp
+
+            current_ts = timestamp or datetime.now().isoformat()
+            timestamps_list = [current_ts]
+
+            # Check duplicate
             for row in values:
-                if len(row) >= 13:
-                    try:
-                        row_timestamps = json.loads(row[12]) if row[12] else []
-                    except Exception:
-                        row_timestamps = []
-                    if not isinstance(row_timestamps, list):
-                        row_timestamps = [row_timestamps]
+                row = row + [""] * 14
+                try:
+                    row_timestamps = json.loads(row[12]) if row[12] else []
                     if not isinstance(row_timestamps, list):
                         row_timestamps = [row_timestamps]
-                    row_recipient_id = row[4]
-                    row_page_id = row[5]
-                    if (str(timestamp) in [str(ts) for ts in row_timestamps] and str(row_recipient_id) == str(recipient_id) and str(row_page_id) == str(page_id)):
-                        logger.info(f"Found duplicate conversation for user {recipient_id}, page {page_id}, timestamp {timestamp}")
-                        return {
-                            'conversation_id': row[0],
-                            'originalcommand': row[1],
-                            'originalcontent': row[2],
-                            'originalattachments': json.loads(row[3]) if row[3] else [],
-                            'recipient_id': row[4],
-                            'page_id': row[5],
-                            'originaltext': row[6],
-                            'originalvehicle': row[7],
-                            'originalaction': row[8],
-                            'originalpurpose': row[9],
-                            'originalquestion': row[10],
-                            'systemresponse': row[11],
-                            'timestamp': row[12],
-                            'isdone': row[13].lower() == 'true' if len(row) > 13 else False
-                        }
-            # Nếu không trùng thì thêm mới bản ghi
-            conversation_id = generate_conversation_id(recipient_id, page_id, timestamp)
+                except Exception:
+                    row_timestamps = []
+
+                row_recipient_id = row[4]
+                row_page_id = row[5]
+
+                if current_ts in [str(ts) for ts in row_timestamps] and \
+                   str(row_recipient_id) == str(recipient_id) and \
+                   str(row_page_id) == str(page_id):
+                    logger.info(f"Found duplicate conversation for user {recipient_id}, page {page_id}, timestamp {current_ts}")
+                    return {
+                        'conversation_id': row[0],
+                        'originalcommand': row[1],
+                        'originalcontent': row[2],
+                        'originalattachments': json.loads(row[3]) if row[3] else [],
+                        'recipient_id': row[4],
+                        'page_id': row[5],
+                        'originaltext': row[6],
+                        'originalvehicle': row[7],
+                        'originalaction': row[8],
+                        'originalpurpose': row[9],
+                        'originalquestion': row[10],
+                        'systemresponse': row[11],
+                        'timestamp': row_timestamps,
+                        'isdone': row[13].lower() == 'true' if len(row) > 13 else False
+                    }
+
+            conversation_id = generate_conversation_id(recipient_id, page_id, current_ts)
             new_row = [
                 conversation_id,
                 originalcommand,
@@ -204,20 +171,23 @@ class SheetsClient:
                 originalpurpose,
                 originalquestion,
                 systemresponse,
-                json.dumps(timestamp),
+                json.dumps(timestamps_list),
                 str(isdone).lower()
             ]
+
             body = {
                 'values': [new_row]
             }
-            range_name = SHEET_RANGE
+
             self.service.spreadsheets().values().append(
                 spreadsheetId=self.sheet_id,
-                range=range_name,
+                range=SHEET_RANGE,
                 valueInputOption='RAW',
                 body=body
             ).execute()
-            logger.info(f"Thêm mới conversation: {conversation_id} | Giá trị: {{dict(zip(['conversation_id','originalcommand','originalcontent','originalattachments','recipient_id','page_id','originaltext','originalvehicle','originalaction','originalpurpose','originalquestion','systemresponse','timestamp','isdone'], new_row))}}")
+
+            logger.info(f"Thêm mới conversation: {conversation_id}")
+
             return {
                 'conversation_id': conversation_id,
                 'originalcommand': originalcommand,
@@ -231,9 +201,9 @@ class SheetsClient:
                 'originalpurpose': originalpurpose,
                 'originalquestion': originalquestion,
                 'systemresponse': systemresponse,
-                'timestamp': timestamp,
+                'timestamp': timestamps_list,
                 'isdone': isdone
             }
         except Exception as e:
             logger.error(f"Error logging conversation: {e}")
-            return None 
+            return None