Update app/app.py

app/app.py

@@ -63,25 +63,24 @@ class RequestQueue:
             
             queued_request = QueuedRequest(request_id, question, datetime.now())
             
-            # If nothing is processing and queue is empty, this request can be processed immediately
-            if not self.processing and not self.queue:
-                self.processing = queued_request
-                queued_request.status = "processing"
-                return {
-                    "status": "processing",
-                    "message": "Your request is being processed now.",
-                    "queue_position": 0,
-                    "estimated_wait_time": "0-2 minutes"
-                }
-            
-            # Add to queue
+            # Always enqueue; the background worker is the single executor
             self.queue.append(queued_request)
-            position = len(self.queue)
-            estimated_wait = f"{position * 2}-{(position + 1) * 2} minutes"
+            position = len(self.queue)  # 1-based position in queue
+            
+            # Compute an ETA that reflects whether something is currently processing
+            # ahead_of_you = (1 if a job is currently processing else 0) + (position - 1 already queued ahead)
+            ahead_of_you = (1 if self.processing else 0) + (position - 1)
+            # Each slot ~2 minutes based on your heuristic
+            estimated_wait = f"{ahead_of_you * 2}-{(ahead_of_you + 1) * 2} minutes"
+            
+            message = (
+                "Using free CPU tier - can only process one request at a time. "
+                f"Your request is #{position} in queue and will be processed after current requests are completed."
+            )
             
             return {
                 "status": "queued",
-                "message": f"Using free CPU tier - can only process one request at a time. Your request is #{position} in queue and will be processed after current requests are completed.",
+                "message": message,
                 "queue_position": position,
                 "estimated_wait_time": estimated_wait
             }