add null template

.gitignore

@@ -1,7 +1,8 @@
 en_core_web_sm-3.6.0/*
 daily_receive.*
 weekly_train_generate.*
-app[2-3].py
+app[2-4].py
+app_test.py
 test_gradio_client.py
 boxes.py
 *.tar.gz

app.py

@@ -4,6 +4,8 @@ import gradio as gr
 import os
 import json
 import requests
+import time
+from concurrent.futures import ThreadPoolExecutor
 from utils import is_chinese, process_image_without_resize, parse_response, templates_agent_cogagent, template_grounding_cogvlm, postprocess_text
 
 DESCRIPTION = '''<h2 style='text-align: center'> <a href="https://github.com/THUDM/CogVLM"> CogVLM & CogAgent Chat Demo</a> </h2>'''
@@ -22,6 +24,10 @@ default_chatbox = [("", "Hi, What do you want to know about this image?")]
 URL = os.environ.get("URL")
 
 
+def make_request(URL, headers, data):
+    response = requests.request("POST", URL, headers=headers, data=data, timeout=(60, 100))
+    return response.json()
+
 def post(
         input_text,
         temperature,
@@ -77,7 +83,7 @@ def post(
             input_text = postprocess_text(grounding_template, input_text)
     elif cogagent:
         model_use = "agent_chat"
-        if agent_template:
+        if agent_template is not None and agent_template != "do not use template":
             input_text = postprocess_text(agent_template, input_text)
 
     prompt = input_text
@@ -99,7 +105,11 @@ def post(
         'max_new_tokens': 2048
     })
     try:
-        response = requests.request("POST", URL, headers=headers, data=data, timeout=(60, 100)).json()
+        with ThreadPoolExecutor(max_workers=1) as executor:
+            future = executor.submit(make_request, URL, headers, data)
+            # time.sleep(15)
+            response = future.result()  # Blocks until the request is complete
+        # response = requests.request("POST", URL, headers=headers, data=data, timeout=(60, 100)).json()
     except Exception as e:
         print("error message", e)
         if is_zh:
@@ -190,7 +200,7 @@ def main():
         print(gr.__version__)
 
     demo.queue(concurrency_count=10)
-    demo.launch()
+    demo.launch(server_port=7862)
 
 if __name__ == '__main__':
     main()

utils.py

@@ -121,6 +121,7 @@ def postprocess_text(template, text):
     
 # The templates is for CogAgent_Agent Template
 templates_agent_cogagent = [
+    "do not use template",
     "Can you advise me on how to <TASK>?",
     "I'm looking for guidance on how to <TASK>.",
     "What steps do I need to take to <TASK>?",