Update app.py

app.py

@@ -54,18 +54,30 @@ def fetch_github_users(github_token=None, max_users=200, min_followers=10):
                         if user_response.status_code == 200:
                             user_data = user_response.json()
 
-                            # Fetch user's contribution data (public repos and events)
-                            events_url = f"https://api.github.com/users/{user['login']}/events/public"
+                            # Fetch user's contribution data for last 30 days
+                            events_url = f"https://api.github.com/users/{user['login']}/events/public?per_page=100"
                             events_response = requests.get(events_url, headers=headers)
 
                             contributions = 0
+                            thirty_days_ago = datetime.now() - timedelta(days=30)
+                            
                             if events_response.status_code == 200:
                                 events = events_response.json()
-                                # 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)
+                                # Count various contribution events from last 30 days
+                                for event in events:
+                                    event_date = datetime.strptime(event.get('created_at', ''), '%Y-%m-%dT%H:%M:%SZ')
+                                    if event_date >= thirty_days_ago:
+                                        event_type = event.get('type', '')
+                                        # Count different types of contributions
+                                        if event_type == 'PushEvent':
+                                            # Count commits in push event
+                                            commits = event.get('payload', {}).get('commits', [])
+                                            contributions += len(commits) if commits else 1
+                                        elif event_type in ['PullRequestEvent', 'IssuesEvent', 'CreateEvent']:
+                                            contributions += 1
+
+                            # Total contributions is based on last 30 days activity
+                            total_contributions = contributions
 
                             all_users.append({
                                 'login': user_data.get('login', ''),
@@ -114,7 +126,7 @@ def fetch_github_users(github_token=None, max_users=200, min_followers=10):
             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 top {len(df)} contributors (sorted by contributions)\n" + "\n".join(status_updates[-5:])
+            status_message = f"✅ Successfully fetched top {len(df)} contributors (sorted by last 30 days contributions)\n" + "\n".join(status_updates[-5:])
             return display_df, status_message
         else:
             return pd.DataFrame(), "⚠️ No users found\n" + "\n".join(status_updates)
@@ -141,8 +153,8 @@ def search_users(df, search_term):
 with gr.Blocks(theme=gr.themes.Soft(), title="GitHub UAE Top Contributors") as app:
 
     gr.Markdown("""
-    # 🏆 Top 200 GitHub Contributors in UAE
-    ### Ranked by Total Contributions (Public Repos + Recent Push Events)
+    # 🏆 Top 200 GitHub Contributors in UAE (Last 30 Days)
+    ### Ranked by Contributions in the Last 30 Days
 
     **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.
@@ -200,9 +212,10 @@ with gr.Blocks(theme=gr.themes.Soft(), title="GitHub UAE Top Contributors") as a
     gr.Markdown("""
     ---
     **Ranking Criteria:**
-    - **Primary Sort:** Total Contributions (Public Repos + Recent Push Events)
+    - **Primary Sort:** Contributions in Last 30 Days (Commits, Pull Requests, Issues, Creates)
     - **Secondary Sort:** Followers count
     - Only users from UAE locations are included
+    - Contributions counted: Commits (from PushEvents), Pull Requests, Issues, and Create Events
 
     **How to set up GitHub Token:**