refactor: replace requests with httpx for asynchronous HTTP calls and update error handling in app.py

app.py

@@ -1,6 +1,6 @@
 import os
 import gradio as gr
-import requests
+import httpx
 import inspect
 import pandas as pd
 from agent import BasicAgent
@@ -10,74 +10,7 @@ from workflow import MultiStepWorkflow
 # --- Constants ---
 DEFAULT_API_URL = "https://agents-course-unit4-scoring.hf.space"
 
-def run_and_print_random():
-    api_url = DEFAULT_API_URL
-    random_question_url = f"{api_url}/random-question"
-    submit_url = f"{api_url}/submit"
-    
-    try:
-        agent = BasicAgent(verbose=True)
-    except Exception as e:
-        print(f"Error instantiating agent: {e}")
-        return f"Error initializing agent: {e}", None
-    
-    try:
-        response = requests.get(random_question_url, timeout=15)
-        response.raise_for_status()
-        question_data = response.json()
-        if not question_data:
-            return "Fetched questions list is empty or invalid format.", None
-        print(f"Fetched {len(question_data)} questions.")
-    except requests.exceptions.JSONDecodeError as e:
-        return f"Error decoding server response for questions: {e}", None
-    except requests.exceptions.RequestException as e:
-        return f"Error fetching questions: {e}", None
-    except Exception as e:
-        return f"An unexpected error occurred fetching questions: {e}", None
-    
-    results_log = []
-    answers_payload = []
-    
-    task_id = question_data.get("task_id")
-    question_text = question_data.get("question")
-    if not task_id or question_text is None:
-        print(f"Skipping item with missing task_id or question: {question_data}")
-    try:
-        submitted_answer = agent.call_sync(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})
-    except Exception as e:
-        results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": f"AGENT ERROR: {e}"})
-
-    if not answers_payload:
-        return "Agent did not produce any answers to submit.", pd.DataFrame(results_log)
-
-    # 4. Prepare Submission 
-    submission_data = {"username": 'agsagds', "agent_code": 'https://huggingface.co/spaces/agsagds/Unit_3_Agentic_RAG/tree/main', "answers": answers_payload}
-    status_update = f"Agent finished. Submitting {len(answers_payload)} answers for user agsagds..."
-    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.')}"
-        )
-        print("Submission successful.")
-        results_log.append(final_status)
-        results_df = pd.DataFrame(results_log)
-        return results_df
-    except Exception as e:
-        return f"Error submitting answers: {e}", None
-    
-def run_and_submit_all( profile: gr.OAuthProfile | None):
+async def run_and_submit_all(profile: gr.OAuthProfile | None):
     """
     Fetches all questions, runs the BasicAgent on them, submits all answers,
     and displays the results.
@@ -109,18 +42,18 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
     # 2. Fetch Questions
     print(f"Fetching questions from: {questions_url}")
     try:
-        response = requests.get(questions_url, timeout=15)
-        response.raise_for_status()
-        questions_data = response.json()
+        async with httpx.AsyncClient(timeout=15.0) as client:
+            response = await client.get(questions_url)
+            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.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 requests.exceptions.RequestException as e:
+    except httpx.HTTPStatusError as e:
+        print(f"Error fetching questions: HTTP {e.response.status_code}")
+        return f"Error fetching questions: HTTP {e.response.status_code}", None
+    except httpx.RequestError as e:
         print(f"Error fetching questions: {e}")
         return f"Error fetching questions: {e}", None
     except Exception as e:
@@ -148,7 +81,13 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
             continue
         try:
             print(f"Running agent workflow on question: {task_id} {question_text}")
-            submitted_answer = agent_workflow.callSync(question_text)
+            # Use async run method directly instead of callSync
+            result = await agent_workflow.run(question=question_text)
+            # Extract result if it's a StopEvent, otherwise use directly
+            if hasattr(result, 'result'):
+                submitted_answer = str(result.result)
+            else:
+                submitted_answer = str(result)
             print(f"Submitted answer: {submitted_answer}")
             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})
@@ -168,9 +107,10 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
     # 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()
+        async with httpx.AsyncClient(timeout=60.0) as client:
+            response = await client.post(submit_url, json=submission_data)
+            response.raise_for_status()
+            result_data = response.json()
         final_status = (
             f"Submission Successful!\n"
             f"User: {result_data.get('username')}\n"
@@ -181,23 +121,23 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
         print("Submission successful.")
         results_df = pd.DataFrame(results_log)
         return final_status, results_df
-    except requests.exceptions.HTTPError as e:
+    except httpx.HTTPStatusError 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:
+        except Exception:
             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:
+    except httpx.TimeoutException:
         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:
+    except httpx.RequestError as e:
         status_message = f"Submission Failed: Network error - {e}"
         print(status_message)
         results_df = pd.DataFrame(results_log)
@@ -207,8 +147,6 @@ def run_and_submit_all( profile: gr.OAuthProfile | None):
         print(status_message)
         results_df = pd.DataFrame(results_log)
         return status_message, results_df
-
-
 # Load evns from .env file
 from dotenv import load_dotenv
 load_dotenv()
@@ -234,7 +172,6 @@ with gr.Blocks() as demo:
     gr.LoginButton()
 
     run_button = gr.Button("Run Evaluation & Submit All Answers")
-    run_once_button = gr.Button("Run Evaluation for random question")
 
     status_output = gr.Textbox(label="Run Status / Submission Result", lines=5, interactive=False)
     # Removed max_rows=10 from DataFrame constructor
@@ -244,10 +181,6 @@ with gr.Blocks() as demo:
         fn=run_and_submit_all,
         outputs=[status_output, results_table]
     )
-    run_once_button.click(
-        fn=run_and_print_random,
-        outputs=[results_table]
-    )
 
 if __name__ == "__main__":
     print("\n" + "-"*30 + " App Starting " + "-"*30)

workflow.py

@@ -113,9 +113,6 @@ class MultiStepWorkflow(Workflow):
         
         return StopEvent(result=str(formattedAnswer))
 
-    def callSync(self, question: str) -> str:
-        return asyncio.run(self.run(question=question))
-
 if __name__ == "__main__":
     async def main():
         questionAlbums = "How many studio albums were published by Mercedes Sosa between 2000 and 2009 (included)? You can use the latest 2022 version of english wikipedia."