add font and fix country issue

app.py

@@ -665,57 +665,120 @@ def _get_filtered_top_n_from_duckdb(slider_value, group_col, top_n, view="all_do
         end = pd.to_datetime(slider_value[1], unit="s")
         time_clause = f"WHERE time >= '{start}' AND time <= '{end}'"
 
-    # Build the aggregation query to get top N with all needed metadata
-    # This query groups by the target column and aggregates downloads
-    # while collecting all metadata we need for chips
-    query = f"""
-    WITH base_data AS (
-        SELECT 
-            {group_col},
-            CASE 
-                WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
-                WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
-                ELSE org_country_single
-            END AS org_country_single,
-            author,
-            derived_author,
-            merged_country_groups_single,
-            merged_modality,
-            downloads,
-            model
-        FROM {view}
-        {time_clause}
-    ),
-
-    -- Compute the total downloads for all rows in the time range
-    total_downloads_cte AS (
-        SELECT SUM(downloads) AS total_downloads_all
-        FROM base_data
-    ),
-
-    -- Compute per-group totals and their percentage of all downloads
-    top_items AS (
-        SELECT 
-            b.{group_col} AS name,
-            SUM(b.downloads) AS total_downloads,
-            ROUND(SUM(b.downloads) * 100.0 / t.total_downloads_all, 2) AS percent_of_total,
-            -- Pick first non-null metadata values for reference
-            ANY_VALUE(b.org_country_single) AS org_country_single,
-            ANY_VALUE(b.author) AS author,
-            ANY_VALUE(b.derived_author) AS derived_author,
-            ANY_VALUE(b.merged_country_groups_single) AS merged_country_groups_single,
-            ANY_VALUE(b.merged_modality) AS merged_modality,
-            ANY_VALUE(b.model) AS model
-        FROM base_data b
-        CROSS JOIN total_downloads_cte t
-        GROUP BY b.{group_col}, t.total_downloads_all
-    )
+    # If grouping by country, group by the transformed country column
+    if group_col == "org_country_single":
+        group_expr = """CASE 
+            WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
+            WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
+            ELSE org_country_single
+        END"""
+    else:
+        group_expr = group_col
+
+    # Build a lookup for author -> country mapping
+    # When grouping by derived_author, we need to find the country where derived_author = author
+    if group_col == "derived_author":
+        query = f"""
+        WITH base_data AS (
+            SELECT 
+                {group_expr} AS group_key,
+                CASE 
+                    WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
+                    WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
+                    ELSE org_country_single
+                END AS org_country_single,
+                author,
+                derived_author,
+                merged_country_groups_single,
+                merged_modality,
+                downloads,
+                model
+            FROM {view}
+            {time_clause}
+        ),
+        
+        -- Create a lookup table for derived_author -> country
+        author_country_lookup AS (
+            SELECT DISTINCT
+                author,
+                FIRST_VALUE(org_country_single) OVER (PARTITION BY author ORDER BY downloads DESC) AS author_country
+            FROM base_data
+            WHERE author IS NOT NULL
+        ),
+
+        total_downloads_cte AS (
+            SELECT SUM(downloads) AS total_downloads_all
+            FROM base_data
+        ),
+
+        top_items AS (
+            SELECT 
+                b.group_key AS name,
+                SUM(b.downloads) AS total_downloads,
+                ROUND(SUM(b.downloads) * 100.0 / t.total_downloads_all, 2) AS percent_of_total,
+                COALESCE(acl.author_country, ANY_VALUE(b.org_country_single)) AS org_country_single,
+                ANY_VALUE(b.author) AS author,
+                ANY_VALUE(b.derived_author) AS derived_author,
+                ANY_VALUE(b.merged_country_groups_single) AS merged_country_groups_single,
+                ANY_VALUE(b.merged_modality) AS merged_modality,
+                ANY_VALUE(b.model) AS model
+            FROM base_data b
+            CROSS JOIN total_downloads_cte t
+            LEFT JOIN author_country_lookup acl ON b.group_key = acl.author
+            GROUP BY b.group_key, acl.author_country, t.total_downloads_all
+        )
 
-    SELECT *
-    FROM top_items
-    ORDER BY total_downloads DESC
-    LIMIT {top_n};
-    """
+        SELECT *
+        FROM top_items
+        ORDER BY total_downloads DESC
+        LIMIT {top_n};
+        """
+    else:
+        query = f"""
+        WITH base_data AS (
+            SELECT 
+                {group_expr} AS group_key,
+                CASE 
+                    WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
+                    WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
+                    ELSE org_country_single
+                END AS org_country_single,
+                author,
+                derived_author,
+                merged_country_groups_single,
+                merged_modality,
+                downloads,
+                model
+            FROM {view}
+            {time_clause}
+        ),
+
+        total_downloads_cte AS (
+            SELECT SUM(downloads) AS total_downloads_all
+            FROM base_data
+        ),
+
+        top_items AS (
+            SELECT 
+                b.group_key AS name,
+                SUM(b.downloads) AS total_downloads,
+                ROUND(SUM(b.downloads) * 100.0 / t.total_downloads_all, 2) AS percent_of_total,
+                ANY_VALUE(b.org_country_single) AS org_country_single,
+                ANY_VALUE(b.author) AS author,
+                ANY_VALUE(b.derived_author) AS derived_author,
+                ANY_VALUE(b.merged_country_groups_single) AS merged_country_groups_single,
+                ANY_VALUE(b.merged_modality) AS merged_modality,
+                ANY_VALUE(b.model) AS model
+            FROM base_data b
+            CROSS JOIN total_downloads_cte t
+            GROUP BY b.group_key, t.total_downloads_all
+        )
+
+        SELECT *
+        FROM top_items
+        ORDER BY total_downloads DESC
+        LIMIT {top_n};
+        """
 
     return con.execute(query).fetchdf()
 

assets/styles.css

@@ -1,3 +1,5 @@
+@import url("https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap");
+
 /* Header links: transparent background, white text, grow on hover */
 .no-bg-link {
   background-color: transparent !important;

graphs/leaderboard.py

@@ -424,56 +424,120 @@ def get_top_n_from_duckdb(con, group_col, top_n=10, time_filter=None, view="all_
         start = pd.to_datetime(time_filter[0], unit="s")
         end = pd.to_datetime(time_filter[1], unit="s")
         time_clause = f"WHERE time >= '{start}' AND time <= '{end}'"
-    
-    # Optimized query: first find top N, then get only those rows
-    query = f"""
-    WITH base_data AS (
-        SELECT 
-            {group_col},
-            CASE 
-                WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
-                WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
-                ELSE org_country_single
-            END AS org_country_single,
-            author,
-            derived_author,
-            merged_country_groups_single,
-            merged_modality,
-            downloads,
-            model
-        FROM {view}
-        {time_clause}
-    ),
-
-    -- Compute the total downloads for all rows in the time range
-    total_downloads_cte AS (
-        SELECT SUM(downloads) AS total_downloads_all
-        FROM base_data
-    ),
-
-    -- Compute per-group totals and their percentage of all downloads
-    top_items AS (
-        SELECT 
-            b.{group_col} AS name,
-            SUM(b.downloads) AS total_downloads,
-            ROUND(SUM(b.downloads) * 100.0 / t.total_downloads_all, 2) AS percent_of_total,
-            -- Pick first non-null metadata values for reference
-            ANY_VALUE(b.org_country_single) AS org_country_single,
-            ANY_VALUE(b.author) AS author,
-            ANY_VALUE(b.derived_author) AS derived_author,
-            ANY_VALUE(b.merged_country_groups_single) AS merged_country_groups_single,
-            ANY_VALUE(b.merged_modality) AS merged_modality,
-            ANY_VALUE(b.model) AS model
-        FROM base_data b
-        CROSS JOIN total_downloads_cte t
-        GROUP BY b.{group_col}, t.total_downloads_all
-    )
 
-    SELECT *
-    FROM top_items
-    ORDER BY total_downloads DESC
-    LIMIT {top_n};
-    """
+    # If grouping by country, group by the transformed country column
+    if group_col == "org_country_single":
+        group_expr = """CASE 
+            WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
+            WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
+            ELSE org_country_single
+        END"""
+    else:
+        group_expr = group_col
+
+    # When grouping by derived_author, lookup the country where derived_author = author
+    if group_col == "derived_author":
+        query = f"""
+        WITH base_data AS (
+            SELECT 
+                {group_expr} AS group_key,
+                CASE 
+                    WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
+                    WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
+                    ELSE org_country_single
+                END AS org_country_single,
+                author,
+                derived_author,
+                merged_country_groups_single,
+                merged_modality,
+                downloads,
+                model
+            FROM {view}
+            {time_clause}
+        ),
+        
+        -- Create a lookup table for derived_author -> country
+        author_country_lookup AS (
+            SELECT DISTINCT
+                author,
+                FIRST_VALUE(org_country_single) OVER (PARTITION BY author ORDER BY downloads DESC) AS author_country
+            FROM base_data
+            WHERE author IS NOT NULL
+        ),
+
+        total_downloads_cte AS (
+            SELECT SUM(downloads) AS total_downloads_all
+            FROM base_data
+        ),
+
+        top_items AS (
+            SELECT 
+                b.group_key AS name,
+                SUM(b.downloads) AS total_downloads,
+                ROUND(SUM(b.downloads) * 100.0 / t.total_downloads_all, 2) AS percent_of_total,
+                COALESCE(acl.author_country, ANY_VALUE(b.org_country_single)) AS org_country_single,
+                ANY_VALUE(b.author) AS author,
+                ANY_VALUE(b.derived_author) AS derived_author,
+                ANY_VALUE(b.merged_country_groups_single) AS merged_country_groups_single,
+                ANY_VALUE(b.merged_modality) AS merged_modality,
+                ANY_VALUE(b.model) AS model
+            FROM base_data b
+            CROSS JOIN total_downloads_cte t
+            LEFT JOIN author_country_lookup acl ON b.group_key = acl.author
+            GROUP BY b.group_key, acl.author_country, t.total_downloads_all
+        )
+
+        SELECT *
+        FROM top_items
+        ORDER BY total_downloads DESC
+        LIMIT {top_n};
+        """
+    else:
+        query = f"""
+        WITH base_data AS (
+            SELECT 
+                {group_expr} AS group_key,
+                CASE 
+                    WHEN org_country_single IN ('HF', 'United States of America') THEN 'United States of America'
+                    WHEN org_country_single IN ('International', 'Online') THEN 'International/Online'
+                    ELSE org_country_single
+                END AS org_country_single,
+                author,
+                derived_author,
+                merged_country_groups_single,
+                merged_modality,
+                downloads,
+                model
+            FROM {view}
+            {time_clause}
+        ),
+
+        total_downloads_cte AS (
+            SELECT SUM(downloads) AS total_downloads_all
+            FROM base_data
+        ),
+
+        top_items AS (
+            SELECT 
+                b.group_key AS name,
+                SUM(b.downloads) AS total_downloads,
+                ROUND(SUM(b.downloads) * 100.0 / t.total_downloads_all, 2) AS percent_of_total,
+                ANY_VALUE(b.org_country_single) AS org_country_single,
+                ANY_VALUE(b.author) AS author,
+                ANY_VALUE(b.derived_author) AS derived_author,
+                ANY_VALUE(b.merged_country_groups_single) AS merged_country_groups_single,
+                ANY_VALUE(b.merged_modality) AS merged_modality,
+                ANY_VALUE(b.model) AS model
+            FROM base_data b
+            CROSS JOIN total_downloads_cte t
+            GROUP BY b.group_key, t.total_downloads_all
+        )
+
+        SELECT *
+        FROM top_items
+        ORDER BY total_downloads DESC
+        LIMIT {top_n};
+        """
 
     try:
         return con.execute(query).fetchdf()