From a5c6c110d837460e4688c0da868557277646708e Mon Sep 17 00:00:00 2001 From: "svc-glamr@nvidia.com" Date: Tue, 3 Nov 2026 02:27:19 +0000 Subject: [PATCH 1/4] fix(kv-router): reject non-boolean is_eagle in worker upsert and patch SelectionService.upsert_worker and patch_worker depythonize into WorkerRequest and WorkerPatchRequest, whose typed is_eagle let pythonize coerce any truthy object, so is_eagle="false" enabled Eagle hashing for the worker's partition. Use the strict_bool deserializer from #17238 on both fields so only True, False, None, or an omitted key are accepted. Refs DYN-5218 Signed-off-by: svc-glamr@nvidia.com --- lib/bindings/python/tests/test_kv_bindings.py | 54 +++++++++++++++++++ lib/kv-router/src/services/selection/types.rs | 34 ++++++++++++ 2 files changed, 88 insertions(+) diff --git a/lib/bindings/python/tests/test_kv_bindings.py b/lib/bindings/python/tests/test_kv_bindings.py index cfaee04c3d5f..6482923246d9 100644 --- a/lib/bindings/python/tests/test_kv_bindings.py +++ b/lib/bindings/python/tests/test_kv_bindings.py @@ -462,6 +462,60 @@ def __iter__(self): service.shutdown() +@pytest.mark.skipif( + SelectionService is None, + reason="SelectionService requires the select-service Cargo feature", +) +@pytest.mark.timeout(5) +@pytest.mark.asyncio +async def test_selection_service_worker_is_eagle_rejects_non_booleans(monkeypatch): + monkeypatch.setenv("DYN_ROUTER_USE_KV_EVENTS", "false") + service = SelectionService(indexer_threads=1) + + def worker(worker_id, model_name, **extra): + return { + "worker_id": worker_id, + "model_name": model_name, + "endpoint": f"http://worker-{worker_id}:8000", + "block_size": 4, + "max_num_batched_tokens": 1024, + **extra, + } + + def stored_is_eagle(model_name): + (record,) = service.list_workers(model_name=model_name) + return record["is_eagle"] + + try: + # Real booleans keep their meaning; omitted and None stay unset. + record = await service.upsert_worker(worker(1, "plain", is_eagle=False)) + assert record["is_eagle"] is False + record = await service.upsert_worker(worker(2, "eagle", is_eagle=True)) + assert record["is_eagle"] is True + record = await service.upsert_worker(worker(3, "omitted")) + assert record["is_eagle"] is None + record = await service.upsert_worker(worker(4, "null", is_eagle=None)) + assert record["is_eagle"] is None + + # Worker booleans are not coerced by truthiness, so "false" cannot enable Eagle. + for value in ["false", "true", 1, [False]]: + with pytest.raises(ValueError, match="boolean"): + await service.upsert_worker(worker(5, "malformed", is_eagle=value)) + with pytest.raises(ValueError, match="boolean"): + await service.patch_worker(1, {"is_eagle": value}) + assert service.list_workers(model_name="malformed") == [] + assert stored_is_eagle("plain") is False + + # An omitted or None patch value leaves the stored value unchanged. + for patch in [{}, {"is_eagle": None}]: + record = await service.patch_worker(2, patch) + assert record["is_eagle"] is True + record = await service.patch_worker(1, {"is_eagle": False}) + assert record["is_eagle"] is False + finally: + await service.shutdown_async() + + @pytest.mark.skipif( SelectionService is None, reason="SelectionService requires the select-service Cargo feature", diff --git a/lib/kv-router/src/services/selection/types.rs b/lib/kv-router/src/services/selection/types.rs index 2689b09a8cb2..2360e75858b7 100644 --- a/lib/kv-router/src/services/selection/types.rs +++ b/lib/kv-router/src/services/selection/types.rs @@ -328,6 +328,7 @@ pub struct WorkerRequest { pub max_num_batched_tokens: Option, pub total_kv_blocks: Option, pub stable_routing_id: Option, + #[serde(default, deserialize_with = "strict_bool")] pub is_eagle: Option, #[serde(default)] pub taints: HashSet, @@ -363,6 +364,7 @@ pub struct WorkerPatchRequest { pub max_num_batched_tokens: Option, pub total_kv_blocks: Option, pub stable_routing_id: Option, + #[serde(default, deserialize_with = "strict_bool")] pub is_eagle: Option, pub taints: Option>, pub topology_domains: Option>, @@ -907,6 +909,38 @@ mod tests { } } + #[test] + fn worker_requests_parse_is_eagle_as_strict_bool() { + // `default` keeps an omitted key as `None`; `strict_bool` rejects non-booleans. + for (value, expected) in [ + (None, None), + (Some(serde_json::Value::Null), None), + (Some(serde_json::json!(true)), Some(true)), + (Some(serde_json::json!(false)), Some(false)), + ] { + let mut worker = serde_json::json!({"worker_id": 1}); + let mut patch = serde_json::json!({}); + if let Some(value) = value { + worker["is_eagle"] = value.clone(); + patch["is_eagle"] = value; + } + let worker: WorkerRequest = serde_json::from_value(worker).expect("worker request"); + assert_eq!(worker.is_eagle, expected); + let patch: WorkerPatchRequest = serde_json::from_value(patch).expect("worker patch"); + assert_eq!(patch.is_eagle, expected); + } + + let err = serde_json::from_value::( + serde_json::json!({"worker_id": 1, "is_eagle": "false"}), + ) + .expect_err("string is_eagle must be rejected"); + assert!(err.to_string().contains("boolean"), "{err}"); + let err = + serde_json::from_value::(serde_json::json!({"is_eagle": "false"})) + .expect_err("string is_eagle must be rejected"); + assert!(err.to_string().contains("boolean"), "{err}"); + } + #[test] fn select_request_falls_back_to_legacy_session_id() { let mut request: SelectRequest = serde_json::from_value(serde_json::json!({ From fae94fedf1f1dcffc167597c4550ef31967ec628 Mon Sep 17 00:00:00 2001 From: "svc-glamr@nvidia.com" Date: Tue, 3 Nov 2026 03:04:48 +0000 Subject: [PATCH 2/4] test(kv-router): drop serde_json is_eagle unit test The Python binding test covers is_eagle rejection and the omitted-key default through the real depythonize path; the serde_json test passed without the fix. Refs DYN-5218 Signed-off-by: svc-glamr@nvidia.com --- lib/kv-router/src/services/selection/types.rs | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/lib/kv-router/src/services/selection/types.rs b/lib/kv-router/src/services/selection/types.rs index 2360e75858b7..30d0f0fdc058 100644 --- a/lib/kv-router/src/services/selection/types.rs +++ b/lib/kv-router/src/services/selection/types.rs @@ -909,38 +909,6 @@ mod tests { } } - #[test] - fn worker_requests_parse_is_eagle_as_strict_bool() { - // `default` keeps an omitted key as `None`; `strict_bool` rejects non-booleans. - for (value, expected) in [ - (None, None), - (Some(serde_json::Value::Null), None), - (Some(serde_json::json!(true)), Some(true)), - (Some(serde_json::json!(false)), Some(false)), - ] { - let mut worker = serde_json::json!({"worker_id": 1}); - let mut patch = serde_json::json!({}); - if let Some(value) = value { - worker["is_eagle"] = value.clone(); - patch["is_eagle"] = value; - } - let worker: WorkerRequest = serde_json::from_value(worker).expect("worker request"); - assert_eq!(worker.is_eagle, expected); - let patch: WorkerPatchRequest = serde_json::from_value(patch).expect("worker patch"); - assert_eq!(patch.is_eagle, expected); - } - - let err = serde_json::from_value::( - serde_json::json!({"worker_id": 1, "is_eagle": "false"}), - ) - .expect_err("string is_eagle must be rejected"); - assert!(err.to_string().contains("boolean"), "{err}"); - let err = - serde_json::from_value::(serde_json::json!({"is_eagle": "false"})) - .expect_err("string is_eagle must be rejected"); - assert!(err.to_string().contains("boolean"), "{err}"); - } - #[test] fn select_request_falls_back_to_legacy_session_id() { let mut request: SelectRequest = serde_json::from_value(serde_json::json!({ From 9ef4e76447463a6921ac10482506e12d382f7d69 Mon Sep 17 00:00:00 2001 From: "svc-glamr@nvidia.com" Date: Tue, 3 Nov 2026 04:17:00 +0000 Subject: [PATCH 3/4] test(kv-router): drop placeholder port and check is_eagle patch changes value Signed-off-by: svc-glamr@nvidia.com --- lib/bindings/python/tests/test_kv_bindings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bindings/python/tests/test_kv_bindings.py b/lib/bindings/python/tests/test_kv_bindings.py index 6482923246d9..260a9977eb8f 100644 --- a/lib/bindings/python/tests/test_kv_bindings.py +++ b/lib/bindings/python/tests/test_kv_bindings.py @@ -476,7 +476,7 @@ def worker(worker_id, model_name, **extra): return { "worker_id": worker_id, "model_name": model_name, - "endpoint": f"http://worker-{worker_id}:8000", + "endpoint": f"http://worker-{worker_id}", "block_size": 4, "max_num_batched_tokens": 1024, **extra, @@ -506,11 +506,11 @@ def stored_is_eagle(model_name): assert service.list_workers(model_name="malformed") == [] assert stored_is_eagle("plain") is False - # An omitted or None patch value leaves the stored value unchanged. + # An omitted or None patch value leaves the stored value unchanged; a real boolean replaces it. for patch in [{}, {"is_eagle": None}]: record = await service.patch_worker(2, patch) assert record["is_eagle"] is True - record = await service.patch_worker(1, {"is_eagle": False}) + record = await service.patch_worker(2, {"is_eagle": False}) assert record["is_eagle"] is False finally: await service.shutdown_async() From 165e44a258221fe83885e2f0b28e9f6944ac961a Mon Sep 17 00:00:00 2001 From: GLAMR Date: Fri, 6 Nov 2026 00:16:50 +0000 Subject: [PATCH 4/4] fix(kv-router): validate worker boolean fields and trim regression tests Signed-off-by: GLAMR --- lib/bindings/python/tests/test_kv_bindings.py | 61 +++---------------- lib/kv-router/src/services/selection/types.rs | 4 +- 2 files changed, 9 insertions(+), 56 deletions(-) diff --git a/lib/bindings/python/tests/test_kv_bindings.py b/lib/bindings/python/tests/test_kv_bindings.py index 260a9977eb8f..753cb6113247 100644 --- a/lib/bindings/python/tests/test_kv_bindings.py +++ b/lib/bindings/python/tests/test_kv_bindings.py @@ -436,6 +436,7 @@ async def test_selection_service_session_binding_stream_drains_queue( async def test_selection_service_malformed_payload_raises_value_error( monkeypatch, method, payload ): + """Malformed binding inputs raise ValueError without truthy boolean coercion.""" monkeypatch.setenv("DYN_ROUTER_USE_KV_EVENTS", "false") service = SelectionService(indexer_threads=1) @@ -449,6 +450,12 @@ async def test_selection_service_malformed_payload_raises_value_error( with pytest.raises(ValueError, match="boolean"): await service.select({"token_ids": [1, 2, 3, 4], "is_eagle": "false"}) + for field in ("is_eagle", "engine_owned_mm_identity"): + with pytest.raises(ValueError, match="boolean"): + await service.upsert_worker({"worker_id": 1, field: "false"}) + with pytest.raises(ValueError, match="boolean"): + await service.patch_worker(1, {field: "false"}) + class IteratesNegative(list): def __iter__(self): return iter([-1]) @@ -462,60 +469,6 @@ def __iter__(self): service.shutdown() -@pytest.mark.skipif( - SelectionService is None, - reason="SelectionService requires the select-service Cargo feature", -) -@pytest.mark.timeout(5) -@pytest.mark.asyncio -async def test_selection_service_worker_is_eagle_rejects_non_booleans(monkeypatch): - monkeypatch.setenv("DYN_ROUTER_USE_KV_EVENTS", "false") - service = SelectionService(indexer_threads=1) - - def worker(worker_id, model_name, **extra): - return { - "worker_id": worker_id, - "model_name": model_name, - "endpoint": f"http://worker-{worker_id}", - "block_size": 4, - "max_num_batched_tokens": 1024, - **extra, - } - - def stored_is_eagle(model_name): - (record,) = service.list_workers(model_name=model_name) - return record["is_eagle"] - - try: - # Real booleans keep their meaning; omitted and None stay unset. - record = await service.upsert_worker(worker(1, "plain", is_eagle=False)) - assert record["is_eagle"] is False - record = await service.upsert_worker(worker(2, "eagle", is_eagle=True)) - assert record["is_eagle"] is True - record = await service.upsert_worker(worker(3, "omitted")) - assert record["is_eagle"] is None - record = await service.upsert_worker(worker(4, "null", is_eagle=None)) - assert record["is_eagle"] is None - - # Worker booleans are not coerced by truthiness, so "false" cannot enable Eagle. - for value in ["false", "true", 1, [False]]: - with pytest.raises(ValueError, match="boolean"): - await service.upsert_worker(worker(5, "malformed", is_eagle=value)) - with pytest.raises(ValueError, match="boolean"): - await service.patch_worker(1, {"is_eagle": value}) - assert service.list_workers(model_name="malformed") == [] - assert stored_is_eagle("plain") is False - - # An omitted or None patch value leaves the stored value unchanged; a real boolean replaces it. - for patch in [{}, {"is_eagle": None}]: - record = await service.patch_worker(2, patch) - assert record["is_eagle"] is True - record = await service.patch_worker(2, {"is_eagle": False}) - assert record["is_eagle"] is False - finally: - await service.shutdown_async() - - @pytest.mark.skipif( SelectionService is None, reason="SelectionService requires the select-service Cargo feature", diff --git a/lib/kv-router/src/services/selection/types.rs b/lib/kv-router/src/services/selection/types.rs index 30d0f0fdc058..15de398ccec8 100644 --- a/lib/kv-router/src/services/selection/types.rs +++ b/lib/kv-router/src/services/selection/types.rs @@ -348,7 +348,7 @@ pub struct WorkerRequest { pub kv_event_source_mode: Option, /// The KV event source derives multimodal pad values from engine identities /// (SGLang after sgl-project/sglang#43043). Unset means a legacy source. - #[serde(default)] + #[serde(default, deserialize_with = "strict_bool")] pub engine_owned_mm_identity: Option, } @@ -377,7 +377,7 @@ pub struct WorkerPatchRequest { pub router_hint_source_control_endpoints: Option>, #[serde(default)] pub kv_event_source_mode: Option, - #[serde(default)] + #[serde(default, deserialize_with = "strict_bool")] pub engine_owned_mm_identity: Option, }