Reduced global variables

app.py

@@ -291,239 +291,243 @@ tr.row_odd {
 
 """
 
-with gr.Blocks(theme=gr.themes.Soft(text_size=text_md), css=custom_css) as main:
-    gr.Markdown(HEADER_MARKDOWN)
+def gradio_app():
+    with gr.Blocks(theme=gr.themes.Soft(text_size=text_md), css=custom_css) as main:
+        gr.Markdown(HEADER_MARKDOWN)
 
-    with gr.Tabs():
-        with leaderboard_server.var_lock.ro:
-            submission_ids_and_titles = get_submission_ids_and_titles()
-        
-        with gr.TabItem('Leaderboard'):
-            with gr.Column():
-                gr.Markdown(LEADERBOARD_TAB_TITLE_MARKDOWN)
-
-                with gr.Row():
-                    category_of_tasks = gr.Dropdown(
-                        choices=[leaderboard_server.TASKS_CATEGORY_OVERALL] + sorted(leaderboard_server.TASKS_CATEGORIES),
-                        value=leaderboard_server.TASKS_CATEGORY_OVERALL,
-                        label="Category of benchmarks",
-                        interactive=True,
-                    )
-                
-                with gr.Row():
-                    leaderboard_table = gr.DataFrame(
-                        leaderboard_server.get_leaderboard(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
-                        interactive=False,
-                        label=None,
-                        visible=True,
-                        datatype="markdown",
-                        elem_classes="leaderboard-table",
-                    )
-                
-                with gr.Row():
-                    leaderboard_table_legend = gr.DataFrame(
-                        value=None,
-                        headers=[
-                            "Abbr.", # "task abbreviation"
-                            "Name",
-                            "URL",
+        with gr.Tabs():
+            with leaderboard_server.var_lock.ro:
+                submission_ids_and_titles = get_submission_ids_and_titles()
+            
+            with gr.TabItem('Leaderboard'):
+                with gr.Column():
+                    gr.Markdown(LEADERBOARD_TAB_TITLE_MARKDOWN)
+
+                    with gr.Row():
+                        category_of_tasks = gr.Dropdown(
+                            choices=[leaderboard_server.TASKS_CATEGORY_OVERALL] + sorted(leaderboard_server.TASKS_CATEGORIES),
+                            value=leaderboard_server.TASKS_CATEGORY_OVERALL,
+                            label="Category of benchmarks",
+                            interactive=True,
+                        )
+                    
+                    with gr.Row():
+                        leaderboard_table = gr.DataFrame(
+                            leaderboard_server.get_leaderboard(category=leaderboard_server.TASKS_CATEGORY_OVERALL),
+                            interactive=False,
+                            label=None,
+                            visible=True,
+                            datatype="markdown",
+                            elem_classes="leaderboard-table",
+                        )
+                    
+                    with gr.Row():
+                        leaderboard_table_legend = gr.DataFrame(
+                            value=None,
+                            headers=[
+                                "Abbr.", # "task abbreviation"
+                                "Name",
+                                "URL",
+                            ],
+                            column_widths=["150px"],
+                            datatype="markdown",
+                            label="Descriptions of the tasks",
+                            visible=False,
+                            interactive=False,
+                            elem_classes="leaderboard-table-legend",
+                        )
+                    
+                    with gr.Row():
+                        tournament_results_title = gr.Markdown(
+                            value="## Tournament results for selected model",
+                            visible=False,
+                        )
+                    
+                    with gr.Row():
+                        tournament_results_dropdown = gr.Dropdown(
+                            value=None,
+                            choices=submission_ids_and_titles,
+                            label="Select model",
+                            visible=False,
+                            interactive=True,
+                        )
+                    
+                    with gr.Row():
+                        model_tournament_results_table = gr.DataFrame(
+                            value=None,
+                            datatype="markdown",
+                            label="The model won against…",
+                            visible=False,
+                            interactive=False,
+                            elem_classes="leaderboard-table-model-details",
+                        )
+                    
+                    category_of_tasks.change(
+                        fn=change_leaderboard_category,
+                        inputs=[
+                            category_of_tasks,
+                            tournament_results_dropdown,
+                        ],
+                        outputs=[
+                            leaderboard_table,
+                            leaderboard_table_legend,
+                            tournament_results_title,
+                            tournament_results_dropdown,
+                            model_tournament_results_table,
                         ],
-                        column_widths=["150px"],
-                        datatype="markdown",
-                        label="Descriptions of the tasks",
-                        visible=False,
-                        interactive=False,
-                        elem_classes="leaderboard-table-legend",
-                    )
-                
-                with gr.Row():
-                    tournament_results_title = gr.Markdown(
-                        value="## Tournament results for selected model",
-                        visible=False,
-                    )
-                
-                with gr.Row():
-                    tournament_results_dropdown = gr.Dropdown(
-                        value=None,
-                        choices=submission_ids_and_titles,
-                        label="Select model",
-                        visible=False,
-                        interactive=True,
                     )
-                
-                with gr.Row():
-                    model_tournament_results_table = gr.DataFrame(
-                        value=None,
-                        datatype="markdown",
-                        label="The model won against…",
-                        visible=False,
-                        interactive=False,
-                        elem_classes="leaderboard-table-model-details",
+                    
+                    tournament_results_dropdown.change(
+                        fn=fetch_model_tournament_results_table,
+                        inputs=[
+                            tournament_results_dropdown,
+                            category_of_tasks,
+                        ],
+                        outputs=model_tournament_results_table,
                     )
+
+            with gr.TabItem('Model details'):
+                gr.Markdown(MORE_DETAILS_MARKDOWN)
                 
-                category_of_tasks.change(
-                    fn=change_leaderboard_category,
-                    inputs=[
-                        category_of_tasks,
-                        tournament_results_dropdown,
-                    ],
-                    outputs=[
-                        leaderboard_table,
-                        leaderboard_table_legend,
-                        tournament_results_title,
-                        tournament_results_dropdown,
-                        model_tournament_results_table,
-                    ],
-                )
-                
-                tournament_results_dropdown.change(
-                    fn=fetch_model_tournament_results_table,
-                    inputs=[
-                        tournament_results_dropdown,
-                        category_of_tasks,
-                    ],
-                    outputs=model_tournament_results_table,
+                detail_dropdown = gr.Dropdown(
+                    choices=submission_ids_and_titles,
+                    label="Select model",
+                    interactive=True,
                 )
 
-        with gr.TabItem('Model details'):
-            gr.Markdown(MORE_DETAILS_MARKDOWN)
-            
-            detail_dropdown = gr.Dropdown(
-                choices=submission_ids_and_titles,
-                label="Select model",
-                interactive=True,
-            )
-
-            with gr.Row():
-                model_description = gr.Text(value='', label='Model description', visible=False, interactive=False)
-                model_url = gr.Text(value='', label='Model url', visible=False, interactive=False)
+                with gr.Row():
+                    model_description = gr.Text(value='', label='Model description', visible=False, interactive=False)
+                    model_url = gr.Text(value='', label='Model url', visible=False, interactive=False)
 
-            detail_dropdown.change(
-                fn=fetch_model_detail,
-                inputs=[detail_dropdown],
-                outputs=[model_description, model_url],
-            )
+                detail_dropdown.change(
+                    fn=fetch_model_detail,
+                    inputs=[detail_dropdown],
+                    outputs=[model_description, model_url],
+                )
 
-        with gr.TabItem('Submission'):
-            with gr.Column():
-                gr.Markdown(SUBMISSION_TAB_TITLE_MARKDOWN)
-                
-                submission_inputs = dict.fromkeys(SUBMISSION_INPUTS)
-                
-                with gr.Row():
-                    submission_inputs["team_name"] = gr.Textbox(label='Team name', type='text')
-                    submission_inputs["model_name"] = gr.Textbox(label='Model name', type='text')
-                    submission_inputs["model_type"] = gr.Dropdown(
-                        label="Model type",
-                        choices=("chat", "pretrained", "ensemble"),
-                    )
-                    submission_inputs["parameters"] = gr.Number(
-                        label='Parameters (B)',
-                        value=0.01,
-                        step=0.01,
+            with gr.TabItem('Submission'):
+                with gr.Column():
+                    gr.Markdown(SUBMISSION_TAB_TITLE_MARKDOWN)
+                    
+                    submission_inputs = dict.fromkeys(SUBMISSION_INPUTS)
+                    
+                    with gr.Row():
+                        submission_inputs["team_name"] = gr.Textbox(label='Team name', type='text')
+                        submission_inputs["model_name"] = gr.Textbox(label='Model name', type='text')
+                        submission_inputs["model_type"] = gr.Dropdown(
+                            label="Model type",
+                            choices=("chat", "pretrained", "ensemble"),
+                        )
+                        submission_inputs["parameters"] = gr.Number(
+                            label='Parameters (B)',
+                            value=0.01,
+                            step=0.01,
+                        )
+
+                    with gr.Row():
+                        submission_inputs["input_length"] = gr.Number(
+                            label='Input length (# tokens)',
+                            value=0,
+                            step=1,
+                        )
+                        submission_inputs["precision"] = gr.Dropdown(
+                            label="Precision",
+                            choices=("float32", "bfloat32", "float16", "bfloat16", "8bit", "4bit"),
+                        )
+                        submission_inputs["description"] = gr.Textbox(label='Description', type='text')
+                        submission_inputs["link_to_model"] = gr.Textbox(label='Link to model', type='text')
+
+                    submission_inputs["submission_file"] = gr.File(label='Upload your results', type='filepath')
+                    
+                    pre_submission_btn = gr.Button(value='Pre-submit model', interactive=True)
+
+                    submit_prompt = gr.Markdown(
+                        SUBMISSION_DETAILS_MARKDOWN,
+                        visible=False
                     )
 
-                with gr.Row():
-                    submission_inputs["input_length"] = gr.Number(
-                        label='Input length (# tokens)',
-                        value=0,
-                        step=1,
-                    )
-                    submission_inputs["precision"] = gr.Dropdown(
-                        label="Precision",
-                        choices=("float32", "bfloat32", "float16", "bfloat16", "8bit", "4bit"),
+                    pre_submit_info = gr.Markdown(
+                        RANKING_AFTER_SUBMISSION_MARKDOWN,
+                        visible=False
                     )
-                    submission_inputs["description"] = gr.Textbox(label='Description', type='text')
-                    submission_inputs["link_to_model"] = gr.Textbox(label='Link to model', type='text')
-
-                submission_inputs["submission_file"] = gr.File(label='Upload your results', type='filepath')
-                
-                pre_submission_btn = gr.Button(value='Pre-submit model', interactive=True)
 
-                submit_prompt = gr.Markdown(
-                    SUBMISSION_DETAILS_MARKDOWN,
-                    visible=False
-                )
-
-                pre_submit_info = gr.Markdown(
-                    RANKING_AFTER_SUBMISSION_MARKDOWN,
-                    visible=False
-                )
-
-                pre_submit_table = gr.DataFrame(pd.DataFrame(), interactive=False, label=None, visible=False)
-
-                submission_btn_yes = gr.Button(value='Submit model', interactive=False, visible=False)
-                submission_btn_no = gr.Button(value='Reverse process', interactive=False, visible=False)
-
-                with Modal(visible=False) as modal_submit:
-                    gr.Markdown(MODAL_SUBMIT_MARKDOWN)
-                    modal_submit_yes = gr.Button("Yes", interactive=True)
-                    modal_submit_no = gr.Button("No", interactive=True)
-
-                pre_submission_btn.click(
-                    fn=on_submit_pressed,
-                    outputs=[pre_submission_btn],
-                ).then(  # TODO: Zjistit proč to neběží konkurentně.
-                    fn=process_submission,
-                    inputs=list(submission_inputs.values()),
-                    outputs=[
-                        pre_submission_btn,
-                        submit_prompt,
-                        submission_btn_yes,
-                        submission_btn_no,
-                        pre_submit_info,
-                        pre_submit_table,
-                    ],
-                )
+                    pre_submit_table = gr.DataFrame(pd.DataFrame(), interactive=False, label=None, visible=False)
+
+                    submission_btn_yes = gr.Button(value='Submit model', interactive=False, visible=False)
+                    submission_btn_no = gr.Button(value='Reverse process', interactive=False, visible=False)
+
+                    with Modal(visible=False) as modal_submit:
+                        gr.Markdown(MODAL_SUBMIT_MARKDOWN)
+                        modal_submit_yes = gr.Button("Yes", interactive=True)
+                        modal_submit_no = gr.Button("No", interactive=True)
+
+                    pre_submission_btn.click(
+                        fn=on_submit_pressed,
+                        outputs=[pre_submission_btn],
+                    ).then(  # TODO: Zjistit proč to neběží konkurentně.
+                        fn=process_submission,
+                        inputs=list(submission_inputs.values()),
+                        outputs=[
+                            pre_submission_btn,
+                            submit_prompt,
+                            submission_btn_yes,
+                            submission_btn_no,
+                            pre_submit_info,
+                            pre_submit_table,
+                        ],
+                    )
 
-                submission_btn_yes.click(
-                    fn=show_modal,
-                    outputs=[modal_submit]
-                )
+                    submission_btn_yes.click(
+                        fn=show_modal,
+                        outputs=[modal_submit]
+                    )
 
-                modal_submit_yes.click(
-                    fn=submit_results,
-                    outputs=[
-                        pre_submission_btn,
-                        submission_btn_yes,
-                        submission_btn_no,
-                        submit_prompt,
-                        pre_submit_info,
-                        pre_submit_table,
-                        leaderboard_table,
-                        modal_submit,
-                        detail_dropdown,
-                        category_of_tasks,
-                        tournament_results_dropdown,
-                    ],
-                )
+                    modal_submit_yes.click(
+                        fn=submit_results,
+                        outputs=[
+                            pre_submission_btn,
+                            submission_btn_yes,
+                            submission_btn_no,
+                            submit_prompt,
+                            pre_submit_info,
+                            pre_submit_table,
+                            leaderboard_table,
+                            modal_submit,
+                            detail_dropdown,
+                            category_of_tasks,
+                            tournament_results_dropdown,
+                        ],
+                    )
 
-                modal_submit_no.click(
-                    fn=hide_modal,
-                    outputs=[modal_submit]
-                )
+                    modal_submit_no.click(
+                        fn=hide_modal,
+                        outputs=[modal_submit]
+                    )
 
-                submission_btn_no.click(
-                    fn=erase_pre_submit,
-                    outputs=[
-                        pre_submission_btn,
-                        submission_btn_yes,
-                        submission_btn_no,
-                        submit_prompt,
-                        pre_submit_info,
-                        pre_submit_table,
-                    ],
-                )
+                    submission_btn_no.click(
+                        fn=erase_pre_submit,
+                        outputs=[
+                            pre_submission_btn,
+                            submission_btn_yes,
+                            submission_btn_no,
+                            submit_prompt,
+                            pre_submit_info,
+                            pre_submit_table,
+                        ],
+                    )
+        
+        main.load(
+            on_application_load,
+            inputs=None,
+            outputs=[
+                leaderboard_table,
+                detail_dropdown,
+                category_of_tasks,
+                tournament_results_dropdown,
+            ]
+        )
     
-    main.load(
-        on_application_load,
-        inputs=None,
-        outputs=[
-            leaderboard_table,
-            detail_dropdown,
-            category_of_tasks,
-            tournament_results_dropdown,
-        ]
-    )
+    return main
 
-main.launch()
+app = gradio_app()
+app.launch()