add

msr.py

@@ -1050,16 +1050,22 @@ def calculate_monthly_metrics_by_discussions(all_discussions_dict, assistants):
     }
 
 
-def calculate_monthly_metrics_by_wanted_issues(wanted_resolved_dict, wanted_in_progress_dict, assistants):
-    """Calculate monthly metrics for wanted issues for all assistants for visualization."""
+def calculate_monthly_metrics_by_wanted_issues(wanted_resolved_dict, assistants):
+    """Calculate monthly metrics for resolved wanted issues for all assistants for visualization.
+    """
     identifier_to_name = {assistant.get('github_identifier'): assistant.get('name') for assistant in assistants if assistant.get('github_identifier')}
 
-    if not wanted_resolved_dict and not wanted_in_progress_dict:
+    if not wanted_resolved_dict:
         return {'assistants': [], 'months': [], 'data': {}}
 
-    agent_month_data = defaultdict(lambda: defaultdict(lambda: {'resolved': [], 'in_progress': []}))
+    # Calculate the valid date range for filtering
+    current_time = datetime.now(timezone.utc)
+    start_date = current_time - timedelta(days=LEADERBOARD_TIME_FRAME_DAYS)
+    start_month_key = f"{start_date.year}-{start_date.month:02d}"
+
+    agent_month_data = defaultdict(lambda: defaultdict(list))
 
-    # Process resolved wanted issues
+    # Process resolved wanted issues - group by closed_at date
     for agent_identifier, metadata_list in (wanted_resolved_dict or {}).items():
         for issue_meta in metadata_list:
             closed_at = issue_meta.get('closed_at')
@@ -1071,62 +1077,34 @@ def calculate_monthly_metrics_by_wanted_issues(wanted_resolved_dict, wanted_in_p
 
             try:
                 dt = datetime.fromisoformat(closed_at.replace('Z', '+00:00'))
-                month_key = f"{dt.year}-{dt.month:02d}"
-                agent_month_data[agent_name][month_key]['resolved'].append(issue_meta)
-            except Exception as e:
-                print(f"Warning: Could not parse wanted issue date '{closed_at}': {e}")
-                continue
 
-    # Process in-progress wanted issues
-    for agent_identifier, metadata_list in (wanted_in_progress_dict or {}).items():
-        for issue_meta in metadata_list:
-            created_at = issue_meta.get('created_at')
-
-            if not created_at or created_at == 'N/A':
-                continue
-
-            agent_name = identifier_to_name.get(agent_identifier, agent_identifier)
+                # Skip if closed before the timeframe window
+                if dt < start_date:
+                    continue
 
-            try:
-                dt = datetime.fromisoformat(created_at.replace('Z', '+00:00'))
                 month_key = f"{dt.year}-{dt.month:02d}"
-                agent_month_data[agent_name][month_key]['in_progress'].append(issue_meta)
+                agent_month_data[agent_name][month_key].append(issue_meta)
             except Exception as e:
-                print(f"Warning: Could not parse wanted issue date '{created_at}': {e}")
+                print(f"Warning: Could not parse wanted issue date '{closed_at}': {e}")
                 continue
 
     all_months = set()
     for agent_data in agent_month_data.values():
         all_months.update(agent_data.keys())
-    months = sorted(list(all_months))
+
+    # Filter to only include months within the timeframe
+    months = sorted([m for m in all_months if m >= start_month_key])
 
     result_data = {}
     for agent_name, month_dict in agent_month_data.items():
-        resolved_rates = []
-        total_wanted_list = []
         resolved_wanted_list = []
-        in_progress_wanted_list = []
 
         for month in months:
-            month_data = month_dict.get(month, {'resolved': [], 'in_progress': []})
-
-            resolved_count = len(month_data['resolved'])
-            in_progress_count = len(month_data['in_progress'])
-            total_count = resolved_count + in_progress_count
-
-            # Resolved rate = resolved / total * 100
-            resolved_rate = (resolved_count / total_count * 100) if total_count > 0 else None
-
-            resolved_rates.append(resolved_rate)
-            total_wanted_list.append(total_count)
+            resolved_count = len(month_dict.get(month, []))
             resolved_wanted_list.append(resolved_count)
-            in_progress_wanted_list.append(in_progress_count)
 
         result_data[agent_name] = {
-            'resolved_rates': resolved_rates,
-            'total_wanted': total_wanted_list,
-            'resolved_wanted': resolved_wanted_list,
-            'in_progress_wanted': in_progress_wanted_list
+            'resolved_wanted': resolved_wanted_list
         }
 
     agents_list = sorted(list(agent_month_data.keys()))
@@ -1310,7 +1288,7 @@ def mine_all_agents():
             agent_discussions, assistants
         )
         wanted_issue_monthly_metrics = calculate_monthly_metrics_by_wanted_issues(
-            wanted_resolved, wanted_in_progress, assistants
+            wanted_resolved, assistants
         )
         save_leaderboard_data_to_hf(
             leaderboard_dict, issue_monthly_metrics, wanted_open, discussion_monthly_metrics, wanted_issue_monthly_metrics