xgae 0.3.0__tar.gz → 0.3.1__tar.gz

{xgae-0.3.0 → xgae-0.3.1}/PKG-INFO

@@ -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 → xgae-0.3.1}/examples/agent/langgraph/reflection/custom_prompt_rag.py

@@ -1,6 +1,7 @@
 import logging
 import os
-from typing import override, List
+from typing import  List
+from typing_extensions import override
 
 from langchain_core.documents import Document
 from langchain_core.embeddings import Embeddings

{xgae-0.3.0 → xgae-0.3.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "xgae"
-version = "0.3.0"
+version = "0.3.1"
 description = "Extreme General Agent Engine"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "colorlog==6.9.0",
-    "litellm==1.74.15",
-    "mcp==1.13.0",
+    "litellm==1.71.1",
+    "mcp==1.11.0",
     "langfuse==2.60.9",
     "langchain-mcp-adapters==0.1.9",
 ]

{xgae-0.3.0 → xgae-0.3.1}/uv.lock

@@ -733,6 +733,19 @@ wheels = [
     { url = "https://pypi.tuna.tsinghua.edu.cn/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" },
 ]
 
+[[package]]
+name = "httpx-aiohttp"
+version = "0.1.9"
+source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
+dependencies = [
+    { name = "aiohttp" },
+    { name = "httpx" },
+]
+sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/d8/f2/9a86ce9bc48cf57dabb3a3160dfed26d8bbe5a2478a51f9d1dbf89f2f1fc/httpx_aiohttp-0.1.9.tar.gz", hash = "sha256:4ee8b22e6f2e7c80cd03be29eff98bfe7d89bd77f021ce0b578ee76b73b4bfe6", size = 206023, upload-time = "2025-10-15T08:52:57.475Z" }
+wheels = [
+    { url = "https://pypi.tuna.tsinghua.edu.cn/packages/a1/db/5cfa8254a86c34a1ab7fe0dbec9f81bb5ebd831cbdd65aa4be4f37027804/httpx_aiohttp-0.1.9-py3-none-any.whl", hash = "sha256:3dc2845568b07742588710fcf3d72db2cbcdf2acc93376edf85f789c4d8e5fda", size = 6180, upload-time = "2025-10-15T08:52:56.521Z" },
+]
+
 [[package]]
 name = "httpx-sse"
 version = "0.4.1"
@@ -1125,12 +1138,13 @@ wheels = [
 
 [[package]]
 name = "litellm"
-version = "1.74.15"
+version = "1.71.1"
 source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
 dependencies = [
     { name = "aiohttp" },
     { name = "click" },
     { name = "httpx" },
+    { name = "httpx-aiohttp" },
     { name = "importlib-metadata" },
     { name = "jinja2" },
     { name = "jsonschema" },
@@ -1140,9 +1154,9 @@ dependencies = [
     { name = "tiktoken" },
     { name = "tokenizers" },
 ]
-sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/4b/13/90865340f76d54c1c2709074f882bf8ef3be0ac612a2164da5eed07ebe11/litellm-1.74.15.tar.gz", hash = "sha256:530a4b3918c02f87079ca7efb77eaf13d31f281218863f65b2da4bd863790677", size = 9748743, upload-time = "2025-08-02T21:49:08.631Z" }
+sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/8d/f7/1d51b81e608543c6a79b275a4e2b43f6b4b7f32588566b303102014b725d/litellm-1.71.1.tar.gz", hash = "sha256:c20e5917fdbe771ba4b6d1862b3d38d6e89cfba53e85bb337013f848256566eb", size = 7935681, upload-time = "2025-05-25T14:24:10.744Z" }
 wheels = [
-    { url = "https://pypi.tuna.tsinghua.edu.cn/packages/b9/9c/f4dd62d790d65c924699450d8789df437e63c8d99229e95bd7467ce7b82a/litellm-1.74.15-py3-none-any.whl", hash = "sha256:bf3db744dee982e53196cb688097ba76e2867004e39ad201b3761c5de9e3265b", size = 8835438, upload-time = "2025-08-02T21:49:05.817Z" },
+    { url = "https://pypi.tuna.tsinghua.edu.cn/packages/34/0e/328e077a66726dc1d4cfee37c67548b151a33a6d196a32737c85a034712b/litellm-1.71.1-py3-none-any.whl", hash = "sha256:9b94e250c58fba3c87c6ebb77e33c1cc8aa9110cee99dfdc37b368a11cec57c7", size = 7921387, upload-time = "2025-05-25T14:24:08.205Z" },
 ]
 
 [[package]]
@@ -1219,7 +1233,7 @@ wheels = [
 
 [[package]]
 name = "mcp"
-version = "1.13.0"
+version = "1.11.0"
 source = { registry = "https://pypi.tuna.tsinghua.edu.cn/simple" }
 dependencies = [
     { name = "anyio" },
@@ -1234,9 +1248,9 @@ dependencies = [
     { name = "starlette" },
     { name = "uvicorn", marker = "sys_platform != 'emscripten'" },
 ]
-sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/d3/a8/564c094de5d6199f727f5d9f5672dbec3b00dfafd0f67bf52d995eaa5951/mcp-1.13.0.tar.gz", hash = "sha256:70452f56f74662a94eb72ac5feb93997b35995e389b3a3a574e078bed2aa9ab3", size = 434709, upload-time = "2025-08-14T15:03:58.58Z" }
+sdist = { url = "https://pypi.tuna.tsinghua.edu.cn/packages/3a/f5/9506eb5578d5bbe9819ee8ba3198d0ad0e2fbe3bab8b257e4131ceb7dfb6/mcp-1.11.0.tar.gz", hash = "sha256:49a213df56bb9472ff83b3132a4825f5c8f5b120a90246f08b0dac6bedac44c8", size = 406907, upload-time = "2025-07-10T16:41:09.388Z" }
 wheels = [
-    { url = "https://pypi.tuna.tsinghua.edu.cn/packages/8b/6b/46b8bcefc2ee9e2d2e8d2bd25f1c2512f5a879fac4619d716b194d6e7ccc/mcp-1.13.0-py3-none-any.whl", hash = "sha256:8b1a002ebe6e17e894ec74d1943cc09aa9d23cb931bf58d49ab2e9fa6bb17e4b", size = 160226, upload-time = "2025-08-14T15:03:56.641Z" },
+    { url = "https://pypi.tuna.tsinghua.edu.cn/packages/92/9c/c9ca79f9c512e4113a5d07043013110bb3369fc7770040c61378c7fbcf70/mcp-1.11.0-py3-none-any.whl", hash = "sha256:58deac37f7483e4b338524b98bc949b7c2b7c33d978f5fafab5bde041c5e2595", size = 155880, upload-time = "2025-07-10T16:41:07.935Z" },
 ]
 
 [[package]]
@@ -2994,7 +3008,7 @@ wheels = [
 
 [[package]]
 name = "xgae"
-version = "0.3.0"
+version = "0.3.1"
 source = { editable = "." }
 dependencies = [
     { name = "colorlog" },
@@ -3019,8 +3033,8 @@ requires-dist = [
     { name = "langchain-mcp-adapters", specifier = "==0.1.9" },
     { name = "langfuse", specifier = "==2.60.9" },
     { name = "langgraph", marker = "extra == 'examples'", specifier = "==0.6.5" },
-    { name = "litellm", specifier = "==1.74.15" },
-    { name = "mcp", specifier = "==1.13.0" },
+    { name = "litellm", specifier = "==1.71.1" },
+    { name = "mcp", specifier = "==1.11.0" },
 ]
 provides-extras = ["examples"]
 

{xgae-0.3.0 → xgae-0.3.1}/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-0.3.0 → xgae-0.3.1}/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-0.3.0 → xgae-0.3.1}/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-0.3.0 → xgae-0.3.1}/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-0.3.0 → xgae-0.3.1}/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-0.3.0 → xgae-0.3.1}/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(