Browse Source

async_engine

jack 2 tuần trước cách đây
mục cha
commit
7d4162a0bd
4 tập tin đã thay đổi với 8 bổ sung5 xóa
  1. 4 2
      app/core/runner/llm_backend.py
  2. 2 1
      app/tasks/run_task.py
  3. 1 1
      config/database.py
  4. 1 1
      docker-compose.yml

+ 4 - 2
app/core/runner/llm_backend.py

@@ -48,8 +48,8 @@ class LLMBackend:
         if extra_body:
             model_params = extra_body.get("model_params")
             if model_params:
-                if "n" in model_params:
-                    raise ValueError("n is not allowed in model_params")
+                #if "n" in model_params:
+                #    raise ValueError("n is not allowed in model_params")
                 chat_params.update(model_params)
             stream_options_params = extra_body.get("stream_options")
             if stream_options_params:
@@ -85,6 +85,8 @@ class LLMBackend:
         for message in chat_params["messages"]:
             if "content" not in message:
                 message["content"] = ""
+            elif "content" in message and message["content"]["type"] == "text":
+                message["content"] = message["content"]["text"]
         chat_params["timeout"] = 300
 
         logging.info("chat_params: %s", chat_params)

+ 2 - 1
app/tasks/run_task.py

@@ -7,7 +7,8 @@ from app.providers.celery_app import celery_app
 from app.providers.database import session
 from app.services.run.run import RunService
 
-
+#@celery_app.task(bind=True, autoretry_for=(Exception,), max_retries=3, default_retry_delay=60)
+#@celery_app.task(bind=True, max_retries=3, default_retry_delay=60)
 @celery_app.task(bind=True, autoretry_for=())
 def run_task(self, run_id: str, token_id: str, stream: bool = False):
     logging.info(

+ 1 - 1
config/database.py

@@ -11,7 +11,7 @@ class Settings(BaseSettings):
     DB_DATABASE: str = "open_assistant"
     DB_USER: str = "root"
     DB_PASSWORD: str = "123456"
-    DB_POOL_SIZE: int = 20000
+    DB_POOL_SIZE: int = 2000
     DB_POOL_RECYCLE: int = 3600
     DB_OVERLOW: int = 10000
 

+ 1 - 1
docker-compose.yml

@@ -183,7 +183,7 @@ services:
       MYSQL_PASSWORD: '123456'
       MYSQL_DATABASE: open_assistant1
       # TZ: Asia/Shanghai
-    command: [ 'mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci','--max_connections=100000', '--wait_timeout=60', '--interactive_timeout=60' ]
+    command: [ 'mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci','--max_connections=100000', '--wait_timeout=28800', '--interactive_timeout=28800', '--max_allowed_packet=1024M' ]
     healthcheck:
       test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
       timeout: 20s