Update app.py

app.py

@@ -251,175 +251,140 @@ with demo:
     gr.Markdown(INTRODUCTION_TEXT, elem_classes="markdown-text")
 
     with gr.Tabs(elem_classes="tab-buttons") as tabs:
-        with gr.TabItem("📊 Benchmark Geral", id=0):
-            # Colunas a exibir por padrão na aba geral (Nova Ordem)
+        # --- Definir Ordem das Abas --- 
+        tab_index = 0
+
+        # 1. Benchmark Geral
+        with gr.TabItem("📊 Benchmark Geral", id=tab_index):
+            # Colunas a exibir: T, Modelo, Média Geral, PLUE (remover outras médias)\
             general_cols_to_display = [
                 AutoEvalColumn.model_type_symbol.name, # T
                 AutoEvalColumn.model.name, # Modelo
                 AutoEvalColumn.average.name, # Média Geral
                 AutoEvalColumn.plue_avg.name, # Média PLUE
-                # Médias das áreas NÃO PLUE
-                AutoEvalColumn.discurso_odio_avg.name,
-                AutoEvalColumn.economia_contabilidade_avg.name,
-                AutoEvalColumn.semantica_inferencia_avg.name,
+                # Remover médias individuais das áreas NÃO PLUE (agora todas estão em PLUE)
+                # AutoEvalColumn.discurso_odio_avg.name,\
+                # AutoEvalColumn.economia_contabilidade_avg.name,\
+                # AutoEvalColumn.semantica_inferencia_avg.name,\
             ] 
-            # Garantir que só incluimos colunas que existem no DF
             general_cols_to_display = [col for col in general_cols_to_display if col in LEADERBOARD_DF.columns]
-            general_hidden_cols = [task.name for task in Tasks] + [
-                AREA_AVG_COLUMN_MAP[area] for area in PLUE_GROUP_AREAS if area in AREA_AVG_COLUMN_MAP
-            ] + [
-                AutoEvalColumn.model_type.name,
-                AutoEvalColumn.architecture.name,
-                AutoEvalColumn.weight_type.name,
-                AutoEvalColumn.precision.name,
-                AutoEvalColumn.license.name,
-                AutoEvalColumn.params.name,
-                AutoEvalColumn.likes.name,
-                AutoEvalColumn.still_on_hub.name,
-                AutoEvalColumn.revision.name
-            ]
-
+            
+            # Colunas a ocultar: Todas as tasks + TODAS as médias de área individuais + detalhes
+            general_hidden_cols = [task.name for task in Tasks] + \
+                                  list(AREA_AVG_COLUMN_MAP.values()) + \
+                                  [
+                                      AutoEvalColumn.model_type.name,
+                                      AutoEvalColumn.architecture.name,
+                                      AutoEvalColumn.weight_type.name,
+                                      AutoEvalColumn.precision.name,
+                                      AutoEvalColumn.license.name,
+                                      AutoEvalColumn.params.name,
+                                      AutoEvalColumn.likes.name,
+                                      AutoEvalColumn.still_on_hub.name,
+                                      AutoEvalColumn.revision.name
+                                  ]
             create_leaderboard_component(
                 LEADERBOARD_DF,
                 displayed_cols=general_cols_to_display,
                 hidden_cols=[col for col in general_hidden_cols if col in LEADERBOARD_DF.columns],
                 title="Benchmark Geral"
             )
-
-        # Áreas fora do grupo PLUE e criação da aba PLUE
-        tab_index = 1
-        plue_tab_created = False
-        # Remover dicionário plue_containers daqui, ele será criado dentro da aba PLUE
-        # plue_containers = {}
-        # Remover lista all_plue_options daqui
-        # all_plue_options = [PLUE_GENERAL_VIEW_NAME] + PLUE_GROUP_AREAS
-
-        # Loop principal para criar as abas
-        all_area_names = sorted(AREA_DEFINITIONS.keys())
-        for area_name in all_area_names:
-            if area_name not in PLUE_GROUP_AREAS:
-                # >>> RESTAURAR CRIAÇÃO DAS ABAS NÃO-PLUE <<<
-                with gr.TabItem(f"🎓 {area_name}", id=tab_index):
-                    tasks_in_area = AREA_DEFINITIONS[area_name]
-                    area_cols_to_display = [
+        tab_index += 1
+
+        # 2. PLUE
+        with gr.TabItem("📚 PLUE", id=tab_index) as plue_tab:
+            # --- Lógica interna da aba PLUE (atualizada) ---
+            gr.Markdown("## Selecione a visualização PLUE:") 
+            # ATUALIZAR choices com base na nova PLUE_GROUP_AREAS
+            all_plue_options = [PLUE_GENERAL_VIEW_NAME] + sorted(PLUE_GROUP_AREAS) # Ordenar para consistência
+            plue_dropdown = gr.Dropdown(
+                choices=all_plue_options, 
+                label="Visualização PLUE", 
+                value=PLUE_GENERAL_VIEW_NAME 
+            )
+            
+            # Função auxiliar (ATUALIZAR lógica para PLUE_GENERAL_VIEW_NAME)
+            def get_plue_leaderboard_config(selected_option):
+                if selected_option == PLUE_GENERAL_VIEW_NAME:
+                    # Visão geral PLUE agora mostra TODAS as médias das áreas PLUE
+                    displayed_cols = [
+                        AutoEvalColumn.model_type_symbol.name,
+                        AutoEvalColumn.model.name,
+                    ] + [AREA_AVG_COLUMN_MAP[area] for area in PLUE_GROUP_AREAS if area in AREA_AVG_COLUMN_MAP]
+                    hidden_cols = [task.name for task in Tasks] + \
+                                  [AutoEvalColumn.average.name] + \
+                                  [
+                                      AutoEvalColumn.plue_avg.name, # Ocultar média PLUE agregada aqui
+                                      AutoEvalColumn.model_type.name,
+                                      AutoEvalColumn.architecture.name,
+                                      AutoEvalColumn.weight_type.name,
+                                      AutoEvalColumn.precision.name,
+                                      AutoEvalColumn.license.name,
+                                      AutoEvalColumn.params.name,
+                                      AutoEvalColumn.likes.name,
+                                      AutoEvalColumn.still_on_hub.name,
+                                      AutoEvalColumn.revision.name
+                                  ]
+                    title = PLUE_GENERAL_VIEW_NAME
+                else:
+                    # Lógica para área específica (inalterada)
+                    selected_area = selected_option
+                    tasks_in_area = AREA_DEFINITIONS[selected_area]
+                    displayed_cols = [
                         AutoEvalColumn.model_type_symbol.name,
                         AutoEvalColumn.model.name,
                     ] + [task.name for task in tasks_in_area]
-                    
-                    area_hidden_cols = list(AREA_AVG_COLUMN_MAP.values()) + [
-                        task.name for task in Tasks if task not in tasks_in_area
-                    ] + [
-                        # Manter outras colunas ocultas como na aba geral
-                        AutoEvalColumn.model_type.name,
-                        AutoEvalColumn.architecture.name,
-                        AutoEvalColumn.weight_type.name,
-                        AutoEvalColumn.precision.name,
-                        AutoEvalColumn.license.name,
-                        AutoEvalColumn.params.name,
-                        AutoEvalColumn.likes.name,
-                        AutoEvalColumn.still_on_hub.name,
-                        AutoEvalColumn.revision.name
-                    ] 
-                    
-                    create_leaderboard_component(
-                        LEADERBOARD_DF, 
-                        displayed_cols=area_cols_to_display,
-                        hidden_cols=[col for col in area_hidden_cols if col in LEADERBOARD_DF.columns], # Ajuste se média geral deve ser oculta
-                        title=area_name
-                    )
-                # >>> FIM RESTAURAR <<<
-                tab_index += 1
-            elif not plue_tab_created: # Criar a aba PLUE apenas uma vez
-                with gr.TabItem("📚 PLUE", id=tab_index) as plue_tab:
-                    plue_tab_created = True # Marcar como criada
-                    # >>> Lógica interna da aba PLUE <<<
-                    gr.Markdown("## Selecione a visualização PLUE:") 
-                    plue_dropdown = gr.Dropdown(
-                        choices=[PLUE_GENERAL_VIEW_NAME] + PLUE_GROUP_AREAS, 
-                        label="Visualização PLUE", 
-                        value=PLUE_GENERAL_VIEW_NAME 
-                    )
-                    
-                    # Função auxiliar
-                    def get_plue_leaderboard_config(selected_option):
-                        if selected_option == PLUE_GENERAL_VIEW_NAME:
-                            displayed_cols = [
-                                AutoEvalColumn.model_type_symbol.name,
-                                AutoEvalColumn.model.name,
-                            ] + [AREA_AVG_COLUMN_MAP[area] for area in PLUE_GROUP_AREAS if area in AREA_AVG_COLUMN_MAP]
-                            hidden_cols = [task.name for task in Tasks] + [
-                                avg_col for area, avg_col in AREA_AVG_COLUMN_MAP.items() if area not in PLUE_GROUP_AREAS
-                            ] + [
-                                AutoEvalColumn.average.name
-                            ] + [
-                                AutoEvalColumn.model_type.name,
-                                AutoEvalColumn.architecture.name,
-                                AutoEvalColumn.weight_type.name,
-                                AutoEvalColumn.precision.name,
-                                AutoEvalColumn.license.name,
-                                AutoEvalColumn.params.name,
-                                AutoEvalColumn.likes.name,
-                                AutoEvalColumn.still_on_hub.name,
-                                AutoEvalColumn.revision.name
-                            ]
-                            title = PLUE_GENERAL_VIEW_NAME
-                        else:
-                            selected_area = selected_option
-                            tasks_in_area = AREA_DEFINITIONS[selected_area]
-                            displayed_cols = [
-                                AutoEvalColumn.model_type_symbol.name,
-                                AutoEvalColumn.model.name,
-                            ] + [task.name for task in tasks_in_area]
-                            hidden_cols = list(AREA_AVG_COLUMN_MAP.values()) + [
-                                task.name for task in Tasks if task not in tasks_in_area
-                            ] + [
-                                AutoEvalColumn.model_type.name,
-                                AutoEvalColumn.architecture.name,
-                                AutoEvalColumn.weight_type.name,
-                                AutoEvalColumn.precision.name,
-                                AutoEvalColumn.license.name,
-                                AutoEvalColumn.params.name,
-                                AutoEvalColumn.likes.name,
-                                AutoEvalColumn.still_on_hub.name,
-                                AutoEvalColumn.revision.name
-                            ] 
-                            title = selected_area
-                        final_hidden_cols = [col for col in hidden_cols if col in LEADERBOARD_DF.columns]
-                        return displayed_cols, final_hidden_cols, title
-
-                    # Pré-renderização dos Groups e Leaderboards
-                    plue_containers = {} 
-                    all_plue_options = [PLUE_GENERAL_VIEW_NAME] + PLUE_GROUP_AREAS
-                    for option in all_plue_options:
-                        displayed_cols, hidden_cols, title = get_plue_leaderboard_config(option)
-                        is_visible = (option == PLUE_GENERAL_VIEW_NAME)
-                        with gr.Group(visible=is_visible) as plue_containers[option]:
-                             create_leaderboard_component(\
-                                LEADERBOARD_DF, \
-                                displayed_cols=displayed_cols,\
-                                hidden_cols=hidden_cols, \
-                                title=title\
-                             )\
-                    
-                    # Função de callback para visibilidade
-                    def switch_plue_view(selected_option):
-                        update_list = []
-                        for option in all_plue_options:
-                            update_list.append(gr.update(visible=(option == selected_option)))
-                        return update_list
-                                                
-                    # Evento change
-                    plue_dropdown.change(\
-                        fn=switch_plue_view,\
-                        inputs=[plue_dropdown],
-                        outputs=[plue_containers[option] for option in all_plue_options] \
-                    )\
-                    # >>> FIM LÓGICA INTERNA PLUE <<<
-                                     
-                tab_index += 1 # Incrementar após criar a aba PLUE
-            # Se a área é PLUE mas a aba já foi criada, não faz nada neste loop
-
-        with gr.TabItem("📤 Submeta aqui!", id=tab_index):
+                    hidden_cols = list(AREA_AVG_COLUMN_MAP.values()) + \
+                                  [task.name for task in Tasks if task not in tasks_in_area] + \
+                                  [
+                                      AutoEvalColumn.plue_avg.name, # Ocultar média PLUE agregada aqui
+                                      AutoEvalColumn.average.name, # Ocultar média geral aqui também
+                                      AutoEvalColumn.model_type.name,
+                                      AutoEvalColumn.architecture.name,
+                                      AutoEvalColumn.weight_type.name,
+                                      AutoEvalColumn.precision.name,
+                                      AutoEvalColumn.license.name,
+                                      AutoEvalColumn.params.name,
+                                      AutoEvalColumn.likes.name,
+                                      AutoEvalColumn.still_on_hub.name,
+                                      AutoEvalColumn.revision.name
+                                  ] 
+                    title = selected_area
+                final_hidden_cols = [col for col in hidden_cols if col in LEADERBOARD_DF.columns]
+                return displayed_cols, final_hidden_cols, title
+
+            # Pré-renderização (ATUALIZAR loop com novas all_plue_options)
+            plue_containers = {} 
+            for option in all_plue_options:
+                displayed_cols, hidden_cols, title = get_plue_leaderboard_config(option)
+                is_visible = (option == PLUE_GENERAL_VIEW_NAME)
+                with gr.Group(visible=is_visible) as plue_containers[option]:
+                     create_leaderboard_component(LEADERBOARD_DF, displayed_cols=displayed_cols, hidden_cols=hidden_cols, title=title)
+            
+            # Função de callback (inalterada, mas opera sobre novas opções)
+            def switch_plue_view(selected_option):
+                update_list = []
+                for option in all_plue_options:
+                    update_list.append(gr.update(visible=(option == selected_option)))
+                return update_list
+            
+            # Evento change (ATUALIZAR outputs com novas all_plue_options)
+            plue_dropdown.change(fn=switch_plue_view, inputs=[plue_dropdown], outputs=[plue_containers[option] for option in all_plue_options]) 
+            # --- Fim Lógica PLUE ---
+        tab_index += 1
+
+        # 3. Energy 
+        with gr.TabItem("⚡️ Energy", id=tab_index):
+             create_leaderboard_component(pd.DataFrame(), [], title="Energy") 
+        tab_index += 1
+
+        # 4. Reasoning
+        with gr.TabItem("🤔 Reasoning", id=tab_index):
+             create_leaderboard_component(pd.DataFrame(), [], title="Reasoning") 
+        tab_index += 1
+
+        # 5. Submit
+        with gr.TabItem("�� Submit aqui!", id=tab_index):
             with gr.Column():
                 with gr.Row():
                     gr.Markdown(EVALUATION_QUEUE_TEXT, elem_classes="markdown-text")
@@ -460,7 +425,7 @@ with demo:
                                 row_count=5,
                             )
             with gr.Row():
-                gr.Markdown("# ✉✨ Submeta seu modelo aqui!", elem_classes="markdown-text")
+                gr.Markdown("# ✉️✨ Submeta seu modelo aqui!", elem_classes="markdown-text")
 
             with gr.Row():
                 with gr.Column():