Update app.py

app.py

@@ -4,20 +4,19 @@ import requests
 import pandas as pd
 import json
 import time
-import asyncio
-from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from langchain_core.messages import HumanMessage
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
-from agent import AdvancedAgent
+from datetime import datetime, timedelta
+from agent import AdvancedAgent  # Assuming you have an AdvancedAgent class in agent.py
 
 # --- Constants ---
 DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 CACHE_FILE = "questions_cache.json"
-CACHE_EXPIRATION_SECONDS = 86400  # 1 day
-MAX_RETRIES = 3
-INITIAL_BACKOFF = 2  # seconds
+CACHE_EXPIRATION = timedelta(days=1)  # Cache expires after 1 day
+MAX_RETRIES = 5
+INITIAL_BACKOFF = 5  # Initial backoff time in seconds for retries
 
 def create_retry_session():
     """Create a requests session with retry logic for handling 429 errors."""
@@ -39,15 +38,15 @@ def load_cached_questions():
     if cache_path.exists():
         try:
             with cache_path.open('r') as f:
-                data = json.load(f)
-                cached_time = data.get("timestamp")
-                if cached_time and (time.time() - cached_time) < CACHE_EXPIRATION_SECONDS:
+                cache_data = json.load(f)
+                timestamp = datetime.fromisoformat(cache_data['timestamp'])
+                if datetime.now() - timestamp < CACHE_EXPIRATION:
                     questions = [
                         {
                             "task_id": item["task_id"],
                             "question": HumanMessage(content=item["question"])
                         }
-                        for item in data["questions"]
+                        for item in cache_data['questions']
                     ]
                     print(f"Loaded {len(questions)} questions from cache.")
                     return questions
@@ -62,7 +61,7 @@ def cache_questions(questions_data):
     cache_path = Path(CACHE_FILE)
     try:
         cache_data = {
-            "timestamp": time.time(),
+            "timestamp": datetime.now().isoformat(),
             "questions": [
                 {
                     "task_id": item["task_id"],
@@ -77,27 +76,46 @@ def cache_questions(questions_data):
     except Exception as e:
         print(f"Error caching questions: {e}")
 
-async def process_question(agent, item):
-    """Process a single question using the agent."""
-    task_id = item["task_id"]
-    question = item["question"]
+def fetch_questions_with_retry(url):
+    """Fetch questions with retry logic for 429 errors."""
+    session = create_retry_session()
     try:
-        loop = asyncio.get_event_loop()
-        submitted_answer = await loop.run_in_executor(None, agent, question.content)
-        return {
-            "task_id": task_id,
-            "submitted_answer": submitted_answer,
-            "question_text": question.content
-        }
-    except Exception as e:
-        print(f"Error processing task {task_id}: {e}")
-        return {
-            "task_id": task_id,
-            "submitted_answer": f"AGENT ERROR: {e}",
-            "question_text": question.content
-        }
+        response = session.get(url, timeout=15)
+        response.raise_for_status()
+        return response.json()
+    except requests.exceptions.RequestException as e:
+        print(f"Error fetching questions: {e}")
+        raise e
+
+def load_questions():
+    """Load questions from cache or fetch from server with retries."""
+    questions_data = load_cached_questions()
+    if questions_data is None:
+        print(f"Fetching questions from: {DEFAULT_API_URL}/questions")
+        try:
+            raw_questions = fetch_questions_with_retry(f"{DEFAULT_API_URL}/questions")
+            if not raw_questions:
+                raise ValueError("Fetched questions list is empty.")
+            questions_data = [
+                {
+                    "task_id": item["task_id"],
+                    "question": HumanMessage(content=item["question"])
+                }
+                for item in raw_questions
+            ]
+            cache_questions(questions_data)
+        except Exception as e:
+            print(f"Error fetching questions: {e}")
+            # Try to load expired cache as fallback
+            cache_data = load_cached_questions()
+            if cache_data:
+                print("Using expired cache due to API failure.")
+                questions_data = cache_data
+            else:
+                raise e
+    return questions_data
 
-async def run_and_submit_all(profile: gr.OAuthProfile | None):
+def run_and_submit_all(profile: gr.OAuthProfile | None):
     """
     Fetches all questions, runs the AdvancedAgent on them, submits all answers,
     and displays the results.
@@ -113,7 +131,6 @@ async def run_and_submit_all(profile: gr.OAuthProfile | None):
         return "Please Login to Hugging Face with the button.", None
 
     api_url = DEFAULT_API_URL
-    questions_url = f"{api_url}/questions"
     submit_url = f"{api_url}/submit"
 
     # 1. Instantiate Agent
@@ -126,64 +143,35 @@ async def run_and_submit_all(profile: gr.OAuthProfile | None):
     agent_code = f"https://huggingface.co/spaces/{space_id}/tree/main"
     print(agent_code)
 
-    # 2. Fetch or Load Questions
-    questions_data = load_cached_questions()
-    if questions_data is None:
-        print(f"Fetching questions from: {questions_url}")
-        try:
-            session = create_retry_session()
-            response = session.get(questions_url, timeout=15)
-            response.raise_for_status()
-            raw_questions = response.json()
-            if not raw_questions:
-                print("Fetched questions list is empty.")
-                return "Fetched questions list is empty or invalid format.", None
-            questions_data = [
-                {
-                    "task_id": item["task_id"],
-                    "question": HumanMessage(content=item["question"])
-                }
-                for item in raw_questions
-            ]
-            print(f"Fetched {len(questions_data)} questions.")
-            cache_questions(questions_data)
-        except requests.exceptions.RequestException as e:
-            print(f"Error fetching questions: {e}")
-            # Fallback to cache even if expired
-            questions_data = load_cached_questions()
-            if questions_data:
-                print("Using expired cache due to API failure.")
-            else:
-                return f"Error fetching questions and no valid cache: {e}", None
-        except requests.exceptions.JSONDecodeError as e:
-            print(f"Error decoding JSON response: {e}")
-            return f"Error decoding server response: {e}", None
-        except Exception as e:
-            print(f"An unexpected error occurred fetching questions: {e}")
-            return f"An unexpected error occurred: {e}", None
+    # 2. Load Questions (from cache or server)
+    try:
+        questions_data = load_questions()
+    except Exception as e:
+        print(f"Failed to load questions: {e}")
+        return f"Failed to load questions: {e}", None
 
-    # 3. Run Agent Asynchronously
+    # 3. Run Agent (simplified for this example)
     results_log = []
     answers_payload = []
-    print(f"Running agent on {len(questions_data)} questions asynchronously...")
-
-    with ThreadPoolExecutor(max_workers=5) as executor:
-        tasks = [process_question(agent, item) for item in questions_data]
-        responses = await asyncio.gather(*tasks, return_exceptions=True)
-
-        for response in responses:
-            if isinstance(response, Exception):
-                print(f"Unexpected error in async processing: {response}")
-                continue
-            task_id = response["task_id"]
-            submitted_answer = response["submitted_answer"]
-            question_text = response["question_text"]
+    print(f"Running agent on {len(questions_data)} questions...")
+    for item in questions_data:
+        task_id = item["task_id"]
+        question = item["question"]
+        try:
+            submitted_answer = agent(question.content)
             answers_payload.append({"task_id": task_id, "submitted_answer": submitted_answer})
             results_log.append({
                 "Task ID": task_id,
-                "Question": question_text,
+                "Question": question.content,
                 "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.content,
+                "Submitted Answer": f"AGENT ERROR: {e}"
+            })
 
     if not answers_payload:
         print("Agent did not produce any answers to submit.")
@@ -194,7 +182,7 @@ async def run_and_submit_all(profile: gr.OAuthProfile | None):
     status_update = f"Agent finished. Submitting {len(answers_payload)} answers for user '{username}'..."
     print(status_update)
 
-    # 5. Submit
+    # 5. Submit (with retry logic)
     print(f"Submitting {len(answers_payload)} answers to: {submit_url}")
     try:
         session = create_retry_session()