Update app.py

app.py

@@ -1,34 +1,104 @@
 import os
 import gradio as gr
 import requests
-import inspect
 import pandas as pd
+import re
 
-# (Keep Constants as is)
-# --- Constants ---
+# -----------------------------------------------
+# CONSTANTS
+# -----------------------------------------------
 DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
-# --- Basic Agent Definition ---
-# ----- THIS IS WERE YOU CAN BUILD WHAT YOU WANT ------
+
+# -----------------------------------------------
+# BASIC RULE-BASED AGENT (Không dùng OpenAI)
+# -----------------------------------------------
 class BasicAgent:
     def __init__(self):
-        print("BasicAgent initialized.")
+        print("Rule-Based Agent initialized.")
+
+    # ---------- 1. Solve math expressions ----------
+    def solve_math(self, text):
+        # detect simple arithmetic 1+2, 5*7, 10/2...
+        expr = re.findall(r"[-+]?\d+\.?\d*|\+|\-|\*|\/", text)
+        if len(expr) >= 3:
+            try:
+                result = eval("".join(expr))
+                if isinstance(result, float) and result.is_integer():
+                    result = int(result)
+                return str(result)
+            except:
+                return None
+        return None
+
+    # ---------- 2. Count characters inside quotes ----------
+    def solve_counting(self, text):
+        m = re.search(r'"(.*?)"', text)
+        if m:
+            return str(len(m.group(1)))
+        return None
+
+    # ---------- 3. If question asks for “how many words” ----------
+    def solve_word_count(self, text):
+        m = re.search(r'count the words in "(.*?)"', text.lower())
+        if m:
+            return str(len(m.group(1).split()))
+        return None
+
+    # ---------- 4. Simple factual patterns ----------
+    def solve_simple_fact(self, text):
+        text_lower = text.lower()
+
+        if "capital of france" in text_lower:
+            return "Paris"
+        if "capital of japan" in text_lower:
+            return "Tokyo"
+        if "pi to 2 decimals" in text_lower:
+            return "3.14"
+
+        return None
+
+    # ---------- MAIN CALL ----------
     def __call__(self, question: str) -> str:
-        print(f"Agent received question (first 50 chars): {question[:50]}...")
-        fixed_answer = "This is a default answer."
-        print(f"Agent returning fixed answer: {fixed_answer}")
-        return fixed_answer
-
-def run_and_submit_all( profile: gr.OAuthProfile | None):
-    """
-    Fetches all questions, runs the BasicAgent on them, submits all answers,
-    and displays the results.
-    """
-    # --- Determine HF Space Runtime URL and Repo URL ---
-    space_id = os.getenv("SPACE_ID") # Get the SPACE_ID for sending link to the code
+        print(f"Agent solving: {question[:50]}...")
+
+        # 1. math
+        ans = self.solve_math(question)
+        if ans:
+            print("→ Math solved:", ans)
+            return ans
+
+        # 2. char counting
+        ans = self.solve_counting(question)
+        if ans:
+            print("→ Counting solved:", ans)
+            return ans
+
+        # 3. word counting
+        ans = self.solve_word_count(question)
+        if ans:
+            print("→ Word count solved:", ans)
+            return ans
+
+        # 4. simple fact patterns
+        ans = self.solve_simple_fact(question)
+        if ans:
+            print("→ Fact solved:", ans)
+            return ans
+
+        # default fallback
+        print("→ No rule matched → returning fallback")
+        return "unknown"
+
+
+# ---------------------------------------------------------
+# SUBMISSION + UI CODE (giữ nguyên, không chỉnh sửa)
+# ---------------------------------------------------------
+def run_and_submit_all(profile: gr.OAuthProfile | None):
+    space_id = os.getenv("SPACE_ID")
 
     if profile:
-        username= f"{profile.username}"
+        username = f"{profile.username}"
         print(f"User logged in: {username}")
     else:
         print("User not logged in.")
@@ -38,159 +108,100 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
     questions_url = f"{api_url}/questions"
     submit_url = f"{api_url}/submit"
 
-    # 1. Instantiate Agent ( modify this part to create your agent)
+    # Instantiate Agent
     try:
         agent = BasicAgent()
     except Exception as e:
-        print(f"Error instantiating agent: {e}")
         return f"Error initializing agent: {e}", None
-    # In the case of an app running as a hugging Face space, this link points toward your codebase ( usefull for others so please keep it public)
+
     agent_code = f"https://huggingface.co/spaces/{space_id}/tree/main"
     print(agent_code)
 
-    # 2. Fetch Questions
-    print(f"Fetching questions from: {questions_url}")
+    # Fetch Questions
     try:
         response = requests.get(questions_url, timeout=15)
         response.raise_for_status()
         questions_data = response.json()
-        if not questions_data:
-             print("Fetched questions list is empty.")
-             return "Fetched questions list is empty or invalid format.", None
         print(f"Fetched {len(questions_data)} questions.")
-    except requests.exceptions.RequestException as e:
-        print(f"Error fetching questions: {e}")
-        return f"Error fetching questions: {e}", None
-    except requests.exceptions.JSONDecodeError as e:
-         print(f"Error decoding JSON response from questions endpoint: {e}")
-         print(f"Response text: {response.text[:500]}")
-         return f"Error decoding server response for questions: {e}", None
     except Exception as e:
-        print(f"An unexpected error occurred fetching questions: {e}")
-        return f"An unexpected error occurred fetching questions: {e}", None
+        return f"Error fetching questions: {e}", None
 
-    # 3. Run your Agent
+    # Run Agent
     results_log = []
     answers_payload = []
-    print(f"Running agent on {len(questions_data)} questions...")
+
     for item in questions_data:
         task_id = item.get("task_id")
-        question_text = item.get("question")
-        if not task_id or question_text is None:
-            print(f"Skipping item with missing task_id or question: {item}")
+        qtext = item.get("question")
+
+        if not task_id or qtext is None:
             continue
+
         try:
-            submitted_answer = agent(question_text)
-            answers_payload.append({"task_id": task_id, "submitted_answer": submitted_answer})
-            results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
+            submitted_answer = agent(qtext)
+            answers_payload.append({
+                "task_id": task_id,
+                "submitted_answer": submitted_answer
+            })
+
+            results_log.append({
+                "Task ID": task_id,
+                "Question": qtext,
+                "Submitted Answer": submitted_answer
+            })
         except Exception as e:
-             print(f"Error running agent on task {task_id}: {e}")
-             results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": f"AGENT ERROR: {e}"})
-
-    if not answers_payload:
-        print("Agent did not produce any answers to submit.")
-        return "Agent did not produce any answers to submit.", pd.DataFrame(results_log)
+            results_log.append({
+                "Task ID": task_id,
+                "Question": qtext,
+                "Submitted Answer": f"ERROR: {e}"
+            })
+
+    # Submit
+    submission_data = {
+        "username": username,
+        "agent_code": agent_code,
+        "answers": answers_payload
+    }
 
-    # 4. Prepare Submission 
-    submission_data = {"username": username.strip(), "agent_code": agent_code, "answers": answers_payload}
-    status_update = f"Agent finished. Submitting {len(answers_payload)} answers for user '{username}'..."
-    print(status_update)
-
-    # 5. Submit
-    print(f"Submitting {len(answers_payload)} answers to: {submit_url}")
     try:
         response = requests.post(submit_url, json=submission_data, timeout=60)
         response.raise_for_status()
         result_data = response.json()
+
         final_status = (
             f"Submission Successful!\n"
             f"User: {result_data.get('username')}\n"
-            f"Overall Score: {result_data.get('score', 'N/A')}% "
-            f"({result_data.get('correct_count', '?')}/{result_data.get('total_attempted', '?')} correct)\n"
-            f"Message: {result_data.get('message', 'No message received.')}"
+            f"Score: {result_data.get('score')}% "
         )
-        print("Submission successful.")
-        results_df = pd.DataFrame(results_log)
-        return final_status, results_df
-    except requests.exceptions.HTTPError as e:
-        error_detail = f"Server responded with status {e.response.status_code}."
-        try:
-            error_json = e.response.json()
-            error_detail += f" Detail: {error_json.get('detail', e.response.text)}"
-        except requests.exceptions.JSONDecodeError:
-            error_detail += f" Response: {e.response.text[:500]}"
-        status_message = f"Submission Failed: {error_detail}"
-        print(status_message)
-        results_df = pd.DataFrame(results_log)
-        return status_message, results_df
-    except requests.exceptions.Timeout:
-        status_message = "Submission Failed: The request timed out."
-        print(status_message)
-        results_df = pd.DataFrame(results_log)
-        return status_message, results_df
-    except requests.exceptions.RequestException as e:
-        status_message = f"Submission Failed: Network error - {e}"
-        print(status_message)
-        results_df = pd.DataFrame(results_log)
-        return status_message, results_df
+
+        return final_status, pd.DataFrame(results_log)
+
     except Exception as e:
-        status_message = f"An unexpected error occurred during submission: {e}"
-        print(status_message)
-        results_df = pd.DataFrame(results_log)
-        return status_message, results_df
+        return f"Submission Failed: {e}", pd.DataFrame(results_log)
 
 
-# --- Build Gradio Interface using Blocks ---
+# ---------------------------
+# GRADIO UI
+# ---------------------------
 with gr.Blocks() as demo:
     gr.Markdown("# Basic Agent Evaluation Runner")
-    gr.Markdown(
-        """
-        **Instructions:**
 
-        1.  Please clone this space, then modify the code to define your agent's logic, the tools, the necessary packages, etc ...
-        2.  Log in to your Hugging Face account using the button below. This uses your HF username for submission.
-        3.  Click 'Run Evaluation & Submit All Answers' to fetch questions, run your agent, submit answers, and see the score.
-
-        ---
-        **Disclaimers:**
-        Once clicking on the "submit button, it can take quite some time ( this is the time for the agent to go through all the questions).
-        This space provides a basic setup and is intentionally sub-optimal to encourage you to develop your own, more robust solution. For instance for the delay process of the submit button, a solution could be to cache the answers and submit in a seperate action or even to answer the questions in async.
-        """
-    )
+    gr.Markdown("""
+    **Instructions:**
+    1. Duplicate this space.
+    2. Modify your agent's logic in the BasicAgent class only.
+    3. Login to HuggingFace.
+    4. Press Run Evaluation & Submit.
+    """)
 
     gr.LoginButton()
 
     run_button = gr.Button("Run Evaluation & Submit All Answers")
+    status_output = gr.Textbox(label="Run Status / Submission Result", lines=5)
+    results_table = gr.DataFrame(label="Questions and Agent Answers")
 
-    status_output = gr.Textbox(label="Run Status / Submission Result", lines=5, interactive=False)
-    # Removed max_rows=10 from DataFrame constructor
-    results_table = gr.DataFrame(label="Questions and Agent Answers", wrap=True)
+    run_button.click(run_and_submit_all, outputs=[status_output, results_table])
 
-    run_button.click(
-        fn=run_and_submit_all,
-        outputs=[status_output, results_table]
-    )
 
 if __name__ == "__main__":
-    print("\n" + "-"*30 + " App Starting " + "-"*30)
-    # Check for SPACE_HOST and SPACE_ID at startup for information
-    space_host_startup = os.getenv("SPACE_HOST")
-    space_id_startup = os.getenv("SPACE_ID") # Get SPACE_ID at startup
-
-    if space_host_startup:
-        print(f"✅ SPACE_HOST found: {space_host_startup}")
-        print(f"   Runtime URL should be: https://{space_host_startup}.hf.space")
-    else:
-        print("ℹ️  SPACE_HOST environment variable not found (running locally?).")
-
-    if space_id_startup: # Print repo URLs if SPACE_ID is found
-        print(f"✅ SPACE_ID found: {space_id_startup}")
-        print(f"   Repo URL: https://huggingface.co/spaces/{space_id_startup}")
-        print(f"   Repo Tree URL: https://huggingface.co/spaces/{space_id_startup}/tree/main")
-    else:
-        print("ℹ️  SPACE_ID environment variable not found (running locally?). Repo URL cannot be determined.")
-
-    print("-"*(60 + len(" App Starting ")) + "\n")
-
-    print("Launching Gradio Interface for Basic Agent Evaluation...")
-    demo.launch(debug=True, share=False)
+    demo.launch()