Spaces:

DAMO-NLP-SG
/

CoI_Agent

Running

App Files Files Community

jianghuyihei commited on Oct 15

Commit

97a5f88

•

1 Parent(s): 760970b

fix

Browse files

Files changed (2) hide show

__pycache__/app.cpython-310.pyc +0 -0
app.py +101 -33

__pycache__/app.cpython-310.pyc CHANGED Viewed

Binary files a/__pycache__/app.cpython-310.pyc and b/__pycache__/app.cpython-310.pyc differ

app.py CHANGED Viewed

@@ -1,4 +1,4 @@
-from fastapi import FastAPI, Form
 from fastapi.responses import HTMLResponse
 from jinja2 import Template
 import markdown
@@ -8,6 +8,8 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from agents import DeepResearchAgent, get_llms
 import threading
 import logging
 lock = threading.Lock()
 app = FastAPI()
@@ -19,8 +21,6 @@ reply_count = 0
 # 启动时设置计数器重置
 last_reset_time = datetime.now()
-is_processing = False
 # HTML模板
 html_template = """
 <!DOCTYPE html>
@@ -267,33 +267,33 @@ html_template = """
         <h1>CoI Agent online demo 😊</h1>
         <div class="time-counter-container">
             <div id="time-taken" class="time-box">Time Taken: {{ time_taken }} seconds</div>
-            <div class="counter-box">Today's Replies: {{ reply_count }}</div>
         </div>
-        <div class="example-container">
-        <div class="example-label">Example Input:</div>
-            <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>
             </div>
         </div>
         <form action="/" method="post" onsubmit="showLoading()">
             <div class="form-group">
                 <label for="topic">Topic:</label>
                 <input type="text" id="topic" name="topic">
-                <button type="submit" id="submit-btn">Generate</button>
             </div>
         </form>
-        <div id="loading" class="loading">Generating content, Usually takes 3-4 minutes, please wait...</div>
-        <div class="progress-bar-container">
-            <div id="progress-bar" class="progress-bar"></div>
-        </div>
-        <div class="result">
-            <div class="box">
-                <h2>Idea</h2>
-                <div>{{ idea | safe }}</div>
             </div>
         </div>
         {% if error %}
         <div class="error">
             <div class="box">
@@ -305,6 +305,20 @@ html_template = """
     </div>
     <script>
         hideLoading();
     </script>
 </body>
 </html>
@@ -320,30 +334,84 @@ scheduler = BackgroundScheduler()
 scheduler.add_job(reset_counter, 'cron', hour=0, minute=0)
 scheduler.start()
 @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)
 @app.post("/", response_class=HTMLResponse)
-def form_post(topic: str = Form(...)):
     global reply_count
-    global is_processing
     start_time = time.time()
-    if is_processing:
-        error = "The server is processing another request. Please try again later(We only process one instruction at a time, please forgive me.)."
-        return Template(html_template).render(idea="", error=error, reply_count=reply_count)
     with lock:
-        is_processing = True
         logging.info(f"Processing request for topic: {topic}")
         start_time = time.time()
         # 检查是否超过每日最大回复次数
         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.")
-            is_processing = False
-            return Template(html_template).render(idea="", error=error_message, reply_count=reply_count)
         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)
@@ -357,11 +425,11 @@ def form_post(topic: str = Form(...)):
             end_time = time.time()
             time_taken = round(end_time - start_time, 2)
             logging.info(f"Successfully generated idea for topic: {topic}")
-            is_processing = False
-            return Template(html_template).render(idea=idea_md, error=None, reply_count=reply_count, time_taken=time_taken)
         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)}")
-            is_processing = False
-            return Template(html_template).render(idea="", error=str(e), reply_count=reply_count, time_taken=time_taken)

+from fastapi import FastAPI, Form, Request,Response
 from fastapi.responses import HTMLResponse
 from jinja2 import Template
 import markdown
 from agents import DeepResearchAgent, get_llms
 import threading
 import logging
+from queue import Queue
+import uuid
 lock = threading.Lock()
 app = FastAPI()
 # 启动时设置计数器重置
 last_reset_time = datetime.now()
 # HTML模板
 html_template = """
 <!DOCTYPE html>
         <h1>CoI Agent online demo 😊</h1>
         <div class="time-counter-container">
             <div id="time-taken" class="time-box">Time Taken: {{ time_taken }} seconds</div>
+            <div class="counter-box">Today's Replies: {{ reply_count }}/100 </div>
         </div>
+        <div class="progress-bar-container">
+            <div id="progress-bar" class="progress-bar"></div>
+        </div>
+        <div class="result">
+            <div class="box">
+                <h2>Idea</h2>
+                <div>{{ idea | safe }}</div>
             </div>
         </div>
         <form action="/" method="post" onsubmit="showLoading()">
             <div class="form-group">
                 <label for="topic">Topic:</label>
                 <input type="text" id="topic" name="topic">
+                <button type="submit" id="submit-btn">{{ button_text }}</button>
             </div>
         </form>
+        <div class="example-container">
+        <div class="example-label">Example Input:</div>
+            <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>
             </div>
         </div>
+        <div id="loading" class="loading">{{ loading_text }}</div>
         {% if error %}
         <div class="error">
             <div class="box">
     </div>
     <script>
         hideLoading();
+<script>
+        async function getUserId() {
+            // 清除 sessionStorage 中的 user_id
+            sessionStorage.removeItem("user_id");
+            // 请求新的 user_id
+            const response = await fetch("/user_id");
+            const data = await response.json();
+            const userId = data.user_id;
+            sessionStorage.setItem("user_id", userId);
+            console.log("User ID:", userId);
+        }
+        window.onload = getUserId;
     </script>
 </body>
 </html>
 scheduler.add_job(reset_counter, 'cron', hour=0, minute=0)
 scheduler.start()
+queue = Queue()
+@app.middleware("http")
+async def add_user_id_and_state_cookie(request: Request, call_next):
+    user_id = request.cookies.get("user_id")
+    state = request.cookies.get("state")
+    if not user_id:
+        user_id = str(uuid.uuid4())
+        state = "generate"
+        response = await call_next(request)
+        response.set_cookie(key="user_id", value=user_id)
+        response.set_cookie(key="state", value=state)
+    elif not state:
+        state = "generate"
+        response = await call_next(request)
+        response.set_cookie(key="state", value=state)
+    else:
+        response = await call_next(request)
+    return response
+@app.get("/user_id")
+async def get_user_id():
+    user_id = str(uuid.uuid4())
+    return {"user_id": user_id}
 @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...")
 @app.post("/", response_class=HTMLResponse)
+def form_post(request: Request,response: Response,topic: str = Form(...)):
     global reply_count
     start_time = time.time()
+    # 获得每个网页的user_id
+    user_id = request.cookies.get("user_id")
+    state = request.cookies.get("state", "generate")
+    print(user_id,state)
+    loading_text = "Generating content, Usually takes 2-3 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 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...")
+        else:
+            queue.put(user_id)
+    elif state == "continue":
+        queue.put(user_id)
+    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:
+        continue
     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)
             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)
+        # 从队列中移除当前用户
+        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)