Update app.py

app.py

@@ -239,94 +239,36 @@ def fetch_personalized_data(externalID):
         print(f"Error: {err}")
         return None
     
-def extract_variables(all_personalized_data):
-    extracted_data = []
-    for row in all_personalized_data:
-        extracted_row = {}
-        if row['part'] == 1:
-            if row['transfer1']:
-                extracted_row['transfer1'] = row['transfer1']
-            if row['tripledAmount1']:
-                extracted_row['tripledAmount1'] = row['tripledAmount1']
-            if row['keptForSelf1']:
-                extracted_row['keptForSelf1'] = row['keptForSelf1']
-            if row['returned1']:
-                extracted_row['returned1'] = row['returned1']
-            if row['totalRound2']:
-                extracted_row['totalRound2'] = row['totalRound2']
-            if row['transfer2']:
-                extracted_row['transfer2'] = row['transfer2']
-            if row['tripledAmount2']:
-                extracted_row['tripledAmount2'] = row['tripledAmount2']
-            if row['keptForSelf2']:
-                extracted_row['keptForSelf2'] = row['keptForSelf2']
-            if row['returned2']:
-                extracted_row['returned2'] = row['returned2']
-            if row['totalRound2']:
-                extracted_row['totalRound2'] = row['totalRound2']
-            if row['transfer3']:
-                extracted_row['transfer3'] = row['transfer3']
-            if row['tripledAmount3']:
-                extracted_row['tripledAmount3'] = row['tripledAmount3']
-            if row['keptForSelf3']:
-                extracted_row['keptForSelf3'] = row['keptForSelf3']
-            if row['returned3']:
-                extracted_row['returned3'] = row['returned3']
-            if row['totalRound3']:
-                extracted_row['totalRound3'] = row['totalRound3']
-        elif row['part'] == 2:
-            if row['transfer4']:
-                extracted_row['transfer4'] = row['transfer4']
-            if row['tripledAmount4']:
-                extracted_row['tripledAmount4'] = row['tripledAmount4']
-            if row['keptForSelf4']:
-                extracted_row['keptForSelf4'] = row['keptForSelf4']
-            if row['returned4']:
-                extracted_row['returned4'] = row['returned4']
-            if row['totalRound4']:
-                extracted_row['totalRound4'] = row['totalRound4']
-            if row['transfer5']:
-                extracted_row['transfer5'] = row['transfer5']
-            if row['tripledAmount5']:
-                extracted_row['tripledAmount5'] = row['tripledAmount5']
-            if row['keptForSelf5']:
-                extracted_row['keptForSelf5'] = row['keptForSelf5']
-            if row['returned5']:
-                extracted_row['returned5'] = row['returned5']
-            if row['totalRound5']:
-                extracted_row['totalRound5'] = row['totalRound5']
-            if row['transfer6']:
-                extracted_row['transfer6'] = row['transfer6']
-            if row['tripledAmount6']:
-                extracted_row['tripledAmount6'] = row['tripledAmount6']
-            if row['keptForSelf6']:
-                extracted_row['keptForSelf6'] = row['keptForSelf6']
-        if extracted_row:
-            extracted_data.append(extracted_row)
-        print(extracted_data)
+def extract_variables(all_personalized_data, part):
+    extracted_data = {}
+
+    if part == "1":
+        rounds = range(1, 4)  # Rounds 1-3
+    elif part == "2":
+        rounds = range(1, 4)  # Rounds 1-3 for part 2 as well
+    else:
+        print("No data for the particular part found")
+        return None
+
+    for data in all_personalized_data:
+        role = map_role(str(data.get('role', 'unknown')))  # Get the role description
+        player_data = {}  # Store data for the current player
+        for round_num in rounds:
+            round_key = f'round{round_num}'
+            player_data[round_key] = {}
+            for var in ['transfer', 'tripledAmount', 'keptForSelf', 'returned', 'totalRound']:
+                var_name = f'{var}{round_num}'
+                if data.get(var_name) is not None:
+                    player_data[round_key][var] = data[var_name]
+
+        # Update extracted_data with role prompt as key
+        if role in extracted_data:
+            extracted_data[role].update(player_data)
+        else:
+            extracted_data[role] = player_data
+
     return extracted_data
-            
-## trust-game-llama-2-7b-chat
-# app.py 
-def get_default_system_prompt(extracted_data, onPage_prompt, role_prompt):
-    #BOS, EOS = "<s>", "</s>" 
-    #BINST, EINST = "[INST]", "[/INST]"
-    BSYS, ESYS = "<<SYS>>\n", "\n<</SYS>>\n\n"
 
-    DEFAULT_SYSTEM_PROMPT = f""" You are a smart game assistant for a Trust Game outside of this chat.
-    Trust Game rules: Two players, The Investor and The Dealer, each play to maximize their own earnings. 
-    There are 3 rounds. Every round follows the same pattern. 
-    - First, each player gets a virtual starting credit of 10 coins.
-    - Investor's turn: The Investor decides how much they want to investo into a shared pot. The shared pot is tripled automatically before the Dealer's turn.
-    - Dealer's turn: The Dealer can keep and return as much of the tripled amount as they like. Their virtual starting credit remains untouched.
-    Earnings from each round are not transferred to the next round. Each or your answers should be maximum 2 sentences long. 
-    Answer in a consistent style. If you are unsure about an answer, do not guess. 
-    Currently it is {role_prompt}’s turn so you are assisting {role_prompt} to make the right decision. 
-    The game is currently in round {onPage_prompt} of 3. 
-    This is what happened in the last rounds: {extracted_data}. 
-    """
-    print(DEFAULT_SYSTEM_PROMPT)
-    return DEFAULT_SYSTEM_PROMPT
 
 def map_onPage(onPage):
     # Define the mapping of onPage values to onPage_filename and onPage_prompt
@@ -365,6 +307,29 @@ def map_role(role):
         # If the role is not in the mapping, set role_prompt to "unknown"
         role_prompt = "unknown"
     return role_prompt
+            
+## trust-game-llama-2-7b-chat
+# app.py 
+def get_default_system_prompt(extracted_data, onPage_prompt, role_prompt):
+    #BOS, EOS = "<s>", "</s>" 
+    #BINST, EINST = "[INST]", "[/INST]"
+    BSYS, ESYS = "<<SYS>>\n", "\n<</SYS>>\n\n"
+
+    DEFAULT_SYSTEM_PROMPT = f""" You are a smart game assistant for a Trust Game outside of this chat.
+    Trust Game rules: Two players, The Investor and The Dealer, each play to maximize their own earnings. 
+    There are 3 rounds. Every round follows the same pattern. 
+    - First, each player gets a virtual starting credit of 10 coins.
+    - Investor's turn: The Investor decides how much they want to investo into a shared pot. The shared pot is tripled automatically before the Dealer's turn.
+    - Dealer's turn: The Dealer can keep and return as much of the tripled amount as they like. Their virtual starting credit remains untouched.
+    Earnings from each round are not transferred to the next round. Each or your answers should be maximum 2 sentences long. 
+    Answer in a consistent style. If you are unsure about an answer, do not guess. 
+    Currently it is {role_prompt}’s turn so you are assisting {role_prompt} to make the right decision. 
+    The game is currently in round {onPage_prompt} of 3. 
+    This is what happened in the last rounds: {extracted_data}. 
+    """
+    print(DEFAULT_SYSTEM_PROMPT)
+    return DEFAULT_SYSTEM_PROMPT
+
 
 ## trust-game-llama-2-7b-chat
 # app.py
@@ -416,9 +381,8 @@ def generate(
     # Fetch personalized data
     #personalized_data = fetch_personalized_data(externalID)
     all_personalized_data = fetch_personalized_data(externalID)
-    print(all_personalized_data)
 
-        # Initialize onPage, playerNr, and groupNrStart variables
+    # Initialize onPage, playerNr, and groupNrStart variables
     onPage = playerNr = groupNrStart = role = part = None
     
     # Iterate over each dictionary in the list
@@ -449,9 +413,9 @@ def generate(
     role_prompt = map_role(role) 
     print("role_prompt:", role_prompt)
     
-    extracted_data = extract_variables(all_personalized_data)
+    extracted_data = extract_variables(all_personalized_data, part)
     print(extracted_data)
-    
+        
     # Construct the input prompt using the functions from the system_prompt_config module
     input_prompt = construct_input_prompt(chat_history, message, extracted_data, onPage_prompt, role_prompt)
 
@@ -578,4 +542,5 @@ with gr.Blocks(css="style.css") as demo:
 if __name__ == "__main__":
     demo.queue(max_size=20).launch()
     #demo.queue(max_size=20)
-    demo.launch(share=True, debug=True)
+    demo.launch(share=True, debug=True)
+