xgae 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

xgae/engine/engine_base.py

@@ -6,7 +6,7 @@ class XGAError(Exception):
     """Custom exception for errors in the XGA system."""
     pass
 
-XGAMsgStatusType = Literal["error", "finish", "tool_started", "tool_completed", "tool_error", "tool_failed"]
+XGAMsgStatusType = Literal["error", "stop", "finish", "tool_started", "tool_completed", "tool_error", "tool_failed"]
 XGAResponseMsgType = Literal["user", "status",  "tool", "assistant", "assistant_chunk"]
 
 class XGAResponseMessage(TypedDict, total=False):
@@ -40,6 +40,10 @@ class XGAToolResult:
 
 
 class XGAToolBox(ABC):
+    @abstractmethod
+    async def init_tool_schemas(self):
+        pass
+
     @abstractmethod
     async def creat_task_tool_box(self, task_id: str, general_tools: List[str], custom_tools: List[str]):
         pass

xgae/engine/mcp_tool_box.py

@@ -2,7 +2,8 @@ import json
 import logging
 import os
 
-from typing import List, Any, Dict, Optional, Literal, override
+from typing import List, Any, Dict, Optional, Literal
+from typing_extensions import override
 
 from langchain_mcp_adapters.client import MultiServerMCPClient
 from langchain_mcp_adapters.tools import load_mcp_tools
@@ -33,7 +34,11 @@ class XGAMcpToolBox(XGAToolBox):
         self.mcp_tool_schemas: Dict[str, List[XGAToolSchema]] = {}
         self.task_tool_schemas: Dict[str, Dict[str,XGAToolSchema]] = {}
 
-        self.is_loaded_tool_schemas = False
+        self._is_loaded_mcp_tool_schemas = False
+
+    @override
+    async def init_tool_schemas(self):
+        await self._load_mcp_tools_schema()
 
     @override
     async def creat_task_tool_box(self, task_id: str, general_tools: List[str], custom_tools: List[str]):
@@ -139,8 +144,8 @@ class XGAMcpToolBox(XGAToolBox):
             return result
 
 
-    async def load_mcp_tools_schema(self)-> None:
-        if not self.is_loaded_tool_schemas:
+    async def _load_mcp_tools_schema(self)-> None:
+        if not self._is_loaded_mcp_tool_schemas:
             for server_name in self.mcp_server_names:
                 self.mcp_tool_schemas[server_name] = []
                 try:
@@ -169,11 +174,12 @@ class XGAMcpToolBox(XGAToolBox):
                                                 input_schema=input_schema,
                                                 metadata=metadata)
                     self.mcp_tool_schemas[server_name].append(tool_schema)
-            self.is_loaded_tool_schemas = True
+
+            self._is_loaded_mcp_tool_schemas = True
 
     async def reload_mcp_tools_schema(self) -> None:
-        self.is_loaded_tool_schemas = False
-        await self.load_mcp_tools_schema()
+        self._is_loaded_mcp_tool_schemas = False
+        await self.init_tool_schemas()
 
 
     def _load_mcp_servers_config(self, mcp_config_path: str) -> Dict[str, Any]:
@@ -219,7 +225,7 @@ if __name__ == "__main__":
         #mcp_tool_box = XGAMcpToolBox()
 
         task_id = "task1"
-        await mcp_tool_box.load_mcp_tools_schema()
+        await mcp_tool_box.init_tool_schemas()
         await mcp_tool_box.creat_task_tool_box(task_id=task_id, general_tools=["*"], custom_tools=["*"])
         tool_schemas = mcp_tool_box.get_task_tool_schemas(task_id, "general")
         print("general_tools_schemas" + "*"*50)

xgae/engine/responser/non_stream_responser.py

@@ -1,6 +1,7 @@
 import logging
 
-from typing import List, Dict, Any, AsyncGenerator, override,Optional
+from typing import List, Dict, Any, AsyncGenerator,Optional
+from typing_extensions import override
 
 from xgae.utils import log_trace
 

xgae/engine/responser/stream_responser.py

@@ -1,6 +1,7 @@
 import logging
-import asyncio
-from typing import List, Dict, Any, Optional, AsyncGenerator, override
+
+from typing import List, Dict, Any, Optional, AsyncGenerator
+from typing_extensions import override
 
 from xgae.utils import log_trace
 

xgae/engine/task_engine.py

@@ -116,8 +116,7 @@ class XGATaskEngine:
                     general_tools.append("ask")
 
             custom_tools = self.custom_tools or []
-            if isinstance(self.tool_box, XGAMcpToolBox):
-                await  self.tool_box.load_mcp_tools_schema()
+            await  self.tool_box.init_tool_schemas()
 
             await self.tool_box.creat_task_tool_box(self.task_id, general_tools, custom_tools)
             general_tool_schemas = self.tool_box.get_task_tool_schemas(self.task_id, "general")
@@ -201,6 +200,9 @@ class XGATaskEngine:
                 yield error_msg
             finally:
                 if not self.running_task_checkpoint("termination_check", iterations):
+                    status_content = {'status_type': "stop", 'role': "system", 'message': "Task is termiated by Stop Command"}
+                    error_msg = self.add_response_message(type="status", content=status_content, is_llm_message=False)
+                    yield error_msg
                     break
 
     async def _run_task_once(self, continuous_state: TaskRunContinuousState) -> AsyncGenerator[Dict[str, Any], None]:
@@ -239,8 +241,8 @@ class XGATaskEngine:
         reverse_chunks = reversed(chunks)
         chunk = None
 
-        if self.terminate_task:
-            return XGATaskResult(type="error", content="LLM Task is terminated !")
+        # if self.terminate_task:
+        #     return XGATaskResult(type="error", content="LLM Task is terminated !")
 
         try:
             finish_reason = ''
@@ -249,7 +251,7 @@ class XGATaskEngine:
                 if chunk_type == "status":
                     status_content = chunk['content']
                     status_type = status_content['status_type']
-                    if status_type == "error":
+                    if status_type == "error" or  status_type == "stop":
                         error = status_content['message']
                         final_result = XGATaskResult(type="error", content=error)
                     elif status_type == "finish":

xgae/gaia2/are_engine.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Any, Optional, override, Callable, Literal, Dict, List
+from typing import Any, Optional, Callable, Literal, Dict, List
+from typing_extensions import override
 
 from xgae.engine.engine_base import XGAToolBox
 from xgae.engine.task_engine import XGATaskEngine
@@ -81,12 +82,12 @@ if __name__ == "__main__":
 
     def terminate_task(agent, iterations: int) -> bool:
         logging.info(f"terminate_task: iterations={iterations}")
-        return iterations > 6 # can test terminate by > 3
+        return iterations > 3 # can test terminate by > 3
 
 
     async def main():
         # Before Run Exec: uv run example-fault-tools
-        # LLAMA_API_KEY ,
+        # LLAMA_API_KEY , LLAMA_API_BASE
         tool_box = XGAMcpToolBox(custom_mcp_server_file="mcpservers/custom_servers.json")
         system_prompt = read_file("templates/example/fault_user_prompt.txt")
         llm_config = LLMConfig(

{xgae-0.3.0.dist-info → xgae-0.3.1.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: xgae
-Version: 0.3.0
+Version: 0.3.1
 Summary: Extreme General Agent Engine
 Requires-Python: >=3.11
 Requires-Dist: colorlog==6.9.0
 Requires-Dist: langchain-mcp-adapters==0.1.9
 Requires-Dist: langfuse==2.60.9
-Requires-Dist: litellm==1.74.15
-Requires-Dist: mcp==1.13.0
+Requires-Dist: litellm==1.71.1
+Requires-Dist: mcp==1.11.0
 Provides-Extra: examples
 Requires-Dist: chromadb==1.1.0; extra == 'examples'
 Requires-Dist: langchain-community==0.3.29; extra == 'examples'

{xgae-0.3.0.dist-info → xgae-0.3.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 xgae/__init__.py,sha256=oBX_YzTliM-343BAlR-sD7BUZmsCJ7PY2oYrGBhsdLM,79
 xgae/engine_cli_app.py,sha256=FdmIpq8KDsgyZNfwCDgNX7FEZFeRFyGOt_H1oZF8aKs,2890
-xgae/engine/engine_base.py,sha256=RR1em2wHiM2jP-peHt77SKdHWjnYOjdIIzN93zT61cA,1715
-xgae/engine/mcp_tool_box.py,sha256=G4hKIMguwg1cO4Us2NMfdloYim8kuikVyVTIPucJr7o,10903
+xgae/engine/engine_base.py,sha256=bXwLxli7CK7JndAcOu-Rx4uTuy0pJDh_ZOGyhym76WY,1796
+xgae/engine/mcp_tool_box.py,sha256=7dOiP9cfBU8TfAxzbdw0V31ISF-o2TgdTVUqEemz004,11044
 xgae/engine/prompt_builder.py,sha256=6I5rjgvNJ27QJ8DDuBTplutoPZdGs9LYFv3TSgT7zmc,5045
-xgae/engine/task_engine.py,sha256=1YgkcsX8LAAIIp1DsVbphwOVO9xA0FioABxzaRvers8,23223
+xgae/engine/task_engine.py,sha256=QhjTPQ_aREsT19QfT1nQwNLKUMwWdSgqlfjfCNq_dho,23470
 xgae/engine/task_langfuse.py,sha256=ifkGrPBv2daLTKE-fCfEtOoI0n4Pd-lCwhyRRL0h308,2850
-xgae/engine/responser/non_stream_responser.py,sha256=zEJjqCgZVe2B8gkHYRFU7tmBV834f7w2a4Ws25P1N-c,5289
+xgae/engine/responser/non_stream_responser.py,sha256=WFzrT0tHGVLi_AR1IrIPPvpQ94ne7slwbFyXaoTpCQc,5318
 xgae/engine/responser/responser_base.py,sha256=jhl1Bdz1Fs3KofGEymThNXlQuCORFTTkTAR_U47krds,24403
-xgae/engine/responser/stream_responser.py,sha256=cv4UGcxj8OksEogW7DUGTCvSJabu-DF6GceFyUwaXI4,7627
-xgae/gaia2/are_engine.py,sha256=GPs6c94CN8jJjmNNsE7XHxdskPJ31p4Ds9QCST7BiI4,5050
+xgae/engine/responser/stream_responser.py,sha256=5n7i2QnE_u7RP1bcJFky8sFPjYMjfYY9NcR5TeFxl9Y,7642
+xgae/gaia2/are_engine.py,sha256=QPvyWEydeiOECQ7WfxjMIurQHD_ET7uWQCnXVCh_ZQk,5094
 xgae/tools/without_general_tools_app.py,sha256=KqsdhxD3hvTpiygaGUVHysRFjvv_1A8zOwMKN1J0J0U,3821
 xgae/utils/__init__.py,sha256=ElaGS-zdeZeu6is41u3Ny7lkvhg7BDSK-jMNg9j6K5A,499
 xgae/utils/json_helpers.py,sha256=WD4G5U9Dh8N6J9O0L5wGyqj-NHi09kcXHGdLD_26nlc,3607
@@ -16,7 +16,7 @@ xgae/utils/llm_client.py,sha256=rqnu_NYXBC0hl4aozP5UOSyf0q-ONB5ywtnrXzA88OE,1505
 xgae/utils/misc.py,sha256=aMWOvJ9VW52q-L9Lkjl1hvXqLwpJAmyxA-Z8jzqFG0U,907
 xgae/utils/setup_env.py,sha256=MqNG0c2QQBDFU1kI8frxr9kB5d08Mmi3QZ1OoorgIa0,2662
 xgae/utils/xml_tool_parser.py,sha256=Mb0d8kBrfyAEvUwW1Nqir-3BgxZRr0ZX3WymQouuFSo,4859
-xgae-0.3.0.dist-info/METADATA,sha256=OAdIkEtp1xWqtU2MrOBRJfPyu7TLJk6m5EPYh9WYNdQ,471
-xgae-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-xgae-0.3.0.dist-info/entry_points.txt,sha256=wmvgtMQbtzTbDPETS-tbQJD7jVlcs4hp0w6wOB0ooCc,229
-xgae-0.3.0.dist-info/RECORD,,
+xgae-0.3.1.dist-info/METADATA,sha256=vOaoxeqkHDKwSuRUscc9--4KpuOTqM5BwEXqsCPUQ1I,470
+xgae-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+xgae-0.3.1.dist-info/entry_points.txt,sha256=wmvgtMQbtzTbDPETS-tbQJD7jVlcs4hp0w6wOB0ooCc,229
+xgae-0.3.1.dist-info/RECORD,,