fix duplicate message

app/sheets.py

@@ -79,21 +79,21 @@ class SheetsClient:
                 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,
                 range=range_name
             ).execute()
-
             values = result.get('values', [])
             history = []
-
             for row in values:
                 row = row + [""] * (12 - len(row))
-                timestamps = json.loads(row[10]) if row[10] else []
-                if isinstance(timestamps, list) and len(timestamps) == 1 and isinstance(timestamps[0], list):
-                    timestamps = timestamps[0]
+                try:
+                    timestamps = json.loads(row[10]) if row[10] else []
+                except Exception:
+                    timestamps = []
+                if not isinstance(timestamps, list):
+                    timestamps = [timestamps]
                 if row[4] == user_id and row[5] == page_id and row[11].lower() == 'false':
                     history.append({
                         'conversation_id': row[0],
@@ -109,7 +109,6 @@ class SheetsClient:
                         'timestamp': timestamps,
                         'isdone': row[11].lower() == 'true'
                     })
-
             return history
         except Exception as e:
             logger.error(f"Error getting conversation history: {e}")
@@ -128,7 +127,7 @@ class SheetsClient:
         originalvehicle: str = "",
         originalaction: str = "",
         originalpurpose: str = "",
-        timestamp: str = "",
+        timestamp: Any = None,
         isdone: bool = False
     ) -> Optional[Dict[str, Any]]:
         """
@@ -149,14 +148,21 @@ class SheetsClient:
             values = result.get('values', [])
             logger.info(f"[DEBUG] Gsheet values {values}")
             ts = datetime.now().isoformat()
-
+            # Đảm bảo timestamp luôn là list
+            if timestamp is None:
+                timestamp = []
+            elif not isinstance(timestamp, list):
+                timestamp = [timestamp]
             if not conversation_id:
                 # Check for duplicates before creating new conversation
                 for row in values:
                     if len(row) >= 11:
-                        row_timestamps = json.loads(row[10]) if row[10] else []
-                        if isinstance(row_timestamps, list) and len(row_timestamps) == 1 and isinstance(row_timestamps[0], list):
-                            row_timestamps = row_timestamps[0]
+                        try:
+                            row_timestamps = json.loads(row[10]) if row[10] else []
+                        except Exception:
+                            row_timestamps = []
+                        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)):
@@ -193,11 +199,9 @@ class SheetsClient:
                     json.dumps(timestamp),
                     str(isdone).lower()
                 ]
-
                 body = {
                     'values': [new_row]
                 }
-
                 range_name = SHEET_RANGE
                 self.service.spreadsheets().values().append(
                     spreadsheetId=self.sheet_id,
@@ -205,7 +209,6 @@ class SheetsClient:
                     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','timestamp','isdone'], new_row))}")
 
                 # Return the conversation data directly
@@ -240,12 +243,16 @@ class SheetsClient:
                     logger.info(f"[DEBUG] Gsheet current row {current_row}")
                     while len(current_row) < 13:
                         current_row.append("")
-                    # Tạo dòng mới với giá trị mới nếu có, giữ nguyên nếu không
-                    current_timestamps = json.loads(current_row[10]) if current_row[10] else []
-                    if isinstance(current_timestamps, list) and len(current_timestamps) == 1 and isinstance(current_timestamps[0], list):
-                        current_timestamps = current_timestamps[0]
-                    if timestamp not in current_timestamps:
-                        current_timestamps.append(timestamp)
+                    try:
+                        current_timestamps = json.loads(current_row[10]) if current_row[10] else []
+                    except Exception:
+                        current_timestamps = []
+                    if not isinstance(current_timestamps, list):
+                        current_timestamps = [current_timestamps]
+                    # Chỉ append nếu chưa có
+                    for ts in timestamp:
+                        if ts not in current_timestamps:
+                            current_timestamps.append(ts)
                     new_row = [
                         conversation_id,
                         originalcommand if originalcommand else current_row[1],
@@ -289,10 +296,9 @@ class SheetsClient:
                         'originalvehicle': new_row[7],
                         'originalaction': new_row[8],
                         'originalpurpose': new_row[9],
-                        'timestamp': json.loads(new_row[10]),
+                        'timestamp': current_timestamps,
                         'isdone': new_row[11].lower() == 'true'
                     }
-
             return None
         except Exception as e:
             logger.error(f"Error logging conversation: {e}")