implement shuffle queue

app.py

@@ -1,5 +1,6 @@
 import os
 import random
+from copy import deepcopy
 
 import gradio as gr
 import numpy as np
@@ -47,9 +48,18 @@ kana_list = [c for c in kana_list if c.strip()]
 chars = [os.path.join(dn, fn) for dn, _, ff in os.walk("chars") for fn in ff]
 
 
-def get_char(ch=None, assist=True, kana=True):
+def init_chars():
+    curr_chars = deepcopy(chars)
+    random.shuffle(curr_chars)
+    return curr_chars
+
+
+def get_char(ch=None, assist=True, kana=True, curr_chars: list = []):
+    if not curr_chars:
+        curr_chars = init_chars()
+
     if ch is None:
-        img_path = random.choice(chars)
+        img_path = curr_chars.pop()
         ch = img_path[-5]
     else:
         img_path = f"chars/{ch}.png"
@@ -61,16 +71,20 @@ def get_char(ch=None, assist=True, kana=True):
     if not kana:
         info = f"{to_roma(ch)}"
 
-    return ch, img_path, info
+    return ch, img_path, info, curr_chars
 
 
 font = gr.themes.GoogleFont("Noto Sans")
 theme = gr.themes.Soft(font=font)
 
 with gr.Blocks(theme=theme, title="Kana Writer") as app:
-    ch, char_img, roma = get_char()
+    ch = "あ"
+    char_img = "chars/あ.png"
+    roma = "あ (a)"
+
     curr_img_path = gr.State(char_img)
     curr_char = gr.State(ch)
+    curr_chars = gr.State([])
     recog = Recognizer("model/model.xml", "model/char_list.txt")
 
     with gr.Tab("寫字練習"):
@@ -114,35 +128,35 @@ with gr.Blocks(theme=theme, title="Kana Writer") as app:
         _, nbest = recog(img)
         return ", ".join(parse_item(item) for items in nbest for item in items if valid_item(item))
 
-    def rand_char(assist, kana):
-        char, img, roma = get_char(None, assist, kana)
-        return char, img, img, roma, None
+    def rand_char(assist, kana, chars):
+        char, img, roma, chars = get_char(None, assist, kana, chars)
+        return char, img, img, roma, None, chars
 
     def clear(curr_char):
         return curr_char
 
-    def change_opt(curr_char, assist, kana):
-        char, img, roma = get_char(curr_char, assist, kana)
-        return char, img, img, roma
+    def change_opt(char, assist, kana, chars):
+        char, img, roma, chars = get_char(char, assist, kana, chars)
+        return char, img, img, roma, chars
 
     check_btn.click(do_recog, sketch, result, show_progress="minimal")
     rand_btn.click(
         rand_char,
-        [assist, kana],
-        [curr_char, sketch, curr_img_path, header, result],
+        [assist, kana, curr_chars],
+        [curr_char, sketch, curr_img_path, header, result, curr_chars],
         show_progress="minimal",
     )
     sketch.clear(clear, curr_img_path, sketch, show_progress="minimal")
     assist.change(
         change_opt,
-        [curr_char, assist, kana],
-        [curr_char, sketch, curr_img_path, header],
+        [curr_char, assist, kana, curr_chars],
+        [curr_char, sketch, curr_img_path, header, curr_chars],
         show_progress="minimal",
     )
     kana.change(
         change_opt,
-        [curr_char, assist, kana],
-        [curr_char, sketch, curr_img_path, header],
+        [curr_char, assist, kana, curr_chars],
+        [curr_char, sketch, curr_img_path, header, curr_chars],
         show_progress="minimal",
     )