Update app.py

app.py

@@ -73,43 +73,42 @@ async def process_question(agent, question_text: str, task_id: str, results_log:
     """Process a single question with global rate limiting."""
     submitted_answer = None
     max_retries = 3
-    retry_delay = 60  # Start with Gemini's recommended delay
+    retry_delay = 6  # 6 seconds for 10 RPM
 
     for attempt in range(max_retries):
         try:
-            if not token_bucket.consume(1):
+            # Non-blocking rate limit check
+            while not token_bucket.consume(1):
                 print(f"Rate limit reached for task {task_id}. Waiting to retry...")
                 await asyncio.sleep(retry_delay)
-                continue
-
-            submitted_answer = await agent(question_text, task_id)
+            print(f"Processing task {task_id} (attempt {attempt + 1})...")
+            submitted_answer = await asyncio.wait_for(
+                agent(question_text, task_id),
+                timeout=60  # 60-second timeout per question
+            )
             results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
+            print(f"Completed task {task_id} with answer: {submitted_answer[:50]}...")
             return {"task_id": task_id, "submitted_answer": submitted_answer}
-            
         except aiohttp.ClientResponseError as e:
             if e.status == 429:
-                print(f"Rate limit hit for task {task_id}. Retrying after delay...")
+                print(f"Rate limit hit for task {task_id}. Retrying after {retry_delay}s...")
                 retry_delay *= 2  # Exponential backoff
-#                retry_delay += random.uniform(0, 5)  # Jitter
-                print(f"Retry #{attempt+1} in {retry_delay:.1f}s")
                 await asyncio.sleep(retry_delay)
-                while not token_bucket.consume(1):
-                    await asyncio.sleep(60)
-                try:
-                    submitted_answer = await agent(question_text)
-                    results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
-                    return {"task_id": task_id, "submitted_answer": submitted_answer}
-                except Exception as retry_e:
-                    submitted_answer = f"AGENT ERROR: {retry_e}"
-                    results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
-                    return None
+                continue
             else:
                 submitted_answer = f"AGENT ERROR: {e}"
                 results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
+                print(f"Failed task {task_id}: {submitted_answer}")
                 return None
+        except asyncio.TimeoutError:
+            submitted_answer = f"AGENT ERROR: Timeout after 60 seconds"
+            results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
+            print(f"Failed task {task_id}: {submitted_answer}")
+            return None
         except Exception as e:
             submitted_answer = f"AGENT ERROR: {e}"
             results_log.append({"Task ID": task_id, "Question": question_text, "Submitted Answer": submitted_answer})
+            print(f"Failed task {task_id}: {submitted_answer}")
             return None
 
 async def run_and_submit_all(profile: gr.OAuthProfile | None):