Update app.py

app.py

@@ -24,42 +24,32 @@ class BasicAgent:
             If you are asked for a comma separated list, apply the above rules depending of whether the element
             to be put in the list is a number or a string."""
         )
-    
-        
+
+    def format_final_answer(self, answer: str) -> str:
+        """Ensure final answer matches required format"""
+        cleaned = " ".join(answer.split())
+        return f"FINAL ANSWER: {cleaned}"
+
     def check_commutativity(self):
-        # Define the set S
         S = ['a', 'b', 'c', 'd', 'e']
         counter_example_elements = set()
-    
-        # Define a map for converting letters to table indices
         index = {'a': 0, 'b': 1, 'c': 2, 'd': 3, 'e': 4}
-    
-        # Operation table as provided
         self.operation_table = [
-            ['a', 'b', 'c', 'b', 'd'],  # a * a, a * b, a * c, a * d, a * e
-            ['b', 'c', 'a', 'e', 'c'],  # b * a, b * b, b * c, b * d, b * e
-            ['c', 'a', 'b', 'b', 'a'],  # c * a, c * b, c * c, c * d, c * e
-            ['b', 'e', 'b', 'e', 'd'],  # d * a, d * b, d * c, d * d, d * e
-            ['d', 'b', 'a', 'd', 'c']   # e * a, e * b, e * c, e * d, e * e
+            ['a', 'b', 'c', 'b', 'd'],
+            ['b', 'c', 'a', 'e', 'c'],
+            ['c', 'a', 'b', 'b', 'a'],
+            ['b', 'e', 'b', 'e', 'd'],
+            ['d', 'b', 'a', 'd', 'c']
         ]
-        
-        # Check for commutativity violations (x * y != y * x)
         for x in S:
             for y in S:
-                # Convert x and y to their corresponding table indices
                 x_idx = index[x]
                 y_idx = index[y]
-    
-                # Check if the operation does not commute
                 if self.operation_table[x_idx][y_idx] != self.operation_table[y_idx][x_idx]:
-                    # If not commutative, add both elements to the set
                     counter_example_elements.add(x)
                     counter_example_elements.add(y)
-    
-        # Return the sorted list of elements involved in violations
-        return sorted(counter_example_elements)
+        return self.format_final_answer(", ".join(sorted(counter_example_elements)))
 
-        
     def maybe_reversed(self, text: str) -> bool:
         words = text.split()
         reversed_ratio = sum(
@@ -71,7 +61,7 @@ class BasicAgent:
         return reversed_ratio > 0.3
 
     def solve_riddle(self, question: str) -> str:
-        question = question[::-1]  # properly reverse before parsing
+        question = question[::-1]
         if "opposite of the word" in question:
             match = re.search(r"opposite of the word ['\"](\w+)['\"]", question)
             if match:
@@ -81,27 +71,21 @@ class BasicAgent:
                     "true": "false", "yes": "no", "black": "white"
                 }
                 opposite = opposites.get(word, f"UNKNOWN_OPPOSITE_OF_{word}")
-                final_answer_clean = opposite.strip().replace("\n", " ").replace("\r", "")
-            return f"FINAL ANSWER: {final_answer_clean}."
-        return "FINAL ANSWER: COULD_NOT_SOLVE"
+                return self.format_final_answer(opposite)
+        return self.format_final_answer("COULD_NOT_SOLVE")
 
     def __call__(self, question: str) -> str:
         print(f"Received question: {question[:50]}...")
-        # If question relates to commutativity
         if "commutative" in question.lower():
-            counter_example_elements = self.check_commutativity()
-            final_answer = ", ".join(counter_example_elements)
-            return f"FINAL ANSWER:{final_answer}"
-            
+            return self.check_commutativity()
         if self.maybe_reversed(question):
             print("Detected likely reversed riddle.")
             return self.solve_riddle(question)
-        return "FINAL ANSWER: NOT_A_RIDDLE"
+        return self.format_final_answer("NOT_A_RIDDLE")
 
 
 def run_and_submit_all(profile: gr.OAuthProfile | None):
     space_id = os.getenv("SPACE_ID")
-
     if profile:
         username = f"{profile.username}"
         print("User logged in.")
@@ -116,12 +100,9 @@ def run_and_submit_all(profile: gr.OAuthProfile | None):
     try:
         agent = BasicAgent()
     except Exception as e:
-        print(f"Error instantiating agent: {e}")
         return f"Error initializing agent: {e}", None
 
     agent_code = f"https://huggingface.co/spaces/{space_id}/tree/main"
-    print(agent_code)
-
     try:
         response = requests.get(questions_url, timeout=15)
         response.raise_for_status()
@@ -185,4 +166,4 @@ with gr.Blocks() as demo:
 
 if __name__ == "__main__":
     print("Launching Gradio Interface for Basic Agent Evaluation...")
-    demo.launch(debug=True, share=False)
+    demo.launch(debug=True, share=False)