feat: trump sends first message

app.py

@@ -50,7 +50,7 @@ async def get_chat_history():
             game_number = len(os.listdir('games/'))
 
         chat_history = load_chat_history(f'games/game_{game_number}')
-        
+
         return {"chat_history": chat_history}
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
@@ -70,10 +70,9 @@ async def send_message(message: Message):
 
         # Load existing chat history
         chat_history = load_chat_history(f'games/game_{game_number}')
-        interaction_number = len(chat_history) + 1
-        
+
         #If we're at the beginning of a round
-        if interaction_number == 1:
+        if message.message == "":
             idea, concern, advisor_full, events, consequences = generate_round_context(game_number)
             round_context = {
                     "idea": idea,
@@ -101,7 +100,10 @@ async def send_message(message: Message):
 
         # Add user message to history
 
-        chat_history = update_chat_history(chat_history, user_message=message.message)
+        if message.message != "":
+            chat_history = update_chat_history(chat_history, user_message=message.message)
+        else:
+            chat_history = []
         # Format the prompt
         formatted_prompt = instruction_prompt.format(
             hints=hints,
@@ -123,9 +125,10 @@ async def send_message(message: Message):
                 "user": "user",
                 "trump": "assistant"  # Mapping 'trump' to 'assistant'
             }
+        print(chat_history)
         for interaction in chat_history:
             for key, value in interaction.items():
-                user_message = value['user']['message']
+                user_message = value['user']['message'] if 'user' in value else "..."
                 trump_message = value['trump']['message'] if value['trump'] else None
 
                 dynamic_history.append({
@@ -142,12 +145,14 @@ async def send_message(message: Message):
 
         messages = system + dynamic_history
 
+        print("messages", messages)
+        print("model", model)
         chat_response = client.chat.complete(
             model=model,
             messages=messages
         )
 
-        trump_response = chat_response.choices[0].message.content   
+        trump_response = chat_response.choices[0].message.content
 
         # Add Trump's response to history
         chat_history = update_chat_history(chat_history, trump_message=trump_response)

helper_functions.py

@@ -6,7 +6,7 @@ from random import choice
 def load_character_data():
     current_dir = os.path.dirname(os.path.abspath(__file__))
     json_path = os.path.join(current_dir, 'original_setup/trump.character.json')
-    
+
     with open(json_path, 'r',encoding='utf-8') as file:
         return json.load(file)
 
@@ -21,7 +21,7 @@ def load_chat_history(game_root):
 def update_chat_history(chat_history, user_message=None, trump_message=None):
     # If this is a new interaction, create a new interaction number
     interaction_number = len(chat_history) + 1
-    
+
     # If we're starting a new interaction with a user message
     if user_message and not trump_message:
         interaction_key = f"interaction_{interaction_number}"
@@ -32,19 +32,29 @@ def update_chat_history(chat_history, user_message=None, trump_message=None):
             }
         }
         chat_history.append(new_interaction)
-    
+
     # If we're adding Trump's response to an existing interaction
-    elif trump_message:
+    elif trump_message and chat_history:
         # Get the last interaction number (current one)
         interaction_key = f"interaction_{len(chat_history)}"
         current_interaction = chat_history[-1][interaction_key]
         current_interaction["trump"] = {"role": "Trump", "message": trump_message}
-    
+    # Init
+    elif not chat_history and trump_message and not user_message:
+        interaction_key = f"interaction_{interaction_number}"
+        new_interaction = {
+            interaction_key: {
+                "trump": {"role": "Trump", "message": trump_message},
+                "user": {"role": "user", "message": "..."},
+            }
+        }
+        chat_history.append(new_interaction)
+
     return chat_history
 
 def save_chat_history(history, game_root):
     history_path = os.path.join(game_root, 'chat_history.json')
-    
+
     with open(history_path, 'w',encoding='utf-8') as file:
         json.dump(history, file, indent=2)
 
@@ -114,11 +124,11 @@ def process_ending(idea_is_accepted, game_number, idea):
 
         with open(f'games/game_{game_number}/round_consequences.json', 'r',encoding='utf-8') as f:
             consequences = json.load(f)
-            country = consequences['country'] 
+            country = consequences['country']
             delta_USA = int(consequences['delta_USA'])
             delta_country = int(consequences['delta_country'])
-            delta_friendliness = int(consequences['delta_friendliness']) 
-        
+            delta_friendliness = int(consequences['delta_friendliness'])
+
         GDP = world_graph.update_world(country, delta_USA, delta_country, delta_friendliness, game_number)
 
-        return GDP
+        return GDP

static/index.html

@@ -157,6 +157,53 @@
         addMessageToChat('Error: Failed to get response', false);
       });
     }
+    let receivedFirstMessage = false
+    function receiveFirstMessage() {
+      console.log("in receive first")
+      if (receivedFirstMessage) {
+        return
+      }
+      console.log("iiiin receive first")
+
+      receivedFirstMessage = true
+
+      const trumpMessageDiv = addMessageToChat("Donald Trump is typing", false);
+      let dots = 0;
+
+      // Animate "Donald Trump is typing..."
+      const typingInterval = setInterval(() => {
+        dots = (dots + 1) % 4; // Cycle through 0, 1, 2, 3 dots
+        const dotsText = '.'.repeat(dots); // Generate dots
+        updateChatMessage(trumpMessageDiv, `Donald Trump is typing${dotsText}`);
+      }, 200); // Update every 200ms
+
+      // Simulate fetching the first message from the server
+      fetch('/api/generate-text', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ message: "" })
+      })
+        .then(response => response.json())
+        .then(data => {
+          // Stop the typing animation
+          clearInterval(typingInterval);
+
+          // Replace "Donald Trump is typing..." with the actual message
+          updateChatMessage(trumpMessageDiv, "");
+
+          // Add the first message from Donald Trump
+          typeMessage(trumpMessageDiv, data.character_response);
+        })
+        .catch(error => {
+          console.error('Error:', error);
+
+          // Stop typing animation and display error message
+          clearInterval(typingInterval);
+          updateChatMessage(trumpMessageDiv, "Error: Failed to get the first message");
+        });
+    }
 
     // Trigger on button click
     document.getElementById('sendButton').addEventListener('click', sendMessage);
@@ -210,6 +257,7 @@
       });
 
       okBtn.addEventListener('click', () => {
+        receiveFirstMessage()
         popup.classList.add('minimized');
       });
 
@@ -965,12 +1013,8 @@ const regionData = {
   "Greenland": { "money": 10, "friendliness": 1 }
 };
 
-
-
-
-
-    // Détermine la couleur de chaque région (vert si au moins un pays est "friendless: Yes", rouge sinon)
-    const regionColors = Object.keys(regionData).reduce((acc, region) => {
+  // Détermine la couleur de chaque région (vert si au moins un pays est "friendless: Yes", rouge sinon)
+  const regionColors = Object.keys(regionData).reduce((acc, region) => {
   const friendliness = regionData[region].friendliness;
   // Convertir `friendliness` en une couleur allant de rouge vif (-3) à vert vif (3)
   const green = Math.max(0, 255 + friendliness * 85);