mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-16 17:46:20 +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>
241 lines
10 KiB
Python
241 lines
10 KiB
Python
"""Config-driven extension loading.
|
|
|
|
Entry points are named as `module.path:install`, resolved through the same
|
|
`resolve_variable` helper the guardrails provider already uses. Load order is
|
|
the config list order — explicit and reproducible, which matters because the
|
|
middleware stack is position-sensitive.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from collections.abc import Mapping, Sequence
|
|
from dataclasses import dataclass
|
|
from typing import Any, Literal
|
|
|
|
from deerflow_extension_api import API_VERSION
|
|
from pydantic import BaseModel, ConfigDict, Field
|
|
|
|
from deerflow.extensions.registry import ExtensionRegistry, LoadedExtensions
|
|
from deerflow.reflection import resolve_variable
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
DiagnosticLevel = Literal["debug", "info", "warning", "error"]
|
|
|
|
|
|
class ExtensionSpec(BaseModel):
|
|
"""One entry of the `plugins:` list in config.yaml."""
|
|
|
|
model_config = ConfigDict(extra="forbid")
|
|
|
|
enabled: bool = Field(
|
|
default=True,
|
|
description="When false, skip the extension without resolving or importing it",
|
|
)
|
|
name: str | None = Field(
|
|
default=None,
|
|
description="Stable operator-facing name recorded by the extension manager",
|
|
)
|
|
package: str | None = Field(
|
|
default=None,
|
|
description="Installed Python distribution recorded by the extension manager",
|
|
)
|
|
use: str = Field(description="Entry point path, e.g. 'my_extension:install'")
|
|
config: dict[str, Any] = Field(
|
|
default_factory=dict,
|
|
description="Extension-private configuration, passed to install() verbatim",
|
|
)
|
|
required: bool = Field(
|
|
default=False,
|
|
description="When true, a load failure aborts startup instead of being skipped",
|
|
)
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class Diagnostic:
|
|
"""A load- or run-time problem attributed to a specific extension.
|
|
|
|
The repository has no structured diagnostics channel today; this is a
|
|
deliberately minimal one whose only job is keeping failures attributable.
|
|
"""
|
|
|
|
level: DiagnosticLevel
|
|
source: str
|
|
message: str
|
|
|
|
@classmethod
|
|
def error(cls, source: str, message: str) -> Diagnostic:
|
|
return cls("error", source, message)
|
|
|
|
@classmethod
|
|
def warning(cls, source: str, message: str) -> Diagnostic:
|
|
return cls("warning", source, message)
|
|
|
|
@classmethod
|
|
def info(cls, source: str, message: str) -> Diagnostic:
|
|
return cls("info", source, message)
|
|
|
|
@classmethod
|
|
def debug(cls, source: str, message: str) -> Diagnostic:
|
|
return cls("debug", source, message)
|
|
|
|
|
|
class ExtensionLoadError(RuntimeError):
|
|
"""Raised when an extension marked `required: true` fails to load."""
|
|
|
|
|
|
def _parse_version(version: object) -> tuple[int, ...] | None:
|
|
if not isinstance(version, str):
|
|
return None
|
|
try:
|
|
return tuple(int(part) for part in str.split(version, "."))
|
|
except ValueError:
|
|
return None
|
|
|
|
|
|
def _compatible(declared: str, current: str) -> bool:
|
|
"""One-directional, with the semver window for the contract's life stage.
|
|
|
|
Pre-1.0 minors may break, so the window is same major.minor with patches
|
|
additive: host >= declared.
|
|
From 1.0 on contracts only grow within a major, so a newer host stays
|
|
compatible with older extensions while an extension written against a
|
|
newer minor is refused — it would reach for contract additions the host
|
|
does not implement. Unparseable versions are refused, not waved through."""
|
|
declared_parts = _parse_version(declared)
|
|
current_parts = _parse_version(current)
|
|
if not declared_parts or not current_parts:
|
|
return False
|
|
width = max(len(declared_parts), len(current_parts), 2)
|
|
declared_padded = declared_parts + (0,) * (width - len(declared_parts))
|
|
current_padded = current_parts + (0,) * (width - len(current_parts))
|
|
if declared_padded[0] != current_padded[0]:
|
|
return False
|
|
if declared_padded[0] == 0 and declared_padded[1] != current_padded[1]:
|
|
return False
|
|
return current_padded >= declared_padded
|
|
|
|
|
|
def _range_for(declared: str) -> str:
|
|
"""The pip window matching ``_compatible``'s rules, for the actionable
|
|
refusal message. Falls back to an exact request when the declared version
|
|
is unparseable — the message must survive the version that caused it."""
|
|
parts = _parse_version(declared)
|
|
if not parts:
|
|
return f"=={declared}"
|
|
if parts[0] == 0:
|
|
minor = parts[1] if len(parts) > 1 else 0
|
|
return f">={declared},<0.{minor + 1}"
|
|
return f">={declared},<{parts[0] + 1}.0"
|
|
|
|
|
|
def load_extensions(specs: Sequence[ExtensionSpec]) -> tuple[LoadedExtensions, list[Diagnostic]]:
|
|
"""Resolve and install every configured extension.
|
|
|
|
Fail-open by default: a broken extension is skipped with a diagnostic so
|
|
the Gateway still starts. `required: true` flips that to fail-closed for
|
|
extensions whose absence changes behaviour rather than just observability.
|
|
"""
|
|
registry = ExtensionRegistry()
|
|
diagnostics: list[Diagnostic] = []
|
|
loaded_sources: list[str] = []
|
|
|
|
for spec in specs:
|
|
if not spec.enabled:
|
|
continue
|
|
|
|
try:
|
|
install = resolve_variable(spec.use)
|
|
except Exception as exc:
|
|
message = f"could not resolve extension entry point: {exc}"
|
|
diagnostics.append(Diagnostic.error(spec.use, message))
|
|
logger.error("Extension %s: %s", spec.use, message)
|
|
if spec.required:
|
|
raise ExtensionLoadError(f"required extension {spec.use} failed to load") from exc
|
|
continue
|
|
|
|
if not callable(install):
|
|
message = f"extension entry point is not callable: {type(install).__name__}"
|
|
diagnostics.append(Diagnostic.error(spec.use, message))
|
|
logger.error("Extension %s: %s", spec.use, message)
|
|
if spec.required:
|
|
raise ExtensionLoadError(f"required extension {spec.use} is not callable")
|
|
continue
|
|
|
|
try:
|
|
declared = getattr(install, "__deerflow_api__", None)
|
|
except Exception as exc:
|
|
message = f"could not inspect extension-api version marker: {type(exc).__name__}"
|
|
diagnostics.append(Diagnostic.error(spec.use, message))
|
|
logger.error("Extension %s: %s", spec.use, message)
|
|
if spec.required:
|
|
raise ExtensionLoadError(f"required extension {spec.use} could not inspect api marker") from exc
|
|
continue
|
|
if declared is not None and _parse_version(declared) is None:
|
|
message = f"extension declares invalid extension-api version marker of type {type(declared).__name__}; expected a dotted numeric string such as '0.1'"
|
|
diagnostics.append(Diagnostic.error(spec.use, message))
|
|
logger.error("Extension %s: %s", spec.use, message)
|
|
if spec.required:
|
|
raise ExtensionLoadError(f"required extension {spec.use} declares invalid api marker")
|
|
continue
|
|
if declared is not None:
|
|
# ``isinstance(..., str)`` also accepts subclasses whose
|
|
# ``__str__``/``__format__`` methods can execute plugin code while
|
|
# we build an incompatibility diagnostic. Normalize with the base
|
|
# implementation before compatibility checks and rendering.
|
|
declared = str.__str__(declared)
|
|
if declared is not None and not _compatible(declared, API_VERSION):
|
|
message = f"extension requires extension-api {declared}, host provides {API_VERSION}. Install a matching version: pip install 'deerflow-extension-api{_range_for(declared)}'"
|
|
diagnostics.append(Diagnostic.error(spec.use, message))
|
|
logger.error("Extension %s: %s", spec.use, message)
|
|
if spec.required:
|
|
raise ExtensionLoadError(f"required extension {spec.use} declares incompatible api {declared}")
|
|
continue
|
|
|
|
# Positional rollback, not registry.discard(spec.use): two specs may
|
|
# legitimately share the same `use` with different config, and
|
|
# discard-by-source would also erase an earlier, successfully
|
|
# installed instance that happens to share this spec's `use`.
|
|
mark = registry.mark()
|
|
try:
|
|
with registry.attributed_to(spec.use):
|
|
install(registry, _frozen_config(spec.config))
|
|
except Exception as exc:
|
|
registry.rollback_to(mark)
|
|
message = f"install() failed: {exc}"
|
|
diagnostics.append(Diagnostic.error(spec.use, message))
|
|
logger.exception("Extension %s: install() failed", spec.use)
|
|
if spec.required:
|
|
raise ExtensionLoadError(f"required extension {spec.use} failed to install") from exc
|
|
continue
|
|
|
|
loaded_sources.append(spec.use)
|
|
|
|
# Loading third-party code is exactly the event an operator needs positive
|
|
# confirmation of, and every other branch here is failure-only — so without
|
|
# this line a fully successful load is indistinguishable from a `plugins:`
|
|
# block the host never read. The x/y count names the difference between
|
|
# "all loaded" and "some were skipped" without repeating the per-failure
|
|
# errors already logged above.
|
|
if specs:
|
|
logger.info("Extensions loaded: %d/%d (%s)", len(loaded_sources), len(specs), ", ".join(loaded_sources) or "none")
|
|
else:
|
|
# Debug, not info: no configured plugins is the default state for almost
|
|
# every deployment, and an unconditional line would be pure boot noise.
|
|
logger.debug("No extensions configured")
|
|
|
|
return registry.build(), diagnostics
|
|
|
|
|
|
def _frozen_config(config: dict[str, Any]) -> Mapping[str, Any]:
|
|
"""Hand extensions a shallow copy of their config block.
|
|
|
|
This is a shallow copy: it stops an extension from reassigning
|
|
top-level keys on another extension's (or the caller's) config dict, but
|
|
nested structures (lists, dicts) are still shared by reference and can be
|
|
mutated in place. Use plain, top-level config values if this guarantee
|
|
matters to you.
|
|
"""
|
|
return dict(config)
|