xgae 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

xgae/engine/{xga_base.py → engine_base.py}

@@ -6,24 +6,20 @@ class XGAError(Exception):
     """Custom exception for errors in the XGA system."""
     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"]
 
-class XGAContextMsg(TypedDict, total=False):
-    type: Literal["user", "status",  "tool", "assistant", "assistant_response_end"]
-    content: Union[Dict[str, Any], List[Any], str]
-    is_llm_message: bool
-    metadata: Dict[str, Any]
+class XGAResponseMessage(TypedDict, total=False):
     message_id: str
-    session_id: str
-    agent_id: str
-    task_id: str
-    task_run_id: str
-    trace_id: str
-
-class XGAResponseMsg(TypedDict, total=False):
-    type: Literal["content", "status"]
+    type: XGAResponseMsgType
+    is_llm_message: bool
     content: Union[Dict[str, Any], List[Any], str]
-    status: Literal["error", "status"]
-    message: str
+    metadata: Dict[str, Any]
+
+class XGATaskResult(TypedDict, total=False):
+    type: Literal["ask", "answer", "error"]
+    content: str
+    attachments: Optional[List[str]]
 
 @dataclass
 class XGAToolSchema:
@@ -39,6 +35,7 @@ class XGAToolResult:
     success: bool
     output: str
 
+
 class XGAToolBox(ABC):
     @abstractmethod
     async def creat_task_tool_box(self, task_id: str, general_tools: List[str], custom_tools: List[str]):

xgae/engine/{xga_mcp_tool_box.py → mcp_tool_box.py}

@@ -7,8 +7,8 @@ from typing import List, Any, Dict, Optional, Literal, override
 from langchain_mcp_adapters.client import MultiServerMCPClient
 from langchain_mcp_adapters.tools import load_mcp_tools
 
-from xgae.engine.xga_base import XGAError, XGAToolSchema, XGAToolBox, XGAToolResult
-from xgae.utils.setup_env import langfuse
+from xgae.engine.engine_base import XGAError, XGAToolSchema, XGAToolBox, XGAToolResult
+from xgae.utils import langfuse
 
 class XGAMcpToolBox(XGAToolBox):
     GENERAL_MCP_SERVER_NAME = "xga_general"
@@ -38,7 +38,7 @@ class XGAMcpToolBox(XGAToolBox):
     async def creat_task_tool_box(self, task_id: str, general_tools: List[str], custom_tools: List[str]):
         task_tool_schemas = {}
         general_tool_schemas = self.mcp_tool_schemas.get(XGAMcpToolBox.GENERAL_MCP_SERVER_NAME, {})
-        if len(general_tools) > 0 and general_tools[0] == "*":
+        if "*" in general_tools:
             task_tool_schemas = {tool_schema.tool_name: tool_schema for tool_schema in general_tool_schemas}
         else:
             for tool_schema in general_tool_schemas:
@@ -58,8 +58,8 @@ class XGAMcpToolBox(XGAToolBox):
             if custom_tool_schemas is None:
                 continue
             if custom_tool_name == "*":
-                custom_tool_schema_d = {tool_schema.tool_name: tool_schema for tool_schema in custom_tool_schemas}
-                task_tool_schemas.update(custom_tool_schema_d)
+                custom_tool_schema_dict = {tool_schema.tool_name: tool_schema for tool_schema in custom_tool_schemas}
+                task_tool_schemas.update(custom_tool_schema_dict)
             else:
                 for tool_schema in custom_tool_schemas:
                     if custom_tool_name == tool_schema.tool_name:
@@ -112,10 +112,7 @@ class XGAMcpToolBox(XGAToolBox):
             if mcp_tool:
                 tool_args = args or {}
                 if server_name == self.GENERAL_MCP_SERVER_NAME:
-                    pass
-                    #tool_args["task_id"] = task_id #xga general tool, first param must be task_id
-                else:
-                    tool_args = args
+                    tool_args = dict({"task_id": task_id}, **tool_args)
 
                 try:
                     tool_result = await mcp_tool.arun(tool_args)

xgae/engine/{xga_prompt_builder.py → prompt_builder.py}

@@ -1,9 +1,10 @@
 import json
 import datetime
+
 from typing import Optional, List
 
-from xga_base import XGAToolSchema, XGAError
-from xgae.utils.utils import read_file, format_file_with_args
+from engine_base import XGAToolSchema, XGAError
+from xgae.utils.misc import read_file, format_file_with_args
 
 
 class XGAPromptBuilder():

xgae/engine/responser/non_stream_responser.py

@@ -0,0 +1,110 @@
+import logging
+
+from typing import List, Dict, Any, AsyncGenerator, override,Optional
+
+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):
+        super().__init__(response_context)
+
+    @override
+    async def process_response(self,llm_response: Any,prompt_messages: List[Dict[str, Any]],
+                               continuous_state: Optional[TaskRunContinuousState] = None) -> AsyncGenerator[Dict[str, Any], None]:
+        llm_content = ""
+        parsed_xml_data = []
+        finish_reason = None
+
+        try:
+            # Extract finish_reason, content, tool calls
+            if hasattr(llm_response, 'choices') and llm_response.choices:
+                if hasattr(llm_response.choices[0], 'finish_reason'):
+                    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_streaming_finish_reason", level="DEFAULT",
+                                     status_message=(f"Non-streaming finish_reason: {finish_reason}"))
+
+                response_message = llm_response.choices[0].message if hasattr(llm_response.choices[0], 'message') else None
+                if response_message:
+                    if hasattr(response_message, 'content') and response_message.content:
+                        llm_content = response_message.content
+                        
+                        parsed_xml_data = self._parse_xml_tool_calls(llm_content)
+                        if self.max_xml_tool_calls > 0 and len(parsed_xml_data) > self.max_xml_tool_calls:
+                            logging.warning(f"NonStreamTask：Truncate content, parsed_xml_data length {len(parsed_xml_data)} limit over max_xml_tool_calls={self.max_xml_tool_calls}")
+                            xml_chunks = self._extract_xml_chunks(llm_content)[:self.max_xml_tool_calls]
+                            if xml_chunks:
+                                last_chunk = xml_chunks[-1]
+                                last_chunk_pos = llm_content.find(last_chunk)
+                                if last_chunk_pos >= 0:
+                                    llm_content = llm_content[:last_chunk_pos + len(last_chunk)]
+                            parsed_xml_data = parsed_xml_data[:self.max_xml_tool_calls]
+                            finish_reason = "xml_tool_limit_reached"
+                            logging.info(f"NonStreamTask：LLM response finish_reason={finish_reason}")
+                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)
+            yield assistant_msg
+
+            tool_calls_to_execute = [item['tool_call'] for item in parsed_xml_data]
+            if  len(tool_calls_to_execute) > 0:
+                logging.info(f"NonStreamTask：Executing {len(tool_calls_to_execute)} tools with strategy: {self.tool_execution_strategy}")
+                langfuse.create_event(trace_context=self.trace_context, name="executing_tools_with_strategy", level="DEFAULT", status_message=(
+                    f"NonStreamTask Executing {len(tool_calls_to_execute)} tools with strategy: {self.tool_execution_strategy}"))
+
+                tool_results = await self._execute_tools(tool_calls_to_execute, self.tool_execution_strategy)
+
+                tool_index = 0
+                for i, (returned_tool_call, tool_result) in enumerate(tool_results):
+                    parsed_xml_item = parsed_xml_data[i]
+                    tool_call = parsed_xml_item['tool_call']
+                    parsing_details = parsed_xml_item['parsing_details']
+                    assistant_msg_id = assistant_msg['message_id'] if assistant_msg else None
+
+                    tool_context = self._create_tool_context(tool_call, tool_index, assistant_msg_id, parsing_details)
+                    tool_context.result = tool_result
+
+                    tool_start_msg = self._add_tool_start_message(tool_context)
+                    yield format_for_yield(tool_start_msg)
+
+                    tool_message = self._add_tool_messsage(tool_call, tool_result, self.xml_adding_strategy, assistant_msg_id, parsing_details)
+
+                    tool_completed_msg = self._add_tool_completed_message(tool_context, tool_message['message_id'])
+                    yield format_for_yield(tool_completed_msg)
+
+                    yield format_for_yield(tool_message)
+
+                    if tool_completed_msg["metadata"].get("agent_should_terminate") == "true":
+                        finish_reason = "completed"
+                        break
+                    tool_index += 1
+
+            if finish_reason:
+                finish_content = {"status_type": "finish", "finish_reason": finish_reason}
+                finish_msg_obj = self.add_response_message(type="status", content=finish_content, is_llm_message=False)
+                if finish_msg_obj:
+                    yield format_for_yield(finish_msg_obj)
+
+        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",
+                             status_message=(f"Error processing non-streaming response: {str(e)}"))
+
+            content = {"role": "system", "status_type": "error", "message": str(e)}
+            err_msg = self.add_response_message(ype="status", content=content,is_llm_message=False)
+            if err_msg:
+                yield format_for_yield(err_msg)
+
+            # 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",
+                             status_message=(f"Re-raising error to stop further processing: {str(e)}"))
+            raise  # Use bare 'raise' to preserve the original exception with its traceback
+
+
+