Skip to content

Commit

Permalink
fix metrics table proprietary models toggle
Browse files Browse the repository at this point in the history
thanks @alinelena for noticing, broke when adding hover tooltips showing model version to the model name column
  • Loading branch information
janosh committed Aug 7, 2024
1 parent 2314e61 commit 69f25b4
Show file tree
Hide file tree
Showing 7 changed files with 1,713 additions and 1,718 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ default_install_hook_types: [pre-commit, commit-msg]

repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.5
rev: v0.5.6
hooks:
- id: ruff
args: [--fix]
Expand Down Expand Up @@ -79,7 +79,7 @@ repos:
- id: check-github-actions

- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.374
rev: v1.1.375
hooks:
- id: pyright
args: [--level, error]
29 changes: 12 additions & 17 deletions scripts/model_figs/metrics_tables.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# %%
import numpy as np
import pandas as pd
import yaml
Expand Down Expand Up @@ -32,6 +33,13 @@
date_added_col = "Date Added"
df_met.loc[Key.train_set.label] = df_met.loc[date_added_col] = ""

hide_closed = False # hide proprietary models (openness != OSOD)
closed_models = [
key
for key, meta in MODEL_METADATA.items()
if meta.get("openness", Open.OSOD) != Open.OSOD
]

for model in df_metrics:
model_name = name_map.get(model, model)
if not (model_data := MODEL_METADATA.get(model_name)):
Expand All @@ -41,9 +49,10 @@

# Add model version as hover tooltip to model name
model_version = model_data.get("model_version", "")
df_met.loc[Key.model_name.label, model] = (
f'<span title="Version: {model_version}">{model}</span>'
)
css_cls = "proprietary" if model in closed_models else ""
attrs = {"title": f"Version: {model_version}", "class": css_cls}
attr_str = " ".join(f'{k}="{v}"' for k, v in attrs.items() if v)
df_met.loc[Key.model_name.label, model] = f"<span {attr_str}>{model}</span>"
# assign this col to all tables
for df in (df_metrics, df_metrics_10k, df_metrics_uniq_protos):
df.loc[Key.model_name.label] = df_met.loc[Key.model_name.label]
Expand Down Expand Up @@ -137,13 +146,6 @@
# in PredFiles!
make_uip_megnet_comparison = False

hide_closed = True # hide proprietary models (openness != OSOD)
closed_models = [
key
for key, meta in MODEL_METADATA.items()
if meta.get("openness", Open.OSOD) != Open.OSOD
]

meta_cols = [
Key.train_set.label,
Key.model_params.label.replace("eter", ""),
Expand Down Expand Up @@ -206,13 +208,6 @@
[f"{col}{arrow_suffix.get(col, '')}" for col in df_table], axis="columns"
).set_uuid("")

# add CSS class 'proprietary' to cells of proprietary models (openness != OSOD)
styler.set_td_classes(
df_table.T.assign(**dict.fromkeys(closed_models, "proprietary"))[
closed_models
].T
)

# export model metrics as styled HTML table and Svelte component
# get index of MAE column
mae_col_idx = styler.columns.get_loc("MAE")
Expand Down
18 changes: 9 additions & 9 deletions site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
"@iconify/svelte": "^4.0.2",
"@rollup/plugin-yaml": "^4.1.2",
"@sveltejs/adapter-static": "^3.0.2",
"@sveltejs/kit": "^2.5.18",
"@sveltejs/kit": "^2.5.20",
"@sveltejs/vite-plugin-svelte": "^3.1.1",
"d3-scale-chromatic": "^3.1.0",
"elementari": "^0.2.3",
"eslint": "^9.7.0",
"eslint-plugin-svelte": "^2.42.0",
"eslint": "^9.8.0",
"eslint-plugin-svelte": "^2.43.0",
"hastscript": "^9.0.0",
"highlight.js": "^11.10.0",
"js-yaml": "^4.1.0",
"json-schema-to-typescript": "^14.1.0",
"json-schema-to-typescript": "^15.0.0",
"katex": "^0.16.11",
"mdsvex": "^0.11.2",
"prettier": "^3.3.3",
Expand All @@ -39,16 +39,16 @@
"rehype-slug": "^6.0.0",
"remark-math": "3.0.0",
"svelte": "^4.2.18",
"svelte-check": "^3.8.4",
"svelte-check": "^3.8.5",
"svelte-multiselect": "^10.3.0",
"svelte-preprocess": "^6.0.2",
"svelte-toc": "^0.5.9",
"svelte-zoo": "^0.4.10",
"svelte2tsx": "^0.7.13",
"svelte2tsx": "^0.7.15",
"tslib": "^2.6.3",
"typescript": "5.5.3",
"typescript-eslint": "^7.16.1",
"vite": "^5.3.4"
"typescript": "5.5.4",
"typescript-eslint": "^8.0.1",
"vite": "^5.3.5"
},
"prettier": {
"semi": false,
Expand Down
4 changes: 2 additions & 2 deletions site/src/figs/metrics-table-first-10k.svelte

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions site/src/figs/metrics-table-uniq-protos.svelte

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions site/src/figs/metrics-table.svelte

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 69f25b4

Please sign in to comment.