Merge

Author: BabyChouSr

fastchat/serve/gradio_block_arena_vision.py

@@ -258,9 +258,11 @@ def add_text(state, model_selector, chat_input, context: Context, request: gr.Re
         state.conv.append_message(state.conv.roles[0], post_processed_text)
         state.skip_next = True
         gr.Warning(MODERATION_MSG)
-        return (state, gradio_chatbot_before_user_input, None, "", no_change_btn) + (
-            no_change_btn,
-        ) + (no_change_btn,) * 5
+        return (
+            (state, gradio_chatbot_before_user_input, None, "", no_change_btn)
+            + (no_change_btn,)
+            + (no_change_btn,) * 5
+        )
 
     if (len(state.conv.messages) - state.conv.offset) // 2 >= CONVERSATION_TURN_LIMIT:
         logger.info(f"conversation turn limit. ip: {ip}. text: {text}")

fastchat/serve/gradio_block_arena_vision_named.py

@@ -34,24 +34,17 @@
     add_image,
     _prepare_text_with_image,
     convert_images_to_conversation_format,
-<<<<<<< HEAD
     enable_multimodal_keep_input,
     enable_multimodal_clear_input,
-=======
-    enable_multimodal,
->>>>>>> main
     disable_multimodal,
     invisible_text,
     invisible_btn,
     visible_text,
 )
-<<<<<<< HEAD
 from fastchat.serve.moderation.moderator import (
     BaseContentModerator,
     AzureAndOpenAIContentModerator,
 )
-=======
->>>>>>> main
 from fastchat.serve.gradio_global_state import Context
 from fastchat.serve.gradio_web_server import (
     State,

fastchat/serve/monitor/monitor.py

@@ -631,12 +631,8 @@ def update_leaderboard_and_plots(category, filters):
         elem_id="leaderboard_markdown",
     )
 
-<<<<<<< HEAD
-    leader_component_values[:] = [default_md, p1, p2, p3, p4]
-=======
     if not vision:
         leader_component_values[:] = [default_md, p1, p2, p3, p4]
->>>>>>> main
 
     if show_plot:
         more_stats_md = gr.Markdown(
@@ -968,26 +964,6 @@ def build_leaderboard_tab(
             """,
                     elem_id="leaderboard_markdown",
                 )
-<<<<<<< HEAD
-            with gr.Tab("Arena", id=1):
-                gr_plots = build_arena_tab(
-                    elo_results_text,
-                    model_table_df,
-                    default_md,
-                    show_plot=show_plot,
-                )
-
-            if vision:
-                with gr.Tab("Arena (Vision)", id=2):
-                    build_arena_tab(
-                        elo_results_vision,
-                        model_table_df,
-                        default_md,
-                        vision=True,
-                        show_plot=show_plot,
-                    )
-
-=======
             with gr.Tab("Arena (Vision)", id=2):
                 build_arena_tab(
                     elo_results_vision,
@@ -996,7 +972,6 @@ def build_leaderboard_tab(
                     vision=True,
                     show_plot=show_plot,
                 )
->>>>>>> main
             model_to_score = {}
             if arena_hard_leaderboard is not None:
                 with gr.Tab("Arena-Hard-Auto", id=3):