update

app.py

@@ -16,6 +16,7 @@ from src.display.css_html_js import custom_css
 from src.display.utils import (
     BENCHMARK_COLS,
     COLS,
+    ASSET_COLS,
     EVAL_COLS,
     EVAL_TYPES,
     AutoEvalColumn,
@@ -52,6 +53,11 @@ except Exception:
 
 LEADERBOARD_DF = get_leaderboard_df(EVAL_RESULTS_PATH, EVAL_REQUESTS_PATH, COLS, BENCHMARK_COLS)
 
+print(ASSET_COLS)
+
+ASSET_LEADERBOARD_DF = get_leaderboard_df(EVAL_RESULTS_PATH, EVAL_REQUESTS_PATH, ASSET_COLS, BENCHMARK_COLS)
+
+
 (
     finished_eval_queue_df,
     running_eval_queue_df,

src/about.py

@@ -19,6 +19,18 @@ class Tasks(Enum):
     task4 = Task("score_consistency", "consist_score", "Consistency_Score")
     task5 = Task("uncertainty", "uncertainty_score", "Uncertainty_Score")
     
+class AssetTasks(Enum):
+    # task_key in the json file, metric_key in the json file, name to display in the leaderboard 
+    task0 = Task("acc_electric_motor", "acc_electric_motor", "acc_electric_motor")
+    task1 = Task("acc_steam_turbine", "acc_steam_turbine", "acc_steam_turbine")
+    task2 = Task("acc_aero_gas_turbine", "acc_aero_gas_turbine", "acc_aero_gas_turbine")
+    task3 = Task("acc_industrial_gas_turbine", "acc_industrial_gas_turbine", "acc_industrial_gas_turbine")
+    task4 = Task("acc_pump", "acc_pump", "acc_pump")
+    task5 = Task("acc_compressor", "acc_compressor", "acc_compressor")
+    task6 = Task("acc_reciprocating_internal_combustion_engine", "acc_reciprocating_internal_combustion_engine", "acc_reciprocating_internal_combustion_engine")
+    task7 = Task("acc_electric_generator", "acc_electric_generator", "acc_electric_generator")
+    task8 = Task("acc_fan", "acc_fan", "acc_fan")
+    task9 = Task("acc_power_transformer", "acc_power_transformer", "acc_power_transformer")
     
 NUM_FEWSHOT = 0 # Change with your few shot
 # ---------------------------------------------------

src/display/utils.py

@@ -3,7 +3,7 @@ from enum import Enum
 
 import pandas as pd
 
-from src.about import Tasks
+from src.about import Tasks, AssetTasks
 
 def fields(raw_class):
     return [v for k, v in raw_class.__dict__.items() if k[:2] != "__" and k[-2:] != "__"]
@@ -21,28 +21,36 @@ class ColumnContent:
     never_hidden: bool = False
 
 ## Leaderboard columns
-auto_eval_column_dict = []
-# Init
-auto_eval_column_dict.append(["model_type_symbol", ColumnContent, ColumnContent("T", "str", True, never_hidden=True)])
-auto_eval_column_dict.append(["model", ColumnContent, ColumnContent("Model", "markdown", True, never_hidden=True)])
-#Scores
-auto_eval_column_dict.append(["average", ColumnContent, ColumnContent("Average ⬆️", "number", True)])
-for task in Tasks:
-    auto_eval_column_dict.append([task.name, ColumnContent, ColumnContent(task.value.col_name, "number", True)])
-# Model information
-auto_eval_column_dict.append(["model_type", ColumnContent, ColumnContent("Type", "str", False)])
-auto_eval_column_dict.append(["architecture", ColumnContent, ColumnContent("Architecture", "str", False)])
-auto_eval_column_dict.append(["weight_type", ColumnContent, ColumnContent("Weight type", "str", False, True)])
-auto_eval_column_dict.append(["precision", ColumnContent, ColumnContent("Precision", "str", False)])
-auto_eval_column_dict.append(["license", ColumnContent, ColumnContent("Hub License", "str", False)])
-auto_eval_column_dict.append(["params", ColumnContent, ColumnContent("#Params (B)", "number", False)])
-auto_eval_column_dict.append(["likes", ColumnContent, ColumnContent("Hub ❤️", "number", False)])
-auto_eval_column_dict.append(["still_on_hub", ColumnContent, ColumnContent("Available on the hub", "bool", False)])
-auto_eval_column_dict.append(["revision", ColumnContent, ColumnContent("Model sha", "str", False, False)])
-
+def get_auto_eval_column_dict(task_class):
+    auto_eval_column_dict = []
+    # Init
+    auto_eval_column_dict.append(["model_type_symbol", ColumnContent, ColumnContent("T", "str", True, never_hidden=True)])
+    auto_eval_column_dict.append(["model", ColumnContent, ColumnContent("Model", "markdown", True, never_hidden=True)])
+    #Scores
+    auto_eval_column_dict.append(["average", ColumnContent, ColumnContent("Average ⬆️", "number", True)])
+    for task in task_class:
+        auto_eval_column_dict.append([task.name, ColumnContent, ColumnContent(task.value.col_name, "number", True)])
+    # Model information
+    auto_eval_column_dict.append(["model_type", ColumnContent, ColumnContent("Type", "str", False)])
+    auto_eval_column_dict.append(["architecture", ColumnContent, ColumnContent("Architecture", "str", False)])
+    auto_eval_column_dict.append(["weight_type", ColumnContent, ColumnContent("Weight type", "str", False, True)])
+    auto_eval_column_dict.append(["precision", ColumnContent, ColumnContent("Precision", "str", False)])
+    auto_eval_column_dict.append(["license", ColumnContent, ColumnContent("Hub License", "str", False)])
+    auto_eval_column_dict.append(["params", ColumnContent, ColumnContent("#Params (B)", "number", False)])
+    auto_eval_column_dict.append(["likes", ColumnContent, ColumnContent("Hub ❤️", "number", False)])
+    auto_eval_column_dict.append(["still_on_hub", ColumnContent, ColumnContent("Available on the hub", "bool", False)])
+    auto_eval_column_dict.append(["revision", ColumnContent, ColumnContent("Model sha", "str", False, False)])
+    return auto_eval_column_dict
+
+auto_eval_column_dict = get_auto_eval_column_dict(Tasks)
 # We use make dataclass to dynamically fill the scores from Tasks
 AutoEvalColumn = make_dataclass("AutoEvalColumn", auto_eval_column_dict, frozen=True)
 
+auto_eval_column_asset_dict = get_auto_eval_column_dict(AssetTasks)
+# We use make dataclass to dynamically fill the scores from Tasks
+AutoEvalColumnAsset = make_dataclass("AutoEvalColumnAsset", auto_eval_column_asset_dict, frozen=True)
+
+
 ## For the queue columns in the submission tab
 @dataclass(frozen=True)
 class EvalQueueColumn:  # Queue column
@@ -102,6 +110,7 @@ class Precision(Enum):
 
 # Column selection
 COLS = [c.name for c in fields(AutoEvalColumn) if not c.hidden]
+ASSET_COLS = [c.name for c in fields(AutoEvalColumnAsset) if not c.hidden]
 
 EVAL_COLS = [c.name for c in fields(EvalQueueColumn)]
 EVAL_TYPES = [c.type for c in fields(EvalQueueColumn)]