업데이트

app.py

@@ -28,7 +28,7 @@ QUESTION_TEMPLATE = {"question": "다음 포켓몬의 이름은 뭘까요?![]({i
 
 def get_question_answer(pokemons_set):
     chosen = random.choice(pokemons_set)
-    name = chosen['name']
+    name = chosen['name'].replace("♀", "암컷").replace("♂", "수컷")
     image_path = chosen['image_path']
     answer.value = QUESTION_TEMPLATE['answer'].format(name=name)
     img_url = f"https://huggingface.co/spaces/yoon-gu/pokemon/resolve/main/{image_path}"
@@ -36,7 +36,7 @@ def get_question_answer(pokemons_set):
     a = QUESTION_TEMPLATE['answer'].format(name=name)
     return q, a
 
-info = {u: {"done" : True, "score": 0, "count": 0, "best": 0, "time": 0.0} for u in USERS}
+info = {u: {"done" : True, "score": 0, "count": 0, "best_score": 0, "best_time": float("inf"), "time": 0.0} for u in USERS}
 
 MD = """# 포켓몬 퀴즈
 ## 사용방법
@@ -54,7 +54,7 @@ with gr.Blocks() as demo:
     answer = gr.State(value="")
     with gr.Row():
         with gr.Column():
-            markdown = gr.Markdown(MD.format(content='\n'.join([f"- {u}({v['score']:3.1f}점, {v['time']:3.1f}초)" for u, v in info.items()])))
+            markdown = gr.Markdown(MD.format(content=''))
             user = gr.Radio(USERS, value="Dummy", label="사용자", info="당신은 누구신가요?")
             quiz_count = gr.Radio([10, 20, 30], value=10, label="총 퀴즈 개수", info="퀴즈를 몇 개 풀 예정인가요?")
         with gr.Column():
@@ -70,10 +70,13 @@ with gr.Blocks() as demo:
                             label="포켓몬 타입",
                             info="원하는 포켓몬 타입을 선택하세요."
                     )
+            with gr.Row():
+                play = gr.Button(value="퀴즈 시작", label="퀴즈 시작")
+                stop = gr.Button(value="퀴즈 종료", label="퀴즈 종료")
             chatbot = gr.Chatbot(bubble_full_width=False)
-            msg = gr.Textbox(value="퀴즈 시작", label="답")
+            msg = gr.Textbox(placeholder="문제의 답을 입력하세요.", label="답")
 
-    def respond(user, quiz_count, gen, types, message, chat_history, request: gr.Request):
+    def respond(message, chat_history, user, quiz_count, gen, types, request: gr.Request):
         done = info[user]['done']
         start, end = GEN_RANGE[gen]
         sdf = df[start:end]
@@ -85,6 +88,7 @@ with gr.Blocks() as demo:
                 bot_message = f"퀴즈를 시작합니다.\n{q}"
                 answer.value = a
                 info[user]['done'] = False
+                info[user]['score'] = 0
                 info[user]['count'] = 0
                 info[user]['time'] = time.time()
             else:
@@ -99,7 +103,9 @@ with gr.Blocks() as demo:
                 if quiz_count == info[user]['count']:
                     bot_message = f"모든 퀴즈를 다 풀었습니다. 점수는 {info[user]['score']:3.1f}점 입니다."
                     info[user]['done'] = True
-                    info[user]['time'] = time.time() - info[user]['time']
+                    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'])
             elif "퀴즈종료" == message.replace(" ", ""):
                 bot_message = f"퀴즈를 강제 종료합니다."
                 info[user]['done'] = True
@@ -108,12 +114,18 @@ with gr.Blocks() as demo:
                 info[user]['score'] -= 0.1
 
         chat_history.append((message, bot_message))
-        return "", chat_history, MD.format(content='\n'.join([f"- {u}({v['score']:3.1f}점, {v['time']:3.1f}초)" for u, v in info.items()]))
-    
-    demo.load(lambda : MD.format(content='\n'.join([f"- {u}({v['score']:3.1f}점)" for u, v in info.items()])),
+        return "", chat_history, MD.format(content='\n'.join([f"- {u}({v['best_score']:3.1f}점, {v['best_time']:3.1f}초)" for u, v in info.items()]))
+
+    play.click(respond, 
+               inputs=[play, chatbot, user, quiz_count, generation, poke_types],
+               outputs=[msg, chatbot, markdown])
+    stop.click(respond, 
+               inputs=[stop, chatbot, user, quiz_count, generation, poke_types],
+               outputs=[msg, chatbot, markdown])
+    demo.load(lambda : MD.format(content='\n'.join([f"- {u}({v['best_score']:3.1f}점, {v['best_time']:3.1f}초)" for u, v in info.items()])),
               inputs=None,
               outputs=markdown)
-    msg.submit(respond, [user, quiz_count, generation, poke_types, msg, chatbot], [msg, chatbot, markdown])
+    msg.submit(respond, [msg, chatbot, user, quiz_count, generation, poke_types], [msg, chatbot, markdown])
 
 demo.queue(concurrency_count=1)
 demo.launch()