fix: isolate user concurrency from internal agent runs

This commit is contained in:
吉鑫升 committed 2026-06-30 14:56:29 +08:00
1 parent 124eb04a6b
commit c23350f17b
8 files changed
+162 -10

No files matched your search

@@ -10,11 +10,17 @@ import pytest
from app.gateway.routers import system_settings as ss_router
from app.gateway.services import (
RUN_SCOPE_EXTERNAL_ROOT,
RUN_SCOPE_ORCHESTRATION_CHILD,
_get_model_concurrency_limit,
_get_user_model_concurrency_limit,
_resolve_run_scope,
_resolve_effective_run_model_name,
internal_run_scope_headers,
)
from deerflow.config import system_settings as ss
from deerflow.config.concurrency_config import RedisConcurrencyConfig
from deerflow.runtime.runs.concurrency_gate import RedisConcurrencyGate
from deerflow.runtime.runs.manager import ModelConcurrencyLimitError, RunManager
@@ -212,6 +218,15 @@ async def test_run_manager_rejects_user_model_limit_atomically(
assert _get_user_model_concurrency_limit("other") == 3
run_mgr = RunManager()
await run_mgr.create_or_reject(
"t-child",
metadata={
"model_name": "glm5",
"user_id": "u1",
"run_scope": RUN_SCOPE_ORCHESTRATION_CHILD,
},
user_model_concurrency_limit=("glm5", "u1", 1),
)
await run_mgr.create_or_reject("t1", metadata={"model_name": "glm5", "user_id": "u1"})
await run_mgr.create_or_reject(
"t2",
@@ -247,3 +262,44 @@ def test_get_model_concurrency_limit_skips_when_disabled(
)
assert _get_model_concurrency_limit("glm5") is None
assert _get_user_model_concurrency_limit("glm5") is None
def test_internal_run_scope_is_only_trusted_for_loopback_or_server_argument() -> None:
body = SimpleNamespace(metadata={"run_scope": RUN_SCOPE_ORCHESTRATION_CHILD})
trusted_loopback_request = SimpleNamespace(
client=SimpleNamespace(host="127.0.0.1"),
headers=internal_run_scope_headers(),
)
untrusted_loopback_request = SimpleNamespace(
client=SimpleNamespace(host="127.0.0.1"),
headers={},
)
public_request = SimpleNamespace(
client=SimpleNamespace(host="10.0.0.8"),
headers=internal_run_scope_headers(),
)
assert (
_resolve_run_scope(body, trusted_loopback_request, None)
== RUN_SCOPE_ORCHESTRATION_CHILD
)
assert (
_resolve_run_scope(body, untrusted_loopback_request, None)
== RUN_SCOPE_EXTERNAL_ROOT
)
assert _resolve_run_scope(body, public_request, None) == RUN_SCOPE_EXTERNAL_ROOT
assert (
_resolve_run_scope(
SimpleNamespace(metadata={}),
public_request,
RUN_SCOPE_ORCHESTRATION_CHILD,
)
== RUN_SCOPE_ORCHESTRATION_CHILD
)
def test_redis_concurrency_namespace_has_system_prefix() -> None:
assert RedisConcurrencyConfig().namespace == "cmzs_deerflow:concurrency"
gate = RedisConcurrencyGate(RedisConcurrencyConfig(namespace=""))
assert gate._ns() == "cmzs_deerflow:concurrency"