bugfix: fix minor bugs

app.py

@@ -67,9 +67,11 @@ def get_player_logs(player_backend_user_id):
             f"Player {player_backend_user_id} not found in processed_player_adventure_logs.json"
         )
 
+
 def init_reward():
     return CompletionReward()
 
+
 # start of gradio interface
 with gr.Blocks(theme=seafoam, css=get_content("css/style.css")) as demo:
     player_info = gr.State()
@@ -93,7 +95,9 @@ with gr.Blocks(theme=seafoam, css=get_content("css/style.css")) as demo:
                     height=200,
                 )
 
-                badge_description = gr.Markdown("# 徽章", elem_id="badge_avatar_description")
+                badge_description = gr.Markdown(
+                    "# 徽章", elem_id="badge_avatar_description"
+                )
                 badge_gallery = gr.Gallery(
                     [],
                     label="徽章",
@@ -140,11 +144,15 @@ with gr.Blocks(theme=seafoam, css=get_content("css/style.css")) as demo:
                 "<div style='max-width:100%; max-height:360px; overflow:auto'>"
                 + get_content("htmls/adventure_blank.html")
             )
-            adventure_log = gr.HTML(html, label="Adventure Log", elem_id="adventure_log")
+            adventure_log = gr.HTML(
+                html, label="Adventure Log", elem_id="adventure_log"
+            )
 
         # handling player info
         with gr.Row():
-            player_backend_id = gr.Textbox("", elem_id="player_backend_id", visible=False)
+            player_backend_id = gr.Textbox(
+                "", elem_id="player_backend_id", visible=False
+            )
             player_info_query_btn = gr.Button(
                 "Query", elem_id="trigger_button", visible=False
             )
@@ -293,207 +301,209 @@ with gr.Blocks(theme=seafoam, css=get_content("css/style.css")) as demo:
 
     # actions when player login
     # define args
-    # send_player_login_info = dict(
-    #     fn=render_finished,
-    #     inputs=[player_activity_tracker, player_info],
-    #     outputs=None,
-    # )
-
-    # player_info_query_btn.click(get_player_info, player_backend_id, player_info).then(
-    #     render_player_data,
-    #     player_info,
-    #     [avatar, pet_gallery, badge_gallery, adventure_log, achievements, adventure],
-    # ).then(
-    #     **send_player_login_info
-    # )
-
-    # pull_newest_player_data.submit(
-    #     save_latest_player_data,
-    #     None,
-    #     update_status,
-    #     api_name="pull_newest_player_data",
-    # )
-
-    # def create_visibility_updates(visible, count):
-    #     return tuple(gr.update(visible=visible) for _ in range(count))
-
-    # start_make_reward.click(
-    #     check_is_in_completion_reward,
-    #     player_backend_id,
-    #     [
-    #         start_make_reward,
-    #         player_name_title,
-    #         player_name,
-    #         confirm_player_name,
-    #         not_participate,
-    #         not_start,
-    #         already_issued,
-    #     ],
-    #     queue=False,
-    # )
-
-    # set_player_name_args = dict(
-    #     fn=set_player_name,
-    #     inputs=[completion_reward, player_name, player_backend_id],
-    #     outputs=None,
-    #     queue=False,
-    # )
-
-    # confirm_player_name.click(
-    #     lambda: (gr.update(interactive=False), gr.update(visible=False)),
-    #     None,
-    #     [player_name, confirm_player_name],
-    #     queue=False,
-    # ).then(
-    #     lambda: create_visibility_updates(True, 2),
-    #     None,
-    #     [cancel_player_name, player_name_next_step],
-    #     queue=False,
-    # ).then(
-    #     **set_player_name_args
-    # )
-
-    # cancel_player_name.click(
-    #     lambda: (gr.update(interactive=True), gr.update(visible=True)),
-    #     None,
-    #     [player_name, confirm_player_name],
-    #     queue=False,
-    # ).then(
-    #     lambda: create_visibility_updates(False, 2),
-    #     None,
-    #     [cancel_player_name, player_name_next_step],
-    #     queue=False,
-    # )
-
-    # player_name_next_step.click(
-    #     lambda: create_visibility_updates(False, 5),
-    #     None,
-    #     [
-    #         player_name,
-    #         player_name_next_step,
-    #         confirm_player_name,
-    #         player_name_title,
-    #         cancel_player_name,
-    #     ],
-    #     queue=False,
-    # ).then(
-    #     lambda: create_visibility_updates(True, 11),
-    #     None,
-    #     [
-    #         openai_img,
-    #         aws_img,
-    #         google_img,
-    #         mtk_img,
-    #         story_title,
-    #         story_description,
-    #         openai_description,
-    #         aws_description,
-    #         google_description,
-    #         mtk_description,
-    #         start_generate_story,
-    #     ],
-    #     queue=False,
-    # )
-
-    # get_llm_response_args = dict(
-    #     fn=get_llm_response,
-    #     inputs=[completion_reward, player_logs],
-    #     outputs=[bot1, bot2, bot3, bot4],
-    #     queue=False,
-    # )
-
-    # start_generate_story.click(
-    #     lambda: gr.update(visible=False), None, start_generate_story, queue=False
-    # ).then(
-    #     lambda: create_visibility_updates(True, 4),
-    #     None,
-    #     [bot1, bot2, bot3, bot4],
-    #     queue=False,
-    # ).then(
-    #     **get_llm_response_args
-    # ).then(
-    #     lambda: gr.update(visible=True), None, [select_story], queue=False
-    # )
-
-    # select_story.select(
-    #     lambda: gr.update(visible=True), None, confirm_story, queue=False
-    # )
-
-    # set_player_selected_character_args = dict(
-    #     fn=set_player_selected_character,
-    #     inputs=[completion_reward, select_story],
-    #     outputs=None,
-    #     queue=False,
-    # )
-
-    # confirm_story.click(
-    #     lambda: gr.update(interactive=False), None, [select_story], queue=False
-    # ).then(lambda: gr.update(visible=False), None, [confirm_story], queue=False).then(
-    #     lambda: (gr.update(visible=True), gr.update(visible=True)),
-    #     None,
-    #     [start_generate_certificate, cancel_story],
-    #     queue=False,
-    # ).then(
-    #     **set_player_selected_character_args
-    # )
-
-    # cancel_story.click(
-    #     lambda: gr.update(interactive=True), None, [select_story], queue=False
-    # ).then(lambda: gr.update(visible=False), None, [cancel_story], queue=False).then(
-    #     lambda: (gr.update(visible=False), gr.update(visible=True)),
-    #     None,
-    #     [start_generate_certificate, confirm_story],
-    #     queue=False,
-    # )
-
-    # create_certificate_args = dict(
-    #     fn=create_certificate,
-    #     inputs=[completion_reward],
-    #     outputs=reward_result,
-    #     queue=False,
-    # )
-
-    # complete_reward_args = dict(
-    #     fn=complete_reward,
-    #     inputs=[completion_reward],
-    #     outputs=None,
-    #     queue=False,
-    # )
-
-    # start_generate_certificate.click(
-    #     lambda: create_visibility_updates(False, 18),
-    #     None,
-    #     [
-    #         openai_img,
-    #         aws_img,
-    #         google_img,
-    #         mtk_img,
-    #         story_title,
-    #         story_description,
-    #         openai_description,
-    #         aws_description,
-    #         google_description,
-    #         mtk_description,
-    #         bot1,
-    #         bot2,
-    #         bot3,
-    #         bot4,
-    #         select_story,
-    #         processing,
-    #         cancel_story,
-    #         start_generate_certificate,
-    #     ],
-    #     queue=False,
-    # ).then(lambda: gr.update(visible=True), None, [processing], queue=False).then(
-    #     **create_certificate_args
-    # ).then(
-    #     lambda: (gr.update(visible=True), gr.update(visible=False)),
-    #     None,
-    #     [complete, processing],
-    #     queue=False,
-    # ).then(
-    #     **complete_reward_args
-    # )
+    send_player_login_info = dict(
+        fn=render_finished,
+        inputs=[player_activity_tracker, player_info],
+        outputs=None,
+    )
+
+    player_info_query_btn.click(get_player_info, player_backend_id, player_info).then(
+        get_player_logs, player_backend_id, player_logs
+    ).then(
+        render_player_data,
+        player_info,
+        [avatar, pet_gallery, badge_gallery, adventure_log, achievements, adventure],
+    ).then(
+        **send_player_login_info
+    )
+
+    pull_newest_player_data.submit(
+        save_latest_player_data,
+        None,
+        update_status,
+        api_name="pull_newest_player_data",
+    )
+
+    def create_visibility_updates(visible, count):
+        return tuple(gr.update(visible=visible) for _ in range(count))
+
+    start_make_reward.click(
+        check_is_in_completion_reward,
+        player_backend_id,
+        [
+            start_make_reward,
+            player_name_title,
+            player_name,
+            confirm_player_name,
+            not_participate,
+            not_start,
+            already_issued,
+        ],
+        queue=False,
+    )
+
+    set_player_name_args = dict(
+        fn=set_player_name,
+        inputs=[completion_reward, player_name, player_backend_id],
+        outputs=None,
+        queue=False,
+    )
+
+    confirm_player_name.click(
+        lambda: (gr.update(interactive=False), gr.update(visible=False)),
+        None,
+        [player_name, confirm_player_name],
+        queue=False,
+    ).then(
+        lambda: create_visibility_updates(True, 2),
+        None,
+        [cancel_player_name, player_name_next_step],
+        queue=False,
+    ).then(
+        **set_player_name_args
+    )
+
+    cancel_player_name.click(
+        lambda: (gr.update(interactive=True), gr.update(visible=True)),
+        None,
+        [player_name, confirm_player_name],
+        queue=False,
+    ).then(
+        lambda: create_visibility_updates(False, 2),
+        None,
+        [cancel_player_name, player_name_next_step],
+        queue=False,
+    )
+
+    player_name_next_step.click(
+        lambda: create_visibility_updates(False, 5),
+        None,
+        [
+            player_name,
+            player_name_next_step,
+            confirm_player_name,
+            player_name_title,
+            cancel_player_name,
+        ],
+        queue=False,
+    ).then(
+        lambda: create_visibility_updates(True, 11),
+        None,
+        [
+            openai_img,
+            aws_img,
+            google_img,
+            mtk_img,
+            story_title,
+            story_description,
+            openai_description,
+            aws_description,
+            google_description,
+            mtk_description,
+            start_generate_story,
+        ],
+        queue=False,
+    )
+
+    get_llm_response_args = dict(
+        fn=get_llm_response,
+        inputs=[completion_reward, player_logs],
+        outputs=[bot1, bot2, bot3, bot4],
+        queue=False,
+    )
+
+    start_generate_story.click(
+        lambda: gr.update(visible=False), None, start_generate_story, queue=False
+    ).then(
+        lambda: create_visibility_updates(True, 4),
+        None,
+        [bot1, bot2, bot3, bot4],
+        queue=False,
+    ).then(
+        **get_llm_response_args
+    ).then(
+        lambda: gr.update(visible=True), None, [select_story], queue=False
+    )
+
+    select_story.select(
+        lambda: gr.update(visible=True), None, confirm_story, queue=False
+    )
+
+    set_player_selected_character_args = dict(
+        fn=set_player_selected_character,
+        inputs=[completion_reward, select_story],
+        outputs=None,
+        queue=False,
+    )
+
+    confirm_story.click(
+        lambda: gr.update(interactive=False), None, [select_story], queue=False
+    ).then(lambda: gr.update(visible=False), None, [confirm_story], queue=False).then(
+        lambda: (gr.update(visible=True), gr.update(visible=True)),
+        None,
+        [start_generate_certificate, cancel_story],
+        queue=False,
+    ).then(
+        **set_player_selected_character_args
+    )
+
+    cancel_story.click(
+        lambda: gr.update(interactive=True), None, [select_story], queue=False
+    ).then(lambda: gr.update(visible=False), None, [cancel_story], queue=False).then(
+        lambda: (gr.update(visible=False), gr.update(visible=True)),
+        None,
+        [start_generate_certificate, confirm_story],
+        queue=False,
+    )
+
+    create_certificate_args = dict(
+        fn=create_certificate,
+        inputs=[completion_reward],
+        outputs=reward_result,
+        queue=False,
+    )
+
+    complete_reward_args = dict(
+        fn=complete_reward,
+        inputs=[completion_reward],
+        outputs=None,
+        queue=False,
+    )
+
+    start_generate_certificate.click(
+        lambda: create_visibility_updates(False, 18),
+        None,
+        [
+            openai_img,
+            aws_img,
+            google_img,
+            mtk_img,
+            story_title,
+            story_description,
+            openai_description,
+            aws_description,
+            google_description,
+            mtk_description,
+            bot1,
+            bot2,
+            bot3,
+            bot4,
+            select_story,
+            processing,
+            cancel_story,
+            start_generate_certificate,
+        ],
+        queue=False,
+    ).then(lambda: gr.update(visible=True), None, [processing], queue=False).then(
+        **create_certificate_args
+    ).then(
+        lambda: (gr.update(visible=True), gr.update(visible=False)),
+        None,
+        [complete, processing],
+        queue=False,
+    ).then(
+        **complete_reward_args
+    )
 
 if __name__ == "__main__":
     demo.launch()

utils/completion_reward.py

@@ -35,6 +35,7 @@ gcs_client = storage.Client(
     credentials=creds, project=service_account_info_dict["project_id"]
 )
 
+
 class CompletionReward:
     def __init__(self):
         self.player_backend_user_id = None

utils/completion_reward_utils.py

@@ -32,7 +32,11 @@ def check_is_in_completion_reward(player_backend_user_id):
         completion_reward_issue_status_dict = json.load(f)
 
     if player_backend_user_id in completion_reward_issue_status_dict:
-        preview_list = ["chen.kao@junyiacademy.org", "http://googleid.junyiacademy.org/111939868185365078143", "http://googleid.junyiacademy.org/107407156051367422051"]
+        preview_list = [
+            "chen.kao@junyiacademy.org",
+            "http://googleid.junyiacademy.org/111939868185365078143",
+            "http://googleid.junyiacademy.org/107407156051367422051",
+        ]
         if player_backend_user_id in preview_list:
             value = completion_reward_issue_status_dict[player_backend_user_id]
             if value == "not_issued":