xgae 0.1.13__py3-none-any.whl → 0.1.15__py3-none-any.whl

xgae/engine/mcp_tool_box.py

@@ -17,16 +17,17 @@ class XGAMcpToolBox(XGAToolBox):
                  custom_mcp_server_config: Optional[Dict[str, Any]] = None
         ):
         general_mcp_server_config = self._load_mcp_servers_config("mcpservers/xga_server.json")
-        tool_box_mcp_server_config = general_mcp_server_config.get("mcpServers", {})
+        tool_box_mcp_server_config = general_mcp_server_config.get('mcpServers', {})
 
         if custom_mcp_server_config:
             tool_box_mcp_server_config.update(custom_mcp_server_config)
         elif custom_mcp_server_file:
             custom_mcp_server_config = self._load_mcp_servers_config(custom_mcp_server_file)
-            custom_mcp_server_config = custom_mcp_server_config.get("mcpServers", {})
+            custom_mcp_server_config = custom_mcp_server_config.get('mcpServers', {})
             tool_box_mcp_server_config.update(custom_mcp_server_config)
 
         self._mcp_client = MultiServerMCPClient(tool_box_mcp_server_config)
+
         self.mcp_server_names: List[str] = [server_name for server_name in tool_box_mcp_server_config]
         self.mcp_tool_schemas: Dict[str, List[XGAToolSchema]] = {}
         self.task_tool_schemas: Dict[str, Dict[str,XGAToolSchema]] = {}
@@ -178,18 +179,18 @@ class XGAMcpToolBox(XGAToolBox):
                     for server_name, server_info in server_config["mcpServers"].items():
                         if "transport" not in server_info:
                             if "url" in server_info:
-                                server_info["transport"] = "streamable_http" if "mcp" in server_info["url"] else "sse"
+                                server_info['transport'] = "streamable_http" if "mcp" in server_info['url'] else "sse"
                             else:
-                                server_info["transport"] = "stdio"
+                                server_info['transport'] = "stdio"
 
                     return server_config
             else:
                 logging.warning(f"McpToolBox load_mcp_servers_config: MCP servers config file not found at: {mcp_config_path}")
-                return {"mcpServers": {}}
+                return {'mcpServers': {}}
 
         except Exception as e:
             logging.error(f"McpToolBox load_mcp_servers_config: Failed to load MCP servers config: {e}")
-            return {"mcpServers": {}}
+            return {'mcpServers': {}}
 
 
 if __name__ == "__main__":
@@ -200,7 +201,7 @@ if __name__ == "__main__":
     setup_logging()
 
     async def main():
-        ## Before Run Exec: uv run custom_fault_tools
+        ## Before Run Exec: uv run example-fault-tools
         mcp_tool_box = XGAMcpToolBox(custom_mcp_server_file="mcpservers/custom_servers.json")
         #mcp_tool_box = XGAMcpToolBox()
 

xgae/engine/prompt_builder.py

@@ -34,19 +34,20 @@ class XGAPromptBuilder():
             openai_schemas = []
             for tool_schema in tool_schemas:
                 openai_schema = {}
-                openai_schema["type"] = "function"
                 openai_function = {}
-                openai_schema["function"] = openai_function
+                openai_schema['type'] = "function"
+                openai_schema['function'] = openai_function
 
-                openai_function["name"] = tool_schema.tool_name
-                openai_function["description"] = tool_schema.description if tool_schema.description else 'No description available'
+                openai_function['name'] = tool_schema.tool_name
+                openai_function['description'] = tool_schema.description if tool_schema.description else 'No description available'
 
                 openai_parameters = {}
+                openai_function['parameters'] = openai_parameters
+
                 input_schema = tool_schema.input_schema
-                openai_function["parameters"] = openai_parameters
-                openai_parameters["type"] = input_schema["type"]
-                openai_parameters["properties"] = input_schema.get("properties", {})
-                openai_parameters["required"] = input_schema["required"]
+                openai_parameters['type']       = input_schema['type']
+                openai_parameters['properties'] = input_schema.get('properties', {})
+                openai_parameters['required']   = input_schema['required']
 
                 openai_schemas.append(openai_schema)
 

xgae/engine/responser/non_stream_responser.py

@@ -3,7 +3,7 @@ import logging
 from typing import List, Dict, Any, AsyncGenerator, override,Optional
 
 from xgae.utils import log_trace
-from xgae.utils.json_helpers import format_for_yield
+
 
 from xgae.engine.responser.responser_base import TaskResponseProcessor, TaskResponserContext, TaskRunContinuousState
 
@@ -25,7 +25,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
         try:
             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
+                    finish_reason = llm_response.choices[0].finish_reason # LLM finish reason: ‘stop' , 'length'
                     logging.info(f"NonStreamResp: LLM response finish_reason={finish_reason}")
 
                 response_message = llm_response.choices[0].message if hasattr(llm_response.choices[0], 'message') else None
@@ -35,12 +35,13 @@ class NonStreamTaskResponser(TaskResponseProcessor):
                         
                         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"NonStreamResp: Truncate content, parsed_xml_data length={len(parsed_xml_data)} limit over max_xml_tool_calls={self.max_xml_tool_calls}")
+                            logging.warning(f"NonStreamResp: Over XML Tool Limit, finish_reason='xml_tool_limit_reached', "
+                                            f"parsed_xml_data_len={len(parsed_xml_data)}")
                             parsed_xml_data = parsed_xml_data[:self.max_xml_tool_calls]
                             finish_reason = "xml_tool_limit_reached"
 
             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}, "
+                             status_message=f"finish_reason={finish_reason}, tool_exec_strategy={self.tool_exec_strategy}, "
                                             f"parsed_xml_data_len={len(parsed_xml_data)}, llm_content_len={len(llm_content)}")
 
             if  len(llm_content) == 0:
@@ -52,7 +53,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
 
             tool_calls_to_execute = [item['tool_call'] for item in parsed_xml_data]
             if  len(tool_calls_to_execute) > 0:
-                tool_results = await self._execute_tools(tool_calls_to_execute, self.tool_execution_strategy)
+                tool_results = await self._execute_tools(tool_calls_to_execute, self.tool_exec_strategy)
 
                 tool_index = 0
                 for i, (returned_tool_call, tool_result) in enumerate(tool_results):
@@ -61,20 +62,19 @@ class NonStreamTaskResponser(TaskResponseProcessor):
                     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_context = self._create_tool_context(tool_call, tool_index, assistant_msg_id, parsing_details, tool_result)
 
                     tool_start_msg = self._add_tool_start_message(tool_context)
-                    yield format_for_yield(tool_start_msg)
+                    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 tool_completed_msg
 
-                    yield format_for_yield(tool_message)
+                    yield tool_message
 
-                    if tool_completed_msg["metadata"].get("agent_should_terminate") == "true":
+                    if tool_context.function_name in ['ask', 'complete']:
                         finish_reason = "completed"
                         break
 
@@ -86,7 +86,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
             if finish_reason:
                 finish_content = {"status_type": "finish", "finish_reason": finish_reason}
                 finish_msg = self.add_response_message(type="status", content=finish_content, is_llm_message=False)
-                yield format_for_yield(finish_msg)
+                yield finish_msg
         except Exception as e:
             trace = log_trace(e, f"NonStreamResp: Process response llm_content:\n {llm_content}")
             self.root_span.event(name="non_stream_process_response_error", level="ERROR",
@@ -95,7 +95,7 @@ class NonStreamTaskResponser(TaskResponseProcessor):
 
             content = {"role": "system", "status_type": "error", "message": f"Process non-streaming response error: {e}"}
             error_msg = self.add_response_message(type="status", content=content, is_llm_message=False)
-            yield format_for_yield(error_msg)
+            yield error_msg
 
             raise  # Use bare 'raise' to preserve the original exception with its traceback