sync update from LAN repo (source dhk-1 @ 3e87be55)
This commit is contained in:
1 parent
ab6068a7c1
commit
42f2a26fa8
1482 files changed
+227759
-9584
No files matched your search
@@ -28,6 +28,8 @@ from langchain_core.callbacks import BaseCallbackHandler
|
||||
from langchain_core.messages import AnyMessage, BaseMessage, HumanMessage, ToolMessage
|
||||
from langgraph.types import Command
|
||||
|
||||
from deerflow.utils.tool_visibility import internal_tool_call_ids, project_outward_messages
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from deerflow.runtime.events.store.base import RunEventStore
|
||||
|
||||
@@ -84,6 +86,7 @@ class RunJournal(BaseCallbackHandler):
|
||||
# LLM request/response tracking
|
||||
self._llm_call_index = 0
|
||||
self._seen_llm_starts: set[str] = set() # langchain run_ids that fired on_chat_model_start
|
||||
self._internal_tool_call_ids: set[str] = set()
|
||||
|
||||
# -- Lifecycle callbacks --
|
||||
|
||||
@@ -193,6 +196,10 @@ class RunJournal(BaseCallbackHandler):
|
||||
|
||||
for message in messages:
|
||||
caller = self._identify_caller(tags)
|
||||
serialized_message = message.model_dump()
|
||||
self._internal_tool_call_ids.update(
|
||||
internal_tool_call_ids([serialized_message])
|
||||
)
|
||||
|
||||
# Latency
|
||||
rid = str(run_id)
|
||||
@@ -212,17 +219,22 @@ class RunJournal(BaseCallbackHandler):
|
||||
self._seen_llm_starts.add(rid)
|
||||
|
||||
# Trace event: llm_response (OpenAI completion format)
|
||||
self._put(
|
||||
event_type="llm.ai.response",
|
||||
category="message",
|
||||
content=message.model_dump(),
|
||||
metadata={
|
||||
"caller": caller,
|
||||
"usage": usage_dict,
|
||||
"latency_ms": latency_ms,
|
||||
"llm_call_index": call_index,
|
||||
},
|
||||
projected = project_outward_messages(
|
||||
[serialized_message],
|
||||
known_internal_tool_call_ids=self._internal_tool_call_ids,
|
||||
)
|
||||
if projected:
|
||||
self._put(
|
||||
event_type="llm.ai.response",
|
||||
category="message",
|
||||
content=projected[0],
|
||||
metadata={
|
||||
"caller": caller,
|
||||
"usage": usage_dict,
|
||||
"latency_ms": latency_ms,
|
||||
"llm_call_index": call_index,
|
||||
},
|
||||
)
|
||||
|
||||
# Token accumulation
|
||||
if self._track_tokens:
|
||||
@@ -248,16 +260,31 @@ class RunJournal(BaseCallbackHandler):
|
||||
|
||||
def on_tool_end(self, output, *, run_id, parent_run_id=None, **kwargs):
|
||||
"""Handle tool end event, append message and clear node data"""
|
||||
def put_message(message: BaseMessage) -> None:
|
||||
tool_call_id = str(getattr(message, "tool_call_id", "") or "")
|
||||
projected = project_outward_messages(
|
||||
[message.model_dump()],
|
||||
known_internal_tool_call_ids=self._internal_tool_call_ids,
|
||||
)
|
||||
if projected:
|
||||
self._put(
|
||||
event_type="llm.tool.result",
|
||||
category="message",
|
||||
content=projected[0],
|
||||
)
|
||||
else:
|
||||
self._internal_tool_call_ids.discard(tool_call_id)
|
||||
|
||||
try:
|
||||
if isinstance(output, ToolMessage):
|
||||
msg = cast(ToolMessage, output)
|
||||
self._put(event_type="llm.tool.result", category="message", content=msg.model_dump())
|
||||
put_message(msg)
|
||||
elif isinstance(output, Command):
|
||||
cmd = cast(Command, output)
|
||||
messages = cmd.update.get("messages", [])
|
||||
for message in messages:
|
||||
if isinstance(message, BaseMessage):
|
||||
self._put(event_type="llm.tool.result", category="message", content=message.model_dump())
|
||||
put_message(message)
|
||||
else:
|
||||
logger.warning(f"on_tool_end {run_id}: command update message is not BaseMessage: {type(message)}")
|
||||
else:
|
||||
|
||||
Reference in new issue
Block a user