Update app.py

app.py

@@ -15,34 +15,19 @@ def fetch_data(dataset_name: str, workspace: str):
     return client.datasets(dataset_name, workspace=workspace)
 
 
-def get_progress(dataset) -> dict:
-    records = list(dataset.records)
-    total_records = len(records)
-    annotated_records = len(
-        [record.status for record in records if record.status == "completed"]
-    )
-    progress = (annotated_records / total_records) * 100 if total_records > 0 else 0
+def get_progress(dataset: rg.Dataset) -> dict:
+    dataset_progress = dataset.progress(with_users_distribution=True)
+
+    total, completed = dataset_progress["total"], dataset_progress["completed"]
+    progress = (completed / total) * 100 if total > 0 else 0
+
     return {
-        "total": total_records,
-        "annotated": annotated_records,
+        "total": total,
+        "annotated": completed,
         "progress": progress,
+        "users": dataset_progress["users"] 
     }
 
-
-def get_leaderboard(dataset) -> dict:
-    user_annotations = {}
-    for record in dataset.records:
-        for response in record.responses:
-            user = response.user_id
-            retrieved_user = client.users(id=user)
-            user = retrieved_user.username
-            if user not in user_annotations:
-                user_annotations[user] = 0
-            user_annotations[user] += 1
-    print(user_annotations)
-    return user_annotations
-
-
 def create_gauge_chart(progress):
     fig = go.Figure(
         go.Indicator(
@@ -151,13 +136,12 @@ def create_treemap(user_annotations, total_records):
 def update_dashboard():
     dataset = fetch_data(os.getenv("DATASET_NAME"), os.getenv("WORKSPACE"))
     progress = get_progress(dataset)
-    user_annotations = get_leaderboard(dataset)
-
+    
     gauge_chart = create_gauge_chart(progress)
-    treemap = create_treemap(user_annotations, progress["total"])
+    treemap = create_treemap(progress["users"], progress["total"])
 
     leaderboard_df = pd.DataFrame(
-        list(user_annotations.items()), columns=["User", "Annotations"]
+        list(progress["users"].items()), columns=["User", "Annotations"]
     )
     leaderboard_df = leaderboard_df.sort_values(
         "Annotations", ascending=False