mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-05-21 15:36:48 +00:00
3e6a34297d
Squashes 25 PR commits onto current main. AppConfig becomes a pure value object with no ambient lookup. Every consumer receives the resolved config as an explicit parameter — Depends(get_config) in Gateway, self._app_config in DeerFlowClient, runtime.context.app_config in agent runs, AppConfig.from_file() at the LangGraph Server registration boundary. Phase 1 — frozen data + typed context - All config models (AppConfig, MemoryConfig, DatabaseConfig, …) become frozen=True; no sub-module globals. - AppConfig.from_file() is pure (no side-effect singleton loaders). - Introduce DeerFlowContext(app_config, thread_id, run_id, agent_name) — frozen dataclass injected via LangGraph Runtime. - Introduce resolve_context(runtime) as the single entry point middleware / tools use to read DeerFlowContext. Phase 2 — pure explicit parameter passing - Gateway: app.state.config + Depends(get_config); 7 routers migrated (mcp, memory, models, skills, suggestions, uploads, agents). - DeerFlowClient: __init__(config=...) captures config locally. - make_lead_agent / _build_middlewares / _resolve_model_name accept app_config explicitly. - RunContext.app_config field; Worker builds DeerFlowContext from it, threading run_id into the context for downstream stamping. - Memory queue/storage/updater closure-capture MemoryConfig and propagate user_id end-to-end (per-user isolation). - Sandbox/skills/community/factories/tools thread app_config. - resolve_context() rejects non-typed runtime.context. - Test suite migrated off AppConfig.current() monkey-patches. - AppConfig.current() classmethod deleted. Merging main brought new architecture decisions resolved in PR's favor: - circuit_breaker: kept main's frozen-compatible config field; AppConfig remains frozen=True (verified circuit_breaker has no mutation paths). - agents_api: kept main's AgentsApiConfig type but removed the singleton globals (load_agents_api_config_from_dict / get_agents_api_config / set_agents_api_config). 8 routes in agents.py now read via Depends(get_config). - subagents: kept main's get_skills_for / custom_agents feature on SubagentsAppConfig; removed singleton getter. registry.py now reads app_config.subagents directly. - summarization: kept main's preserve_recent_skill_* fields; removed singleton. - llm_error_handling_middleware + memory/summarization_hook: replaced singleton lookups with AppConfig.from_file() at construction (these hot-paths have no ergonomic way to thread app_config through; AppConfig.from_file is a pure load). - worker.py + thread_data_middleware.py: DeerFlowContext.run_id field bridges main's HumanMessage stamping logic to PR's typed context. Trade-offs (follow-up work): - main's #2138 (async memory updater) reverted to PR's sync implementation. The async path is wired but bypassed because propagating user_id through aupdate_memory required cascading edits outside this merge's scope. - tests/test_subagent_skills_config.py removed: it relied heavily on the deleted singleton (get_subagents_app_config/load_subagents_config_from_dict). The custom_agents/skills_for functionality is exercised through integration tests; a dedicated test rewrite belongs in a follow-up. Verification: backend test suite — 2560 passed, 4 skipped, 84 failures. The 84 failures are concentrated in fixture monkeypatch paths still pointing at removed singleton symbols; mechanical follow-up (next commit).
135 lines
4.5 KiB
Python
135 lines
4.5 KiB
Python
"""Pure functions to convert LangChain message objects to OpenAI Chat Completions format.
|
|
|
|
Used by RunJournal to build content dicts for event storage.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import Any
|
|
|
|
_ROLE_MAP = {
|
|
"human": "user",
|
|
"ai": "assistant",
|
|
"system": "system",
|
|
"tool": "tool",
|
|
}
|
|
|
|
|
|
def langchain_to_openai_message(message: Any) -> dict:
|
|
"""Convert a single LangChain BaseMessage to an OpenAI message dict.
|
|
|
|
Handles:
|
|
- HumanMessage → {"role": "user", "content": "..."}
|
|
- AIMessage (text only) → {"role": "assistant", "content": "..."}
|
|
- AIMessage (with tool_calls) → {"role": "assistant", "content": null, "tool_calls": [...]}
|
|
- AIMessage (text + tool_calls) → both content and tool_calls present
|
|
- AIMessage (list content / multimodal) → content preserved as list
|
|
- SystemMessage → {"role": "system", "content": "..."}
|
|
- ToolMessage → {"role": "tool", "tool_call_id": "...", "content": "..."}
|
|
"""
|
|
msg_type = getattr(message, "type", "")
|
|
role = _ROLE_MAP.get(msg_type, msg_type)
|
|
content = getattr(message, "content", "")
|
|
|
|
if role == "tool":
|
|
return {
|
|
"role": "tool",
|
|
"tool_call_id": getattr(message, "tool_call_id", ""),
|
|
"content": content,
|
|
}
|
|
|
|
if role == "assistant":
|
|
tool_calls = getattr(message, "tool_calls", None) or []
|
|
result: dict = {"role": "assistant"}
|
|
|
|
if tool_calls:
|
|
openai_tool_calls = []
|
|
for tc in tool_calls:
|
|
args = tc.get("args", {})
|
|
openai_tool_calls.append(
|
|
{
|
|
"id": tc.get("id", ""),
|
|
"type": "function",
|
|
"function": {
|
|
"name": tc.get("name", ""),
|
|
"arguments": json.dumps(args) if not isinstance(args, str) else args,
|
|
},
|
|
}
|
|
)
|
|
# If no text content, set content to null per OpenAI spec
|
|
result["content"] = content if (isinstance(content, list) and content) or (isinstance(content, str) and content) else None
|
|
result["tool_calls"] = openai_tool_calls
|
|
else:
|
|
result["content"] = content
|
|
|
|
return result
|
|
|
|
# user / system / unknown
|
|
return {"role": role, "content": content}
|
|
|
|
|
|
def _infer_finish_reason(message: Any) -> str:
|
|
"""Infer OpenAI finish_reason from an AIMessage.
|
|
|
|
Returns "tool_calls" if tool_calls present, else looks in
|
|
response_metadata.finish_reason, else returns "stop".
|
|
"""
|
|
tool_calls = getattr(message, "tool_calls", None) or []
|
|
if tool_calls:
|
|
return "tool_calls"
|
|
resp_meta = getattr(message, "response_metadata", None) or {}
|
|
if isinstance(resp_meta, dict):
|
|
finish = resp_meta.get("finish_reason")
|
|
if finish:
|
|
return finish
|
|
return "stop"
|
|
|
|
|
|
def langchain_to_openai_completion(message: Any) -> dict:
|
|
"""Convert an AIMessage and its metadata to an OpenAI completion response dict.
|
|
|
|
Returns:
|
|
{
|
|
"id": message.id,
|
|
"model": message.response_metadata.get("model_name"),
|
|
"choices": [{"index": 0, "message": <openai_message>, "finish_reason": <inferred>}],
|
|
"usage": {"prompt_tokens": ..., "completion_tokens": ..., "total_tokens": ...} or None,
|
|
}
|
|
"""
|
|
resp_meta = getattr(message, "response_metadata", None) or {}
|
|
model_name = resp_meta.get("model_name") if isinstance(resp_meta, dict) else None
|
|
|
|
openai_msg = langchain_to_openai_message(message)
|
|
finish_reason = _infer_finish_reason(message)
|
|
|
|
usage_metadata = getattr(message, "usage_metadata", None)
|
|
if usage_metadata is not None:
|
|
input_tokens = usage_metadata.get("input_tokens", 0) or 0
|
|
output_tokens = usage_metadata.get("output_tokens", 0) or 0
|
|
usage: dict | None = {
|
|
"prompt_tokens": input_tokens,
|
|
"completion_tokens": output_tokens,
|
|
"total_tokens": input_tokens + output_tokens,
|
|
}
|
|
else:
|
|
usage = None
|
|
|
|
return {
|
|
"id": getattr(message, "id", None),
|
|
"model": model_name,
|
|
"choices": [
|
|
{
|
|
"index": 0,
|
|
"message": openai_msg,
|
|
"finish_reason": finish_reason,
|
|
}
|
|
],
|
|
"usage": usage,
|
|
}
|
|
|
|
|
|
def langchain_messages_to_openai(messages: list) -> list[dict]:
|
|
"""Convert a list of LangChain BaseMessages to OpenAI message dicts."""
|
|
return [langchain_to_openai_message(m) for m in messages]
|