feat: support multi-user by KoalaBryson · Pull Request #68 · devsapp/cap-comfyui

KoalaBryson · 2026-02-01T08:45:26Z

Change-Id: I1dbd079817dbb351eba8f7ce2e72121b163a6f05

CiCi503 · 2026-02-02T03:51:28Z

src/code/agent/utils/user_auth.py

+1. JWT 方式：从 Art-Comfy-User header 提取（网关解析 JWT 后注入）
+2. Basic Auth 方式：从 Authorization: Basic header 中解析 username
+
+通过 ENABLE_COMFYUI_USER 环境变量控制：


相比于 ENABLE_COMFYUI_USER，ENABLE_MULTI_USER 是不是会好一些？

CiCi503 · 2026-02-02T05:58:44Z

src/code/agent/utils/user_auth.py

+    return decorated_function
+
+
+def user_optional(func):


user_optional 是有必要的吗？在哪里会用到呢？

CiCi503 · 2026-02-02T06:06:10Z

src/code/agent/utils/user_auth.py

+    return None
+
+
+def user_required(func):


模块名：user_auth => user_identity.py

函数名：user_required => identify_user # 明确表达：从多租户环境中识别用户

函数名：user_optional => identify_user_or_default

identify (识别) 比 auth (认证) 更准确，因为它描述的是“你是谁”，而不是“你的密码对不对”。
user_identity 作为一个模块名，清晰地告诉别人这里是处理用户身份识别逻辑的地方。
or_default 后缀比 optional 更清楚地说明了“如果获取不到会发生什么”（即：降级到默认用户）。

CiCi503 · 2026-02-02T06:48:39Z

src/code/agent/routes/gateway_routes.py


    def _register_prompt_handler(self):
        @self.bp.route("/prompt", methods=["POST"])
+        @user_required


如果这个需要每个 handler 都定义一个，是不是可以放到 @self.bp.before_request 里？

CiCi503 · 2026-02-02T06:54:43Z

src/code/agent/services/gateway/handlers/prompt_handler.py

                }
            }), 400

+        # 注入user_id到extra_data


中英文之前有空格

CiCi503 · 2026-02-02T06:59:27Z

src/code/agent/services/gateway/handlers/serverless_handler.py

        client_id = ""

+        # 注入user_id到extra_data
+        user_id = getattr(g, 'user_id', 'default')


serverless_handler 有必要修改么？webui 是不是不会走到这里？

CiCi503 · 2026-02-02T07:02:04Z

src/code/agent/services/gateway/handlers/ws_handler.py

 from services.process.websocket.websocket_manager import ws_manager
 from utils.logger import log
+from utils.user_auth import extract_user_from_header
+import constants


constants 看起来没被用到？

CiCi503 · 2026-02-02T07:42:49Z

src/code/agent/services/gateway/task/task_manager.py

+            )
+        return user_id
+
+    return 'system'


这里返回 'system' 有什么特殊的考量吗？
其他的都是 getattr(g, 'user_id', 'default')

CiCi503 · 2026-02-02T07:55:29Z

src/code/agent/services/gateway/task/task_manager.py

+        return self._history_helper.get_history(user_id, max_items, offset)
+
+    @staticmethod
+    def _extract_prompt_id_from_body(prompt_body: dict, fallback_id: str) -> str:


在此之前，prompt_id 和 task_id 是一样的吗?

CiCi503 · 2026-02-02T07:55:56Z

src/code/agent/services/gateway/task/task_manager.py

+        return self._history_helper.get_history(user_id, max_items, offset)
+
+    @staticmethod
+    def _extract_prompt_id_from_body(prompt_body: dict, fallback_id: str) -> str:


fallback_id 太怪了

CiCi503 · 2026-02-02T08:00:57Z

src/code/agent/services/gateway/task/task_manager.py


            for task_id, task in self._tasks.items():
+                # 只清理当前用户的任务
+                if task.user_id != user_id:


有一个方法是 get_current_user_tasks，可以复用吗？

CiCi503 · 2026-02-02T08:07:47Z

src/code/agent/services/gateway/task/task_manager.py

+
+            # 只有当任务确实是运行中状态时才减少计数
+            # 这里再次检查状态，确保计数器准确
+            if old_status in [TaskStatus.PENDING, TaskStatus.RUNNING]:


298 行已经判断过了，这里是不是不需要再判断了？

CiCi503 · 2026-02-02T08:08:10Z

src/code/agent/services/gateway/task/task_manager.py

+                self._running_count_by_user[user_id] -= 1
+
            cancelled = True
+            should_stop_polling = True


同理：cancelled 和 should_stop_polling 这两个变量是不是也没必要了？

CiCi503 · 2026-02-02T08:11:02Z

src/code/agent/services/gateway/task/task_manager.py

                except Exception as e:
                    log("ERROR", f"[TaskManager] Error stopping poller for task {task_id}: {e}")

+    # ==================== History 原子操作辅助方法（委托给 HistoryHelper）====================


History 原子操作辅助方法存在的意义是什么呢？

CiCi503 · 2026-02-02T13:15:49Z

src/code/agent/services/gateway/task/task_manager.py

+                # 单节点任务执行结束
+                data = message.get("data", {})
+                prompt_id = data.get("prompt_id")
+                node_id = data.get("node")


这个 node_id 是有用的不？

若中间节点有输出，history会返回该工作流的所有output，元数据有nodeId，表示是那个节点的输出。

Change-Id: I1dbd079817dbb351eba8f7ce2e72121b163a6f05

CiCi503 · 2026-02-04T06:10:45Z

src/code/agent/utils/user_identity.py

@@ -19,8 +19,8 @@
 from utils.logger import log


-# 认证相关常量
-JWT_USER_HEADER = 'Art-Comfy-User'


这个 header 常量放到 constants 里吧

CiCi503 · 2026-02-04T07:05:34Z

src/code/agent/services/gateway/handlers/prompt_handler.py

+        user_id = getattr(g, 'user_id', 'default')
+        if 'extra_data' not in request_data:
+            request_data['extra_data'] = {}
+        request_data['extra_data']['user_id'] = user_id


注入到 body 里是必要的吗？
/prompt 通过 task_manager 转发给 GPU 函数的时候是带着 x-art-comfy-user 的 header 的

Change-Id: Ia655542268d9dce4a56132cfcf62f751635f4aa0

CiCi503 · 2026-02-04T08:51:22Z

src/code/agent/constants.py

+ENABLE_COMFYUI_MULTI_USER = os.getenv('ENABLE_COMFYUI_MULTI_USER', '').lower() == 'true'
+
+# 用户身份识别相关常量
+JWT_USER_HEADER = 'X-Art-Comfy-User'


改个名：
HEADER_FUNART_COMFY_USERID = 'X-FunArt-Comfy-UserId'

CiCi503 · 2026-02-04T08:54:35Z

src/code/agent/services/gateway/handlers/prompt_handler.py

+        user_id = getattr(g, 'user_id', 'default')
+        if 'extra_data' not in request_data:
+            request_data['extra_data'] = {}
+        request_data['extra_data']['x-art-comfy-user'] = user_id


x-art-comfy-user 不 hardcode，引用 consts

Change-Id: If2c4c240aa2d33650f992cd707779063bec16215

CiCi503 · 2026-02-04T09:02:27Z

src/code/agent/services/gateway/task/history_helper.py

+from utils.logger import log
+
+
+class HistoryHelper:


这个类叫 Helper 不太合适，实际上，他包含了完整的 crud
建议叫 HistoryManager

CiCi503 · 2026-02-04T09:16:49Z

src/code/agent/services/gateway/task/task_manager.py

+        with self._lock:
+            return self._tasks.get(task_id)
+
+    def get_user_running_count(self, user_id: str) -> int:


=> get_running_task_count_by_user

Change-Id: I9491b4b7c601219775f8964d722823539714cc17

Change-Id: I67caaf83428d7441951fafa4e0d363cccb3fa71b

Change-Id: Iaedb020f0aace2518969f96f6b5f19d1851c9163

KoalaBryson force-pushed the comfyui-multi-user branch 10 times, most recently from 6b5bb81 to 141f860 Compare February 2, 2026 02:49

CiCi503 reviewed Feb 2, 2026

View reviewed changes

KoalaBryson force-pushed the comfyui-multi-user branch 2 times, most recently from dfee1e1 to bc10f1c Compare February 3, 2026 02:13

feat: support multi-user

b529491

Change-Id: I1dbd079817dbb351eba8f7ce2e72121b163a6f05

KoalaBryson force-pushed the comfyui-multi-user branch 2 times, most recently from 7597cb1 to 74e1aa8 Compare February 4, 2026 02:22

CiCi503 reviewed Feb 4, 2026

View reviewed changes

KoalaBryson force-pushed the comfyui-multi-user branch from 33aa93a to f703d8d Compare February 4, 2026 07:14

fix comments

2e08f11

Change-Id: Ia655542268d9dce4a56132cfcf62f751635f4aa0

KoalaBryson force-pushed the comfyui-multi-user branch from f703d8d to 2e08f11 Compare February 4, 2026 07:32

CiCi503 reviewed Feb 4, 2026

View reviewed changes

fix comments （user-header）

c51f0eb

Change-Id: If2c4c240aa2d33650f992cd707779063bec16215

CiCi503 reviewed Feb 4, 2026

View reviewed changes

yinsu.zs added 3 commits February 4, 2026 17:53

fix comments- history

c148984

Change-Id: I9491b4b7c601219775f8964d722823539714cc17

dead code

4374146

Change-Id: I67caaf83428d7441951fafa4e0d363cccb3fa71b

fix comments

6c8c530

Change-Id: Iaedb020f0aace2518969f96f6b5f19d1851c9163

KoalaBryson force-pushed the comfyui-multi-user branch from ee792c6 to 6c8c530 Compare February 5, 2026 02:29

Conversation

KoalaBryson commented Feb 1, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CiCi503 Feb 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

CiCi503 Feb 4, 2026 •

edited

Loading