Update app.py

app.py

@@ -15,40 +15,32 @@ def randomly_select_from_json(world_data):
     world_name = world_data["name"]
     world_description = world_data["description"]
 
-    # Filter valid kingdoms (those with towns containing NPCs)
     valid_kingdoms = {
         k_name: k_data
         for k_name, k_data in world_data["kingdoms"].items()
         if any("npcs" in town_data and town_data["npcs"] for town_data in k_data["towns"].values())
     }
-
     if not valid_kingdoms:
         raise ValueError("No kingdoms with valid towns and NPCs found.")
 
-    # Randomly select a kingdom
     kingdom_name, kingdom_data = random.choice(list(valid_kingdoms.items()))
     kingdom_description = kingdom_data["description"]
 
-    # Filter towns with NPCs in the selected kingdom
     valid_towns = {
         t_name: t_data
         for t_name, t_data in kingdom_data["towns"].items()
         if "npcs" in t_data and t_data["npcs"]
     }
-
     if not valid_towns:
         raise ValueError(f"No towns with NPCs found in kingdom: {kingdom_name}")
 
-    # Randomly select a town
     town_name, town_data = random.choice(list(valid_towns.items()))
     town_description = town_data["description"]
 
-    # Randomly select an NPC
     npcs = town_data["npcs"]
     character_name, character_data = random.choice(list(npcs.items()))
     character_description = character_data["description"]
 
-    # Return the selected elements
     return {
         "world": {"name": world_name, "description": world_description},
         "kingdom": {"name": kingdom_name, "description": kingdom_description},
@@ -56,24 +48,14 @@ def randomly_select_from_json(world_data):
         "character": {"name": character_name, "description": character_description},
     }
 
-# Game state to store the world, kingdom, town, and character
-game_state = None
-
-# Function to start the game with a new character
-def start_new_game():
-    global game_state
-    # Reload JSON data and randomly select new elements
+# Initialize random state
+def initialize_game_state():
     random_state = randomly_select_from_json(world_data)
+    world = random_state["world"]
+    kingdom = random_state["kingdom"]
+    town = random_state["town"]
+    character = random_state["character"]
 
-    # Format the data for the game
-    game_state = {
-        "world": random_state["world"]["description"],
-        "kingdom": random_state["kingdom"]["description"],
-        "town": random_state["town"]["description"],
-        "character": random_state["character"]["description"],
-    }
-
-    # Create the system prompt for the new game
     system_prompt = """You are an AI Game master. Your job is to create a 
     start to an adventure based on the world, kingdom, town, and character 
     a player is playing as. 
@@ -85,15 +67,13 @@ def start_new_game():
     - First describe the character and their backstory.
     - Then describe where they start and what they see around them."""
 
-    # Format the world info for the model
     world_info = f"""
-    World: {random_state['world']['description']}
-    Kingdom: {random_state['kingdom']['description']}
-    Town: {random_state['town']['description']}
-    Your Character: {random_state['character']['description']}
+    World: {world['description']}
+    Kingdom: {kingdom['description']}
+    Town: {town['description']}
+    Your Character: {character['description']}
     """
 
-    # Generate the starting point using Together AI
     model_output = client.chat.completions.create(
         model="meta-llama/Llama-3-70b-chat-hf",
         temperature=1.0,
@@ -103,21 +83,23 @@ def start_new_game():
         ],
     )
 
-    # Extract the start response
-    start_text = model_output.choices[0].message.content
+    start = model_output.choices[0].message.content
 
-    # Save the starting point to the game state
-    game_state["start"] = start_text
-    return start_text
+    return {
+        "world": world["description"],
+        "kingdom": kingdom["description"],
+        "town": town["description"],
+        "character": character["description"],
+        "start": start,
+    }
 
-# Main action loop for the game
-def run_action(message, history):
-    global game_state
+# Game state
+game_state = initialize_game_state()
 
+def run_action(message, history, game_state):
     if message.lower() == "start game":
         return game_state["start"]
 
-    # Continue the story
     system_prompt = """You are an AI Game master. Your job is to write what \
     happens next in a player's adventure game.\
     Instructions: \
@@ -126,25 +108,24 @@ def run_action(message, history):
     - Always write in second person, e.g., "You look north and see..." \
     - Write in present tense."""
 
-    # Build the context for the conversation
+    world_info = f"""
+    World: {game_state['world']}
+    Kingdom: {game_state['kingdom']}
+    Town: {game_state['town']}
+    Your Character: {game_state['character']}"""
+
     messages = [
         {"role": "system", "content": system_prompt},
-        {"role": "user", "content": f"""
-        World: {game_state['world']}
-        Kingdom: {game_state['kingdom']}
-        Town: {game_state['town']}
-        Your Character: {game_state['character']}
-        """},
+        {"role": "user", "content": world_info},
     ]
 
     for action in history:
-        messages.append({"role": "assistant", "content": action[0]})
-        messages.append({"role": "user", "content": action[1]})
+        if isinstance(action, tuple) and len(action) == 2:
+            messages.append({"role": "assistant", "content": action[0]})
+            messages.append({"role": "user", "content": action[1]})
 
-    # Add the user's current action
     messages.append({"role": "user", "content": message})
 
-    # Get the model's response
     model_output = client.chat.completions.create(
         model="meta-llama/Llama-3-70b-chat-hf",
         messages=messages,
@@ -152,31 +133,27 @@ def run_action(message, history):
 
     return model_output.choices[0].message.content
 
-# Gradio interface
-def main_loop(message, history):
-    return run_action(message, history)
-
-# Initialize Gradio interface
-demo = gr.ChatInterface(
-    main_loop,
-    chatbot=gr.Chatbot(
-        height=250,
-        placeholder="Type 'start game' to begin",
-        type="messages",
-    ),
-    textbox=gr.Textbox(
-        placeholder="What do you do next?",
-        container=False,
-        scale=7,
-    ),
-    title="AI RPG",
-    theme="soft",
-    examples=["Look around", "Continue the story"],
-    cache_examples=False,
-)
-
-# Add a "Start Again" button
-demo.add_button("Start Again", start_new_game)
-
-# Launch the Gradio app
-demo.launch(share=True)
+# Main Gradio app
+with gr.Blocks() as demo:
+    gr.Markdown("## AI RPG Adventure Game")
+    chatbot = gr.Chatbot(type="messages")
+    msg_input = gr.Textbox(
+        placeholder="Type 'start game' to begin or enter actions...",
+        label="Your Action",
+    )
+    start_again = gr.Button("Start Again")
+
+    def handle_message(message, history):
+        response = run_action(message, history, game_state)
+        return history + [(message, response)]
+
+    def restart_game():
+        global game_state
+        game_state = initialize_game_state()
+        return [("Game restarted!", game_state["start"])]
+
+    msg_input.submit(handle_message, [msg_input, chatbot], chatbot)
+    start_again.click(restart_game, inputs=[], outputs=chatbot)
+
+# Launch the game
+demo.launch(share=True, server_name="0.0.0.0")