fix

app.py

@@ -329,7 +329,7 @@ html_template = """
             <div class="example-topics">
                 <button onclick="fillTopic('Realistic Image Synthesis in Medical Imaging')">Realistic Image Synthesis in Medical Imaging</button>
                 <button onclick="fillTopic('Using diffusion to generate road layout')">Using diffusion to generate road layout</button>
-                <button onclick="fillTopic('Using LLM-based agent to generate idea')">Using LLM-based agent to generate idea</button>
+                <button onclick="fillTopic('Using LLM-based agent to generate research ideas')">Using LLM-based agent to generate research ideas</button>
             </div>
         </div>
         <div id="loading" class="loading">{{ loading_text }}</div>
@@ -433,40 +433,45 @@ def form_post(topic: str = Form(...), user_id: str = Form(...), state: str = For
     script = script_template.format(user_id=user_id, state=new_state)
     print(f"current2 user_id={user_id}, state={new_state}")
     # 判断当前是否轮到该用户,如果没轮到则一直等待到轮到为止
-    print(len(queue.queue),queue.queue[0])
+    print(queue.queue[0], [user_id,topic])
     while queue.queue[0] != [user_id,topic]:
         time.sleep(10)
         continue
-    
-    user_id, topic = queue.get()
-    with lock:
-        logging.info(f"Processing request for topic: {topic}")
-        start_time = time.time()
-        error_message = None
-        idea = ""
-        time_taken = 0
-        # 检查是否超过每日最大回复次数
-        if reply_count >= MAX_REPLIES_PER_DAY:
-            error_message = "Today's maximum number of replies has been reached. Please try again tomorrow."
-            logging.info(f"Today's maximum number of replies has been reached. Please try again tomorrow.")
-        try:
-            main_llm, cheap_llm = get_llms()
-            deep_research_agent = DeepResearchAgent(llm=main_llm, cheap_llm=cheap_llm, improve_cnt=1, max_chain_length=5, min_chain_length=3, max_chain_numbers=1)
-            print(f"begin to generate idea of topic {topic}")
-            idea, related_experiments, entities, idea_chain, ideas, trend, future, human, year = deep_research_agent.generate_idea_with_chain(topic)
 
-            idea = fix_markdown(idea)
-            idea = markdown.markdown(idea)
-            # 更新每日回复次数
-            reply_count += 1
-            end_time = time.time()
-            time_taken = round(end_time - start_time, 2)
-            logging.info(f"Successfully generated idea for topic: {topic}")
-        except Exception as e:
-            end_time = time.time()
-            time_taken = round(end_time - start_time, 2)
-            logging.error(f"Failed to generate idea for topic: {topic}, Error: {str(e)}")
-            error_message = str(e)
-        # 从队列中移除当前用户
+    try:
+        with lock:
+            logging.info(f"Processing request for topic: {topic}")
+            start_time = time.time()
+            error_message = None
+            idea = ""
+            time_taken = 0
+            # 检查是否超过每日最大回复次数
+            if reply_count >= MAX_REPLIES_PER_DAY:
+                error_message = "Today's maximum number of replies has been reached. Please try again tomorrow."
+                logging.info(f"Today's maximum number of replies has been reached. Please try again tomorrow.")
+            try:
+                main_llm, cheap_llm = get_llms()
+                deep_research_agent = DeepResearchAgent(llm=main_llm, cheap_llm=cheap_llm, improve_cnt=1, max_chain_length=5, min_chain_length=3, max_chain_numbers=1)
+                print(f"begin to generate idea of topic {topic}")
+                idea, related_experiments, entities, idea_chain, ideas, trend, future, human, year = deep_research_agent.generate_idea_with_chain(topic)
+
+                idea = fix_markdown(idea)
+                idea = markdown.markdown(idea)
+                # 更新每日回复次数
+                reply_count += 1
+                end_time = time.time()
+                time_taken = round(end_time - start_time, 2)
+                logging.info(f"Successfully generated idea for topic: {topic}")
+            except Exception as e:
+                end_time = time.time()
+                time_taken = round(end_time - start_time, 2)
+                logging.error(f"Failed to generate idea for topic: {topic}, Error: {str(e)}")
+                error_message = str(e)
+            # 从队列中移除当前用户
+            finished = queue.get()
+            print(f"finished: {finished}, still in queue: {queue.qsize()}")
+            return Template(html_template).render(idea=idea, error=error_message, reply_count=reply_count, time_taken=time_taken,button_text=new_button_text,loading_text=loading_text,script=script)
+    except Exception as e:
+        error_message = str(e)
         queue.get()
-        return Template(html_template).render(idea=idea, error=error_message, reply_count=reply_count, time_taken=time_taken,button_text=new_button_text,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)