From 476632294fe69899eea0a30a464cc7874d1c0f60 Mon Sep 17 00:00:00 2001
From: lanceyq <1982376970@qq.com>
Date: Mon, 9 Mar 2026 14:02:23 +0800
Subject: [PATCH] [changes] Remove the "worker-ondemand" queue

---
 api/app/celery_app.py  |  2 +-
 api/app/tasks.py       |  2 ++
 api/docker-compose.yml | 16 +---------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/api/app/celery_app.py b/api/app/celery_app.py
index 7ace1f9b..e6b239dd 100644
--- a/api/app/celery_app.py
+++ b/api/app/celery_app.py
@@ -113,7 +113,7 @@ celery_app.conf.update(
         'app.tasks.run_forgetting_cycle_task': {'queue': 'periodic_tasks'},
         'app.tasks.write_all_workspaces_memory_task': {'queue': 'periodic_tasks'},
         'app.tasks.update_implicit_emotions_storage': {'queue': 'periodic_tasks'},
-        'app.tasks.init_implicit_emotions_for_users': {'queue': 'ondemand_tasks'},
+        'app.tasks.init_implicit_emotions_for_users': {'queue': 'periodic_tasks'},
     },
 )
 
diff --git a/api/app/tasks.py b/api/app/tasks.py
index 0c0fd01e..65a0a091 100644
--- a/api/app/tasks.py
+++ b/api/app/tasks.py
@@ -2457,6 +2457,8 @@ def update_implicit_emotions_storage(self) -> Dict[str, Any]:
     acks_late=False,
     time_limit=3600,
     soft_time_limit=3300,
+    # 触发型任务标识，区别于 periodic_tasks 队列中的定时任务
+    triggered=True,
 )
 def init_implicit_emotions_for_users(self, end_user_ids: List[str]) -> Dict[str, Any]:
     """事件触发任务：对指定用户列表做存在性检查，无记录则执行首次初始化。
diff --git a/api/docker-compose.yml b/api/docker-compose.yml
index 1fcfc977..5d358f2c 100644
--- a/api/docker-compose.yml
+++ b/api/docker-compose.yml
@@ -49,7 +49,7 @@ services:
     networks:
       - celery
 
-  # Periodic worker - Scheduled/beat tasks (prefork, low concurrency)
+  # Periodic worker - Scheduled/beat tasks + API-triggered tasks (prefork, low concurrency)
   worker-periodic:
     image: redbear-mem-open:latest
     container_name: worker-periodic
@@ -63,20 +63,6 @@ services:
     networks:
       - celery
 
-  # On-demand worker - API-triggered tasks (e.g. implicit emotions init)
-  worker-ondemand:
-    image: redbear-mem-open:latest
-    container_name: worker-ondemand
-    env_file:
-      - .env
-    volumes:
-      - ./files:/files
-      - /etc/localtime:/etc/localtime:ro
-    command: celery -A app.celery_worker.celery_app worker -E --loglevel=info --pool=prefork --concurrency=4 --queues=ondemand_tasks --max-tasks-per-child=50 -n ondemand_worker@%h
-    restart: unless-stopped
-    networks:
-      - celery
-
   # Celery Beat - scheduler
   beat:
     image: redbear-mem-open:latest