Changed to 3 choices

app.py

@@ -1,91 +1,8 @@
 from functools import partial
-import time
 import gradio as gr
 
-from chat_quest import sample_conversation, sample_conversation_christmas, generate_chat_response, generate_last_response, ConversationSituation
+from utils import *
 
-def clear_text_box():
-    return gr.Textbox.update(value='')
-
-def format_goal_messsage(goal: str) -> str:
-    return f'######   **Objetivo:** {goal}'
-
-def format_chat_header(name: str) -> str:
-    return f'**{name}**<br>Active now'
-
-
-def _format_dialogue(dialogue_list, opponent):
-    formatted_dialogue = []
-    for entry in dialogue_list:
-        player_line, opponent_line = entry
-        if opponent_line:
-            formatted_dialogue.append(f"{opponent}: {opponent_line}")
-        if player_line:
-            formatted_dialogue.append(f"Player: {player_line}")
-    return '\n'.join(formatted_dialogue)
-        
-    
-def retry_level(current_situation: ConversationSituation):
-    choices_update = [gr.update(value=c, interactive=True, visible=True) for c in current_situation.starting_choices]
-    outcome_update = gr.update(visible=False)
-    chat_history_update = [(None, current_situation.first_message)]
-
-    return choices_update + [current_situation.starting_choices, outcome_update, chat_history_update, chat_history_update]
-
-
-def load_next_level():
-    new_situation = sample_conversation_christmas
-    choices_update = [gr.update(value=c, interactive=True, visible=True) for c in new_situation.starting_choices]
-    outcome_update = gr.update(visible=False)
-    chat_history_update = [(None, new_situation.first_message)]
-
-    opponent_name = format_chat_header(new_situation.character)
-    goal_message = format_goal_messsage(new_situation.goal_message)
-
-    
-    return choices_update + [new_situation, new_situation.starting_choices, outcome_update, chat_history_update, chat_history_update] + [new_situation.character_emoji, opponent_name, goal_message, False]
-
-
-def update_chat(choice_index, choices, msg_history):
-    history = msg_history or []
-    
-
-    print(choice_index, choices)
-    user_msg = choices[choice_index]
-
-    history.append((user_msg, None))
-
-    return [history, history] + [gr.update(interactive=False) for _ in choice_buttons]
-
-
-def process_last_msg(msg_history, conversation_situation: ConversationSituation):
-    # Wait for history to update with the last user input
-    time.sleep(0.2)
-    history = msg_history or []
-
-    dialogue = _format_dialogue(history, conversation_situation.character)
-
-    dialogue_length = len(history)
-
-    print(dialogue_length)
-
-    if dialogue_length > 6:
-        bot_response = generate_last_response(situation=conversation_situation, dialogue=dialogue)
-        choices_update = [gr.update(visible=False) for _ in conversation_situation.starting_choices]
-        won_update = [gr.update(visible=bot_response.has_won)]
-        lost_update = [gr.update(visible=not bot_response.has_won)]
-    else:
-        bot_response = generate_chat_response(situation=conversation_situation, dialogue=dialogue)
-        choices_update = [gr.update(value=c, interactive=True) for c in bot_response.choices]
-        won_update = [gr.update(visible=bot_response.has_won)]
-        lost_update = [gr.update(visible=False)]
-
-    history.append((None, bot_response.message))
-    chat_update = [bot_response.has_won, bot_response.choices, history, history]
-
-    return chat_update + choices_update + won_update + lost_update
-
-    
 
 demo = gr.Blocks(
     css="#gradio_center {text-align: center} #char_icon {font-size: 24px; padding-top: 0px; padding-bottom: 0px;}",
@@ -103,7 +20,13 @@ with demo:
     ## Title
     gr.Markdown('# Chat Quest!', elem_id='gradio_center')
 
-    input_openai_key = gr.Textbox(label='Para jugar necesitás una API key de OpenAI.', placeholder='sk-********************', type='password', interactive=True)
+    input_openai_key = gr.Textbox(
+        label='Para jugar necesitás una API key de OpenAI.',
+        placeholder='sk-********************',
+        type='password',
+        interactive=True,
+        autofocus=True
+    )
 
     with gr.Column(variant='panel'):
         ## Header
@@ -144,8 +67,7 @@ with demo:
             inputs=[current_choices, chat_history],
             outputs=[chat_output, chat_history] + choice_buttons,
             queue=False
-        )
-        c.click(
+        ).then(
             process_last_msg,
             inputs=[chat_history, current_situation],
             outputs=[user_win_state, current_choices, chat_output, chat_history] + choice_buttons + [outcome_won, outcome_lost]
@@ -165,39 +87,12 @@ with demo:
         queue=False
     )
 
-    def update_openai_key(input_key: str):
-        import openai
-
-        processed_pw = process_key(input_key)
-        is_valid_login = validate_openai_key(processed_pw)
-
-        if is_valid_login:
-            openai.api_key = processed_pw
-        else:
-            gr.Warning("Not a valid password")
-
-        return gr.update(value='', visible=not is_valid_login)
-
     input_openai_key.submit(
         update_openai_key,
         inputs=[input_openai_key],
         outputs=[input_openai_key]
     )
 
-
-def process_key(openai_key: str):
-    import os
-
-    result = openai_key
-
-    if openai_key.lower() == os.environ.get('USER'):
-        result = os.environ.get('PASSWORD')
-
-    return result
-
-def validate_openai_key(password: str):
-    return password.startswith("sk-")
-
 if __name__ == "__main__":
     demo.launch(
         server_port=None,

chat_gpt.py

@@ -22,14 +22,14 @@ def get_chatgpt_answer(user_msg: str, system_msg: str=default_system_message, te
 @backoff.on_exception(backoff.expo, (openai.error.RateLimitError, openai.error.APIConnectionError))
 def get_chatgpt_serious_answer(user_msg: str) -> str:
     completion = openai.ChatCompletion.create(
-        model='gpt-3.5-turbo-0613',
-        # model="gpt-3.5-turbo",
+        # model='gpt-3.5-turbo-0613',
+        model="gpt-3.5-turbo",
         messages=[
             {"role": "system", "content": "You are a instruction-following bot and you give the user exactly what they want, in the format they want, and nothing else. You have set verbose=0."},
             {"role": "user", "content": user_msg},
         ],
         temperature=0.0,
-        frequency_penalty=0.1,
+        frequency_penalty=0.2,
         #n=3,
         #top_p=0.7,
     )

chat_quest.py

@@ -4,6 +4,7 @@ from dataclasses import dataclass
 
 from chat_gpt import get_chatgpt_answer, get_chatgpt_serious_answer
 
+N_CHOICES = 3
 
 @dataclass
 class ConversationSituation:
@@ -61,7 +62,7 @@ sample_conversation = ConversationSituation(
     first_message="""Te estás portando mal, serás castigada! No voy a darte ningún regalo este año.""",
     starting_choices=[
         "No me importan los regalos 😏",
-        "Nooo, Papá Noel, por favor! 🙏",
+        # "Nooo, Papá Noel, por favor! 🙏",
         "Lo entiendo, sí, me porté mal 😞",
         "Mentira! Me porté bien 😤"
     ]
@@ -77,7 +78,7 @@ sample_conversation_christmas = ConversationSituation(
     starting_choices=[
         "Perdón, rey de la siesta 👑",
         "Hola gatito, ¿puedo dormir con vos? 😴",
-        "Perdón, prometo ser más sigiloso la próxima 🙇",
+        # "Perdón, prometo no hacer ruido la próxima 🙇",
         "Uh, disculpá, ¿me voy? 🚶‍♂️",
     ]
 )
@@ -116,7 +117,7 @@ def _parse_conversation_response(string: str) -> ConversationResponse:
     
     return ConversationResponse(message, has_won, choices)
 
-def generate_chat_response(situation: ConversationSituation, dialogue: str, n_choices=4):
+def generate_chat_response(situation: ConversationSituation, dialogue: str, n_choices=N_CHOICES):
     prompt_template = """RULES
 Welcome to "TextQuest", an interactive text-based game where you engage in realistic conversations with various characters through your phone. Each conversation reflects different relationships in your life, and your choices will shape the outcome of the story. Get ready to navigate through challenging scenarios, make crucial decisions, and see where your text-based adventures take you!
 

utils.py

@@ -0,0 +1,114 @@
+import gradio as gr
+
+import time
+from chat_quest import sample_conversation, sample_conversation_christmas, generate_chat_response, generate_last_response, ConversationSituation, N_CHOICES
+
+
+def update_chat(choice_index, choices, msg_history):
+    history = msg_history or []
+
+    print(choice_index, choices)
+    user_msg = choices[choice_index]
+
+    history.append((user_msg, None))
+
+    return [history, history] + [gr.update(interactive=False) for _ in range(N_CHOICES)]
+
+
+def process_last_msg(msg_history, conversation_situation: ConversationSituation):
+    history = msg_history or []
+
+    dialogue = _format_dialogue(history, conversation_situation.character)
+
+    dialogue_length = len(history)
+
+    print(dialogue_length)
+
+    if dialogue_length > 6:
+        bot_response = generate_last_response(situation=conversation_situation, dialogue=dialogue)
+        choices_update = [gr.update(visible=False) for _ in conversation_situation.starting_choices]
+        won_update = [gr.update(visible=bot_response.has_won)]
+        lost_update = [gr.update(visible=not bot_response.has_won)]
+    else:
+        bot_response = generate_chat_response(situation=conversation_situation, dialogue=dialogue)
+        choices_update = [gr.update(value=c, interactive=True) for c in bot_response.choices]
+        won_update = [gr.update(visible=bot_response.has_won)]
+        lost_update = [gr.update(visible=False)]
+
+    history.append((None, bot_response.message))
+    chat_update = [bot_response.has_won, bot_response.choices, history, history]
+
+    return chat_update + choices_update + won_update + lost_update
+
+
+def clear_text_box():
+    return gr.Textbox.update(value='')
+
+
+def format_goal_messsage(goal: str) -> str:
+    return f'######   **Objetivo:** {goal}'
+
+
+def format_chat_header(name: str) -> str:
+    return f'**{name}**<br>Active now'
+        
+    
+def retry_level(current_situation: ConversationSituation):
+    choices_update = [gr.update(value=c, interactive=True, visible=True) for c in current_situation.starting_choices]
+    outcome_update = gr.update(visible=False)
+    chat_history_update = [(None, current_situation.first_message)]
+
+    return choices_update + [current_situation.starting_choices, outcome_update, chat_history_update, chat_history_update]
+
+
+def load_next_level():
+    new_situation = sample_conversation_christmas
+    choices_update = [gr.update(value=c, interactive=True, visible=True) for c in new_situation.starting_choices]
+    outcome_update = gr.update(visible=False)
+    chat_history_update = [(None, new_situation.first_message)]
+
+    opponent_name = format_chat_header(new_situation.character)
+    goal_message = format_goal_messsage(new_situation.goal_message)
+
+    
+    return choices_update + [new_situation, new_situation.starting_choices, outcome_update, chat_history_update, chat_history_update] + [new_situation.character_emoji, opponent_name, goal_message, False]
+
+
+def process_key(openai_key: str):
+    import os
+
+    result = openai_key
+
+    if openai_key.lower() == os.environ.get('USER'):
+        result = os.environ.get('PASSWORD')
+
+    return result
+
+
+def validate_openai_key(password: str):
+    return password.startswith("sk-")
+
+
+def update_openai_key(input_key: str):
+    import openai
+
+    processed_pw = process_key(input_key)
+    is_valid_login = validate_openai_key(processed_pw)
+
+    if is_valid_login:
+        openai.api_key = processed_pw
+    else:
+        gr.Warning("Not a valid password")
+
+    return gr.update(value='', visible=not is_valid_login)
+
+
+def _format_dialogue(dialogue_list, opponent):
+    formatted_dialogue = []
+    for entry in dialogue_list:
+        player_line, opponent_line = entry
+        if opponent_line:
+            formatted_dialogue.append(f"{opponent}: {opponent_line}")
+        if player_line:
+            formatted_dialogue.append(f"Player: {player_line}")
+    return '\n'.join(formatted_dialogue)