multiple choice

app.py

@@ -13,7 +13,7 @@ run = wandb.init(project="pokemon-quiz", entity="yoon-gu")
 
 with open('pokemon.json', 'r') as f:
     pokemons = json.load(f)
-pokemons_types = ["모든 타입"] + sorted(set([t for poke in pokemons for t in poke['types']]))
+pokemons_types = sorted(set([t for poke in pokemons for t in poke['types']]))
 df = pd.DataFrame(pokemons)
 GEN_RANGE = {
     "모든 세대": [1, 1017],
@@ -90,13 +90,15 @@ with gr.Blocks() as demo:
         with gr.Column():
             with gr.Row():
                 generation = gr.Dropdown(
-                            [f"{k}세대" for k in range(1, 10)] + ["모든 세대"],
-                            value="모든 세대",
+                            [f"{k}세대" for k in range(1, 10)],
+                            value=[f"{k}세대" for k in range(1, 10)],
+                            multiselect=True,
                             label="포켓몬 세대",
                             info="원하는 포켓몬 세대를 선택하세요."
                         )
                 poke_types = gr.Dropdown(
-                            pokemons_types, value="모든 타입",
+                            pokemons_types, value=pokemons_types,
+                            multiselect=True,
                             label="포켓몬 타입",
                             info="원하는 포켓몬 타입을 선택하세요."
                     )
@@ -119,9 +121,13 @@ with gr.Blocks() as demo:
             raise gr.Error("사용자 이름을 입력하세요.")
         message = message.strip()
         done = infos[user].done
-        start, end = GEN_RANGE[gen]
-        sdf = df[start:end]
-        pokemons_set = sdf[sdf['types'].apply(lambda x: (types in x)) | (types == "모든 타입")]
+
+        dfs = []
+        for g in gen:
+            start, end = GEN_RANGE[g]
+            dfs.append(df[start-1:end])
+        sdf = pd.concat(dfs)
+        pokemons_set = sdf[sdf['types'].apply(lambda x: any([t in x for t in  types]))]
         pokemons_set = pokemons_set.to_dict("records")
         if done:
             infos[user].history = []
@@ -133,6 +139,8 @@ with gr.Blocks() as demo:
                 infos[user].score = 0
                 infos[user].count = 0
                 infos[user].time = time.time()
+                infos[user].generations = gen
+                infos[user].types = types
             else:
                 bot_message = "퀴즈를 시작하고 싶으시면, **퀴즈 시작** 버튼을 누르세요."
         else: