mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-10-27 05:30:39 +00:00
* feat: support client context capabilities (cherry picked from commit b7c223f9415dcd545cbe05a5f5a6e47073a42d68) [Totoro-qaq: resolved onto main. The persisted-reminder middleware hunks and their tests are dropped (delivery is redesigned in a follow-up); the RunCreateRequest description moved to app/gateway/run_models.py.] * fix: address client context review comments (cherry picked from commit bce6da6b819228eda58e887872720b6f9b5fab69) [Totoro-qaq: middleware hunks dropped with the redesigned delivery.] * feat(agents): deliver client context as a request-scoped data block The cherry-picked #3106 put context.client into the persisted first-turn reminder, with change detection and a "not provided" clear marker. Main has since moved the date reminder to a SystemMessage, made request-scoped context (the project block, #5443) request-only, and agents/AGENTS.md now requires user-influenced values to ride the HumanMessage data channel, never system text. Render runtime.context["client"] on every model call in DynamicContextMiddleware.wrap_model_call/awrap_model_call as one hidden HumanMessage right after the leading SystemMessages, where DurableContext puts its data. It is never a state update and never flagged dynamic_context_reminder, so nothing is checkpointed, summarized or replayed, and a run without a client gets no block. An unchanged client keeps the previous request as the next request's prefix. The renderer sanitizes again (direct graph callers bypass the Gateway), html-escapes values and frames them with frame_untrusted_text: the same --- BEGIN/END USER INPUT --- boundary the user's own turn and the MCP task notification get. The lead prompt treats everything outside those markers as framework data, so unframed values would rank above the user's own text; framed, context.client can say nothing the same caller could not already say in input.messages. client_context joins _BLOCKED_TAG_NAMES so a forged block in user input or a tool result is escaped, and one static, value-free sentence in the lead prompt names the block as untrusted hints, never instructions, permissions or identity. The now unused empty-context marker is removed. * fix(gateway): log dropped context.client fields without values A run request is never rejected over context.client: unknown fields, nested values and malformed entries are silently dropped, the same leniency as the other context keys. That left no signal when a custom client sent something the Gateway ignored (review on #3106). Route both the config.context.client and the body context.client paths through one helper that emits a debug line whenever sanitizing changed the value. Like the malformed client_timezone branch, the line carries no values; unlike client_timezone, client.name and preference strings are free caller-controlled text, so they are never logged, not even sanitized. A clean client, an explicit null or an absent key logs nothing. Tests also pin the config-only path (sanitized before the early return) and the end-to-end start_run admission: the sanitized client reaches config["context"] and never configurable. * fix(runtime): bound numeric client context preferences String preferences are capped at 200 characters, but integers were kept at any size. A JSON body may carry integers of up to 4300 digits, so 32 of them rendered a block of about 138,000 characters, re-sent on every model call of the run. In-process callers could also pass an int past the str() digit limit, which failed the model call, or a number subclass with its own __str__. Keep integers within JavaScript's Number.MAX_SAFE_INTEGER, the range a browser client can send exactly, and coerce numbers to plain int and float. * docs(api): describe client context as advisory request-scoped hints The cherry-picked section described a hidden reminder that no longer exists. Document what a custom client can rely on: the allow-list and its limits (strings, the integer range, and only the first 32 entries of each map), debug-level logging of dropped fields, runtime-only forwarding, and delivery as a per-request user-role block, framed like user input, rather than system text or thread history. Only top-level context.client is documented. An explicit config.context.client is sanitized for the run as well, but the run record keeps the caller's config as sent, so it is not offered as an alternative. It also answers the #3106 review: capabilities and preferences are advisory hints, not enforcement, which belongs outside the model; name is informational and never for authorization; the same object should be sent on every run to keep the cached prefix stable; subagents and embedded DeerFlowClient runs do not receive it, and server-started runs (schedules, IM channels, GitHub agents, MCP notifications, extensions unless the plugin passes one) carry none. * fix(context): declare client delivery and keep client out of configurable The request-only <client_context> block is model-visible, so DynamicContextMiddleware now declares its delivery and the sanitizer's limits in release_policy_parameters(); runs before and after this change no longer share a policy fingerprint. build_run_config copies body.config['configurable'] verbatim and configurable is persisted with checkpoints, so a client placed there is dropped instead of being stored raw. Client context stays runtime-only. Document context.client in the README and in the middleware guide. * fix(context): apply the PII redaction policy to the client block DynamicContextMiddleware adds the <client_context> message inside the outer PiiRedactionMiddleware, and the hidden message is not re-sanitized, so with pii_redaction enabled a preference such as an email address reached the model verbatim while the same address in the user turn was redacted. Pass the rendered block through the shared redact_text seam with this middleware's app_config.pii_redaction, and declare the setting in release_policy_parameters(). * fix(context): keep client hints out of stored run config --------- Co-authored-by: Blair Leng <25675774+BlairLeng@users.noreply.github.com> Co-authored-by: Totoro-qaq <279883115+Totoro-qaq@users.noreply.github.com>
179 lines
9.3 KiB
Python
179 lines
9.3 KiB
Python
"""Shared request models for the LangGraph-compatible run boundary."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from collections.abc import Iterable
|
|
from typing import Annotated, Any, Literal
|
|
|
|
from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, ValidationError, ValidationInfo, field_validator, model_validator
|
|
from pydantic_core import PydanticCustomError
|
|
|
|
from deerflow.runtime.stream_modes import RunStreamMode, UnsupportedStreamModeError, normalize_stream_modes
|
|
from deerflow.utils.thread_id import validate_thread_id
|
|
|
|
# Upper bound on explicit conversation references per run; ``/api/features``
|
|
# reports it so a UI can cap its selection to the same number.
|
|
MAX_CONVERSATION_REFERENCES = 3
|
|
|
|
# One reference as the field accepts it; the conflict guard probes with the
|
|
# same annotation so its acceptance set is exactly the field's, now and after
|
|
# a pydantic upgrade (lax mode also coerces tuples, sets, generators, ...).
|
|
ConversationReference = Annotated[str, Field(strict=True, min_length=1, max_length=2048)]
|
|
_REFERENCES_ADAPTER = TypeAdapter(list[ConversationReference])
|
|
# Inputs the lift never materialises: lists and tuples can be read again, and
|
|
# str, bytes and dict are rejected by the field as a whole (``list_type``), a
|
|
# verdict the field must keep reporting itself.
|
|
_READ_MANY_TIMES = (list, tuple, str, bytes, bytearray, dict)
|
|
|
|
|
|
class RunCreateRequest(BaseModel):
|
|
"""Validated run request used by both HTTP and internal launch paths."""
|
|
|
|
model_config = ConfigDict(extra="forbid")
|
|
|
|
assistant_id: str | None = Field(default=None, description="Agent / assistant to use")
|
|
input: dict[str, Any] | None = Field(default=None, description="Graph input (e.g. {messages: [...]})")
|
|
command: dict[str, Any] | None = Field(default=None, description="LangGraph Command")
|
|
metadata: dict[str, Any] | None = Field(default=None, description="Run metadata")
|
|
config: dict[str, Any] | None = Field(default=None, description="RunnableConfig overrides")
|
|
context: dict[str, Any] | None = Field(default=None, description="DeerFlow context overrides (model_name, thinking_enabled, etc.). May include client capabilities under context.client.")
|
|
conversation_references: list[ConversationReference] = Field(
|
|
default_factory=list,
|
|
max_length=MAX_CONVERSATION_REFERENCES,
|
|
description="Explicit thread IDs or same-origin chat URLs readable only during this run (opt-in read_conversation tool); SDK clients may send the same list as context.conversation_references",
|
|
)
|
|
webhook: None = Field(default=None, description="Compatibility placeholder; completion callbacks are not supported")
|
|
checkpoint_id: str | None = Field(default=None, description="Resume from checkpoint")
|
|
checkpoint: dict[str, Any] | None = Field(default=None, description="Full checkpoint object")
|
|
interrupt_before: list[str] | Literal["*"] | None = Field(default=None, description="Nodes to interrupt before")
|
|
interrupt_after: list[str] | Literal["*"] | None = Field(default=None, description="Nodes to interrupt after")
|
|
stream_mode: list[RunStreamMode] | RunStreamMode | None = Field(default=None, description="Supported stream mode(s)")
|
|
stream_subgraphs: bool = Field(default=False, description="Include subgraph events")
|
|
stream_resumable: Literal[False] | None = Field(default=None, description="Compatibility placeholder; only the SDK's non-resumable default (null/false) is accepted")
|
|
on_disconnect: Literal["cancel", "continue"] = Field(default="cancel", description="Behaviour on SSE disconnect")
|
|
on_completion: None = Field(default=None, description="Compatibility placeholder; completion behavior is not supported")
|
|
multitask_strategy: Literal["reject", "rollback", "interrupt"] = Field(default="reject", description="Concurrency strategy")
|
|
after_seconds: None = Field(default=None, description="Compatibility placeholder; delayed execution is not supported")
|
|
if_not_exists: Literal["create"] = Field(default="create", description="Compatibility default; missing threads are created")
|
|
feedback_keys: None = Field(default=None, description="Compatibility placeholder; feedback key collection is not supported")
|
|
|
|
@model_validator(mode="before")
|
|
@classmethod
|
|
def lift_context_conversation_references(cls, data: Any) -> Any:
|
|
"""Accept ``context.conversation_references`` as the same explicit grant.
|
|
|
|
LangGraph SDK clients build a fixed run body and drop unknown top-level
|
|
fields, so the web UI can only reach ``conversation_references`` through
|
|
``context``. The key is moved to the top level before field validation,
|
|
so it keeps the same bounds and error locations, and it is removed from
|
|
``context`` so run-context merging never sees it. Sending both is an
|
|
error rather than a silent merge.
|
|
"""
|
|
if not isinstance(data, dict):
|
|
return data
|
|
context = data.get("context")
|
|
if not isinstance(context, dict) or "conversation_references" not in context:
|
|
return data
|
|
references = context["conversation_references"]
|
|
top_level = data.get("conversation_references")
|
|
if isinstance(top_level, Iterable) and not isinstance(top_level, _READ_MANY_TIMES):
|
|
# Anything else the field would coerce may be walkable only once
|
|
# (a generator, or an object whose ``__iter__`` hands out one).
|
|
# Materialise it so the probe below and the field validate the same
|
|
# items, instead of the field seeing an exhausted input as [].
|
|
top_level = list(top_level)
|
|
data = {**data, "conversation_references": top_level}
|
|
lifted = {**data, "context": {key: value for key, value in context.items() if key != "conversation_references"}}
|
|
if references is None:
|
|
return lifted
|
|
if top_level is not None:
|
|
try:
|
|
top_level = _REFERENCES_ADAPTER.validate_python(top_level)
|
|
except ValidationError:
|
|
# Let the field report its own error instead of a misleading conflict.
|
|
return data
|
|
if top_level:
|
|
raise PydanticCustomError("conversation_references_conflict", "Pass conversation_references at the top level or in context, not both")
|
|
lifted["conversation_references"] = references
|
|
return lifted
|
|
|
|
@model_validator(mode="after")
|
|
def validate_configurable_thread_id(self) -> RunCreateRequest:
|
|
"""Validate the stateless-run thread selector inside RunnableConfig."""
|
|
if not isinstance(self.config, dict):
|
|
return self
|
|
configurable = self.config.get("configurable")
|
|
if not isinstance(configurable, dict) or "thread_id" not in configurable:
|
|
return self
|
|
thread_id = configurable["thread_id"]
|
|
if thread_id is not None:
|
|
validate_thread_id(thread_id)
|
|
return self
|
|
|
|
@field_validator(
|
|
"webhook",
|
|
"on_completion",
|
|
"multitask_strategy",
|
|
"after_seconds",
|
|
"if_not_exists",
|
|
"feedback_keys",
|
|
mode="before",
|
|
)
|
|
@classmethod
|
|
def reject_unsupported_run_options(cls, value: Any, info: ValidationInfo) -> Any:
|
|
if info.field_name in {"multitask_strategy", "if_not_exists"} and not isinstance(value, str):
|
|
return value
|
|
|
|
supported_defaults = {
|
|
"webhook": None,
|
|
"on_completion": None,
|
|
"multitask_strategy": {"reject", "rollback", "interrupt"},
|
|
"after_seconds": None,
|
|
"if_not_exists": "create",
|
|
"feedback_keys": None,
|
|
}
|
|
supported = supported_defaults[info.field_name]
|
|
if isinstance(supported, set):
|
|
is_supported = isinstance(value, str) and value in supported
|
|
else:
|
|
is_supported = value == supported
|
|
if not is_supported:
|
|
raise PydanticCustomError(
|
|
"unsupported_run_option",
|
|
"Run option '{option}' is not supported by DeerFlow",
|
|
{"option": info.field_name},
|
|
)
|
|
return value
|
|
|
|
@field_validator("stream_resumable", mode="before")
|
|
@classmethod
|
|
def reject_resumable_streams(cls, value: Any) -> Any:
|
|
# LangGraph SDK clients always send this field (its default is ``False``, which the
|
|
# payload's ``None`` filter keeps). ``False`` asks for the non-resumable stream
|
|
# DeerFlow already serves, so only an explicit ``True`` requests the unsupported feature.
|
|
if value is None or value is False:
|
|
return value
|
|
raise PydanticCustomError(
|
|
"unsupported_run_option",
|
|
"Run option '{option}' is not supported by DeerFlow",
|
|
{"option": "stream_resumable"},
|
|
)
|
|
|
|
@field_validator("stream_mode", mode="before")
|
|
@classmethod
|
|
def reject_unsupported_stream_modes(cls, value: Any) -> Any:
|
|
if value is None:
|
|
return value
|
|
if not isinstance(value, str) and (not isinstance(value, list) or not all(isinstance(mode, str) for mode in value)):
|
|
return value
|
|
try:
|
|
normalize_stream_modes(value)
|
|
except UnsupportedStreamModeError as exc:
|
|
modes = ", ".join(exc.modes)
|
|
raise PydanticCustomError(
|
|
"unsupported_stream_mode",
|
|
"Unsupported stream mode(s): {modes}",
|
|
{"modes": modes},
|
|
) from exc
|
|
return value
|