mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-14 16:08:41 +00:00
* feat(extensions): add gateway services and routers * feat(extensions): add standalone reference extension * fix(extensions): harden contributed gateway routes * docs(extensions): document gateway contribution points * feat(extensions): add operator CLI for packaged extension management Add `deerflow extensions install/list/enable/disable/remove` plus the root `make extension-*` wrappers, backed by an `ExtensionManager` that owns one transaction over backend/pyproject.toml, backend/uv.lock, the managed source snapshot, the uv environment, and the `plugins:` block in config.yaml. Install accepts a package requirement, a public HTTPS Git URL, or a local directory. Local directories are copied to backend/extensions/sources/ as deployable snapshots rather than editable installs, and the root .dockerignore re-includes that tree so snapshots reach the backend builder. Remote sources are HTTPS-only; SSH Git, file:// and local wheels are rejected because the stock Docker builder cannot reproduce them. Because environment configuration can still resolve a plain package name to a local wheel (a UV_FIND_LINKS wheelhouse, say), every uv add/remove is followed by an audit of the new lock: any local reference the stock image build cannot reproduce rolls back the whole transaction. A config carrying duplicate top-level `plugins:` keys is rejected outright rather than managed against one block while the Gateway reads another. Dependency synchronization now has one lock authority. The `extensions` dependency group joins [tool.uv].default-groups, every startup path syncs the same lock with --locked and launches with --no-sync, and the Docker images move to uv 0.11.1 for the --no-workspace boundary the manager needs. Loader gains `enabled`, `name` and `package` fields so a disabled extension is skipped before resolution and import. Co-authored-by: Codex <codex@openai.com> * fix(extensions): stop the managed plugins rewrite from destroying config Two data-safety defects in the managed `plugins:` block writer. The "next top-level key" boundary was a regex matching only `[A-Za-z_][A-Za-z0-9_-]*` or a quoted key. `AppConfig` is `extra="allow"`, so a config may legally carry any top-level key, and a key the pattern cannot recognize did not fail loudly — it read as "no next section", and the rewrite replaced that neighbour and its entire subtree with the managed block. `my.key`, `2fa`, `$schema`, `my key` and non-ASCII keys were all silently deleted by a plain `extension-enable`/`disable`. Both boundaries now come from the YAML parser's node marks, so key shape is irrelevant. The file-final branch never consulted the trailing-comment scan the has-next-key branch used, so any comment below the block was dropped. Since the manager appends `plugins:` at end of file, that is the steady-state shape for most installs: an operator note below the block was destroyed on the next toggle. Separately, every managed install wrote `required: true` while the loader defaults to false. That turned any later load failure — broken wheel, missing native library, deleted snapshot — into a Gateway startup abort recoverable only with shell access. New records are now written `required: false`, with an explicit `install --required` opt-in; adopting an existing hand-written record still preserves the operator's own choice. * fix(extensions): harden the manager transaction and correct its docs Follow-up hardening on the extension package manager. Security posture, which the docs already claimed: - Scrub `UV_PYTHON`, `UV_INSECURE_HOST`, `UV_CONSTRAINT` and `UV_NO_BUILD_ISOLATION` from the controlled uv environment. `UV_PYTHON` swaps the interpreter that the entry-point probe then imports and calls, and every later `uv run --no-sync` startup uses; `UV_INSECURE_HOST` removes the TLS validation the HTTPS-only source rule depends on. Neither is an index, proxy, cache or credential-provider setting, so neither was covered by the carve-out. - Recognize run-together and all-caps secret query parameters (`accesstoken`, `ACCESSTOKEN`, `key`, `pw`, `sas`, `code`). The camel-case splitter only fires on case transitions, so only the separated spellings were caught. Short generic words stay boundary-anchored, so `?keyword=` remains installable. - Validate the config before running any uv command. `uv add`/`uv sync` execute the package's build backend, so a config the manager could never write to must fail before that code runs rather than afterwards through rollback. Transaction integrity: - Run the second dependency-file restore from a `finally`. The recovery sync runs without `--locked` when the checkout had no lock, so uv writes one while resolving; if that sync then failed, the restore was skipped and the operator kept a lock file they never had. A failing recovery sync now also reports the original failure instead of replacing it. - Skip the recovery sync on cancellation. Answering Ctrl-C with a full dependency resolve invites a second interrupt that escapes the handler and strands the checkout mid-transaction; the declarations are already restored and the next locked startup sync reconciles the environment. - Retry a non-blocking lock on Windows instead of using `msvcrt.LK_LOCK`, which gives up after ~10s — far shorter than a real `uv add` plus `uv sync`, so contention surfaced as `Permission denied` rather than serializing. - Locate the entry-point probe's JSON payload instead of parsing stdout's first line, so a `sitecustomize`/`.pth` banner cannot roll back a good install. - Warn when the lock records a loopback source. `127.0.0.1` inside the image builder is a different machine, but unlike an environment-driven wheelhouse resolution this is a source the operator typed deliberately, so it is reported rather than rolled back. Private-network indexes are untouched: a builder on that network can reach them. Docs: the blanket claim that failed operations restore the config file was wrong — the conflict branches deliberately preserve a concurrent external edit and leave `remove` deactivated. Document that, the `required: false` default, the config preflight, the interrupt behaviour, and where the plugins-block boundaries come from. * test(gateway): pin the request-path projection agreement `get_request_route_path()` imports the private `starlette._utils.get_route_path` so the auth and CSRF predicates classify the exact string Starlette's router matches on. Its requirement is not "strip root_path correctly" but "return what the dispatcher is matching", so delegating to the router's own implementation keeps the two in lockstep by construction. Keep the private import rather than vendoring a copy: an import that disappears fails loudly at startup, while a stale copy diverges silently at a security boundary. Cover the property directly instead of the mechanism, so the tests survive a future reimplementation: - projection edge cases, including the segment-boundary guard that keeps root_path="/api" from slicing "/apifoo/models" into a string the router would never match - agreement with the router under nested mounts - the two bypasses these predicates exist to prevent: a protected route mounted under the "/health" public prefix must still 401, and a POST mounted under "/api/webhooks" must still require a CSRF token Both are verified to fail when the projection is reverted to `request.url.path` (9/13 red) and when a plausible vendored copy omits the boundary guard (the 2 boundary cases red). Declare starlette as a bounded direct dependency so a bump — which is security-relevant here — shows up in review rather than arriving silently through FastAPI. * ci: pin uv to the version production ships ExtensionManager is not a consumer of uv the build tool -- it is a program whose whole job is driving `uv` as a subprocess, depending on its CLI behavior (`--no-workspace`, `--no-sync`, what `uv add` writes into `[dependency-groups] extensions`) and on the `uv.lock` serialization format. uv is closer to a runtime dependency with a contract than to incidental tooling. backend/Dockerfile pins that binary to 0.11.1, but all eight astral-sh/setup-uv steps installed whatever was latest at run time, so CI exercised the manager against a uv that is not the uv production runs. The sharpest failure that allows: a newer uv bumps uv.lock's `revision`, CI stays green because the same uv reads back what it wrote, and the pinned uv in the production image cannot read the committed lock. `uv lock --check` is version-sensitive for the same reason -- it verifies the lock is what *this* uv would produce, and two versions can emit equivalent but non-identical output. Pin every step to 0.11.1 and lift the one lingering setup-uv@v3 to v7 so the steps share input and caching behavior. Pinning alone drifts apart again on the next bump, so add a constraint test in the style of test_compose_default_bind_host.py: the Dockerfile's UV_IMAGE tag is the single source of truth, and both compose defaults plus every setup-uv step must match it. Verified to fail when a pin drifts, when a step omits `version`, and -- the real scenario -- when the Dockerfile is bumped alone, which lights up the workflows and both compose files at once. * fix(gateway): state the extension route auth limit and abort a failed dev sync Two scoped review follow-ups. README: contributed routers cannot enter the host's reserved public prefixes, which makes every extension endpoint session-authenticated -- there is no way to expose an unauthenticated route. The rejection rule was documented but its consequence was not, so inbound provider webhooks and public status endpoints read as merely undocumented rather than out of scope for this release. docker/dev-entrypoint.sh: the self-heal retry reuses `--locked`, so it repairs a corrupt .venv but never a lock that disagrees with pyproject.toml. `set -e` already stopped the script there -- uvicorn was not being started against a stale environment -- but it exited on a bare uv exit code with no indication of what to do. Abort explicitly with the cause and the fix. Tests slice the sync block out of the real script and run it against a stub uv, so they exercise the shipped code rather than a copy of it (/app/backend only exists inside the container). They cover the success path, the retry that recovers, the abort, and the guidance. Verified against the pre-fix script: only the guidance case goes red, confirming the abort itself was already correct. * fix(extensions): point Git SSH shorthand at the HTTPS correction Git's SCP-like shorthand carries no URL scheme, so `git+git@host:org/repo.git` reached the scheme rules looking like a bare path and was rejected with "local path references are not deployable; pass a local directory so DeerFlow can snapshot it". The operator asked for a remote source, so that guidance points at the wrong fix. Detect the shorthand ahead of the scheme rules and report the public-HTTPS correction instead. The bare `git@host:org/repo.git` spelling took a different wrong turn: packaging parses it as a direct reference named `git`, leaving `host:org/repo.git`, whose `host` reads as a URL scheme and produced the generic HTTPS message. Both spellings now share one message, as does the PEP 508 named form. * docs: keep the root extension summary within its new budget #4799 split the depth out of the module guides and added a size gate; the root file's job is now orientation, and this branch had pushed it 192 bytes past the soft limit. The manager transaction, source rules, and lock discipline are already stated in full in the extensions guide, so the root keeps the one-line orientation and points there instead of restating them. --------- Co-authored-by: Codex <codex@openai.com>
321 lines
11 KiB
Python
321 lines
11 KiB
Python
"""Tests for the extension contract surface.
|
|
|
|
The contracts carry two compatibility promises that are easy to break by
|
|
accident and impossible to catch at runtime later: every Protocol method has a
|
|
default implementation, and every optional dataclass field has a default. Both
|
|
are asserted here.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import dataclasses
|
|
import importlib.resources
|
|
import inspect
|
|
|
|
import pytest
|
|
from deerflow_extension_api import (
|
|
API_VERSION,
|
|
AgentBuildContext,
|
|
AgentScope,
|
|
ExtensionData,
|
|
ExtensionInstall,
|
|
ExtensionRegistry,
|
|
ExtensionRuntimeDeps,
|
|
ExtensionService,
|
|
HostPolicySnapshot,
|
|
MiddlewareContributor,
|
|
MiddlewarePlacement,
|
|
Placement,
|
|
SystemModelCallObserver,
|
|
SystemModelRequest,
|
|
SystemModelResult,
|
|
SystemOperationKind,
|
|
TaskInfo,
|
|
TaskLifecycleContributor,
|
|
TaskOutcome,
|
|
extension,
|
|
)
|
|
from deerflow_extension_api.runtime_bridge import (
|
|
EXTENSION_TASK_STORE_KEY,
|
|
task_store_from_runtime,
|
|
)
|
|
|
|
|
|
def test_placement_members_cover_both_axes():
|
|
assert Placement.MODEL_LOGICAL.value == "model_logical"
|
|
assert Placement.MODEL_PHYSICAL.value == "model_physical"
|
|
assert Placement.TOOL_VISIBLE.value == "tool_visible"
|
|
assert Placement.TOOL_RAW.value == "tool_raw"
|
|
assert Placement.STANDARD.value == "standard"
|
|
|
|
|
|
def test_agent_scope_both_is_union():
|
|
assert AgentScope.BOTH == AgentScope.LEAD | AgentScope.SUBAGENT
|
|
assert AgentScope.LEAD in AgentScope.BOTH
|
|
|
|
|
|
def test_middleware_placement_defaults():
|
|
p = MiddlewarePlacement(middleware=object(), placement=Placement.STANDARD)
|
|
assert p.scope is AgentScope.BOTH
|
|
assert p.order == 0
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"cls",
|
|
[
|
|
HostPolicySnapshot,
|
|
ExtensionRuntimeDeps,
|
|
AgentBuildContext,
|
|
TaskInfo,
|
|
SystemModelRequest,
|
|
SystemModelResult,
|
|
MiddlewarePlacement,
|
|
],
|
|
)
|
|
def test_every_dataclass_is_frozen(cls):
|
|
assert dataclasses.is_dataclass(cls)
|
|
assert cls.__dataclass_params__.frozen, f"{cls.__name__} must be frozen"
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"cls",
|
|
[HostPolicySnapshot, ExtensionRuntimeDeps, TaskInfo, SystemModelRequest, SystemModelResult],
|
|
)
|
|
def test_additive_dataclasses_are_constructible_with_required_fields_only(cls):
|
|
"""Fields added later must carry defaults, or old extensions break on upgrade.
|
|
|
|
HostPolicySnapshot and the two system-call snapshots are host-constructed
|
|
and fully optional. TaskInfo has a required identity core and optional
|
|
remainder. AgentBuildContext gets its own dedicated test below because its
|
|
scope is legitimately required.
|
|
"""
|
|
if cls is TaskInfo:
|
|
info = cls(task_id="t", run_id="r", thread_id="th", kind="lead")
|
|
assert info.parent_task_id is None
|
|
assert info.agent_name is None
|
|
assert info.resumed is False
|
|
else:
|
|
assert cls() is not None
|
|
|
|
|
|
def test_agent_build_context_optional_fields_keep_their_defaults():
|
|
"""AgentBuildContext has one required field (scope); the rest must default.
|
|
|
|
Unlike the fully-optional dataclasses above, scope is legitimately
|
|
required, so this is not folded into the parametrized test above — it
|
|
would misrepresent the required/optional split this suite is meant to
|
|
document.
|
|
"""
|
|
ctx = AgentBuildContext(scope=AgentScope.LEAD)
|
|
assert ctx.agent_name is None
|
|
assert ctx.model_name is None
|
|
assert isinstance(ctx.policy, HostPolicySnapshot)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"protocol",
|
|
[
|
|
ExtensionRegistry,
|
|
ExtensionService,
|
|
MiddlewareContributor,
|
|
TaskLifecycleContributor,
|
|
SystemModelCallObserver,
|
|
],
|
|
)
|
|
def test_every_protocol_method_has_a_default_implementation(protocol):
|
|
"""Adding a method to a Protocol is only additive when it has a default.
|
|
|
|
Without this, shipping a new contract method breaks every already-released
|
|
extension that does not implement it.
|
|
"""
|
|
checked = 0
|
|
for name, member in vars(protocol).items():
|
|
if name.startswith("_") or not inspect.isfunction(member):
|
|
continue
|
|
checked += 1
|
|
body = inspect.getsource(member).split("\n", 1)[1]
|
|
assert "return" in body, f"{protocol.__name__}.{name} has no default implementation. Adding a contract method is only additive when it returns a default; otherwise every already-released extension breaks on upgrade."
|
|
assert checked > 0, f"{protocol.__name__} declared no methods to check"
|
|
|
|
|
|
def test_contributor_defaults_return_empty():
|
|
class _Bare:
|
|
pass
|
|
|
|
bare = _Bare()
|
|
assert MiddlewareContributor.contribute_middlewares(bare, ExtensionData("app"), AgentBuildContext(scope=AgentScope.LEAD)) == ()
|
|
|
|
|
|
def test_task_lifecycle_contract_is_public_and_defaults_to_noop():
|
|
class _Bare:
|
|
pass
|
|
|
|
app_store = ExtensionData("app")
|
|
task_store = ExtensionData("task-1")
|
|
info = TaskInfo(
|
|
task_id="task-1",
|
|
run_id="run-1",
|
|
thread_id="thread-1",
|
|
kind="lead",
|
|
)
|
|
|
|
assert TaskOutcome.COMPLETED.value == "completed"
|
|
assert asyncio.run(TaskLifecycleContributor.on_task_start(_Bare(), app_store, task_store, info)) is None
|
|
assert asyncio.run(TaskLifecycleContributor.on_task_stop(_Bare(), app_store, task_store, info, TaskOutcome.COMPLETED)) is None
|
|
|
|
|
|
def test_system_model_observer_contract_reports_success_and_failure_shapes():
|
|
class _Bare:
|
|
pass
|
|
|
|
app_store = ExtensionData("app")
|
|
task_store = ExtensionData("task-1")
|
|
request = SystemModelRequest(messages=("prompt",), model_name="system-model")
|
|
success = SystemModelResult(response="answer", duration_ms=1.5)
|
|
failure = SystemModelResult(error=RuntimeError("provider failed"), duration_ms=2.0)
|
|
|
|
assert SystemOperationKind.GOAL.value == "goal"
|
|
assert asyncio.run(SystemModelCallObserver.on_system_model_call(_Bare(), app_store, task_store, SystemOperationKind.GOAL, request, success)) is None
|
|
assert asyncio.run(SystemModelCallObserver.on_system_model_call(_Bare(), app_store, task_store, SystemOperationKind.GOAL, request, failure)) is None
|
|
|
|
|
|
def test_system_model_request_normalizes_messages_into_an_immutable_sequence():
|
|
"""``messages`` is a snapshot of a message sequence, never a per-character view.
|
|
|
|
Title and summarization pass a single prompt string, so a bare ``str`` must not
|
|
reach observers as a ``Sequence`` whose items are characters. A live ``list`` from
|
|
a call site must also be copied: the snapshot is documented as read-only, and the
|
|
caller keeps mutating its own list after the observation is dispatched.
|
|
"""
|
|
assert SystemModelRequest(messages="one prompt").messages == ("one prompt",)
|
|
|
|
live: list[str] = ["first"]
|
|
request = SystemModelRequest(messages=live)
|
|
live.append("second")
|
|
assert request.messages == ("first",)
|
|
|
|
assert SystemModelRequest().messages == ()
|
|
assert SystemModelRequest(messages=("already", "a", "tuple")).messages == ("already", "a", "tuple")
|
|
|
|
|
|
def test_gateway_contribution_points_are_part_of_the_public_surface():
|
|
import deerflow_extension_api
|
|
|
|
for name in (
|
|
"ExtensionRuntimeDeps",
|
|
"ExtensionService",
|
|
):
|
|
assert name in deerflow_extension_api.__all__
|
|
assert hasattr(deerflow_extension_api, name)
|
|
assert callable(ExtensionRegistry.service)
|
|
assert callable(ExtensionRegistry.routers)
|
|
assert not hasattr(deerflow_extension_api, "RouterContributor")
|
|
|
|
|
|
def test_task_store_from_runtime_reads_the_host_key():
|
|
class _Runtime:
|
|
def __init__(self, context):
|
|
self.context = context
|
|
|
|
store = ExtensionData("task-1")
|
|
assert task_store_from_runtime(_Runtime({EXTENSION_TASK_STORE_KEY: store})) is store
|
|
|
|
|
|
def test_task_store_from_runtime_returns_none_on_missing_or_wrong_shape():
|
|
class _Runtime:
|
|
def __init__(self, context):
|
|
self.context = context
|
|
|
|
assert task_store_from_runtime(None) is None
|
|
assert task_store_from_runtime(_Runtime({})) is None
|
|
assert task_store_from_runtime(_Runtime("not-a-mapping")) is None
|
|
assert task_store_from_runtime(_Runtime({EXTENSION_TASK_STORE_KEY: "wrong type"})) is None
|
|
|
|
|
|
def test_extension_decorator_stamps_api_requirement():
|
|
@extension(api="0.1", name="demo")
|
|
def install(registry, config):
|
|
return None
|
|
|
|
assert install.__deerflow_api__ == "0.1"
|
|
assert install.__deerflow_name__ == "demo"
|
|
|
|
|
|
def test_task_outcome_members():
|
|
assert {outcome.value for outcome in TaskOutcome} == {"completed", "aborted", "failed"}
|
|
|
|
|
|
def test_system_operation_kind_members():
|
|
assert {kind.value for kind in SystemOperationKind} == {"goal", "memory", "title", "summarization"}
|
|
|
|
|
|
def test_registry_and_install_alias_are_part_of_the_public_surface():
|
|
"""Independent extensions annotate install(registry, config) against the
|
|
contract package alone — importing the host's concrete registry would pin
|
|
them to the harness release cadence and advertise host-only machinery."""
|
|
import typing
|
|
|
|
import deerflow_extension_api
|
|
|
|
assert "ExtensionRegistry" in deerflow_extension_api.__all__
|
|
assert "ExtensionInstall" in deerflow_extension_api.__all__
|
|
parameters, return_type = typing.get_args(ExtensionInstall)
|
|
assert parameters[0] is ExtensionRegistry, "install()'s first argument must be the public registry contract"
|
|
|
|
|
|
def test_distribution_marks_the_contract_package_as_typed():
|
|
marker = importlib.resources.files("deerflow_extension_api").joinpath("py.typed")
|
|
assert marker.is_file()
|
|
|
|
|
|
def test_contract_package_keeps_runtime_dependencies_empty():
|
|
import tomllib
|
|
from pathlib import Path
|
|
|
|
pyproject = Path(__file__).parent.parent / "packages" / "extension-api" / "pyproject.toml"
|
|
|
|
assert tomllib.loads(pyproject.read_text())["project"]["dependencies"] == []
|
|
|
|
|
|
def test_harness_pins_the_contract_package_exactly():
|
|
"""The version contract (extension-system design): the host pins the
|
|
contract package exactly, extensions use ranges. A range here would let an
|
|
older harness resolve a newer 1.x contract package — API_VERSION would
|
|
then come from the upgraded package and newer extensions would look
|
|
supported against a host whose registry/placements/hook pipeline still
|
|
implements the older contract. The pin makes pip reject that skew at
|
|
install time."""
|
|
import tomllib
|
|
from importlib.metadata import version
|
|
from pathlib import Path
|
|
|
|
from packaging.requirements import Requirement
|
|
|
|
pyproject = Path(__file__).parent.parent / "packages" / "harness" / "pyproject.toml"
|
|
dependencies = tomllib.loads(pyproject.read_text())["project"]["dependencies"]
|
|
requirement = next(Requirement(dep) for dep in dependencies if Requirement(dep).name == "deerflow-extension-api")
|
|
|
|
expected = f"=={version('deerflow-extension-api')}"
|
|
assert str(requirement.specifier) == expected, f"the host must pin deerflow-extension-api exactly ({expected}); a range lets pip resolve a contract newer than the host implements"
|
|
|
|
|
|
def test_runtime_api_version_matches_the_installed_contract_package():
|
|
"""Every additive contract slice bumps both gates together."""
|
|
from importlib.metadata import version
|
|
|
|
assert API_VERSION == "0.1.2"
|
|
assert API_VERSION == version("deerflow-extension-api")
|
|
|
|
|
|
def test_extension_service_contract_is_public_and_defaults_to_noop():
|
|
class _Bare:
|
|
pass
|
|
|
|
deps = ExtensionRuntimeDeps()
|
|
|
|
assert deps.app_store is None
|
|
assert deps.session_factory is None
|
|
assert asyncio.run(ExtensionService.start(_Bare(), deps)) is None
|
|
assert asyncio.run(ExtensionService.stop(_Bare())) is None
|