xgae 0.1.7__tar.gz → 0.1.9__tar.gz

{xgae-0.1.7 → xgae-0.1.9}/.env

@@ -1,6 +1,7 @@
 # LOG
 LOG_LEVEL=INFO
 LOG_FILE=log/xgae.log
+LOG_ENABLE=True
 
 # LANGFUSE
 LANGFUSE_PUBLIC_KEY=
@@ -9,6 +10,7 @@ LANGFUSE_HOST=https://cloud.langfuse.com
 
 # LLM
 LLM_MODEL=openai/qwen3-235b-a22b
+#LLM_MODEL=openai/qwen-plus
 LLM_API_BASE=https://dashscope.aliyuncs.com/compatible-mode/v1
 LLM_API_KEY=
 LLM_MAX_TOKENS=16384

{xgae-0.1.7 → xgae-0.1.9}/.idea/workspace.xml

@@ -29,15 +29,19 @@
   "keyToString": {
     "ModuleVcsDetector.initialDetectionPerformed": "true",
     "Python.llm_client.executor": "Run",
+    "Python.mcp_tool_box.executor": "Run",
     "Python.message_tools_app.executor": "Run",
     "Python.responser_base.executor": "Run",
     "Python.run_engine_with_human_in_loop.executor": "Run",
+    "Python.run_human_in_loop.executor": "Run",
     "Python.run_simple.executor": "Run",
     "Python.run_task_engine.executor": "Run",
     "Python.run_user_prompt.executor": "Run",
     "Python.run_xga_engine.executor": "Run",
     "Python.setup_env.executor": "Run",
     "Python.task_engine.executor": "Run",
+    "Python.test_langfuse.executor": "Run",
+    "Python.test_litellm_langfuse.executor": "Run",
     "Python.utils.executor": "Run",
     "Python.xga_engine.executor": "Run",
     "Python.xga_mcp_tool_box.executor": "Debug",
@@ -55,6 +59,7 @@
 }]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/examples/engine" />
       <recent name="$PROJECT_DIR$/src/xgae/engine/responser" />
     </key>
   </component>
@@ -160,7 +165,8 @@
       <workItem from="1755700523844" duration="24000" />
       <workItem from="1755737435202" duration="48139000" />
       <workItem from="1756044658912" duration="1248000" />
-      <workItem from="1756082326044" duration="23338000" />
+      <workItem from="1756082326044" duration="23657000" />
+      <workItem from="1756168626188" duration="45746000" />
     </task>
     <servers />
   </component>
@@ -179,18 +185,23 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/xgae$test_litellm_langfuse.coverage" NAME="test_litellm_langfuse Coverage Results" MODIFIED="1756196476262" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$xga_engine.coverage" NAME="xga_engine Coverage Results" MODIFIED="1755580277172" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/xgae$run_simple.coverage" NAME="run_simple Coverage Results" MODIFIED="1756111714718" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$run_simple.coverage" NAME="run_simple Coverage Results" MODIFIED="1756280626870" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$run_human_in_loop.coverage" NAME="run_human_in_loop Coverage Results" MODIFIED="1756279131815" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$run_xga_engine.coverage" NAME="run_task_engine Coverage Results" MODIFIED="1756111613459" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$message_tools_app.coverage" NAME="message_tools_app Coverage Results" MODIFIED="1756094157566" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$run_engine_with_human_in_loop.coverage" NAME="run_engine_with_human_in_loop Coverage Results" MODIFIED="1756089269027" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$xga_prompt_builder.coverage" NAME="xga_prompt_builder Coverage Results" MODIFIED="1755587456555" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$test_langfuse.coverage" NAME="test_langfuse Coverage Results" MODIFIED="1756196410142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$run_task_engine.coverage" NAME="run_task_engine Coverage Results" MODIFIED="1756280748615" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$responser_base.coverage" NAME="responser_base Coverage Results" MODIFIED="1756103040764" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$mcp_tool_box.coverage" NAME="mcp_tool_box Coverage Results" MODIFIED="1756274403389" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$utils.coverage" NAME="utils Coverage Results" MODIFIED="1755226923439" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/xgae$setup_env.coverage" NAME="setup_env Coverage Results" MODIFIED="1755657717310" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/xgae$run_user_prompt.coverage" NAME="run_user_prompt Coverage Results" MODIFIED="1756089624828" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$setup_env.coverage" NAME="setup_env Coverage Results" MODIFIED="1756273791782" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$run_user_prompt.coverage" NAME="run_user_prompt Coverage Results" MODIFIED="1756279512361" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/xgae$xga_mcp_tool_box.coverage" NAME="xga_mcp_tool_box Coverage Results" MODIFIED="1755583099719" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/xgae$task_engine.coverage" NAME="task_engine Coverage Results" MODIFIED="1756102942600" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/xgae$llm_client.coverage" NAME="llm_client Coverage Results" MODIFIED="1756112044142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$llm_client.coverage" NAME="llm_client Coverage Results" MODIFIED="1756261767854" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/xgae$task_engine.coverage" NAME="task_engine Coverage Results" MODIFIED="1756269353871" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>

xgae-0.1.9/PKG-INFO

@@ -0,0 +1,11 @@
+Metadata-Version: 2.4
+Name: xgae
+Version: 0.1.9
+Summary: Extreme General Agent Engine
+Requires-Python: >=3.13
+Requires-Dist: colorlog==6.9.0
+Requires-Dist: langchain-mcp-adapters==0.1.9
+Requires-Dist: langfuse==2.60.9
+Requires-Dist: langgraph==0.6.5
+Requires-Dist: litellm==1.74.15
+Requires-Dist: mcp==1.13.0

{xgae-0.1.7 → xgae-0.1.9}/pyproject.toml

@@ -1,16 +1,16 @@
 [project]
 name = "xgae"
-version = "0.1.7"
+version = "0.1.9"
 description = "Extreme General Agent Engine"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
-    "colorlog>=6.9.0",
-    "langchain-mcp-adapters>=0.1.4",
-    "langgraph>=0.3.21",
-    "litellm>=1.74.8",
-    "mcp>=1.12.1",
-    "langfuse>=2.60.5",
+    "colorlog==6.9.0",
+    "langchain-mcp-adapters==0.1.9",
+    "langgraph==0.6.5",
+    "litellm==1.74.15",
+    "mcp==1.13.0",
+    "langfuse==2.60.9",
 ]
 
 [build-system]
@@ -22,3 +22,4 @@ exclude = ["log/*"]
 
 [project.scripts]
 xgae-tools = "xgae.tools.without_general_tools_app:main"
+custom_fault_tools = "examples.tools.custom_fault_tools_app:main"

{xgae-0.1.7/src/examples → xgae-0.1.9/src/examples/engine}/run_human_in_loop.py

@@ -5,10 +5,13 @@ from xgae.engine.task_engine import XGATaskEngine
 from xgae.utils.llm_client import LLMConfig
 from xgae.utils.misc import read_file
 
+from xgae.utils.setup_env import setup_langfuse
 
 async def main() -> None:
+    # Before Run Exec: uv run custom_fault_tools
     tool_box = XGAMcpToolBox(custom_mcp_server_file="mcpservers/custom_servers.json")
     system_prompt = read_file("templates/example_user_prompt.txt")
+
     engine = XGATaskEngine(tool_box=tool_box,
                            general_tools=[],
                            custom_tools=["*"],
@@ -16,14 +19,24 @@ async def main() -> None:
                            system_prompt=system_prompt,
                            max_auto_run=8)
 
+    langfuse = setup_langfuse()
+    # Two task run in same langfuse trace
+    trace_id = langfuse.trace(name="xgae_example_run_human_in_loop").trace_id
+
     user_input =  "locate fault and solution"
-    final_result = await engine.run_task_with_final_answer(task_message={"role": "user", "content": user_input})
+    final_result = await engine.run_task_with_final_answer(
+        task_message={"role": "user", "content": user_input},
+        trace_id=trace_id
+    )
     print("FINAL RESULT:", final_result)
 
     if final_result["type"] == "ask":
         print("====== Wait for user input ... ======")
         user_input = "ip=10.0.1.1"
-        final_result = await engine.run_task_with_final_answer(task_message={"role": "user", "content": user_input})
+        final_result = await engine.run_task_with_final_answer(
+            task_message={"role": "user", "content": user_input},
+            trace_id=trace_id
+        )
         print("FINAL RESULT:", final_result)
 
 asyncio.run(main())

{xgae-0.1.7/src/examples → xgae-0.1.9/src/examples/engine}/run_simple.py

@@ -6,7 +6,11 @@ from xgae.utils.llm_client import LLMConfig
 
 async def main() -> None:
     engine =  XGATaskEngine(llm_config=LLMConfig(stream=False), max_auto_run=1)
-    final_result = await engine.run_task_with_final_answer(task_message={"role": "user", "content": "1+1"})
+
+    final_result = await engine.run_task_with_final_answer(
+        task_message={"role": "user", "content": "1+1"}
+    )
+
     print("FINAL RESULT:", final_result)
 
 asyncio.run(main())

{xgae-0.1.7/src/examples → xgae-0.1.9/src/examples/engine}/run_user_prompt.py

@@ -7,8 +7,10 @@ from xgae.utils.misc import read_file
 
 
 async def main() -> None:
+    # Before Run Exec: uv run custom_fault_tools
     tool_box = XGAMcpToolBox(custom_mcp_server_file="mcpservers/custom_servers.json")
     system_prompt = read_file("templates/example_user_prompt.txt")
+
     engine = XGATaskEngine(tool_box=tool_box,
                            general_tools=[],
                            custom_tools=["*"],

xgae-0.1.9/src/examples/tools/custom_fault_tools_app.py

@@ -0,0 +1,104 @@
+import click
+import logging
+
+from typing import Annotated
+from typing import Dict, Any
+from pydantic import Field
+
+from mcp.server.fastmcp import FastMCP
+
+mcp = FastMCP(name="Fault Location Tools")
+alarm_type = 0
+
+@mcp.tool(
+    description="Get Alarm Object",
+)
+def get_alarm(ip: Annotated[str, Field(description="Alarm Object IP Address")]) -> Dict[str, str]:
+    logging.info(f"get_alarm: ip={ip}")
+    return {"alarmId":"alm0123", "objId": "obj567"}
+
+
+@mcp.tool(
+    description="Get alarm type, return result enum: 1: Business Type Alarm; 2: Equipment Type Alarm; 3: Middleware Type Alarm",
+)
+def get_alarm_type(alarm_id: Annotated[str, Field(description="Alarm Object Id")]) -> str:
+    logging.info(f"get_alarm_type: alarm_id={alarm_id}, alarm_type={alarm_type}")
+    return f"{alarm_type}"
+
+
+@mcp.tool(
+    description="Locate Business Type Fault",
+)
+def get_busi_fault(obj_id: Annotated[str, Field(description="Alarm Object Id")]) -> Dict[str, Any]:
+    logging.info(f"get_busi_fault: obj_id={obj_id}")
+    return {"fault_code": "F01", "fault_desc": "Business Recharge Fault"}
+
+
+@mcp.tool(
+    description="Locate Equipment Type Fault",
+)
+def get_equip_fault(obj_id: Annotated[str, Field(description="Alarm Object Id")]) -> Dict[str, Any]:
+    logging.info(f"get_equip_fault: obj_id={obj_id}")
+    return {"fault_code": "F02", "fault_desc": "Host Disk Fault"}
+
+
+@mcp.tool(
+    description="Locate Middleware Type Fault",
+)
+def get_middle_fault(obj_id: Annotated[str, Field(description="Alarm Object Id")]) -> Dict[str, Any]:
+    logging.info(f"get_middle_fault: obj_id={obj_id}")
+    return {"fault_code": "F03", "fault_desc": "Redis Fault"}
+
+
+@mcp.tool(
+    description="Get Business Type Fault Solution and Cause",
+)
+async def get_busi_fault_cause(fault_code: Annotated[str, Field(description="Fault Code")]) -> str:
+    logging.info(f"get_busi_fault_cause: faultCode={fault_code}")
+
+    fault_cause = ""
+    if (fault_code == 'F01'):
+        fault_cause = "Business Recharge Fault, Fault Cause is 'Phone Recharge Application Crash' ，Solution is 'Restart Phone Recharge Application'"
+    else:
+        fault_cause = f"FaultCode '{fault_code}' is not Business Type"
+
+    return  fault_cause
+
+
+@mcp.tool(
+    description="Get Equipment Type Fault Solution and Cause",
+)
+async def get_equip_fault_cause(fault_code: Annotated[str, Field(description="Fault Code")]) -> str:
+    logging.info(f"get_equip_fault_cause: faultCode={fault_code}")
+
+    fault_cause = ""
+    if (fault_code == 'F01'):
+        fault_cause = "Host Fault, Fault Cause is 'Host Disk is Damaged' ，Solution is 'Change Host Disk'"
+    else:
+        fault_cause = f"FaultCode '{fault_code}' is not Equipment Type"
+
+    return  fault_cause
+
+
+@click.command()
+@click.option("--transport", type=click.Choice(["stdio", "sse"]), default="sse", help="Transport type")
+@click.option("--host", default="0.0.0.0", help="Host to listen on for SSE")
+@click.option("--port", default=17070, help="Port to listen on for SSE")
+@click.option("--alarmtype", default=1, help="AlarmType Set")
+def main(transport: str, host: str, port: int, alarmtype:int):
+    if transport != "stdio":
+        from xgae.utils.setup_env import setup_logging
+        setup_logging()
+        logging.info("=" * 20 + f"   Custom Fault Tools Sever Started in {transport} mode   " + "=" * 20)
+
+    global alarm_type
+    alarm_type = alarmtype
+
+    mcp.settings.host = host
+    mcp.settings.port = port
+
+    mcp.run(transport=transport)
+
+
+if __name__ == '__main__':
+    main()

{xgae-0.1.7 → xgae-0.1.9}/src/xgae/engine/engine_base.py

@@ -7,7 +7,7 @@ class XGAError(Exception):
     pass
 
 XGAMsgStatusType = Literal["error", "finish", "tool_error", "tool_started", "tool_completed", "tool_failed", "thread_run_start", "thread_run_end", "assistant_response_start", "assistant_response_end"]
-XGAResponseMsgType = Literal["user", "status",  "tool", "assistant"]
+XGAResponseMsgType = Literal["user", "status",  "tool", "assistant", "assistant_complete"]
 
 class XGAResponseMessage(TypedDict, total=False):
     message_id: str
@@ -55,4 +55,4 @@ class XGAToolBox(ABC):
 
     @abstractmethod
     async def call_tool(self, task_id: str, tool_name: str, args: Optional[Dict[str, Any]] = None) -> XGAToolResult:
-        pass
+        pass

{xgae-0.1.7 → xgae-0.1.9}/src/xgae/engine/mcp_tool_box.py

@@ -8,7 +8,6 @@ from langchain_mcp_adapters.client import MultiServerMCPClient
 from langchain_mcp_adapters.tools import load_mcp_tools
 
 from xgae.engine.engine_base import XGAError, XGAToolSchema, XGAToolBox, XGAToolResult
-from xgae.utils import langfuse
 
 class XGAMcpToolBox(XGAToolBox):
     GENERAL_MCP_SERVER_NAME = "xga_general"
@@ -191,11 +190,16 @@ class XGAMcpToolBox(XGAToolBox):
 if __name__ == "__main__":
     import asyncio
     from dataclasses import asdict
+    from xgae.utils.setup_env import setup_logging
+
+    setup_logging()
 
     async def main():
+        ## Before Run Exec: uv run custom_fault_tools
+        mcp_tool_box = XGAMcpToolBox(custom_mcp_server_file="mcpservers/custom_servers.json")
+        #mcp_tool_box = XGAMcpToolBox()
+
         task_id = "task1"
-        #mcp_tool_box = XGAMcpToolBox(custom_mcp_server_file="mcpservers/custom_servers.json")
-        mcp_tool_box = XGAMcpToolBox()
         await mcp_tool_box.load_mcp_tools_schema()
         await mcp_tool_box.creat_task_tool_box(task_id=task_id, general_tools=["*"], custom_tools=["bomc_fault.*"])
         tool_schemas = mcp_tool_box.get_task_tool_schemas(task_id, "general_tool")
@@ -210,9 +214,6 @@ if __name__ == "__main__":
             print(asdict(tool_schema))
         print()
 
-        result = await mcp_tool_box.call_tool(task_id=task_id, tool_name="web_search", args={"task_id": task_id, "query": "查询天津天气"})
-        print(f"call web_search result: {result}")
-
         result = await mcp_tool_box.call_tool(task_id=task_id, tool_name="complete", args={"task_id": task_id})
         print(f"call complete result: {result}")
 

{xgae-0.1.7 → xgae-0.1.9}/src/xgae/engine/prompt_builder.py

@@ -3,7 +3,7 @@ import datetime
 
 from typing import Optional, List
 
-from xgae.engine.engine_base import XGAToolSchema, XGAError
+from xgae.engine.engine_base import XGAToolSchema
 from xgae.utils.misc import read_file, format_file_with_args
 
 

{xgae-0.1.7 → xgae-0.1.9}/src/xgae/engine/responser/non_stream_responser.py

@@ -1,10 +1,10 @@
 import logging
 
 from typing import List, Dict, Any, AsyncGenerator, override,Optional
+from xgae.utils.json_helpers import format_for_yield
 
 from xgae.engine.responser.responser_base import TaskResponseProcessor, TaskResponserContext, TaskRunContinuousState
-from xgae.utils import langfuse
-from xgae.utils.json_helpers import format_for_yield
+
 
 class NonStreamTaskResponser(TaskResponseProcessor):
     def __init__(self, response_context: TaskResponserContext):
@@ -16,6 +16,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
         llm_content = ""
         parsed_xml_data = []
         finish_reason = None
+        llm_count = continuous_state.get("auto_continue_count")
 
         try:
             # Extract finish_reason, content, tool calls
@@ -24,7 +25,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
                     finish_reason = llm_response.choices[0].finish_reason
                     logging.info(f"NonStreamTask：LLM response finish_reason={finish_reason}")
 
-                    langfuse.create_event(trace_context=self.trace_context, name="non_stream_processor_start", level="DEFAULT",
+                    self.root_span.event(name=f"non_stream_processor_start[{self.task_no}]({llm_count})", level="DEFAULT",
                                      status_message=(f"finish_reason={finish_reason}, tool_exec_strategy={self.tool_execution_strategy}"))
 
                 response_message = llm_response.choices[0].message if hasattr(llm_response.choices[0], 'message') else None
@@ -47,8 +48,8 @@ class NonStreamTaskResponser(TaskResponseProcessor):
                 else:
                     logging.warning(f"NonStreamTask：LLM response_message is empty")
 
-            message_data = {"role": "assistant", "content": llm_content, "index": -1} # index=-1, full llm_content
-            assistant_msg = self.add_response_message(type="assistant", content=message_data, is_llm_message=True)
+            message_data = {"role": "assistant", "content": llm_content} # index=-1, full llm_content
+            assistant_msg = self.add_response_message(type="assistant_complete", content=message_data, is_llm_message=True)
             yield assistant_msg
 
             tool_calls_to_execute = [item['tool_call'] for item in parsed_xml_data]
@@ -90,7 +91,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
 
         except Exception as e:
             logging.error(f"NonStreamTask: Error processing non-streaming response: {llm_content}")
-            langfuse.create_event(trace_context=self.trace_context, name="error_processing_non_streaming_response", level="ERROR",
+            self.root_span.event(name="error_processing_non_streaming_response", level="ERROR",
                              status_message=(f"Error processing non-streaming response: {str(e)}"))
 
             content = {"role": "system", "status_type": "error", "message": str(e)}
@@ -100,7 +101,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
 
             # Re-raise the same exception (not a new one) to ensure proper error propagation
             logging.critical(f"NonStreamTask: Re-raising error to stop further processing: {str(e)}")
-            langfuse.create_event(trace_context=self.trace_context, name="re_raising_error_to_stop_further_processing", level="CRITICAL",
+            self.root_span.event(name="re_raising_error_to_stop_further_processing", level="CRITICAL",
                              status_message=(f"Re-raising error to stop further processing: {str(e)}"))
             raise  # Use bare 'raise' to preserve the original exception with its traceback