mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-08-16 09:49:10 +00:00
1f792d0f4b
* feat(extensions): add middleware plugin foundation * fix(extensions): stop config resolution from masking extension loading `create_app()` resolved the configured plugin list inside the fail-open guard around `load_extensions()`. CI has no `config.yaml` (gitignored and never generated by the workflow), so `get_app_config()` raised `FileNotFoundError` there and was swallowed as an extension failure -- `load_extensions()` never ran at all, and the four `create_app()` tests in `test_extension_app_loading.py` passed locally but failed on every runner. Resolve the plugin list before the guard. Only an absent `config.yaml` is tolerated, mirroring `_resolve_trace_enabled_for_app_construction()`: `create_app()` runs at import time, and lifespan still performs strict config loading before serving. A `config.yaml` that exists but fails to parse or validate now propagates instead of being reported as an extension failure -- reporting it as the latter silently dropped a `required: true` extension rather than failing the boot. Make the tests config-independent with an autouse `stub_app_config` fixture, following the existing pattern in `test_gateway_lifespan_shutdown.py`, and cover both new branches of the config-resolution boundary. * fix(extensions): bind the run's extension snapshot through subagent delegation The lead-agent path resolves one immutable loaded-extension snapshot per run and binds it through task-store allocation and graph construction, but the subagent path re-read the process-wide singleton at execution time. In production both are the same object, yet a `set_loaded_extensions()` between the lead run's start and a subagent's execution (test teardown, a future hot-reload path) would let one run mix two extension generations — exactly what the documented invariant exists to prevent. The graph-build binding is a ContextVar scoped to synchronous construction, so it has already exited by the time a tool delegates; the snapshot has to travel through runtime context instead. The run worker publishes it under the host-internal `EXTENSION_SNAPSHOT_CONTEXT_KEY` (written after the caller merge, popped when the run has none, so a caller-supplied value is never authoritative), `task_tool` reads it back through the type-checking `resolve_run_extensions()`, and `SubagentExecutor` binds it at construction. Callers outside the Gateway run path — embedded `DeerFlowClient`, standalone LangGraph Server — install no snapshot and keep the existing `get_loaded_extensions()` fallback. * refactor(extensions): defer the ordering table by call, not by a lying tuple `CORE_ORDERING_CONSTRAINTS` was a `tuple` subclass that overrode only `__iter__` and resolved into a class-level `_resolved` side channel. A tuple cannot populate its own storage after construction, so the instance stayed the empty tuple it was built as: `len()` was 0, `bool()` was False, `in` was always False, indexing raised, slicing and `reversed()` came back empty, and it compared unequal to the plain tuples tests substitute for it — all while iteration yielded the real constraints. Only `assert_ordering` consumed it, and only by iterating, so the split went unnoticed. The sibling `_AnchorTable(dict)` uses the same idea soundly because dict is mutable: `self.update()` fills the real storage, making every inherited operation correct. That trick does not survive the port to an immutable type. Replace it with `core_ordering_constraints()`, matching how `stack.py` defers the same kind of table via `_anchors()`. The deferral is kept — it is about dependency direction, not just cycles: `extensions/` is the layer the middleware layer calls into, so a module-scope `agents.middlewares` import here points the dependency backwards and closes a cycle as soon as any middleware imports something under `extensions/` at module level. Resolution stays at `assert_ordering` time, which already runs inside the middleware builder. Tests pin both halves: the returned value is a plain tuple whose len/bool/ membership/indexing/reversal/equality agree with iteration, and a subprocess probe asserts importing `extensions.ordering` does not load the middleware layer while calling the function does.
76 lines
2.6 KiB
Python
76 lines
2.6 KiB
Python
"""Install functions used by the extension loader tests."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from collections.abc import Mapping
|
|
from typing import Any
|
|
|
|
from deerflow_extension_api import ExtensionRegistry, extension
|
|
|
|
INSTALLED: list[str] = []
|
|
|
|
|
|
class _Contributor:
|
|
def __init__(self, tag: str) -> None:
|
|
self.tag = tag
|
|
|
|
|
|
def install_ok(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
INSTALLED.append("ok")
|
|
registry.middlewares(_Contributor("ok"))
|
|
|
|
|
|
@extension(api="0.1", name="stamped")
|
|
def install_stamped(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
INSTALLED.append("stamped")
|
|
registry.middlewares(_Contributor("stamped"))
|
|
|
|
|
|
@extension(api="99.0", name="future")
|
|
def install_future_api(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
INSTALLED.append("future")
|
|
registry.middlewares(_Contributor("future"))
|
|
|
|
|
|
@extension(api="0.2", name="newer-minor")
|
|
def install_newer_minor_api(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
"""Written against a newer 0.x minor than the host provides: before 1.0,
|
|
minors carry no compatibility promise in either direction."""
|
|
INSTALLED.append("newer-minor")
|
|
registry.middlewares(_Contributor("newer-minor"))
|
|
|
|
|
|
def install_partial_then_raise(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
"""Registers two contributors, then fails — exercises rollback."""
|
|
registry.middlewares(_Contributor("partial-a"))
|
|
registry.middlewares(_Contributor("partial-b"))
|
|
raise ValueError("boom")
|
|
|
|
|
|
def install_reads_config(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
INSTALLED.append(f"config:{config.get('mode')}")
|
|
|
|
|
|
def install_disabled(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
"""Registers nothing when disabled — the zero-cost path."""
|
|
if not config.get("enabled", False):
|
|
return
|
|
registry.middlewares(_Contributor("enabled"))
|
|
|
|
|
|
def install_shared_use(registry: ExtensionRegistry, config: Mapping[str, Any]) -> None:
|
|
"""Registers a middleware contributor; raises afterward if configured to.
|
|
|
|
Two ExtensionSpecs may legitimately share the same `use` with different
|
|
config (e.g. the same extension mounted twice with different settings).
|
|
This exists to exercise that rollback must be positional, not keyed by
|
|
`use` — a failing instance must not erase an earlier, successful
|
|
instance's registrations just because they share a source string.
|
|
"""
|
|
registry.middlewares(_Contributor(f"shared:{config.get('label', '')}"))
|
|
if config.get("fail"):
|
|
raise ValueError("boom-shared")
|
|
|
|
|
|
NOT_CALLABLE = "i am not a function"
|