agentscope-runtime 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

agentscope_runtime/adapters/agentscope/stream.py

@@ -271,7 +271,7 @@ async def adapt_agentscope_message_stream(
                                 role="assistant",
                             )
                             data_delta_content = DataContent(
-                                index=0,
+                                index=None if last else 0,
                                 data=fc_cls(
                                     call_id=element["id"],
                                     name=element.get("name"),

agentscope_runtime/adapters/langgraph/stream.py

@@ -62,79 +62,121 @@ async def adapt_langgraph_message_stream(
                 yield message.completed()
         elif isinstance(msg, AIMessage):
             role = "assistant"
+            tool_calls = getattr(msg, "tool_calls", [])
             has_tool_call_chunk = (
-                True if getattr(msg, "tool_call_chunks") else False
+                True if getattr(msg, "tool_call_chunks", "") else False
             )
-            is_last_chunk = (
-                True if getattr(msg, "chunk_position") == "last" else False
-            )
-
-            # Extract tool calls if present
-            if tool_started:
-                if has_tool_call_chunk:
-                    tool_call_chunk_msgs.append(msg)
-                if is_last_chunk:
-                    # tool call finished
-                    tool_started = False
-                    result = reduce(lambda x, y: x + y, tool_call_chunk_msgs)
-                    tool_calls = result.tool_call_chunks
-                    for tool_call in tool_calls:
-                        call_id = tool_call.get("id", "")
-                        # Create new tool call message
-                        plugin_call_message = Message(
-                            type=MessageType.PLUGIN_CALL,
-                            role=role,
-                        )
-                        data_content = DataContent(
-                            index=index,
-                            data=FunctionCall(
-                                call_id=call_id,
-                                name=tool_call.get("name", ""),
-                                arguments=json.dumps(
-                                    tool_call.get("args", {}),
-                                    ensure_ascii=False,
-                                ),
-                            ).model_dump(),
-                            delta=True,
+            if tool_calls and not has_tool_call_chunk:
+                plugin_call_message = Message(
+                    type=MessageType.PLUGIN_CALL,
+                    role=role,
+                )
+                for tool_call in tool_calls:
+                    tool_call_args = (
+                        tool_call.get("args")
+                        if isinstance(tool_call.get("args"), str)
+                        else json.dumps(tool_call.get("args"))
+                    )
+                    data_content = DataContent(
+                        index=index,
+                        data=FunctionCall(
+                            call_id=tool_call.get("id"),
+                            name=tool_call.get("name"),
+                            arguments=tool_call_args,
+                        ).model_dump(),
+                    )
+                    plugin_call_message.add_content(
+                        data_content,
+                    )
+                    yield data_content.completed()
+                yield plugin_call_message.completed()
+            else:
+                has_tool_call_chunk = (
+                    True if getattr(msg, "tool_call_chunks", "") else False
+                )
+                is_last_chunk = (
+                    True
+                    if getattr(msg, "chunk_position", "") == "last"
+                    else False
+                )
+                # Extract tool calls if present
+                if tool_started:
+                    if has_tool_call_chunk:
+                        tool_call_chunk_msgs.append(msg)
+                    if is_last_chunk:
+                        # tool call finished
+                        tool_started = False
+                        result = reduce(
+                            lambda x, y: x + y,
+                            tool_call_chunk_msgs,
                         )
+                        tool_calls = result.tool_call_chunks
+                        for tool_call in tool_calls:
+                            call_id = tool_call.get("id", "")
+                            # Create new tool call message
+                            plugin_call_message = Message(
+                                type=MessageType.PLUGIN_CALL,
+                                role=role,
+                            )
+                            tool_call_args = (
+                                tool_call.get("args")
+                                if isinstance(tool_call.get("args"), str)
+                                else json.dumps(tool_call.get("args"))
+                            )
 
-                        data_content = plugin_call_message.add_delta_content(
-                            new_content=data_content,
-                        )
-                        yield data_content
-                        yield plugin_call_message.completed()
-            else:
-                if has_tool_call_chunk:
-                    # tool call start, collect chunks and continue
-                    tool_started = True
-                    tool_call_chunk_msgs.append(msg)
-                else:
-                    # normal message
-                    content = msg.content if hasattr(msg, "content") else None
-                    if msg_id != getattr(msg, "id"):
-                        index = None
-                        message = Message(type=MessageType.MESSAGE, role=role)
-                        msg_id = getattr(msg, "id")
-                        yield message.in_progress()
+                            data_content = DataContent(
+                                index=index,
+                                data=FunctionCall(
+                                    call_id=call_id,
+                                    name=tool_call.get("name"),
+                                    arguments=tool_call_args,
+                                ).model_dump(),
+                            )
 
-                    if content:
-                        # todo support non str content
-                        text_delta_content = TextContent(
-                            delta=True,
-                            index=index,
-                            text=content,
-                        )
-                        text_delta_content = message.add_delta_content(
-                            new_content=text_delta_content,
+                            data_content = (
+                                plugin_call_message.add_delta_content(
+                                    new_content=data_content,
+                                )
+                            )
+                            yield data_content.completed()
+                            yield plugin_call_message.completed()
+                else:
+                    if has_tool_call_chunk:
+                        # tool call start, collect chunks and continue
+                        tool_started = True
+                        tool_call_chunk_msgs.append(msg)
+                    else:
+                        # normal message
+                        content = (
+                            msg.content if hasattr(msg, "content") else None
                         )
-                        index = text_delta_content.index
-                        yield text_delta_content
-                    # Handle final completion
-                    if last:
-                        # completed_content = message.content[index]
-                        # if completed_content.text:
-                        #     yield completed_content.completed()
-                        yield message.completed()
+                        if msg_id != getattr(msg, "id"):
+                            index = None
+                            message = Message(
+                                type=MessageType.MESSAGE,
+                                role=role,
+                            )
+                            msg_id = getattr(msg, "id")
+                            yield message.in_progress()
+
+                        if content:
+                            # todo support non str content
+                            text_delta_content = TextContent(
+                                delta=True,
+                                index=index,
+                                text=content,
+                            )
+                            text_delta_content = message.add_delta_content(
+                                new_content=text_delta_content,
+                            )
+                            index = text_delta_content.index
+                            yield text_delta_content
+                        # Handle final completion
+                        if last:
+                            # completed_content = message.content[index]
+                            # if completed_content.text:
+                            #     yield completed_content.completed()
+                            yield message.completed()
         elif isinstance(msg, SystemMessage):
             role = "system"
             content = msg.content if hasattr(msg, "content") else None
@@ -163,18 +205,26 @@ async def adapt_langgraph_message_stream(
                 type=MessageType.PLUGIN_CALL_OUTPUT,
                 role="tool",
             )
+            tool_call_output = (
+                msg.content
+                if isinstance(msg.content, str)
+                else json.dumps(msg.content, ensure_ascii=False)
+            )
             # Create function call output data
             function_output_data = FunctionCallOutput(
                 call_id=msg.tool_call_id,
                 name=msg.name,
-                output=json.dumps(content, ensure_ascii=False),
+                output=tool_call_output,
             )
 
             data_content = DataContent(
-                index=None,
                 data=function_output_data.model_dump(),
+                msg_id=plugin_output_message.id,
+            )
+            yield data_content.completed()
+            plugin_output_message.add_content(
+                data_content,
             )
-            plugin_output_message.content = [data_content]
             yield plugin_output_message.completed()
         else:
             role = "assistant"