update

app.py

@@ -8,12 +8,12 @@ from log_reader import RemoteLogReader
 # logging.basicConfig(level=logging.INFO)
 # log = logging.getLogger(__name__)
 
-def get_file_data(content: str) -> tuple[str, bool]:
-    """Read file content and return IP and vote condition status"""
+def get_file_data(content: str) -> tuple[str, str, bool]:
+    """Read file content and return IP, username, and vote condition status"""
     try:
         lines = [line.strip() for line in content.split('\n') if line.strip()]
         if not lines:
-            return None, False
+            return None, "", False
         
         # Get IP from first line
         try:
@@ -22,20 +22,47 @@ def get_file_data(content: str) -> tuple[str, bool]:
         except json.JSONDecodeError:
             ip = None
         
-        # Check vote conditions from last line
-        try:
-            last_line_data = json.loads(lines[-1])
-            feedback = last_line_data.get('feedback')
-            vote_conditions_met = (last_line_data.get('type') == 'vote' and 
-                                isinstance(feedback, dict) and 
-                                len(feedback) == 6)
-        except json.JSONDecodeError:
-            vote_conditions_met = False
+        # Find the vote line (if any)
+        username = ""
+        vote_conditions_met = False
+        vote_line_index = -1
+        
+        # Search for the vote line
+        for i, line in enumerate(lines):
+            try:
+                line_data = json.loads(line)
+                if line_data.get('type') == 'vote':
+                    vote_line_index = i
+                    break
+            except json.JSONDecodeError:
+                continue
+        
+        # If we found a vote line, check conditions and get username
+        if vote_line_index >= 0:
+            try:
+                vote_line_data = json.loads(lines[vote_line_index])
+                
+                # Only try to get username if the key exists
+                if 'username' in vote_line_data:
+                    username = vote_line_data.get('username')
+                    
+                feedback = vote_line_data.get('feedback')
+                
+                # Check vote conditions: type is vote, feedback has 6 items, and at least 4 lines (2 rounds of chat)
+                # Only count lines up to and including the vote line
+                relevant_lines = lines[:vote_line_index + 1]
+                vote_conditions_met = (
+                    isinstance(feedback, dict) and 
+                    len(feedback) == 6 and
+                    len(relevant_lines) >= 4
+                )
+            except (json.JSONDecodeError, TypeError):
+                pass
             
-        return ip, vote_conditions_met
+        return ip, username, vote_conditions_met
     except Exception as e:
         logging.error(f"Error processing file content: {e}")
-        return None, False
+        return None, "", False
 
 def search_battle_anony(date_str: str, search_query: str) -> list[list]:
     """Search battle_anony conversations for a specific date and query."""
@@ -53,10 +80,11 @@ def search_battle_anony(date_str: str, search_query: str) -> list[list]:
         for conv_id, logs in battle_anony_logs.items():
             found_query = False
             ip = None
+            username = ""
             
             # Convert messages to file content format for validation check
             content = '\n'.join(json.dumps(msg) for msg in logs)
-            ip, is_valid = get_file_data(content)
+            ip, username, is_valid = get_file_data(content)
             
             if not ip:
                 continue
@@ -79,6 +107,7 @@ def search_battle_anony(date_str: str, search_query: str) -> list[list]:
                 # Convert to list format instead of dict
                 results.append([
                     ip,
+                    username,  # Add username column
                     conv_id,
                     'Yes' if is_valid else 'No',
                     'Yes'
@@ -132,7 +161,7 @@ def create_ui():
         
         with gr.Row():
             table_output = gr.DataFrame(
-                headers=['IP', 'Conversation ID', 'Is Valid', 'Contains Query'],
+                headers=['IP', 'Username', 'Conversation ID', 'Is Valid', 'Contains Query'],
                 label="Results Table",
                 interactive=False,
                 value=[]  # Initialize with empty list