From 3c32ce091529e79fa1aeb70e7fadb0f41eac6f8d Mon Sep 17 00:00:00 2001 From: Aditya Date: Thu, 19 Dec 2024 12:21:25 -0800 Subject: [PATCH 1/2] remove tab --- fastchat/serve/monitor/copilot_arena.py | 9 --------- fastchat/serve/monitor/monitor.py | 14 ++++++++++---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/fastchat/serve/monitor/copilot_arena.py b/fastchat/serve/monitor/copilot_arena.py index 80786e341..369115856 100644 --- a/fastchat/serve/monitor/copilot_arena.py +++ b/fastchat/serve/monitor/copilot_arena.py @@ -7,12 +7,6 @@ copilot_arena_leaderboard_url = os.getenv("COPILOT_ARENA_LEADERBOARD_URL") -if not copilot_arena_leaderboard_url: - raise ValueError( - "COPILOT_ARENA_LEADERBOARD_URL environment variable is not set. " - "Please configure it to a valid URL." - ) - def process_copilot_arena_leaderboard(leaderboard): leaderboard = leaderboard.copy().loc[leaderboard["visibility"] == "public"] @@ -41,9 +35,6 @@ def process_copilot_arena_leaderboard(leaderboard): def build_copilot_arena_tab(): - if copilot_arena_leaderboard_url is None: - print("Copilot Arena Leaderboard URL is not set. Skipping this leaderboard.") - return response = requests.get(copilot_arena_leaderboard_url) if response.status_code == 200: leaderboard = pd.DataFrame(response.json()["elo_data"]) diff --git a/fastchat/serve/monitor/monitor.py b/fastchat/serve/monitor/monitor.py index 9f7e0dd08..f21cf4a58 100644 --- a/fastchat/serve/monitor/monitor.py +++ b/fastchat/serve/monitor/monitor.py @@ -1035,11 +1035,17 @@ def build_leaderboard_tab( elo_results_text, model_table_df, model_to_score ) try: - with gr.Tab("Copilot Arena Leaderboard", id=5): - from fastchat.serve.monitor.copilot_arena import ( - build_copilot_arena_tab, - ) + from fastchat.serve.monitor.copilot_arena import ( + build_copilot_arena_tab, + copilot_arena_leaderboard_url, + ) + if not copilot_arena_leaderboard_url: + raise ValueError( + "COPILOT_ARENA_LEADERBOARD_URL environment variable is not set. " + "Please configure it to a valid URL." + ) + with gr.Tab("Copilot Arena Leaderboard", id=5): build_copilot_arena_tab() except Exception as e: print(f"Unable to build Copilot Arena's Leaderboard. Error: {e}") From defebe1bcec46717e0c70f7b33bf2e27a5e1cea9 Mon Sep 17 00:00:00 2001 From: Aditya Date: Thu, 19 Dec 2024 14:54:47 -0800 Subject: [PATCH 2/2] change error handling --- fastchat/serve/monitor/monitor.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fastchat/serve/monitor/monitor.py b/fastchat/serve/monitor/monitor.py index f21cf4a58..5cbed3f6d 100644 --- a/fastchat/serve/monitor/monitor.py +++ b/fastchat/serve/monitor/monitor.py @@ -1034,21 +1034,21 @@ def build_leaderboard_tab( build_full_leaderboard_tab( elo_results_text, model_table_df, model_to_score ) - try: - from fastchat.serve.monitor.copilot_arena import ( - build_copilot_arena_tab, - copilot_arena_leaderboard_url, - ) - if not copilot_arena_leaderboard_url: - raise ValueError( - "COPILOT_ARENA_LEADERBOARD_URL environment variable is not set. " - "Please configure it to a valid URL." - ) + from fastchat.serve.monitor.copilot_arena import ( + build_copilot_arena_tab, + copilot_arena_leaderboard_url, + ) + + if copilot_arena_leaderboard_url: with gr.Tab("Copilot Arena Leaderboard", id=5): build_copilot_arena_tab() - except Exception as e: - print(f"Unable to build Copilot Arena's Leaderboard. Error: {e}") + else: + print( + "Unable to build Copilot Arena's Leaderboard. " + "COPILOT_ARENA_LEADERBOARD_URL environment variable is not set. " + "Please configure it to a valid URL." + ) if not show_plot: gr.Markdown(