modify app.py file to accommodate 1 step ahead issue from orchestrator function

app.py

@@ -11,6 +11,7 @@ count = gr.State(value=1)
 to_verify = gr.State(value=False)
 game_type = gr.State(value="en")
 game_ended = gr.State(value=False)
+last_call = gr.State(value=False)
 
 def clear_state():
     print("clear_state")
@@ -19,53 +20,67 @@ def clear_state():
 def change_game_type(drop_down_value):
     return drop_down_value
 
-def orchestrate_game_state(message, count, to_verify, game_ended):
+def orchestrate_game_state(message, count, to_verify, last_call, game_ended):
+    
     time.sleep(1.5)
-    if message == "start":
-        count += 1
-        game_ended = False
-    elif (aki.progression <= 80) and (message == "back") and (not game_ended):
-        count -= 1
-    elif (aki.progression <= 80) and (not game_ended):
-        count += 1
-    elif to_verify and (message in ["yes", "no"]) and (not game_ended):
-        game_ended = True
-    elif (not game_ended):
-        count += 1
-        to_verify = True
+    if aki.progression is not None or message == "start":
+        if message == "start":
+            count_add_one = count + 1
+            count = 2 if count > 2 else count_add_one
+            game_ended = False
+        elif (aki.progression <= 80) and (message == "back") and (not game_ended):
+            count -= 1
+            to_verify = False
+        elif (aki.progression <= 80) and (not game_ended):
+            count += 1
+            to_verify = False
+        elif to_verify and (message in ["yes", "no"]) and (not game_ended):
+            game_ended = True
+        elif (not game_ended) and not last_call:
+            count += 1
+            last_call = True
+        elif (not game_ended) and last_call:
+            count += 1
+            to_verify = True
+            last_call = False
 
-    print("orchestrate_game_state", message, count, to_verify, game_ended)
-    return count, to_verify, game_ended
+    print("orchestrate_game_state", aki.progression, message, count, to_verify, last_call, game_ended)
+    return count, to_verify, last_call, game_ended
 
-async def fetch_response(message, history, drop_down_value, count, to_verify, game_type, game_ended):
+async def fetch_response(message, history, drop_down_value, count, to_verify, last_call, game_type, game_ended):
 
-    print("fetch_response", message, drop_down_value, count, to_verify, game_type, game_ended)
-    if message == "start":
-        q = await aki.start_game(
-                language=game_type,
-                child_mode=True
-        )
-        q = f"{count}. " + q
-    elif (aki.progression <= 80) and (message == "back") and (not game_ended):
-        try:
-            q = await aki.back()
+    print("fetch_response", message, drop_down_value, count, to_verify, last_call, game_type, game_ended)
+    if aki.progression is not None or message == "start":
+        if message == "start":
+            count = 1 if count > 1 else count
+            q = await aki.start_game(
+                    language=game_type,
+                    child_mode=True
+            )
+            q = f"{count}. " + q
+        elif (aki.progression <= 80) and (message == "back") and (not game_ended):
+            try:
+                q = await aki.back()
+                q = f"{count}. " + q
+            except akinator.CantGoBackAnyFurther:
+                pass
+        elif (aki.progression <= 80) and (not game_ended):
+            q = await aki.answer(message)
+            q = f"{count}. " + q
+        elif to_verify and message == "yes" and (not game_ended):
+            q = "Yay!!"
+        elif to_verify and message == "no" and (not game_ended):
+            q = "Oof.."
+        elif (not game_ended) and not last_call:
+            q = await aki.answer(message)
+            q = f"{count}. " + q
+        elif (not game_ended) and last_call:
+            await aki.win()
+            q = f"It's {aki.first_guess['name']} ({aki.first_guess['description']})! Was I correct?\n{aki.first_guess['absolute_picture_path']}\n\t"
             q = f"{count}. " + q
-        except akinator.CantGoBackAnyFurther:
-            pass
-    elif (aki.progression <= 80) and (not game_ended):
-        q = await aki.answer(message)
-        q = f"{count}. " + q
-    elif to_verify and message == "yes" and (not game_ended):
-        q = "Yay!!"
-    elif to_verify and message == "no" and (not game_ended):
-        q = "Oof.."
-    elif (not game_ended):
-        await aki.win()
-        q = f"It's {aki.first_guess['name']} ({aki.first_guess['description']})! Was I correct?\n{aki.first_guess['absolute_picture_path']}\n\t"
-        q = f"{count}. " + q
-    elif game_ended:
-        q = "The game has ended. To replay, enter `start` again."
-    return q
+        elif game_ended:
+            q = "The game has ended. To replay, enter `start` again."
+        return q
 
 retry_button = gr.Button("Retry", interactive=False)
 undo_button = gr.Button("Undo", interactive=False)
@@ -73,7 +88,8 @@ clear_button = gr.Button("Clear")
 submit_button = gr.Button("Submit")
 input_textbox = gr.Textbox(
                     placeholder=(
-                            "To play, click [start] and submit. If you answer me genuinely, "
+                            "To play, click [start] and submit. "
+                            "Thereafter, answer me genuinely 😉, "
                             "and I will guess what is in your mind :)"
                     ),
                     interactive=False,
@@ -92,15 +108,15 @@ chat = gr.ChatInterface(
             undo_btn=undo_button,
             clear_btn=clear_button,
             submit_btn=submit_button,
-            additional_inputs=[drop_down_ls, count, to_verify, game_type, game_ended]
+            additional_inputs=[drop_down_ls, count, to_verify, last_call, game_type, game_ended]
 )
 
 with gr.Blocks(fill_height=True) as demo:
     clear_button.click(fn=clear_state, inputs=None, outputs=[count, to_verify])
     drop_down_ls.input(fn=change_game_type, inputs=[drop_down_ls], outputs=[game_type])
     submit_button.click(fn=orchestrate_game_state, 
-                        inputs=[input_textbox, count, to_verify, game_ended], 
-                        outputs=[count, to_verify, game_ended],
+                        inputs=[input_textbox, count, to_verify, last_call, game_ended], 
+                        outputs=[count, to_verify, last_call, game_ended],
                         trigger_mode="always_last")
 
     chat.render()