Update app.py

app.py

@@ -34,10 +34,21 @@ def load_leaderboard_data(csv_file_path):
 
         df['model_type_sort'] = df.apply(get_type_sort_value, axis=1)
         
-        # Convert date columns to datetime and then to ISO format strings
+        # Convert date columns to datetime
         for col in ['Release Date', 'Test Date']:
             df[col] = pd.to_datetime(df[col], format='%m/%d/%Y', errors='coerce')
-            df[col] = df[col].dt.strftime('%Y-%m-%d')  # Store as YYYY-MM-DD
+        
+        # Store original release date for sorting (earliest first for tertiary sort)
+        df['Release_Date_Sort'] = df['Release Date']
+        
+        # Create a multi-tiered sorting key
+        # 1. UGI score (highest first) - primary sort
+        # 2. NatInt score (highest first) - secondary sort for same UGI
+        # 3. Release Date (earliest first) - tertiary sort for same UGI and NatInt
+        
+        # Format dates as strings for display
+        df['Release Date'] = df['Release Date'].dt.strftime('%Y-%m-%d')
+        df['Test Date'] = df['Test Date'].dt.strftime('%Y-%m-%d')
         
         # Calculate the date two weeks ago from today
         two_weeks_ago = (datetime.now() - timedelta(days=6)).strftime('%Y-%m-%d') #temp 6
@@ -66,7 +77,11 @@ def load_leaderboard_data(csv_file_path):
         for col in numeric_columns:
             df[col] = df[col].apply(lambda x: None if pd.isna(x) else round(x, 3))
 
-        df = df.sort_values('UGI 🏆', ascending=False)
+        # Sort with multiple keys in the required order
+        df = df.sort_values(
+            by=['UGI 🏆', 'NatInt 💡', 'Release_Date_Sort'], 
+            ascending=[False, False, True]  # UGI desc, NatInt desc, Release date asc (earliest first)
+        )
         
         return df
     except Exception as e:
@@ -1108,9 +1123,6 @@ def update_grid(selected_types, show_na, pinned_rows):
 
     filtered_df = df.copy()
     
-    # Sort by UGI initially
-    filtered_df = filtered_df.sort_values('UGI 🏆', ascending=False)
-    
     # Get pinned model IDs
     pinned_models = []
     if pinned_rows:
@@ -1143,8 +1155,11 @@ def update_grid(selected_types, show_na, pinned_rows):
     if show_na is None or not show_na:
         filtered_df = filtered_df[~has_na]
     
-    # Always sort by UGI descending
-    filtered_df = filtered_df.sort_values('UGI 🏆', ascending=False)
+    # Use the same multi-key sorting as in load_leaderboard_data
+    filtered_df = filtered_df.sort_values(
+        by=['UGI 🏆', 'NatInt 💡', 'Release_Date_Sort'], 
+        ascending=[False, False, True]  # UGI desc, NatInt desc, Release date asc (earliest first)
+    )
     
     records = filtered_df.to_dict('records')