change toggle, author fix, new live

app.py

@@ -15,6 +15,22 @@ from dash_iconify import DashIconify
 app = Dash()
 server = app.server
 
+
+# Query for most recent date in all_downloads
+def get_last_updated():
+    try:
+        result = con.execute(
+            "SELECT MAX(time) as max_time FROM all_downloads"
+        ).fetchdf()
+        max_time = result["max_time"].iloc[0]
+        if pd.isnull(max_time):
+            return "N/A"
+        dt = pd.to_datetime(max_time)
+        return dt.strftime("%b %d, %Y")
+    except Exception:
+        return "N/A"
+
+
 def load_parquet_to_duckdb(con, parquet_url, view_name):
     """
     Loads a parquet file from a remote URL into DuckDB as a view.
@@ -38,6 +54,7 @@ def load_parquet_to_duckdb(con, parquet_url, view_name):
     end_dt = pd.to_datetime(time_range["max_time"].iloc[0])
     return start_dt, end_dt
 
+
 # DuckDB connection (global)
 con = duckdb.connect(database=":memory:", read_only=False)
 
@@ -53,11 +70,11 @@ try:
     # Load both parquet files as views
     start_dt, end_dt = load_parquet_to_duckdb(con, hf_parquet_url_1, "all_downloads")
     # Example: load a second parquet file as another view
-    start_dt2, end_dt2 = load_parquet_to_duckdb(con, hf_parquet_url_2, "one_year_rolling")
-
-    msg = (
-        f"Successfully connected to datasets in {time.time() - overall_start_time:.2f}s."
+    start_dt2, end_dt2 = load_parquet_to_duckdb(
+        con, hf_parquet_url_2, "one_year_rolling"
     )
+
+    msg = f"Successfully connected to datasets in {time.time() - overall_start_time:.2f}s."
     print(msg)
 except Exception as e:
     err_msg = f"Failed to load dataset(s). Error: {e}"
@@ -68,18 +85,21 @@ except Exception as e:
 start_ts = int(start_dt.timestamp())
 end_ts = int(end_dt.timestamp())
 
+
 def ordinal(n):
     # Helper to get ordinal suffix for a day
     if 10 <= n % 100 <= 20:
-        suffix = 'th'
+        suffix = "th"
     else:
-        suffix = {1: 'st', 2: 'nd', 3: 'rd'}.get(n % 10, 'th')
+        suffix = {1: "st", 2: "nd", 3: "rd"}.get(n % 10, "th")
     return f"{n}{suffix}"
 
+
 def format_date(dt):
     # Format date as "Oct 8th, 2025"
     return dt.strftime("%b") + f" {ordinal(dt.day)}, {dt.year}"
 
+
 marks = []
 # Add start label (e.g. "Jan 2020")
 marks.append({"value": start_ts, "label": start_dt.strftime("%b %Y")})
@@ -92,6 +112,7 @@ for yr in range(start_dt.year, end_dt.year + 1):
 # Add end label (e.g. "Dec 2024")
 marks.append({"value": end_ts, "label": end_dt.strftime("%b %Y")})
 
+
 def get_thumb_labels(values):
     # Returns formatted labels for both thumbs
     distance = abs(values[1] - values[0])
@@ -145,6 +166,7 @@ def get_thumb_labels(values):
             ),
         ]
 
+
 # Create a dcc slider for time range selection by year
 time_slider = dmc.RangeSlider(
     id="time-slider",
@@ -175,151 +197,187 @@ app.layout = dmc.MantineProvider(
     },
     children=[
         dcc.Store(id="selected-view", data="all_downloads"),
-        dcc.Store(id="derived-author-toggle", data=True),  # Store for toggle state
+        dcc.Store(
+            id="model-attribution-type", data="uploader"
+        ),  # Store for attribution type
         html.Div(
             [
                 # Header
                 html.Div(
                     [
+                        # --- Replace title/subtitle with LIVE button and last updated ---
                         html.Div(
                             [
-                                html.Div(
+                                html.Span(
                                     [
-                                        html.Div(
-                                            children="Economies of Open Intelligence",
+                                        html.Span(
                                             style={
-                                                "fontSize": 22,
-                                                "fontWeight": "700",
-                                                "lineHeight": "1.1",
+                                                "display": "inline-block",
+                                                "width": "14px",
+                                                "height": "14px",
+                                                "borderRadius": "50%",
+                                                "backgroundColor": "#AC482A",
+                                                "marginRight": "8px",
+                                                "verticalAlign": "middle",
+                                                "boxShadow": "0 0 6px #AC482A",
                                             },
                                         ),
-                                        html.Div(
-                                            children="Tracing Power & Participation in the Model Ecosystem",
+                                        html.Span(
+                                            "LIVE",
                                             style={
-                                                "fontSize": 13,
-                                                "marginTop": 6,
-                                                "opacity": 0.9,
+                                                "backgroundColor": "transparent",
+                                                "color": "#fff",
+                                                "fontWeight": "700",
+                                                "fontSize": "18px",
+                                                "letterSpacing": "1px",
+                                                "verticalAlign": "middle",
+                                                "display": "inline-block",
                                             },
                                         ),
                                     ],
                                     style={
-                                        "display": "flex",
-                                        "flexDirection": "column",
-                                        "justifyContent": "center",
+                                        "display": "inline-flex",
+                                        "alignItems": "center",
+                                        "marginRight": "16px",
                                     },
                                 ),
-                                html.Div(
-                                    [
-                                        html.A(
-                                            children=[
-                                                html.Img(
-                                                    src="assets/images/dpi.svg",
-                                                    style={
-                                                        "height": "28px",
-                                                        "verticalAlign": "middle",
-                                                        "paddingRight": "8px",
-                                                    },
-                                                ),
-                                                "Data Provenance Initiative",
-                                            ],
-                                            href="https://www.dataprovenance.org/",
-                                            target="_blank",
-                                            className="no-bg-link header-link",
+                                html.Span(
+                                    f"Last updated: {get_last_updated()}",
+                                    style={
+                                        "backgroundColor": "#1B344D",
+                                        "color": "#FFFFFF",
+                                        "fontWeight": "500",
+                                        "fontSize": "15px",
+                                        "verticalAlign": "middle",
+                                        "display": "inline-block",
+                                        "borderRadius": "8px",
+                                        "padding": "4px 14px",
+                                        "boxShadow": "0 1px 4px rgba(8,32,48,0.10)",
+                                        "marginLeft": "0px",
+                                    },
+                                ),
+                            ],
+                            style={
+                                "display": "flex",
+                                "alignItems": "center",
+                                "gap": "12px",
+                            },
+                        ),
+                        html.Div(
+                            [
+                                html.A(
+                                    children=[
+                                        html.Img(
+                                            src="assets/images/dpi.svg",
                                             style={
-                                                "display": "inline-block",
-                                                "padding": "6px 14px",
-                                                "fontSize": 13,
-                                                "color": "#FFFFFF",  # white on dark header
-                                                # background removed so CSS controls it
-                                                "borderRadius": "18px",
-                                                "fontWeight": "700",
-                                                "textDecoration": "none",
-                                                "marginRight": "12px",
+                                                "height": "28px",
+                                                "verticalAlign": "middle",
+                                                "paddingRight": "8px",
                                             },
                                         ),
-                                        html.A(
-                                            children=[
-                                                html.Img(
-                                                    src="assets/images/hf.svg",
-                                                    style={
-                                                        "height": "30px",
-                                                        "verticalAlign": "middle",
-                                                    },
-                                                ),
-                                                html.Span(
-                                                    "Hugging Face",
-                                                    className="hf-brand-text",
-                                                ),
-                                            ],
-                                            href="https://huggingface.co/",
-                                            target="_blank",
-                                            className="no-bg-link header-link",
+                                        "Data Provenance Initiative",
+                                    ],
+                                    href="https://www.dataprovenance.org/",
+                                    target="_blank",
+                                    className="no-bg-link header-link",
+                                    style={
+                                        "display": "inline-block",
+                                        "padding": "6px 14px",
+                                        "fontSize": 13,
+                                        "color": "#FFFFFF",  # white on dark header
+                                        "borderRadius": "18px",
+                                        "fontWeight": "700",
+                                        "textDecoration": "none",
+                                        "marginRight": "12px",
+                                    },
+                                ),
+                                html.A(
+                                    children=[
+                                        html.Img(
+                                            src="assets/images/hf.svg",
                                             style={
-                                                "display": "inline-flex",
-                                                "padding": "6px 14px",
-                                                "alignItems": "center",
-                                                "color": "#FFFFFF",
-                                                "borderRadius": "18px",
-                                                "textDecoration": "none",
-                                                "marginRight": "12px",
+                                                "height": "30px",
+                                                "verticalAlign": "middle",
                                             },
                                         ),
-                                        html.A(
-                                            children=[
-                                                html.Span(
-                                                    "Read the paper",
-                                                    className="paper-text",
-                                                ),
-                                            ],
-                                            href="https://www.google.com/",
-                                            target="_blank",
-                                            className="no-bg-link header-link paper-link",
-                                            style={
-                                                "display": "inline-flex",
-                                                "alignItems": "center",
-                                                "padding": "6px 12px",  # decreased size
-                                                "fontSize": 14,  # smaller text
-                                                "margin": "0 auto",
-                                                "backgroundColor": "#AC482A",
-                                                "color": "#FFFFFF",
-                                                "borderRadius": "5px",
-                                                "textDecoration": "none",
-                                                "fontWeight": "700",
-                                            },
+                                        html.Span(
+                                            "Hugging Face",
+                                            className="hf-brand-text",
                                         ),
                                     ],
-                                    style={"display": "flex", "alignItems": "center"},
+                                    href="https://huggingface.co/",
+                                    target="_blank",
+                                    className="no-bg-link header-link",
+                                    style={
+                                        "display": "inline-flex",
+                                        "padding": "6px 14px",
+                                        "alignItems": "center",
+                                        "color": "#FFFFFF",
+                                        "borderRadius": "18px",
+                                        "textDecoration": "none",
+                                        "marginRight": "12px",
+                                    },
+                                ),
+                                html.A(
+                                    children=[
+                                        html.Span(
+                                            "Read the paper",
+                                            className="paper-text",
+                                        ),
+                                    ],
+                                    href="https://www.google.com/",
+                                    target="_blank",
+                                    className="no-bg-link header-link paper-link",
+                                    style={
+                                        "display": "inline-flex",
+                                        "alignItems": "center",
+                                        "padding": "6px 12px",
+                                        "fontSize": 14,
+                                        "margin": "0 auto",
+                                        "backgroundColor": "#AC482A",
+                                        "color": "#FFFFFF",
+                                        "borderRadius": "5px",
+                                        "textDecoration": "none",
+                                        "fontWeight": "700",
+                                    },
                                 ),
                             ],
-                            style={
-                                "marginLeft": "50px",
-                                "marginRight": "50px",
-                                "display": "flex",
-                                "justifyContent": "space-between",
-                                "alignItems": "center",
-                                "padding": "18px 24px",
-                                "gap": "24px",
-                            },
+                            style={"display": "flex", "alignItems": "center"},
                         ),
                     ],
                     style={
-                        "backgroundColor": "#082030",
-                        "color": "white",
-                        "width": "100%",
+                        "display": "flex",
+                        "justifyContent": "space-between",
+                        "alignItems": "center",
+                        "padding": "18px 24px",
+                        "gap": "24px",
+                        "backgroundColor": "#082030",  # restored dark background
                     },
                 ),
-                # Intro / description below header (kept but styled to match layout)
-                # Title
+                # Title row with "live" button
                 html.Div(
-                    children="The Open Model Leaderboard",
+                    [
+                        html.Span(
+                            "The Open Model Leaderboard",
+                            style={
+                                "fontSize": 40,
+                                "fontWeight": "700",
+                                "textAlign": "center",
+                                "marginTop": "20px",
+                                "marginBottom": "20px",
+                            },
+                        ),
+                    ],
                     style={
-                        "fontSize": 40,
-                        "fontWeight": "700",
-                        "textAlign": "center",
-                        "marginTop": 20,
-                        "marginBottom": 20,
+                        "display": "flex",
+                        "alignItems": "center",
+                        "justifyContent": "center",
+                        "gap": "12px",
+                        "marginTop": "20px",
+                        "marginBottom": "20px",
                     },
                 ),
+                # Intro / description below header (kept but styled to match layout)
                 html.Div(
                     children="This leaderboard assesses concentrations of power in the open model ecosystem across three hierarchies: countries, developers, and models. Explore how downloads are distributed among these groups and identify key players shaping the open model ecosystem on Hugging Face.",
                     style={
@@ -337,32 +395,80 @@ app.layout = dmc.MantineProvider(
                         html.Div(
                             [
                                 html.Div(
-                                    "Select Download View",
+                                    html.Span(
+                                        [
+                                            "Select Download View",
+                                            dmc.HoverCard(
+                                                width=260,
+                                                shadow="md",
+                                                position="top",
+                                                children=[
+                                                    dmc.HoverCardTarget(
+                                                        html.Span(
+                                                            DashIconify(
+                                                                icon="mdi:information-outline",
+                                                                width=16,
+                                                                height=16,
+                                                                style={
+                                                                    "marginLeft": "6px",
+                                                                    "color": "#AC482A",
+                                                                    "verticalAlign": "middle",
+                                                                },
+                                                            ),
+                                                            style={"cursor": "pointer"},
+                                                        )
+                                                    ),
+                                                    dmc.HoverCardDropdown(
+                                                        dmc.Text(
+                                                            "We believe this filter isolates more authentic usage, mitigating the impact of automatic software downloads for older models.",
+                                                            size="sm",
+                                                            style={"maxWidth": "240px"},
+                                                        )
+                                                    ),
+                                                ],
+                                            ),
+                                        ],
+                                        style={
+                                            "display": "inline-flex",
+                                            "alignItems": "center",
+                                        },
+                                    ),
                                     style={
                                         "fontWeight": "700",
                                         "marginBottom": 8,
                                         "fontSize": 14,
+                                        "display": "flex",
+                                        "alignItems": "center",
                                     },
                                 ),
-                                dmc.SegmentedControl(
-                                    id="segmented",
-                                    value="all-downloads",
-                                    color="#AC482A",
-                                    transitionDuration=200,
-                                    data=[
-                                        {
-                                            "value": "all-downloads",
-                                            "label": "All Downloads",
-                                        },
-                                        {
-                                            "value": "filtered-downloads",
-                                            "label": "Filtered Downloads",
-                                        },
+                                html.Div(
+                                    [
+                                        dmc.SegmentedControl(
+                                            id="segmented",
+                                            value="all-downloads",
+                                            color="#AC482A",
+                                            transitionDuration=200,
+                                            data=[
+                                                {
+                                                    "value": "all-downloads",
+                                                    "label": "All Downloads",
+                                                },
+                                                {
+                                                    "value": "filtered-downloads",
+                                                    "label": html.Span(
+                                                        [
+                                                            "Filtered Downloads",
+                                                        ]
+                                                    ),
+                                                },
+                                            ],
+                                            mb=10,
+                                        ),
                                     ],
-                                    mb=10,
+                                    style={"display": "flex", "alignItems": "center"},
                                 ),
                                 html.Div(
-                                    "Choose whether to view all downloads or only those within one year of the model's creation date.",
+                                    "Choose whether to count all downloads, or only downloads up to one year from model creation.",
                                     style={
                                         "fontSize": 13,
                                         "color": "#555",
@@ -373,22 +479,32 @@ app.layout = dmc.MantineProvider(
                                 html.Div(
                                     [
                                         html.Div(
-                                            "Select Author Type",
+                                            "Select Model Attribution",
                                             style={
                                                 "fontWeight": "700",
                                                 "marginBottom": 8,
                                                 "fontSize": 14,
                                             },
                                         ),
-                                        dmc.Switch(
-                                            id="derived-author-switch",  # <-- add id
+                                        dmc.SegmentedControl(
+                                            id="model-attribution-segmented",
+                                            value="uploader",
                                             color="#AC482A",
-                                            label="Derived Authors",
-                                            checked=True,
+                                            transitionDuration=200,
+                                            data=[
+                                                {
+                                                    "value": "uploader",
+                                                    "label": "Model Uploader",
+                                                },
+                                                {
+                                                    "value": "original_creator",
+                                                    "label": "Original Model Creator",
+                                                },
+                                            ],
                                             mb=10,
                                         ),
                                         html.Div(
-                                            "Toggle between viewing downloads by original authors or derived authors (those who forked or adapted models).",
+                                            "Toggle between having downloads attributed to the account that uploaded the model, or the account that uploaded the model that this was originally derived from.",
                                             style={
                                                 "fontSize": 13,
                                                 "color": "#555",
@@ -437,7 +553,10 @@ app.layout = dmc.MantineProvider(
                                                     icon="mdi:lightbulb-on-outline",
                                                     width=20,
                                                     height=20,
-                                                    style={"marginRight": "8px", "color": "#082030"},
+                                                    style={
+                                                        "marginRight": "8px",
+                                                        "color": "#082030",
+                                                    },
                                                 ),
                                                 html.Span("Tip"),
                                             ],
@@ -453,13 +572,39 @@ app.layout = dmc.MantineProvider(
                                         html.Div(
                                             [
                                                 "Try switching between ",
-                                                html.Span("All Downloads", style={"fontWeight": "600", "color": "#AC482A"}),
+                                                html.Span(
+                                                    "All Downloads",
+                                                    style={
+                                                        "fontWeight": "600",
+                                                        "color": "#AC482A",
+                                                    },
+                                                ),
+                                                " and ",
+                                                html.Span(
+                                                    "Filtered Downloads",
+                                                    style={
+                                                        "fontWeight": "600",
+                                                        "color": "#AC482A",
+                                                    },
+                                                ),
+                                                " to compare net popularity (but many duplicate, unused downloads) versus more immediate interest as models are released. ",
+                                                "You can also toggle between ",
+                                                html.Span(
+                                                    "Model Uploader",
+                                                    style={
+                                                        "fontWeight": "600",
+                                                        "color": "#AC482A",
+                                                    },
+                                                ),
                                                 " and ",
-                                                html.Span("Filtered Downloads", style={"fontWeight": "600", "color": "#AC482A"}),
-                                                " to compare overall popularity versus early interest after model release. ",
-                                                "You can also toggle ON ",
-                                                html.Span("Derived Authors", style={"fontWeight": "600", "color": "#AC482A"}),
-                                                " to see how derivative works contribute to developer influence.",
+                                                html.Span(
+                                                    "Original Model Creator",
+                                                    style={
+                                                        "fontWeight": "600",
+                                                        "color": "#AC482A",
+                                                    },
+                                                ),
+                                                " to see how attribution affects perceived popularity.",
                                             ],
                                             style={
                                                 "fontSize": 13,
@@ -524,7 +669,7 @@ app.layout = dmc.MantineProvider(
                                     },
                                     children=[
                                         html.Div(
-                                            children="The model leaderboard assesses concentrations of power across three hierarchies: countries, developers, and models. Explore how downloads are distributed among these groups and identify key players shaping the open model ecosystem on Hugging Face.",
+                                            children="The country leaderboard shows how downloads are distributed across different nations, highlighting which countries are leading in model usage and adoption.",
                                             style={
                                                 "fontSize": 14,
                                                 "marginTop": 18,
@@ -536,7 +681,7 @@ app.layout = dmc.MantineProvider(
                                             id="loading-countries",
                                             type="circle",
                                             color="#AC482A",
-                                            children=html.Div(id="top_countries-table")
+                                            children=html.Div(id="top_countries-table"),
                                         ),
                                         html.Button(
                                             id="top_countries-toggle",
@@ -565,7 +710,7 @@ app.layout = dmc.MantineProvider(
                                     },
                                     children=[
                                         html.Div(
-                                            children="The model leaderboard assesses concentrations of power across three hierarchies: countries, developers, and models. Explore how downloads are distributed among these groups and identify key players shaping the open model ecosystem on Hugging Face.",
+                                            children="The developer leaderboard highlights the most influential model creators on Hugging Face, showcasing which developers have garnered the highest download counts for their models.",
                                             style={
                                                 "fontSize": 14,
                                                 "marginTop": 18,
@@ -577,7 +722,9 @@ app.layout = dmc.MantineProvider(
                                             id="loading-developers",
                                             type="circle",
                                             color="#AC482A",
-                                            children=html.Div(id="top_developers-table")
+                                            children=html.Div(
+                                                id="top_developers-table"
+                                            ),
                                         ),
                                         html.Button(
                                             id="top_developers-toggle",
@@ -606,7 +753,7 @@ app.layout = dmc.MantineProvider(
                                     },
                                     children=[
                                         html.Div(
-                                            children="The model leaderboard assesses concentrations of power across three hierarchies: countries, developers, and models. Explore how downloads are distributed among these groups and identify key players shaping the open model ecosystem on Hugging Face.",
+                                            children="The model leaderboard showcases the most popular models on Hugging Face based on download counts, highlighting which models are driving adoption in the open model ecosystem.",
                                             style={
                                                 "fontSize": 14,
                                                 "marginTop": 18,
@@ -618,7 +765,7 @@ app.layout = dmc.MantineProvider(
                                             id="loading-models",
                                             type="circle",
                                             color="#AC482A",
-                                            children=html.Div(id="top_models-table")
+                                            children=html.Div(id="top_models-table"),
                                         ),
                                         html.Button(
                                             id="top_models-toggle",
@@ -646,14 +793,16 @@ app.layout = dmc.MantineProvider(
                 "backgroundColor": "#ffffff",
                 "minHeight": "100vh",
             },
-        )
+        ),
     ],
 )
 
 
 # Callbacks for interactivity
 # -- helper utilities to consolidate duplicated callback logic --
-def _get_filtered_top_n_from_duckdb(slider_value, group_col, top_n, view="all_downloads"):
+def _get_filtered_top_n_from_duckdb(
+    slider_value, group_col, top_n, view="all_downloads"
+):
     """
     Query DuckDB directly to get top N entries with metadata
     This minimizes data transfer by doing aggregation in DuckDB
@@ -810,10 +959,14 @@ def _leaderboard_callback_logic(
         top_n, new_label = 10, "▼ Show Top 50"
 
     # Get filtered and aggregated data directly from DuckDB
-    df_filtered = _get_filtered_top_n_from_duckdb(slider_value, group_col, top_n, view=view)
+    df_filtered = _get_filtered_top_n_from_duckdb(
+        slider_value, group_col, top_n, view=view
+    )
 
     # Process the already-filtered data - pass derived_author_toggle
-    df, download_df = get_top_n_leaderboard(df_filtered, group_col, top_n, derived_author_toggle=derived_author_toggle)
+    df, download_df = get_top_n_leaderboard(
+        df_filtered, group_col, top_n, derived_author_toggle=derived_author_toggle
+    )
     return render_table_content(
         df, download_df, chip_color=chip_color, filename=filename
     ), new_label
@@ -822,13 +975,13 @@ def _leaderboard_callback_logic(
 # -- end helpers --
 
 
-# --- Callback to store derived author toggle state ---
+# --- Callback to store model attribution type ---
 @app.callback(
-    Output("derived-author-toggle", "data"),
-    Input("derived-author-switch", "checked"),
+    Output("model-attribution-type", "data"),
+    Input("model-attribution-segmented", "value"),
 )
-def update_derived_author_toggle(checked):
-    return checked
+def update_model_attribution_type(selected_value):
+    return selected_value
 
 
 # Callbacks for interactivity (modularized)
@@ -838,10 +991,12 @@ def update_derived_author_toggle(checked):
     Input("top_countries-toggle", "n_clicks"),
     Input("time-slider", "value"),
     Input("selected-view", "data"),
-    Input("derived-author-toggle", "data"),
+    Input("model-attribution-type", "data"),
     State("top_countries-toggle", "children"),
 )
-def update_top_countries(n_clicks, slider_value, selected_view, derived_author_toggle, current_label):
+def update_top_countries(
+    n_clicks, slider_value, selected_view, attribution_type, current_label
+):
     return _leaderboard_callback_logic(
         n_clicks,
         slider_value,
@@ -851,7 +1006,7 @@ def update_top_countries(n_clicks, slider_value, selected_view, derived_author_t
         default_label="▼ Show Top 50",
         chip_color="#F0F9FF",
         view=selected_view,
-        derived_author_toggle=derived_author_toggle,
+        derived_author_toggle=(attribution_type == "uploader"),
     )
 
 
@@ -861,12 +1016,14 @@ def update_top_countries(n_clicks, slider_value, selected_view, derived_author_t
     Input("top_developers-toggle", "n_clicks"),
     Input("time-slider", "value"),
     Input("selected-view", "data"),
-    Input("derived-author-toggle", "data"),
+    Input("model-attribution-type", "data"),
     State("top_developers-toggle", "children"),
 )
-def update_top_developers(n_clicks, slider_value, selected_view, derived_author_toggle, current_label):
-    # Use derived_author if toggle is True, else author
-    group_col = "derived_author" if derived_author_toggle else "author"
+def update_top_developers(
+    n_clicks, slider_value, selected_view, attribution_type, current_label
+):
+    # Use derived_author if attribution_type == "uploader", else author
+    group_col = "derived_author" if attribution_type == "uploader" else "author"
     return _leaderboard_callback_logic(
         n_clicks,
         slider_value,
@@ -876,7 +1033,7 @@ def update_top_developers(n_clicks, slider_value, selected_view, derived_author_
         default_label="▼ Show Top 50",
         chip_color="#F0F9FF",
         view=selected_view,
-        derived_author_toggle=derived_author_toggle,
+        derived_author_toggle=(attribution_type == "uploader"),
     )
 
 
@@ -886,10 +1043,12 @@ def update_top_developers(n_clicks, slider_value, selected_view, derived_author_
     Input("top_models-toggle", "n_clicks"),
     Input("time-slider", "value"),
     Input("selected-view", "data"),
-    Input("derived-author-toggle", "data"),
+    Input("model-attribution-type", "data"),
     State("top_models-toggle", "children"),
 )
-def update_top_models(n_clicks, slider_value, selected_view, derived_author_toggle, current_label):
+def update_top_models(
+    n_clicks, slider_value, selected_view, attribution_type, current_label
+):
     return _leaderboard_callback_logic(
         n_clicks,
         slider_value,
@@ -899,7 +1058,7 @@ def update_top_models(n_clicks, slider_value, selected_view, derived_author_togg
         default_label="▼ Show More",
         chip_color="#F0F9FF",
         view=selected_view,
-        derived_author_toggle=derived_author_toggle,
+        derived_author_toggle=(attribution_type == "uploader"),
     )
 
 
@@ -910,6 +1069,7 @@ def update_top_models(n_clicks, slider_value, selected_view, derived_author_togg
 def update_thumb_labels(values):
     return get_thumb_labels(values)
 
+
 # --- Add callback to update selected view based on segmented control ---
 @app.callback(
     Output("selected-view", "data"),
@@ -920,6 +1080,7 @@ def update_selected_view(seg_value):
         return "one_year_rolling"
     return "all_downloads"
 
+
 # Run the app
 if __name__ == "__main__":
     app.run(debug=True)

graphs/leaderboard.py

@@ -286,13 +286,13 @@ def render_table_content(
 def get_top_n_leaderboard(filtered_df, group_col, top_n=10, derived_author_toggle=True):
     """
     Get top N entries for a leaderboard
-    
+
     Args:
         filtered_df: Pandas DataFrame (already filtered by time from DuckDB query)
         group_col: Column to group by
         top_n: Number of top entries to return
-        derived_author_toggle: Whether to use derived_author or author column
-        
+        derived_author_toggle: If True, attribute to model uploader (derived_author); if False, attribute to original model creator (author)
+
     Returns:
         tuple: (display_df, download_df)
     """