mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-09-14 16:08:41 +00:00
a2011996d8
* fix(scripts): detect the ollama extra from configured models make dev synced without --extra ollama, uninstalling langchain-ollama from a working setup. Same failure #2754 hit with postgres; ollama predates the detector added in #2767 and never got a rule. * fix(deps): declare the ollama extra on backend, pin model use: matching Review follow-ups. `ollama` was the only extra in the detector's map that the root `backend` project did not declare, so any consumer syncing without `--all-packages` failed outright: $ cd backend && uv sync --locked --extra ollama error: Extra `ollama` is not defined in the project's `optional-dependencies` table `serve.sh` and `docker/dev-entrypoint.sh` both pass `--all-packages` and were unaffected, but `backend/Dockerfile` does not, and `config.example.yaml` documents `UV_EXTRAS` as an image build-arg — so `UV_EXTRAS=ollama docker compose build` would have hard-failed on a value this branch makes first-class. Declaring `ollama = ["deerflow-harness[ollama]"]` alongside the other delegating extras closes that, and `uv.lock` is regenerated to match. The `use:` match also accepted any nesting depth inside `models:`, so a `use` in a sub-mapping was read as the model's provider: models: - name: doubao use: deerflow.models.patched_deepseek:PatchedChatDeepSeek when_thinking_enabled: use: langchain_ollama:ChatOllama That yielded `--extra ollama` despite the model's own provider pointing elsewhere, and `when_thinking_enabled` appears fifteen times in config.example.yaml, so the shape is common rather than contrived. Pin matching to the list item's own key indent, mirroring how `section_value()` pins `child_indent` and documents deeper nesting as ignored on purpose. Covered by a regression test that fails on the looser parser. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * chore(deps): drop unrelated standard-aifc marker churn from uv.lock Review follow-up. Regenerating the lock with a newer local uv (0.11.19) also rewrote the `standard-aifc` entry, adding `python_full_version >= '3.13'` markers to its `audioop-lts` and `standard-chunk` dependencies. Unrelated to this change, so restore upstream's lines and keep the lock diff to the `ollama` extra. `uv lock --check` passes with these lines under both the CI- and Dockerfile-pinned uv 0.11.1 and uv 0.11.19. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(scripts): detect ollama in unindented model lists and after nested sequences Review follow-ups on the models parser. `yaml.safe_dump` — used by the setup wizard (`make setup`) and scripts/config-upgrade.sh — writes list items unindented: models: - name: qwen3-local use: langchain_ollama:ChatOllama The parser treated any column-0 line as the end of the `models:` section, so the first model ended it and nothing was detected. That is the layout new users get from the recommended setup path, so `make dev` still synced without `--extra ollama`. Model entries are now recognised before the section-end test, the same ordering `tools_include_name()` already uses for the unindented tools list (#4367). Separately, every sequence item reset the key indent, including items inside a model option. With `stop:` / `- END` before `use:`, the key indent jumped to the nested item's and the model's own `use` was skipped, so detection depended on key order within the model. The first sequence item under `models:` now fixes the model-list indent; only items at that indent start a model and set where its keys sit. Nested sequence items and deeper mappings are skipped without moving it. Regression tests cover the real setup-wizard output via `build_minimal_config()`, a hand-written unindented list, and `use:` after a nested `stop:` list — all three fail on the previous parser — plus a guard that a `- use:` nested inside a model option is still ignored. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
114 lines
5.0 KiB
TOML
114 lines
5.0 KiB
TOML
[project]
|
|
name = "deer-flow"
|
|
version = "2.1.0"
|
|
description = "LangGraph-based AI agent system with sandbox execution capabilities"
|
|
readme = "README.md"
|
|
requires-python = ">=3.12"
|
|
dependencies = [
|
|
"deerflow-harness",
|
|
# Direct dependency on purpose, even though deerflow-harness already pulls
|
|
# it in: app/gateway/app.py and app/gateway/services.py import the public
|
|
# contract package themselves (the extension principal resolver, and the
|
|
# provenance key set the state route strips). Those are the app layer's own
|
|
# imports of a package whose whole point is a stable public surface, so the
|
|
# app declares them rather than relying on the harness to keep supplying it.
|
|
"deerflow-extension-api",
|
|
"fastapi>=0.115.0",
|
|
"httpx>=0.28.0",
|
|
"python-multipart>=0.0.31",
|
|
"sse-starlette>=2.1.0",
|
|
# Direct dependency on purpose, even though FastAPI already pulls it in:
|
|
# app/gateway/request_path.py imports the private
|
|
# `starlette._utils.get_route_path` so the auth and CSRF predicates
|
|
# classify the exact string Starlette's router matches on. A private
|
|
# import is the safest option here because it fails loudly (ImportError at
|
|
# startup) instead of silently drifting from the dispatcher at a security
|
|
# boundary -- but it does mean a Starlette bump is a security-relevant
|
|
# change. Declaring and bounding it here makes that bump visible in the
|
|
# diff; tests/test_gateway_request_path.py pins the agreement itself.
|
|
"starlette>=1.3.1,<2",
|
|
"uvicorn[standard]>=0.34.0",
|
|
"lark-oapi>=1.4.0",
|
|
"slack-sdk>=3.33.0",
|
|
"python-telegram-bot>=21.0",
|
|
"langgraph-sdk>=0.1.51",
|
|
"markdown-to-mrkdwn>=0.3.1",
|
|
"wecom-aibot-python-sdk>=0.1.6",
|
|
"dingtalk-stream>=0.24.3",
|
|
"bcrypt>=4.0.0",
|
|
"pyjwt>=2.13.0",
|
|
"email-validator>=2.0.0",
|
|
"e2b-code-interpreter>=2.8.1",
|
|
]
|
|
|
|
[project.optional-dependencies]
|
|
postgres = ["deerflow-harness[postgres]"]
|
|
redis = ["deerflow-harness[redis]"]
|
|
discord = ["discord.py>=2.7.0"]
|
|
buzz = ["coincurve>=20.0.0"]
|
|
monocle = ["deerflow-harness[monocle]"]
|
|
ollama = ["deerflow-harness[ollama]"]
|
|
browser = ["deerflow-harness[browser]"]
|
|
memory-zh = ["deerflow-harness[memory-zh]"]
|
|
|
|
[dependency-groups]
|
|
# Managed extension packages are added here by `deerflow extensions install`.
|
|
# Keeping them separate from development tooling lets every startup mode sync
|
|
# the same locked runtime set without promoting those packages to core deps.
|
|
extensions = []
|
|
dev = [
|
|
"blockbuster>=1.5.26,<1.6",
|
|
"hypothesis>=6.100,<7",
|
|
"jsonschema>=4.26.0",
|
|
"prompt-toolkit>=3.0.0",
|
|
"pytest>=9.0.3",
|
|
"pytest-asyncio>=1.3.0",
|
|
"pytest-split>=0.11.0",
|
|
"ruff>=0.14.11",
|
|
# Monocle tracer (also the deerflow-harness[monocle] extra); kept in the dev
|
|
# group so the tracing tests can import it without forcing it onto installs.
|
|
"monocle_apptrace>=0.8.8",
|
|
# redis is an optional runtime extra (deerflow-harness[redis]); pin it in the
|
|
# dev group so the stream-bridge tests can always import/exercise the redis
|
|
# bridge without forcing it onto production installs.
|
|
"redis>=5.0.0",
|
|
# TUI runtime dep (also declared as the deerflow-harness[tui] extra); kept in
|
|
# the dev group so the terminal workbench can be run and tested locally / in CI.
|
|
"textual>=0.80",
|
|
]
|
|
|
|
[tool.pytest.ini_options]
|
|
markers = [
|
|
"no_auto_user: disable the conftest autouse contextvar fixture for this test",
|
|
"allow_blocking_io: opt out of the strict Blockbuster gate in tests/blocking_io/",
|
|
"integration: tests that require an external service (e.g. Redis); skipped when unavailable",
|
|
"live: tests that call real external APIs and require explicit opt-in",
|
|
]
|
|
|
|
[tool.uv]
|
|
index-url = "https://pypi.org/simple"
|
|
default-groups = ["dev", "extensions"]
|
|
# langgraph-sdk 0.4.2 (pulled in by langgraph 1.2.9 for DeltaChannel) pins
|
|
# `websockets<16,>=14`, silently downgrading websockets 16.0 -> 15.0.1. The
|
|
# pin is not grounded in any API incompatibility: websockets 16's only
|
|
# breaking change is requiring Python >=3.10 (we require >=3.12), the sdk
|
|
# only imports `websockets.asyncio.client`/`websockets.exceptions` (both
|
|
# 16-compatible), and DeerFlow never uses the sdk's WebSocket transport
|
|
# (httpx/SSE only). DeerFlow does have one direct consumer of its own: the Buzz
|
|
# channel (`app/channels/buzz.py`) imports the top-level `websockets` package and
|
|
# calls `websockets.connect()`, which in 16.0 is the same asyncio client the sdk
|
|
# uses, re-exported at the package root -- so it is covered by the same
|
|
# compatibility argument. Pin the exact pre-upgrade 16.0 for that plus the IM
|
|
# channel integrations (dingtalk-stream, python-telegram-bot, etc.) that ran on
|
|
# it before. Remove once langgraph-sdk relaxes the pin upstream. Note: enabling
|
|
# the `openai[realtime]` or `slack-sdk[optional]` extras would conflict (they
|
|
# also cap websockets<16).
|
|
override-dependencies = ["websockets==16.0"]
|
|
|
|
[tool.uv.workspace]
|
|
members = ["packages/harness", "packages/extension-api"]
|
|
|
|
[tool.uv.sources]
|
|
deerflow-harness = { workspace = true }
|
|
deerflow-extension-api = { workspace = true }
|