feat: map

app.py

@@ -23,6 +23,9 @@ init_game = True
 game_over_rich = False
 game_over_bankrupt = False
 
+world_graph = WorldGraph(f'original_setup/contexts/world_map.edgelist')
+dico_world = world_graph.push_data_to_front()
+
 # Initialize FastAPI app
 app = FastAPI()
 
@@ -60,6 +63,8 @@ async def send_message(message: Message):
     global init_game
     global game_over_rich
     global game_over_bankrupt
+    global dico_world
+
     try:
         #If we're ate the beginning of a game
         if init_game:
@@ -176,6 +181,14 @@ async def send_message(message: Message):
         raise e
         raise HTTPException(status_code=500, detail=str(e))
 
+@app.get("/api/world-data", tags=['Game'])
+async def get_world_data():
+    global dico_world
+    try:
+        return {"world_data": dico_world}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
 # Add this before the final static files mount
 app.mount("/images", StaticFiles(directory="static/images"), name="images")
 

helper_functions.py

@@ -76,7 +76,11 @@ def generate_round_context(game_number):
         idea_csq = file.readlines()
         idea_csq = choice(idea_csq)
         idea, delta_USA, delta_country, delta_friendliness = idea_csq.split(';')
-        delta_friendliness = delta_friendliness.split()[0]
+        try:
+            delta_friendliness = delta_friendliness.split()[0]
+        except:
+            pass
+
     with open(contexts_dir + 'countries.list', 'r',encoding='utf-8') as f_countries:
         countries = f_countries.readlines()
         country = choice(countries).split()[0]

static/index.html

@@ -164,9 +164,6 @@
         console.log("chat ended: ", data.chat_ended);
         if (data.chat_ended === true) {
           endSequence(data.idea, data.idea_is_accepted);
-          console.log("data.idea_is_accepted", data.idea_is_accepted)
-          console.log("data.idea_is_accepted true", data.idea_is_accepted === true)
-          console.log("data.idea_is_accepted false", data.idea_is_accepted === false)
           console.log("data.idea", data.idea)
         }
         //addMessageToChat(data.character_response, false);
@@ -280,7 +277,22 @@
     }
 
     document.addEventListener('DOMContentLoaded', function() {
-      updateMap(regionData)
+      fetch('/api/world-data', {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+      })
+      .then(response => response.json())
+      .then(data => {
+        console.log("new world map: ", data)
+        const regionData = data.world_data
+        updateMap(regionData);
+      })
+      .catch(error => {
+        console.error('Could not update world map:', error);
+      });
+
 
       // Load the intro content
       fetch('./intro.html')
@@ -1074,41 +1086,40 @@
 };
 
     // Le dico qu'on reçoit
-    const regionData = {
-      "United-States": { "money": 100, "friendliness": -1 },
-      "Canada": { "money": 50, "friendliness": -1 },
-      "Mexico": { "money": 30, "friendliness": 2 },
-      "South-America": { "money": 40, "friendliness": 3 },
-      "Africa": { "money": 20, "friendliness": 1 },
-      "Europe": { "money": 80, "friendliness": 2 },
-      "Middle-East": { "money": 60, "friendliness": -2 },
-      "Russia": { "money": 70, "friendliness": -3 },
-      "China": { "money": 90, "friendliness": -1 },
-      "India": { "money": 50, "friendliness": 2 },
-      "Australia": { "money": 55, "friendliness": 1 },
-      "Pacific": { "money": 25, "friendliness": 3 },
-      "Taiwan": { "money": 65, "friendliness": 0 },
-      "Greenland": { "money": 10, "friendliness": 1 }
-    };
+    // const regionData = {
+    //   "United-States": { "money": 100, "friendliness": -1 },
+    //   "Canada": { "money": 50, "friendliness": -1 },
+    //   "Mexico": { "money": 30, "friendliness": 2 },
+    //   "South-America": { "money": 40, "friendliness": 3 },
+    //   "Africa": { "money": 20, "friendliness": 1 },
+    //   "Europe": { "money": 80, "friendliness": 2 },
+    //   "Middle-East": { "money": 60, "friendliness": -2 },
+    //   "Russia": { "money": 70, "friendliness": -3 },
+    //   "China": { "money": 90, "friendliness": -1 },
+    //   "India": { "money": 50, "friendliness": 2 },
+    //   "Australia": { "money": 55, "friendliness": 1 },
+    //   "Pacific": { "money": 25, "friendliness": 3 },
+    //   "Taiwan": { "money": 65, "friendliness": 0 },
+    //   "Greenland": { "money": 10, "friendliness": 1 }
+    // };
 
     function fetchUpdateMap() {
-      const regionData = {
-        "United-States": { "money": 100, "friendliness": -1 },
-        "Canada": { "money": 50, "friendliness": -3 },
-        "Mexico": { "money": 30, "friendliness": 2 },
-        "South-America": { "money": 40, "friendliness": 3 },
-        "Africa": { "money": 20, "friendliness": 1 },
-        "Europe": { "money": 80, "friendliness": 2 },
-        "Middle-East": { "money": 60, "friendliness": -2 },
-        "Russia": { "money": 70, "friendliness": -3 },
-        "China": { "money": 90, "friendliness": -1 },
-        "India": { "money": 50, "friendliness": 2 },
-        "Australia": { "money": 55, "friendliness": 1 },
-        "Pacific": { "money": 25, "friendliness": 3 },
-        "Taiwan": { "money": 65, "friendliness": 0 },
-        "Greenland": { "money": 10, "friendliness": 1 }
-      };
-      updateMap(regionData);
+
+      fetch('/api/world-data', {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+      })
+      .then(response => response.json())
+      .then(data => {
+        console.log("new world map: ", data)
+        const regionData = data.world_data
+        updateMap(regionData);
+      })
+      .catch(error => {
+        console.error('Could not update world map:', error);
+      });
     }
 
     function updateMap(regionData) {