Add word check

.gitattributes

@@ -36,3 +36,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.gif filter=lfs diff=lfs merge=lfs -text
 config/w2v_models/esp_w2v_model filter=lfs diff=lfs merge=lfs -text
 config/w2v_models/eng_w2v_model filter=lfs diff=lfs merge=lfs -text
+config/words.txt filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1 +1 @@
-data/plays/
+data/plays/*.txt

app.py

@@ -1,7 +1,7 @@
 import gradio as gr
 import json
 from game_word2vec import Semantrix as semantrix_word2vec
-from game import Semantrix as semantrix_sentence_transformers
+from game_transformer import Semantrix as semantrix_sentence_transformers
 
 
 config_file_path = "config/lang.json"
@@ -256,7 +256,12 @@ with gr.Blocks() as demo:
                     gr.Radio(label="", visible=False),
                     gr.Textbox(visible=False, label=""),
                     gr.Button(visible=True, variant="stop"),
-                    gr.Textbox(value="", visible=True, placeholder=Menu["New_word"]),
+                    gr.Textbox(
+                        value="",
+                        visible=True,
+                        autofocus=True,
+                        placeholder=Menu["New_word"],
+                    ),
                     gr.Image(interactive=False, visible=False),
                     gr.Textbox(visible=False),
                     gr.Button(visible=False),
@@ -267,7 +272,13 @@ with gr.Blocks() as demo:
             feed = game.play_game(inp)
             feedback_trim = feed.split("[rank]")
             if len(feedback_trim) > 1:
+                ranking_vis = True
                 ranking_md = convert_to_markdown_centered(feedback_trim[1])
+
+            else:
+                ranking_vis = False
+                ranking_md = ""
+
             feedback = feedback_trim[0].split("[hint]")
             win = feedback_trim[0].split("[win]")
             lose = feedback_trim[0].split("[lose]")
@@ -312,7 +323,7 @@ with gr.Blocks() as demo:
                         feedback[1] if hint else "", visible=hint, label="Pista"
                     ),
                     gr.Button(visible=False),
-                    gr.Markdown(ranking_md, visible=True),
+                    gr.Markdown(ranking_md, visible=ranking_vis),
                 ]
             )
 

app_trans.py

@@ -1,12 +1,11 @@
 import gradio as gr
 import json
-from game import Semantrix
+from Research.semantrix.game_transformer import Semantrix
 
 
 config_file_path = "config/lang.json"
 
 
-
 with open(config_file_path, "r") as file:
     Config_full = json.load(file)
 
@@ -19,10 +18,11 @@ elif lang == 1:
 else:
     Config = Config_full["SPA"]["Game"]
 
+
 def convert_to_markdown_centered(text):
     # Separar el texto de último intento y el historial
-    lines = text.strip().split('\n')
-    
+    lines = text.strip().split("\n")
+
     if not lines:
         return ""
 
@@ -31,7 +31,6 @@ def convert_to_markdown_centered(text):
     # Crear el formato Markdown
     markdown = '<div align="center">\n\n'
 
-    
     # Crear la tabla de historial
     markdown += "## Mejores intentos\n"
     markdown += "<table>\n"
@@ -57,11 +56,11 @@ def convert_to_markdown_centered(text):
     markdown += f"**{last_items[0]}:** {last_items[1]} - Score: {last_items[2]}\n\n"
     markdown += "---\n\n"
 
-
     markdown += "</div>"
 
     return markdown
 
+
 with gr.Blocks() as demo:
     state = gr.State(-1)
     difficulty = gr.State(-1)
@@ -69,73 +68,71 @@ with gr.Blocks() as demo:
     hint_path = "config/hint.png"
     game = Semantrix()
 
-
-    
-
     gr.Markdown(
         """
     <p style="text-align:center"> SEMANTRIX: EL JUEGO DE LAS PALABRAS </p>
     """
     )
 
-        
-
     def reset(difficulty):
         game.prepare_game(difficulty)
         output = [
-                    -1,
-                    gr.Textbox(visible=False),
-                    gr.Textbox(visible=False),
-                    gr.Image(hint_path,visible=True,interactive=False),
-                    gr.Button("Empezar",visible=True,variant="secondary"),
-                    gr.Radio(visible=False),
-                    gr.Textbox(visible=False),
-                    gr.Button(visible=False)
-
-                    ]
+            -1,
+            gr.Textbox(visible=False),
+            gr.Textbox(visible=False),
+            gr.Image(hint_path, visible=True, interactive=False),
+            gr.Button("Empezar", visible=True, variant="secondary"),
+            gr.Radio(visible=False),
+            gr.Textbox(visible=False),
+            gr.Button(visible=False),
+        ]
 
         return output
 
-    def change(state,inp):
+    def change(state, inp):
 
         state = state + 1
-        return [state,inp]
+        return [state, inp]
 
-    def update(state, radio,inp,hint):
+    def update(state, radio, inp, hint):
         global difficulty
         dif_state = 4
         output = [state]
-        
+
         state_int = state
 
         if state_int == -1:
             output.extend(
-            [
-                gr.Button("Empezar", visible=True),
-                gr.Radio(label="", visible=False),
-                gr.Textbox(Config[list(Config.keys())[state_int]], visible=False, label=""),
-                gr.Button("Rendirse", visible=False),
-                gr.Textbox(visible=False),
-                gr.Image(interactive=False, visible=True),
-                gr.Textbox(visible=False),
-                gr.Button(visible=False),
-                gr.Markdown(visible=False),  
-            ]
-            )  
+                [
+                    gr.Button("Empezar", visible=True),
+                    gr.Radio(label="", visible=False),
+                    gr.Textbox(
+                        Config[list(Config.keys())[state_int]], visible=False, label=""
+                    ),
+                    gr.Button("Rendirse", visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Image(interactive=False, visible=True),
+                    gr.Textbox(visible=False),
+                    gr.Button(visible=False),
+                    gr.Markdown(visible=False),
+                ]
+            )
 
         if state_int == 1:
             output.extend(
-            [
-                gr.Button("Si", visible=False),
-                gr.Radio(["SÍ", "NO"], label="", visible=True),
-                gr.Textbox(Config[list(Config.keys())[state_int]], visible=True, label=""),
-                gr.Button("Rendirse", visible=False),
-                gr.Textbox(visible=False),
-                gr.Image(interactive=False, visible=False),
-                gr.Textbox(visible=False),
-                gr.Button(visible=False),
-                gr.Markdown(visible=False),
-            ]
+                [
+                    gr.Button("Si", visible=False),
+                    gr.Radio(["SÍ", "NO"], label="", visible=True),
+                    gr.Textbox(
+                        Config[list(Config.keys())[state_int]], visible=True, label=""
+                    ),
+                    gr.Button("Rendirse", visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Image(interactive=False, visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Button(visible=False),
+                    gr.Markdown(visible=False),
+                ]
             )
         elif state_int == 2:
             if radio == "NO":
@@ -143,42 +140,50 @@ with gr.Blocks() as demo:
                     dif_state,
                     gr.Button("Introducir", visible=True),
                     gr.Radio(visible=False),
-                    gr.Textbox(Config[list(Config.keys())[state_int]], visible=True, label=""),
+                    gr.Textbox(
+                        Config[list(Config.keys())[state_int]], visible=True, label=""
+                    ),
                     gr.Button("Rendirse", visible=False),
                     gr.Textbox(visible=False),
                     gr.Image(interactive=False, visible=False),
                     gr.Textbox(visible=False),
                     gr.Button(visible=False),
                     gr.Markdown(visible=False),
-                    ]
-                
+                ]
+
             else:
                 output.extend(
                     [
-                    gr.Button("Siguiente", visible=True), 
-                    gr.Radio(visible=False),
-                    gr.Textbox(Config[list(Config.keys())[state_int]], visible=True, label=""),
+                        gr.Button("Siguiente", visible=True),
+                        gr.Radio(visible=False),
+                        gr.Textbox(
+                            Config[list(Config.keys())[state_int]],
+                            visible=True,
+                            label="",
+                        ),
+                        gr.Button("Rendirse", visible=False),
+                        gr.Textbox(visible=False),
+                        gr.Image(interactive=False, visible=False),
+                        gr.Textbox(visible=False),
+                        gr.Button(visible=False),
+                        gr.Markdown(visible=False),
+                    ]
+                )
+        elif state_int == dif_state:
+            output.extend(
+                [
+                    gr.Button("Siguiente", visible=False),
+                    gr.Radio(["Fácil", "Normal", "Difícil", "Experto"], visible=True),
+                    gr.Textbox(
+                        Config[list(Config.keys())[state_int]], visible=True, label=""
+                    ),
                     gr.Button("Rendirse", visible=False),
                     gr.Textbox(visible=False),
                     gr.Image(interactive=False, visible=False),
                     gr.Textbox(visible=False),
                     gr.Button(visible=False),
                     gr.Markdown(visible=False),
-                    ]
-                )
-        elif state_int == dif_state:
-            output.extend(
-            [
-                gr.Button("Siguiente", visible=False),
-                gr.Radio(["Fácil", "Normal", "Difícil", "Experto"], visible=True),
-                gr.Textbox(Config[list(Config.keys())[state_int]], visible=True, label=""),
-                gr.Button("Rendirse", visible=False),
-                gr.Textbox(visible=False),
-                gr.Image(interactive=False, visible=False),
-                gr.Textbox(visible=False),
-                gr.Button(visible=False),
-                gr.Markdown(visible=False),
-            ]
+                ]
             )
         elif state_int == dif_state + 1:
             if radio == "Fácil":
@@ -190,40 +195,39 @@ with gr.Blocks() as demo:
             else:
                 difficulty = 4
 
-            
-
             output.extend(
-            [
-                gr.Button("Empezar", visible=True, variant="primary"), 
-                gr.Radio(visible=False),
-                gr.Textbox(Config[list(Config.keys())[state_int]], visible=True, label=""),
-                gr.Button("Rendirse", visible=False),
-                gr.Textbox(visible=False),
-                gr.Image(interactive=False, visible=False),
-                gr.Textbox(visible=False),
-                gr.Button(visible=False),
-                gr.Markdown(visible=False),
-
-            ]
+                [
+                    gr.Button("Empezar", visible=True, variant="primary"),
+                    gr.Radio(visible=False),
+                    gr.Textbox(
+                        Config[list(Config.keys())[state_int]], visible=True, label=""
+                    ),
+                    gr.Button("Rendirse", visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Image(interactive=False, visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Button(visible=False),
+                    gr.Markdown(visible=False),
+                ]
             )
-            
+
         elif state_int == dif_state + 2:
 
             game.prepare_game(difficulty)
 
             # feed = game.play_game(inp)
             output.extend(
-            [
-                gr.Button("Enviar", visible=True, variant="primary"),
-                gr.Radio(label="", visible=False),
-                gr.Textbox( visible=False, label=""),
-                gr.Button(visible=True,variant='stop'),
-                gr.Textbox(value="",visible=True,placeholder="Nueva palabra"),
-                gr.Image(interactive=False, visible=False),
-                gr.Textbox(visible=False),
-                gr.Button(visible=False),
-                gr.Markdown(visible=False),
-            ]
+                [
+                    gr.Button("Enviar", visible=True, variant="primary"),
+                    gr.Radio(label="", visible=False),
+                    gr.Textbox(visible=False, label=""),
+                    gr.Button(visible=True, variant="stop"),
+                    gr.Textbox(value="", visible=True, placeholder="Nueva palabra"),
+                    gr.Image(interactive=False, visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Button(visible=False),
+                    gr.Markdown(visible=False),
+                ]
             )
         elif state_int > dif_state + 2:
             feed = game.play_game(inp)
@@ -236,82 +240,102 @@ with gr.Blocks() as demo:
                 hint = True
             else:
                 hint = False
-                
+
             if len(win) > 1:
                 won = True
                 curiosity = game.curiosity()
                 output.extend(
-                [
-                    gr.Button("Enviar", visible=False, variant="primary"),
-                    gr.Radio(label="", visible=False),
-                    gr.Textbox(win[1], visible=True, label=""),
-                    gr.Button(visible=False,variant='stop'),
-                    gr.Textbox(value="",visible=False,placeholder="Nueva palabra"),
-                    gr.Image(hint_path,interactive=False, visible=True),
-                    gr.Textbox(curiosity, visible=True, label="Curiosidad"),
-                    gr.Button(visible=True),
-                    gr.Markdown(visible=False),
-                ]
-                )  
+                    [
+                        gr.Button("Enviar", visible=False, variant="primary"),
+                        gr.Radio(label="", visible=False),
+                        gr.Textbox(win[1], visible=True, label=""),
+                        gr.Button(visible=False, variant="stop"),
+                        gr.Textbox(
+                            value="", visible=False, placeholder="Nueva palabra"
+                        ),
+                        gr.Image(hint_path, interactive=False, visible=True),
+                        gr.Textbox(curiosity, visible=True, label="Curiosidad"),
+                        gr.Button(visible=True),
+                        gr.Markdown(visible=False),
+                    ]
+                )
                 return output
 
             output.extend(
-            [
-                gr.Button("Enviar", visible=True, variant="primary"),
-                gr.Radio(label="", visible=False),
-                gr.Textbox(feedback[0], visible=True, label=""),
-                gr.Button(visible=True,variant='stop'),
-                gr.Textbox(value="",visible=True,placeholder="Nueva palabra"),
-                gr.Image(hint_path,interactive=False, visible=False),
-                gr.Textbox(feedback[1] if hint else "", visible=hint, label="Pista"),
-                gr.Button(visible=False),
-                gr.Markdown(ranking_md, visible=True),
-            ]
-            )  
-
+                [
+                    gr.Button("Enviar", visible=True, variant="primary"),
+                    gr.Radio(label="", visible=False),
+                    gr.Textbox(feedback[0], visible=True, label=""),
+                    gr.Button(visible=True, variant="stop"),
+                    gr.Textbox(value="", visible=True, placeholder="Nueva palabra"),
+                    gr.Image(hint_path, interactive=False, visible=False),
+                    gr.Textbox(
+                        feedback[1] if hint else "", visible=hint, label="Pista"
+                    ),
+                    gr.Button(visible=False),
+                    gr.Markdown(ranking_md, visible=True),
+                ]
+            )
 
         else:
             output.extend(
-            [
-                gr.Button("Siguiente", visible=True),
-                gr.Radio(label="", visible=False),
-                gr.Textbox(Config[list(Config.keys())[state_int]], visible=True, label=""),
-                gr.Button("Pista", visible=False),
-                gr.Textbox(visible=False),
-                gr.Image(interactive=False, visible=False),
-                gr.Textbox(visible=False),
-                gr.Button(visible=False),
-                gr.Markdown(visible=False),
-            ]
+                [
+                    gr.Button("Siguiente", visible=True),
+                    gr.Radio(label="", visible=False),
+                    gr.Textbox(
+                        Config[list(Config.keys())[state_int]], visible=True, label=""
+                    ),
+                    gr.Button("Pista", visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Image(interactive=False, visible=False),
+                    gr.Textbox(visible=False),
+                    gr.Button(visible=False),
+                    gr.Markdown(visible=False),
+                ]
             )
         return output
-        
-    img = gr.Image(hint_path,height=430,interactive=False, visible=True)
+
+    img = gr.Image(hint_path, height=430, interactive=False, visible=True)
     ranking = gr.Markdown(visible=False)
 
     with gr.Row():
-        out = gr.Textbox(
-        visible=False, placeholder=Config[list(Config.keys())[0]]
-    )
-        hint_out = gr.Textbox(
-        visible=False
-        )
+        out = gr.Textbox(visible=False, placeholder=Config[list(Config.keys())[0]])
+        hint_out = gr.Textbox(visible=False)
     radio = gr.Radio(visible=False)
     with gr.Row():
-        inp = gr.Textbox(visible=False,interactive=True,label="")
+        inp = gr.Textbox(visible=False, interactive=True, label="")
         but = gr.Button("Empezar")
         give_up = gr.Button("Pista", visible=False)
         reload = gr.Button("Volver a jugar", visible=False)
 
-    inp.submit(change, inputs=[state,inp], outputs=[state,inp])
-    but.click(change, inputs=[state,inp], outputs=[state,inp])
-    give_up.click(change, inputs=[state,gr.Textbox("give_up",visible=False,interactive=True,label="")], outputs=[state,inp])
-    reload.click(reset,inputs=difficulty,outputs=[state,out,inp,img, but, radio,hint_out,reload])
-    radio.input(change, inputs=[state,inp], outputs=[state,inp])
-    demo.load(reset,inputs=difficulty,outputs=[state,out,inp,img, but, radio,hint_out,reload])
+    inp.submit(change, inputs=[state, inp], outputs=[state, inp])
+    but.click(change, inputs=[state, inp], outputs=[state, inp])
+    give_up.click(
+        change,
+        inputs=[
+            state,
+            gr.Textbox("give_up", visible=False, interactive=True, label=""),
+        ],
+        outputs=[state, inp],
+    )
+    reload.click(
+        reset,
+        inputs=difficulty,
+        outputs=[state, out, inp, img, but, radio, hint_out, reload],
+    )
+    radio.input(change, inputs=[state, inp], outputs=[state, inp])
+    demo.load(
+        reset,
+        inputs=difficulty,
+        outputs=[state, out, inp, img, but, radio, hint_out, reload],
+    )
 
     # out.change(button_name, inputs=radio, outputs=[but, radio, out])
-    
-    state.change(update, inputs=[state, radio,inp,hint], outputs=[state, but, radio, out, give_up, inp, img, hint_out, reload,ranking])
+
+    state.change(
+        update,
+        inputs=[state, radio, inp, hint],
+        outputs=[state, but, radio, out, give_up, inp, img, hint_out, reload, ranking],
+    )
 if __name__ == "__main__":
     demo.launch()

config/words.txt

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b687a6378e0c894c3060004ddab0076557b36ac650506a33abdd250165bd050
+size 53583817

data/ranking.txt

@@ -1 +1 @@
----------------------------
+---------------------------

game.py → game_transformer.py

@@ -23,6 +23,7 @@ class Semantrix:
 
     config_file_path = "config/lang.json"
     secret_file_path = "config/secret.json"
+    possible_words_file_path = "config/words.txt"
     data_path = "data/"
 
     class DictWrapper:
@@ -51,6 +52,12 @@ class Semantrix:
         with open(self.data_path + "ranking.txt", "w+") as file:
             file.write("---------------------------")
 
+        with open(self.possible_words_file_path, "r") as file:
+
+            data = file.read()
+
+        self.possible_words = data.split("\n")
+
     def prepare_game(self, difficulty):
 
         self.secret_list = (
@@ -149,11 +156,33 @@ class Semantrix:
             self.words.append(word)
 
         if word not in self.embeddings_dict.keys():
-            embedding = self.model_st.encode(word, convert_to_tensor=True)
-            self.embeddings_dict[word] = embedding
-            self.model.add_vector(word, embedding.tolist())
-
-        score = round(self.model.similarity(self.secret, word) * 10, 2)
+            if word not in self.possible_words:
+                self.words.pop(len(self.words) - 1)
+                feedback = (
+                    "I don't know that word. Try again."
+                    if self.lang == 1
+                    else "No conozco esa palabra. Inténtalo de nuevo."
+                )
+                feedback += (
+                    "[rank]" + open(self.data_path + "ranking.txt", "r").read()
+                    if len(self.words) > 1
+                    else "\n\n"
+                )
+
+                return feedback
+            else:
+                embedding = self.model_st.encode(word, convert_to_tensor=True)
+                self.embeddings_dict[word] = embedding
+                self.model.add_vector(word, embedding.tolist())
+
+        score = round(
+            np.interp(
+                np.log(self.model.similarity(self.secret, word) * 10),
+                [0, np.log(10)],
+                [0, 10],
+            ),
+            2,
+        )
 
         if repeated == -1:
             self.word_vect.append(self.embeddings_dict[word].tolist())
@@ -223,7 +252,7 @@ class Semantrix:
             with open(self.data_path + "ranking.txt", "r") as original_file:
                 file_content = original_file.readlines()
 
-            new_file_name = self.secret + "_" + str(datetime.now())
+            new_file_name = self.secret + "_" + str(datetime.now()) + ".txt"
 
             with open(self.data_path + "plays/" + new_file_name, "w+") as new_file:
                 new_file.writelines(file_content[2:])

game_word2vec.py

@@ -152,7 +152,11 @@ class Semantrix:
                     if self.lang == 1
                     else "No conozco esa palabra. Inténtalo de nuevo."
                 )
-                feedback += "[rank]" + open(self.data_path + "ranking.txt", "r").read()
+                feedback += (
+                    "[rank]" + open(self.data_path + "ranking.txt", "r").read()
+                    if len(self.words) > 1
+                    else "\n\n"
+                )
 
                 return feedback
 
@@ -229,8 +233,7 @@ class Semantrix:
             with open(self.data_path + "ranking.txt", "r") as original_file:
                 file_content = original_file.readlines()
 
-            new_file_name = self.secret + "_" + str(datetime.now())
-
+            new_file_name = self.secret + "_" + str(datetime.now()) + ".txt"
             with open(self.data_path + "plays/" + new_file_name, "w+") as new_file:
                 new_file.writelines(file_content[2:])