xgae 0.1.5__tar.gz → 0.1.7__tar.gz

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

@@ -15,6 +15,8 @@ LLM_MAX_TOKENS=16384
 LLM_TEMPERATURE=0.7
 LLM_MAX_RETRIES=2
 
+# TASK
+MAX_AUTO_RUN = 15
 
 
 

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

@@ -29,8 +29,15 @@
   "keyToString": {
     "ModuleVcsDetector.initialDetectionPerformed": "true",
     "Python.llm_client.executor": "Run",
+    "Python.message_tools_app.executor": "Run",
+    "Python.responser_base.executor": "Run",
+    "Python.run_engine_with_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.utils.executor": "Run",
     "Python.xga_engine.executor": "Run",
     "Python.xga_mcp_tool_box.executor": "Debug",
@@ -86,7 +93,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="run_xga_engine" type="PythonConfigurationType" factoryName="Python">
+    <configuration name="run_task_engine" type="PythonConfigurationType" factoryName="Python">
       <module name="xgae" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -110,7 +117,7 @@
           <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
         </ENTRIES>
       </EXTENSION>
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/xgae/engine/xga_engine.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/xgae/engine/task_engine.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -152,6 +159,8 @@
       <workItem from="1755668525673" duration="14877000" />
       <workItem from="1755700523844" duration="24000" />
       <workItem from="1755737435202" duration="48139000" />
+      <workItem from="1756044658912" duration="1248000" />
+      <workItem from="1756082326044" duration="23338000" />
     </task>
     <servers />
   </component>
@@ -171,11 +180,17 @@
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <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_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$run_xga_engine.coverage" NAME="run_xga_engine Coverage Results" MODIFIED="1755854764155" 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$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$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$llm_client.coverage" NAME="llm_client Coverage Results" MODIFIED="1755565705235" 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$" />
   </component>
 </project>

{xgae-0.1.5 → xgae-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xgae
-Version: 0.1.5
+Version: 0.1.7
 Summary: Extreme General Agent Engine
 Requires-Python: >=3.13
 Requires-Dist: colorlog>=6.9.0

xgae-0.1.7/mcpservers/xga_server.json

@@ -0,0 +1,11 @@
+{
+    "mcpServers":{
+        "xga_general": {
+      		"command": "uv",
+      		"args": [
+        		"run",
+        		"xgae-tools"
+      		]
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 [project]
 name = "xgae"
-version = "0.1.5"
+version = "0.1.7"
 description = "Extreme General Agent Engine"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -21,3 +21,4 @@ build-backend = "hatchling.build"
 exclude = ["log/*"]
 
 [project.scripts]
+xgae-tools = "xgae.tools.without_general_tools_app:main"

xgae-0.1.7/src/examples/run_human_in_loop.py

@@ -0,0 +1,29 @@
+import asyncio
+
+from xgae.engine.mcp_tool_box import XGAMcpToolBox
+from xgae.engine.task_engine import XGATaskEngine
+from xgae.utils.llm_client import LLMConfig
+from xgae.utils.misc import read_file
+
+
+async def main() -> None:
+    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=["*"],
+                           llm_config=LLMConfig(stream=False),
+                           system_prompt=system_prompt,
+                           max_auto_run=8)
+
+    user_input =  "locate fault and solution"
+    final_result = await engine.run_task_with_final_answer(task_message={"role": "user", "content": user_input})
+    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})
+        print("FINAL RESULT:", final_result)
+
+asyncio.run(main())

xgae-0.1.7/src/examples/run_simple.py

@@ -0,0 +1,12 @@
+import asyncio
+
+from xgae.engine.task_engine import XGATaskEngine
+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"})
+    print("FINAL RESULT:", final_result)
+
+asyncio.run(main())

xgae-0.1.7/src/examples/run_user_prompt.py

@@ -0,0 +1,30 @@
+import asyncio
+
+from xgae.engine.mcp_tool_box import XGAMcpToolBox
+from xgae.engine.task_engine import XGATaskEngine
+from xgae.utils.llm_client import LLMConfig
+from xgae.utils.misc import read_file
+
+
+async def main() -> None:
+    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=["*"],
+                           llm_config=LLMConfig(stream=False),
+                           system_prompt=system_prompt,
+                           max_auto_run=8)
+
+    user_input =  "locate 10.2.3.4 fault and solution"
+    is_final_result = False
+
+    if is_final_result:
+        final_result = await engine.run_task_with_final_answer(task_message={"role": "user", "content": user_input})
+        print("FINAL RESULT:", final_result)
+    else:
+        # Get All Task Process Message
+        async for chunk in engine.run_task(task_message={"role": "user", "content": user_input}):
+            print(chunk)
+
+asyncio.run(main())

xgae-0.1.5/src/xgae/engine/xga_base.py → xgae-0.1.7/src/xgae/engine/engine_base.py

@@ -6,18 +6,15 @@ 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 XGAResponseMsg(TypedDict, total=False):
-    type: Literal["user", "status",  "tool", "assistant", "assistant_response_end"]
-    content: Union[Dict[str, Any], List[Any], str]
+class XGAResponseMessage(TypedDict, total=False):
+    message_id: str
+    type: XGAResponseMsgType
     is_llm_message: bool
+    content: Union[Dict[str, Any], List[Any], str]
     metadata: Dict[str, Any]
-    message_id: str
-    task_id: str
-    task_run_id: str
-    trace_id: str
-    session_id: Optional[str]
-    agent_id: Optional[str]
 
 class XGATaskResult(TypedDict, total=False):
     type: Literal["ask", "answer", "error"]

xgae-0.1.5/src/xgae/engine/xga_mcp_tool_box.py → xgae-0.1.7/src/xgae/engine/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:
@@ -46,6 +46,12 @@ class XGAMcpToolBox(XGAToolBox):
                     task_tool_schemas[tool_schema.tool_name] = tool_schema
         task_tool_schemas.pop("end_task", None)
 
+        if len(custom_tools) == 1 and custom_tools[0] == "*":
+            custom_tools = []
+            for server_name in self.mcp_server_names:
+                if server_name != XGAMcpToolBox.GENERAL_MCP_SERVER_NAME:
+                    custom_tools.append(f"{server_name}.*")
+
         for server_tool_name in custom_tools:
             parts = server_tool_name.split(".")
             if len(parts) != 2:
@@ -58,8 +64,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:

xgae-0.1.5/src/xgae/engine/xga_prompt_builder.py → xgae-0.1.7/src/xgae/engine/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 xgae.engine.engine_base import XGAToolSchema, XGAError
+from xgae.utils.misc import read_file, format_file_with_args
 
 
 class XGAPromptBuilder():

xgae-0.1.7/src/xgae/engine/responser/non_stream_responser.py

@@ -0,0 +1,108 @@
+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_stream_processor_start", 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
+                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}")
+
+                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
+
+
+