Update app.py

app.py

@@ -111,20 +111,45 @@ If the user is engaging in discussion, try to steer them towards getting in touc
         return system_prompt
     
     def chat(self, message, history):
-        messages = [{"role": "system", "content": self.system_prompt()}] + history + [{"role": "user", "content": message}]
+        history_clean = normalize_history(history)
+    
+        messages = [{"role": "system", "content": self.system_prompt()}]
+        messages.extend(history_clean)
+        messages.append({"role": "user", "content": message})
+    
         done = False
+        final_response = ""
+    
         while not done:
-            response = self.groq.chat.completions.create(model="openai/gpt-oss-120b", messages=messages, tools=tools)
-            if response.choices[0].finish_reason=="tool_calls":
-                message = response.choices[0].message
-                tool_calls = message.tool_calls
+            response = self.groq.chat.completions.create(
+                model="openai/gpt-oss-120b",
+                messages=messages,
+                tools=tools,
+                tool_choice="auto"
+            )
+    
+            msg = response.choices[0].message
+    
+            # Tool call?
+            if msg.finish_reason == "tool_calls":
+                tool_calls = msg.tool_calls
+    
+                # model says: "use tool"
+                messages.append({"role": "assistant", "content": msg.content or ""})
+    
+                # run python functions
                 results = self.handle_tool_call(tool_calls)
-                messages.append(message)
+    
+                # return results to model
                 messages.extend(results)
+    
             else:
+                # normal final answer
+                final_response = msg.content or ""
                 done = True
-        return response.choices[0].message.content
     
+        return final_response
+
 
 if __name__ == "__main__":
     me = Me()