mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-04-25 11:18:22 +00:00
style: format unformatted files and add .omc/ to prettierignore (#1539)
Co-authored-by: greatmengqi <chenmengqi.0376@bytedance.com>
This commit is contained in:
parent
084dc7e748
commit
25df82cbfd
@ -50,10 +50,7 @@ You have access to the `write_todos` tool to help you manage and track complex m
|
||||
</todo_list_system>
|
||||
"""
|
||||
|
||||
_TODO_TOOL_DESCRIPTION = (
|
||||
"Use this tool to create and manage a structured task list for complex work sessions. "
|
||||
"Only use for complex tasks (3+ steps)."
|
||||
)
|
||||
_TODO_TOOL_DESCRIPTION = "Use this tool to create and manage a structured task list for complex work sessions. Only use for complex tasks (3+ steps)."
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@ -127,7 +124,10 @@ def create_deerflow_agent(
|
||||
else:
|
||||
feat = features or RuntimeFeatures()
|
||||
effective_middleware, extra_tools = _assemble_from_features(
|
||||
feat, name=name, plan_mode=plan_mode, extra_middleware=extra_middleware or [],
|
||||
feat,
|
||||
name=name,
|
||||
plan_mode=plan_mode,
|
||||
extra_middleware=extra_middleware or [],
|
||||
)
|
||||
# Deduplicate by tool name — user-provided tools take priority.
|
||||
existing_names = {t.name for t in effective_tools}
|
||||
@ -321,30 +321,16 @@ def _insert_extra(chain: list[AgentMiddleware], extras: list[AgentMiddleware]) -
|
||||
|
||||
if next_anchor:
|
||||
if next_anchor in next_targets:
|
||||
raise ValueError(
|
||||
f"Conflict: {type(mw).__name__} and {next_targets[next_anchor].__name__} "
|
||||
f"both @Next({next_anchor.__name__})"
|
||||
)
|
||||
raise ValueError(f"Conflict: {type(mw).__name__} and {next_targets[next_anchor].__name__} both @Next({next_anchor.__name__})")
|
||||
if next_anchor in prev_targets:
|
||||
raise ValueError(
|
||||
f"Conflict: {type(mw).__name__} @Next({next_anchor.__name__}) and "
|
||||
f"{prev_targets[next_anchor].__name__} @Prev({next_anchor.__name__}) "
|
||||
f"— use cross-anchoring between extras instead"
|
||||
)
|
||||
raise ValueError(f"Conflict: {type(mw).__name__} @Next({next_anchor.__name__}) and {prev_targets[next_anchor].__name__} @Prev({next_anchor.__name__}) — use cross-anchoring between extras instead")
|
||||
next_targets[next_anchor] = type(mw)
|
||||
anchored.append((mw, "next", next_anchor))
|
||||
elif prev_anchor:
|
||||
if prev_anchor in prev_targets:
|
||||
raise ValueError(
|
||||
f"Conflict: {type(mw).__name__} and {prev_targets[prev_anchor].__name__} "
|
||||
f"both @Prev({prev_anchor.__name__})"
|
||||
)
|
||||
raise ValueError(f"Conflict: {type(mw).__name__} and {prev_targets[prev_anchor].__name__} both @Prev({prev_anchor.__name__})")
|
||||
if prev_anchor in next_targets:
|
||||
raise ValueError(
|
||||
f"Conflict: {type(mw).__name__} @Prev({prev_anchor.__name__}) and "
|
||||
f"{next_targets[prev_anchor].__name__} @Next({prev_anchor.__name__}) "
|
||||
f"— use cross-anchoring between extras instead"
|
||||
)
|
||||
raise ValueError(f"Conflict: {type(mw).__name__} @Prev({prev_anchor.__name__}) and {next_targets[prev_anchor].__name__} @Next({prev_anchor.__name__}) — use cross-anchoring between extras instead")
|
||||
prev_targets[prev_anchor] = type(mw)
|
||||
anchored.append((mw, "prev", prev_anchor))
|
||||
else:
|
||||
@ -381,12 +367,6 @@ def _insert_extra(chain: list[AgentMiddleware], extras: list[AgentMiddleware]) -
|
||||
remaining_types = {type(m) for m, _, _ in remaining}
|
||||
circular = anchor_types & remaining_types
|
||||
if circular:
|
||||
raise ValueError(
|
||||
f"Circular dependency among extra middlewares: "
|
||||
f"{', '.join(t.__name__ for t in circular)}"
|
||||
)
|
||||
raise ValueError(
|
||||
f"Cannot resolve positions for {', '.join(names)} "
|
||||
f"— anchors {', '.join(a.__name__ for _, _, a in remaining)} not found in chain"
|
||||
)
|
||||
raise ValueError(f"Circular dependency among extra middlewares: {', '.join(t.__name__ for t in circular)}")
|
||||
raise ValueError(f"Cannot resolve positions for {', '.join(names)} — anchors {', '.join(a.__name__ for _, _, a in remaining)} not found in chain")
|
||||
pending = remaining
|
||||
|
||||
@ -710,8 +710,13 @@ def test_full_chain_order(mock_create_agent):
|
||||
pass
|
||||
|
||||
feat = RuntimeFeatures(
|
||||
sandbox=True, memory=True, summarization=MySummarization(), subagent=True,
|
||||
vision=True, auto_title=True, guardrail=MyGuardrail(),
|
||||
sandbox=True,
|
||||
memory=True,
|
||||
summarization=MySummarization(),
|
||||
subagent=True,
|
||||
vision=True,
|
||||
auto_title=True,
|
||||
guardrail=MyGuardrail(),
|
||||
)
|
||||
create_deerflow_agent(_make_mock_model(), features=feat, plan_mode=True)
|
||||
|
||||
|
||||
@ -1 +1,2 @@
|
||||
pnpm-lock.yaml
|
||||
.omc/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user