Update app.py

app.py

@@ -5,9 +5,10 @@ from datetime import datetime, timedelta
 import time
 import os
 
-def fetch_github_users(github_token=None, max_users=256, min_followers=34):
+def fetch_github_users(github_token=None, max_users=200, min_followers=10):
     """
     Fetch GitHub users from UAE directly using GitHub API
+    Sorted by contributions (primary) and followers (secondary)
     """
     # Read token from environment variable if not provided
     if not github_token:
@@ -63,13 +64,16 @@ def fetch_github_users(github_token=None, max_users=256, min_followers=34):
                                 # Count push events as contributions
                                 contributions = len([e for e in events if e.get('type') == 'PushEvent'])
 
+                            # Calculate total contributions
+                            total_contributions = contributions + user_data.get('public_repos', 0)
+
                             all_users.append({
                                 'login': user_data.get('login', ''),
                                 'name': user_data.get('name', user_data.get('login', '')),
                                 'avatar': user_data.get('avatar_url', ''),
                                 'followers': user_data.get('followers', 0),
                                 'public_repos': user_data.get('public_repos', 0),
-                                'contributions': contributions + user_data.get('public_repos', 0),
+                                'contributions': total_contributions,
                                 'location': user_data.get('location', ''),
                                 'bio': user_data.get('bio', ''),
                                 'company': user_data.get('company', ''),
@@ -77,7 +81,7 @@ def fetch_github_users(github_token=None, max_users=256, min_followers=34):
 
                             time.sleep(0.5)  # Rate limiting
 
-                        if len(all_users) >= max_users:
+                        if len(all_users) >= max_users * 2:  # Fetch more to ensure we get top contributors
                             break
 
                 status_updates.append(f"✅ Found {len(users)} users in {location}")
@@ -89,25 +93,28 @@ def fetch_github_users(github_token=None, max_users=256, min_followers=34):
             else:
                 status_updates.append(f"❌ Error searching {location}: {response.status_code}")
 
-            if len(all_users) >= max_users:
+            if len(all_users) >= max_users * 2:
                 break
 
-        # Sort by followers and contributions
-        all_users.sort(key=lambda x: (x['followers'], x['contributions']), reverse=True)
+        # Sort by CONTRIBUTIONS FIRST (descending), then by followers (descending)
+        all_users.sort(key=lambda x: (x['contributions'], x['followers']), reverse=True)
+
+        # Take top contributors based on max_users
+        top_users = all_users[:max_users]
 
-        # Add rank
-        for i, user in enumerate(all_users[:max_users], 1):
+        # Add rank based on contribution order
+        for i, user in enumerate(top_users, 1):
             user['rank'] = i
 
         # Convert to DataFrame
-        df = pd.DataFrame(all_users[:max_users])
+        df = pd.DataFrame(top_users)
 
         if not df.empty:
-            display_df = df[['rank', 'name', 'login', 'followers', 'public_repos', 'contributions', 'location']].copy()
-            display_df.columns = ['Rank', 'Name', 'Username', 'Followers', 'Public Repos', 'Contributions', 'Location']
+            display_df = df[['rank', 'name', 'login', 'contributions', 'followers', 'public_repos', 'location']].copy()
+            display_df.columns = ['Rank', 'Name', 'Username', 'Contributions', 'Followers', 'Public Repos', 'Location']
             display_df['GitHub Profile'] = df['login'].apply(lambda x: f"https://github.com/{x}")
 
-            status_message = f"✅ Successfully fetched {len(df)} users\n" + "\n".join(status_updates[-5:])
+            status_message = f"✅ Successfully fetched top {len(df)} contributors (sorted by contributions)\n" + "\n".join(status_updates[-5:])
             return display_df, status_message
         else:
             return pd.DataFrame(), "⚠️ No users found\n" + "\n".join(status_updates)
@@ -131,11 +138,11 @@ def search_users(df, search_term):
     return df[mask]
 
 # Create Gradio interface
-with gr.Blocks(theme=gr.themes.Soft(), title="GitHub UAE Users Fetcher") as app:
+with gr.Blocks(theme=gr.themes.Soft(), title="GitHub UAE Top Contributors") as app:
 
     gr.Markdown("""
-    # 🏆 GitHub Users in UAE - Direct Fetcher
-    ### Fetch active GitHub users directly from GitHub API
+    # 🏆 Top 200 GitHub Contributors in UAE
+    ### Ranked by Total Contributions (Public Repos + Recent Push Events)
 
     **Note:** The app will automatically use `GITHUB_TOKEN` environment variable if set.
     Without a token, you're limited to 60 requests/hour. With a token: 5000 requests/hour.
@@ -149,25 +156,25 @@ with gr.Blocks(theme=gr.themes.Soft(), title="GitHub UAE Users Fetcher") as app:
             scale=3
         )
         max_users_input = gr.Slider(
-            label="Max Users",
+            label="Max Contributors",
             minimum=10,
             maximum=500,
-            value=256,
-            step=1,
+            value=200,
+            step=10,
             scale=1
         )
 
     with gr.Row():
         min_followers_input = gr.Slider(
-            label="Minimum Followers",
+            label="Minimum Followers (for initial search)",
             minimum=1,
             maximum=100,
-            value=34,
+            value=10,
             step=1
         )
 
     with gr.Row():
-        fetch_btn = gr.Button("🚀 Fetch Users from GitHub", variant="primary", size="lg")
+        fetch_btn = gr.Button("🚀 Fetch Top Contributors from GitHub", variant="primary", size="lg")
 
     status_msg = gr.Textbox(label="Status", interactive=False, lines=3)
 
@@ -184,7 +191,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="GitHub UAE Users Fetcher") as app:
 
     # Display dataframe
     data_display = gr.Dataframe(
-        headers=["Rank", "Name", "Username", "Followers", "Public Repos", "Contributions", "Location", "GitHub Profile"],
+        headers=["Rank", "Name", "Username", "Contributions", "Followers", "Public Repos", "Location", "GitHub Profile"],
         datatype=["number", "str", "str", "number", "number", "number", "str", "str"],
         wrap=True,
         interactive=False
@@ -192,6 +199,11 @@ with gr.Blocks(theme=gr.themes.Soft(), title="GitHub UAE Users Fetcher") as app:
 
     gr.Markdown("""
     ---
+    **Ranking Criteria:**
+    - **Primary Sort:** Total Contributions (Public Repos + Recent Push Events)
+    - **Secondary Sort:** Followers count
+    - Only users from UAE locations are included
+
     **How to set up GitHub Token:**
 
     **Option 1: Environment Variable (Recommended)**