update

app.py

@@ -5,6 +5,8 @@ import random
 import json
 import time
 import wandb
+from copy import deepcopy
+from collections import defaultdict
 
 wandb.login(key=os.environ['WANDB_KEY'])
 run = wandb.init(project="pokemon-quiz", entity="yoon-gu")
@@ -26,7 +28,6 @@ GEN_RANGE = {
     "9세대": [906, 1017]
 }
 
-USERS = ["June", "Sean", "Woojoo", "Taejoo", "Dummy"]
 QUESTION_TEMPLATE = {"question": "다음 포켓몬의 이름은 뭘까요?![]({img_url})", "answer": "{name}"}
 
 def get_question_answer(pokemons_set):
@@ -38,15 +39,22 @@ def get_question_answer(pokemons_set):
     a = QUESTION_TEMPLATE['answer'].format(name=name)
     return q, a
 
+initial_info = {"done" : True,
+                "score": 0, "count": 0,
+                "best_score": 0, "best_time": float("inf"),
+                "time": 0.0, "comment": ""}
+
 try:
     folder = run.use_artifact("settings:latest").download()
+    with open(os.path.join(folder, "users.json"), "r") as f:
+        USERS = json.load(f)
     with open(os.path.join(folder, "info.json"), "r") as f:
         info = json.load(f)
 except:
-    info = {u: {"done" : True,
-                "score": 0, "count": 0,
-                "best_score": 0, "best_time": float("inf"),
-                "time": 0.0, "comment": ""} for u in USERS}
+    info = defaultdict(lambda : deepcopy(initial_info))
+    USERS = ["김서현", "김우주", "Anonymous"]
+    for user in USERS:
+        print(info[user])
 
 MD = """# 포켓몬 퀴즈
 ## 공부 방법
@@ -62,14 +70,14 @@ MD = """# 포켓몬 퀴즈
 4. 포켓몬 타입을 선택하세요.
 
 ## 점수판
-{content}
 """
 
 with gr.Blocks() as demo:
     with gr.Row():
         with gr.Column():
             markdown = gr.Markdown(MD.format(content=''))
-            user = gr.Radio(USERS, value="Dummy", label="사용자", info="당신은 누구신가요?")
+            leader_board = gr.DataFrame()
+            user = gr.Dropdown(USERS, value="Anonymous", label="사용자", info="당신은 누구신가요?", allow_custom_value=True)
             quiz_count = gr.Radio([10, 20, 30], value=10, label="총 퀴즈 개수", info="퀴즈를 몇 개 풀 예정인가요?")
         with gr.Column():
             with gr.Row():
@@ -140,7 +148,7 @@ with gr.Blocks() as demo:
                 bot_message = f"***{message}***!? 🧐 다시 한번 생각해보세요.\n힌트: {hint1}"
                 info[user]['score'] -= 0.1
 
-            bot_message += f"\n총 {quiz_count}개 문제 중 {info[user]['count']}번째 문제 진행 중입니다."
+            bot_message += f"\n\n총 {quiz_count}개 문제 중 {info[user]['count']}번째 문제 진행 중입니다."
 
             if quiz_count == info[user]['count']:
                 bot_message = f"모든 퀴즈를 다 풀었습니다. 점수는 {info[user]['score']:3.1f}점 입니다."
@@ -148,11 +156,15 @@ with gr.Blocks() as demo:
                 if info[user]['score'] >= info[user]['best_score']:
                     info[user]['best_score'] = info[user]['score']
                     info[user]['best_time'] = min(time.time() - info[user]['time'], info[user]['best_time'])
+                    info[user]['best_time'] = round(info[user]['best_time'], 2)
                     info[user]['comment'] = f"{gen}세대+{types}"
                 with open("info.json", "w") as f:
                     json.dump(info, f, indent=4)
+                with open("users.json", "w") as f:
+                    json.dump(USERS, f, indent=4)
                 artifact = wandb.Artifact("settings", type="info")
                 artifact.add_file("info.json")
+                artifact.add_file("users.json")
                 run.log_artifact(artifact)
 
         chat_history.append((message, bot_message))
@@ -161,29 +173,39 @@ with gr.Blocks() as demo:
         lbdf = pd.DataFrame([dict(**a[1], name=a[0]) for a in leader_board])
         lbdf.rename(columns={'name': "이름", 'best_score': "최고점수", 'best_time': "시간기록", 'comment': "퀴즈유형"}, inplace=True)
         lbdf.index += 1
-        md = lbdf[['이름', '최고점수', '시간기록', '퀴즈유형']].to_markdown()
-        return "", chat_history, MD.format(content=md)
+        md = lbdf[['이름', '최고점수', '시간기록', '퀴즈유형']]
+        return "", chat_history, md
 
     play.click(respond, 
                inputs=[play, chatbot, user, quiz_count, generation, poke_types],
-               outputs=[msg, chatbot, markdown])
+               outputs=[msg, chatbot, leader_board])
     skip.click(respond, 
                inputs=[skip, chatbot, user, quiz_count, generation, poke_types],
-               outputs=[msg, chatbot, markdown])
+               outputs=[msg, chatbot, leader_board])
     stop.click(respond, 
                inputs=[stop, chatbot, user, quiz_count, generation, poke_types],
-               outputs=[msg, chatbot, markdown])
+               outputs=[msg, chatbot, leader_board])    
+    
+    def rs_change(rs):
+        global USERS
+        if rs not in USERS:
+            USERS += [rs]
+        return gr.update(choices=sorted(USERS), value=rs)
+
+    user.blur(rs_change, user, user)
+
     def update_table():
         leader_board = sorted(info.items(), key=lambda x: (x[1]['best_score'], -x[1]['best_time']), reverse=True)
         lbdf = pd.DataFrame([dict(**a[1], name=a[0]) for a in leader_board])
         lbdf.rename(columns={'name': "이름", 'best_score': "최고점수", 'best_time': "시간기록", 'comment': "퀴즈유형"}, inplace=True)
         lbdf.index += 1
-        md = lbdf[['이름', '최고점수', '시간기록', '퀴즈유형']].to_markdown()
-        return MD.format(content=md)
+        print(len(lbdf))
+        md = lbdf[['이름', '최고점수', '시간기록', '퀴즈유형']]
+        return md
     demo.load(update_table,
               inputs=None,
-              outputs=markdown)
-    msg.submit(respond, [msg, chatbot, user, quiz_count, generation, poke_types], [msg, chatbot, markdown])
+              outputs=leader_board)
+    msg.submit(respond, [msg, chatbot, user, quiz_count, generation, poke_types], [msg, chatbot, leader_board])
 
 demo.queue(concurrency_count=1)
 demo.launch()