fix

app.py

@@ -360,8 +360,8 @@ def fix_markdown(text):
 async def add_user_id_and_state_cookie(request: Request, call_next):
     user_id = request.cookies.get("user_id")
     state = request.cookies.get("state")
+    print(f"Before call_next: user_id={user_id}, state={state}")
     response = await call_next(request)
-
     if not user_id:
         user_id = str(uuid.uuid4())
         state = "generate"
@@ -370,6 +370,7 @@ async def add_user_id_and_state_cookie(request: Request, call_next):
     elif not state:
         state = "generate"
         response.set_cookie(key="state", value=state)
+    print(f"After call_next: user_id={user_id}, state={state}")
     return response
 
 @app.get("/user_id")
@@ -382,7 +383,7 @@ async def get_user_id(request: Request):
 
 @app.get("/", response_class=HTMLResponse)
 def form_get():
-    return Template(html_template).render(idea= "This is a example of the idea geneartion", error=None, reply_count=reply_count,button_text="Generate",loading_text="Generating content, Usually takes 2-3 minutes, please wait...")
+    return Template(html_template).render(idea= "This is a example of the idea geneartion", error=None, reply_count=reply_count,button_text="Generate",loading_text="Generating content, Usually takes 3-4 minutes, please wait...")
 
 @app.post("/", response_class=HTMLResponse)
 def form_post(request: Request,response: Response,topic: str = Form(...)):
@@ -397,27 +398,28 @@ def form_post(request: Request,response: Response,topic: str = Form(...)):
     response.set_cookie(key="state", value=state)
 
     print(user_id,state)
-    loading_text = "Generating content, Usually takes 2-3 minutes, please wait..."
+    loading_text = "Generating content, Usually takes 3-4 minutes, please wait..."
     if state == "generate":
         if not queue.empty():
             queue_len = queue.qsize()
             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)
-            error_message = "There are currently {} requests being processed. If you want to queue, please rewrite your topic and click the Continue button and you will enter the queue.".format(queue_len)
+            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"
             response.set_cookie(key="state", value=new_state)
-            return Template(html_template).render(idea="", error=error_message, reply_count=reply_count, button_text=new_button_text,loading_text=f"Generating content, Usually takes {queue_len*2}-{queue_len*3} minutes, please wait...")
+            return Template(html_template).render(idea="", error=error_message, reply_count=reply_count, button_text=new_button_text,loading_text=f"Generating content, Usually takes {(queue_len+1)*3}-{(queue_len+1)*4} minutes, please wait...")
 
-    queue.put(user_id)
+    queue.put([user_id,topic])
     new_state = "generate"
     new_button_text = "Generate"
     response.set_cookie(key="state", value=new_state)
     queue_len = queue.qsize()
     
     # 判断当前是否轮到该用户,如果没轮到则一直等待到轮到为止
-    while queue.queue[0] != user_id:
+    while queue.queue[0] != [user_id,topic]:
+        time.sleep(10)
         continue
     
     with lock: