fix

app.py

@@ -11,6 +11,7 @@ import threading
 import logging
 from queue import Queue
 import json
+from collections import Counter
 
 lock = threading.Lock()
 app = FastAPI()
@@ -455,10 +456,10 @@ def form_post(request: Request,topic: str = Form(...), user_id: str = Form(...),
         state = "generate"
 
     script = script_template.format(user_id=user_id, state=state)
-    if user_id in queue.queue:
-        # 如果用户在队列中，移除用户
-        queue.queue.remove(user_id)
-        state = "generate"
+    # if user_id in queue.queue:
+    #     # 如果用户在队列中，移除用户
+    #     queue.queue.remove(user_id)
+    #     state = "generate"
 
     loading_text = "Generating content, Usually takes 3-4 minutes, please wait..."
     if state == "generate":
@@ -467,7 +468,10 @@ def form_post(request: Request,topic: str = Form(...), user_id: str = Form(...),
             if queue_len + reply_count >= MAX_REPLIES_PER_DAY:
                 error_message = "Today's maximum number of replies has been reached. Please try again tomorrow."
                 return Template(html_template).render(idea="", error=error_message, reply_count=reply_count, button_text="Generate",loading_text=loading_text,script=script)
-            error_message = "There are currently {} requests being processed. If you want to queue, please write your original topic and click the Continue button and you will enter the queue.".format(queue_len)
+            if user_id in queue.queue:
+                error_message = "You already have a request in the queue. Submitting a new request will cancel the previous request. Please confirm if you need to submit a new request. If so, click continue. There are currently {} requests being processed."
+            else:
+                error_message = "There are currently {} requests being processed. If you want to queue, please write your original topic and click the Continue button and you will enter the queue.".format(queue_len)
             new_state = "continue"
             new_button_text = "Continue"
             script = f"""
@@ -495,8 +499,11 @@ def form_post(request: Request,topic: str = Form(...), user_id: str = Form(...),
     # 判断当前是否轮到该用户,如果没轮到则一直等待到轮到为止
     print(queue.queue[0], [user_id,topic])
     while queue.queue[0] != user_id:
-        # 检查用户是否还在队列中
-        if not any(user_id == item for item in queue.queue):
+        counts = Counter(queue.queue)
+        if counts[user_id] > 1:
+            while counts[user_id] > 1:
+                queue.queue.remove(user_id)
+                counts[user_id] -= 1
             return Template(html_template).render(
                 idea="", 
                 error="Request was cancelled.", 
@@ -505,7 +512,7 @@ def form_post(request: Request,topic: str = Form(...), user_id: str = Form(...),
                 loading_text=loading_text,
                 script=script
             )
-        time.sleep(10)
+        time.sleep(2)
         continue
 
     try:
@@ -545,4 +552,6 @@ def form_post(request: Request,topic: str = Form(...), user_id: str = Form(...),
     except Exception as e:
         error_message = str(e)
         queue.get()
-        return Template(html_template).render(idea="", error=error_message, reply_count=reply_count, button_text="Generate",loading_text=loading_text,script=script)
+        return Template(html_template).render(idea="", error=error_message, reply_count=reply_count, button_text="Generate",loading_text=loading_text,script=script)
+
+