Update app.py

app.py

@@ -68,14 +68,16 @@ if torch.cuda.is_available():
     tokenizer.use_default_system_prompt = False
 
 
-## gradio-chatbot-read-query-param
-get_window_session_index = """ 
-    function() {
-        const urlParams = new URLSearchParams(window.location.search);
-        const session_index = urlParams.get('session_index'); 
-        return session_index;
-        }
-    """
+
+## gradio-chatbot-read-query-param   
+def get_window_url_params():
+    return """
+        function() {
+            const params = new URLSearchParams(window.location.search);
+            const url_params = Object.fromEntries(params);
+            return url_params;
+            }
+        """
 
 def fetch_personalized_data(session_index):
     # Connect to the database
@@ -116,23 +118,13 @@ def fetch_personalized_data(session_index):
         # return [[str(row[0]), str(row[1]), str(row[2])] for row in rows]  # Convert each row to a list
         # Convert the rows to a list of dictionaries
         data = [{'playerNr': row[0], 'groupNr': row[1], 'subjectNr': row[2]} for row in rows]
+        print(data)
         return data
 
     except mysql.connector.Error as err:
         print(f"Error: {err}")
         return None
 
-
-## gradio-chatbot-read-query-param   
-def get_window_url_params():
-    return """
-        function() {
-            const params = new URLSearchParams(window.location.search);
-            const url_params = Object.fromEntries(params);
-            return url_params;
-            }
-        """
-
 ## trust-game-llama-2-7b-chat
 # app.py
 def construct_input_prompt(chat_history, message, personalized_data):
@@ -145,56 +137,6 @@ def construct_input_prompt(chat_history, message, personalized_data):
 
     return input_prompt
 
-with gr.Blocks(css="style.css") as demo:  
-    #gr.Markdown(DESCRIPTION)
-    #gr.DuplicateButton(value="Duplicate Space for private use", elem_id="duplicate-button")
-    ## gradio-chatbot-read-query-param
-    url_params = gr.JSON({}, visible=False, label="URL Params")
-    # Execute the JavaScript function to obtain the URL parameters as a dictionary
-    url_params = gr.javascript.execute(url_params)
-
-    ## gradio-chatbot-read-query-param
-    def get_session_index(history, url_params):
-        personalized_data = None  # Initialize with None
-        if history and bool(history[-1][0].strip()):
-            session_index = url_params.get('session_index')
-            print(session_index)
-            # Fetch personalized data
-            personalized_data = fetch_personalized_data(session_index)
-            print(personalized_data)
-        return personalized_data
-
-    ## trust-game-llama-2-7b-chat
-    # app.py 
-    def get_default_system_prompt(personalized_data):
-        #BOS, EOS = "<s>", "</s>" 
-        #BINST, EINST = "[INST]", "[/INST]"
-        BSYS, ESYS = "<<SYS>>\n", "\n<</SYS>>\n\n"
-
-        DEFAULT_SYSTEM_PROMPT = f""" You are an intelligent and fair game guide in a 2-player trust game, assisting players in making decisions to win. 
-        Answer in a consistent style. Answer per question should be maximum 2 sentences long. The players are called The Investor and The Dealer and keep their role throughout the whole game. 
-        Both start with 10€ in round 1. The game consists of 3 rounds. In round 1, The Investor invests between 0€ and 10€. 
-        This amount is tripled automatically, and The Dealer can then distribute the tripled amount. After that, round 1 is over. 
-        Both go into the next round with their current asset: The Investor with 10€ minus what he invested plus what he received back from The Dealer.
-        The Dealer with 10€ plus what he kept from the tripled amount. 
-        You will receive a JSON with information on who trusted whom with how much money after each round as context.
-        Your goal is to guide players through the game, providing clear instructions and explanations. 
-        If any question or action seems unclear, explain it rather than providing inaccurate information. 
-        If you're unsure about an answer, it's better not to guess.
-
-        Example JSON context after a round: {personalized_data}
-
-        Few-shot training examples
-        {BSYS} Give an overview of the trust game. {ESYS}
-        {BSYS} Explain how trust amounts are calculated. {ESYS}
-        {BSYS} What happens if a player doesn't trust in a round? {ESYS}
-        """
-        print(DEFAULT_SYSTEM_PROMPT)
-        return DEFAULT_SYSTEM_PROMPT
-    
-    chat_interface.render()
-    #gr.Markdown(LICENSE)
-
 ## trust-game-llama-2-7b-chat
 # app.py 
 @spaces.GPU
@@ -208,8 +150,7 @@ def generate(
     top_k: int = 50,
     repetition_penalty: float = 1.2,
 ) -> Iterator[str]: # Change return type hint to Iterator[str]
-
-
+    
     # Fetch personalized data
     url_params = get_window_url_params()
     session_index = get_session_index(chat_history, url_params)
@@ -297,6 +238,47 @@ chat_interface = gr.ChatInterface(
     ],
 )
 
+with gr.Blocks(css="style.css") as demo:  
+    #gr.Markdown(DESCRIPTION)
+    #gr.DuplicateButton(value="Duplicate Space for private use", elem_id="duplicate-button")
+    ## gradio-chatbot-read-query-param
+    def get_session_index(chat_history, url_params):
+        if chat_history and bool(chat_history[-1][0].strip()):
+            session_index = url_params.get('session_index')
+            print(session_index)
+        return session_index
+
+    ## trust-game-llama-2-7b-chat
+    # app.py 
+    def get_default_system_prompt(personalized_data):
+        #BOS, EOS = "<s>", "</s>" 
+        #BINST, EINST = "[INST]", "[/INST]"
+        BSYS, ESYS = "<<SYS>>\n", "\n<</SYS>>\n\n"
+
+        DEFAULT_SYSTEM_PROMPT = f""" You are an intelligent and fair game guide in a 2-player trust game, assisting players in making decisions to win. 
+        Answer in a consistent style. Answer per question should be maximum 2 sentences long. The players are called The Investor and The Dealer and keep their role throughout the whole game. 
+        Both start with 10€ in round 1. The game consists of 3 rounds. In round 1, The Investor invests between 0€ and 10€. 
+        This amount is tripled automatically, and The Dealer can then distribute the tripled amount. After that, round 1 is over. 
+        Both go into the next round with their current asset: The Investor with 10€ minus what he invested plus what he received back from The Dealer.
+        The Dealer with 10€ plus what he kept from the tripled amount. 
+        You will receive a JSON with information on who trusted whom with how much money after each round as context.
+        Your goal is to guide players through the game, providing clear instructions and explanations. 
+        If any question or action seems unclear, explain it rather than providing inaccurate information. 
+        If you're unsure about an answer, it's better not to guess.
+
+        Example JSON context after a round: {personalized_data}
+
+        Few-shot training examples
+        {BSYS} Give an overview of the trust game. {ESYS}
+        {BSYS} Explain how trust amounts are calculated. {ESYS}
+        {BSYS} What happens if a player doesn't trust in a round? {ESYS}
+        """
+        print(DEFAULT_SYSTEM_PROMPT)
+        return DEFAULT_SYSTEM_PROMPT
+    
+    chat_interface.render()
+    #gr.Markdown(LICENSE)
+
 if __name__ == "__main__":
     #demo.queue(max_size=20).launch()
     demo.queue(max_size=20)